diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-09-26 08:48:16 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-09-26 08:48:23 +1000 |
| commit | da3fce4af75d4ddeec078b651b1dac80eb2b5e73 (patch) | |
| tree | 07eabea23157cfa72210c3409f129dae33d2d6d3 /drivers/gpu/drm/drm_ioctl.c | |
| parent | 945b584c94f8c665b2df3834a8a6a8faf256cd5f (diff) | |
| parent | 65e51e30d8625c82ddfe405da46124e9bbffaa71 (diff) | |
| download | talos-op-linux-da3fce4af75d4ddeec078b651b1dac80eb2b5e73.tar.gz talos-op-linux-da3fce4af75d4ddeec078b651b1dac80eb2b5e73.zip | |
Merge tag 'drm-misc-next-fixes-2019-09-23' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
- Multiple panfrost fixes for regulator support and page fault handling
- Some cleanups and fixes in the self-refresh helpers
- Some cleanups and fixes in the atomic helpers
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Maxime Ripard <mripard@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20190923160946.nvaqiw5j7fpcdhc7@gilmour
Diffstat (limited to 'drivers/gpu/drm/drm_ioctl.c')
| -rw-r--r-- | drivers/gpu/drm/drm_ioctl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index f675a3bb2c88..fcd728d7cf72 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c @@ -336,7 +336,12 @@ drm_setclientcap(struct drm_device *dev, void *data, struct drm_file *file_priv) case DRM_CLIENT_CAP_ATOMIC: if (!drm_core_check_feature(dev, DRIVER_ATOMIC)) return -EOPNOTSUPP; - if (req->value > 1) + /* The modesetting DDX has a totally broken idea of atomic. */ + if (current->comm[0] == 'X' && req->value == 1) { + pr_info("broken atomic modeset userspace detected, disabling atomic\n"); + return -EOPNOTSUPP; + } + if (req->value > 2) return -EINVAL; file_priv->atomic = req->value; file_priv->universal_planes = req->value; |
