aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/drm_syncobj.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2018-09-19 20:14:59 -0400
committerDave Airlie <airlied@redhat.com>2018-09-19 20:15:05 -0400
commit795241040a9102b7dc925714f6a57ec92d84932e (patch)
treec6c224ccfba50c61ab1e68b5c261117865add096 /drivers/gpu/drm/drm_syncobj.c
parent2dc7bad71cd310dc94d1c9907909324dd2b0618f (diff)
parente884818cc0edb9bd128de95e7ca6b569f4667c0f (diff)
Merge tag 'drm-misc-next-2018-09-19' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.20: UAPI Changes: - None Cross-subsystem Changes: - None Core Changes: - Allow drivers to disable features with per-device granularity (Ville) - Use EOPNOTSUPP when iface/feature is unsupported instead of EINVAL/errno soup (Chris) - Simplify M/N DP quirk by using constant N to limit size of M/N (Shawn) - add quirk for LG LP140WF6-SPM1 eDP panel (Shawn) Driver Changes: - i915/amdgpu: Disable DRIVER_ATOMIC for older/unsupported devices (Ville) - sun4i: add support for R40 HDMI PHY (Icenowy) Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Icenowy Zheng <icenowy@aosc.io> Cc: Lee, Shawn C <shawn.c.lee@intel.com> Signed-off-by: Dave Airlie <airlied@redhat.com> From: Sean Paul <sean@poorly.run> Link: https://patchwork.freedesktop.org/patch/msgid/20180919200218.GA186644@art_vandelay
Diffstat (limited to 'drivers/gpu/drm/drm_syncobj.c')
-rw-r--r--drivers/gpu/drm/drm_syncobj.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c
index e9ce623d049e..497729202bfe 100644
--- a/drivers/gpu/drm/drm_syncobj.c
+++ b/drivers/gpu/drm/drm_syncobj.c
@@ -573,7 +573,7 @@ drm_syncobj_create_ioctl(struct drm_device *dev, void *data,
573 struct drm_syncobj_create *args = data; 573 struct drm_syncobj_create *args = data;
574 574
575 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) 575 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
576 return -ENODEV; 576 return -EOPNOTSUPP;
577 577
578 /* no valid flags yet */ 578 /* no valid flags yet */
579 if (args->flags & ~DRM_SYNCOBJ_CREATE_SIGNALED) 579 if (args->flags & ~DRM_SYNCOBJ_CREATE_SIGNALED)
@@ -590,7 +590,7 @@ drm_syncobj_destroy_ioctl(struct drm_device *dev, void *data,
590 struct drm_syncobj_destroy *args = data; 590 struct drm_syncobj_destroy *args = data;
591 591
592 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) 592 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
593 return -ENODEV; 593 return -EOPNOTSUPP;
594 594
595 /* make sure padding is empty */ 595 /* make sure padding is empty */
596 if (args->pad) 596 if (args->pad)
@@ -605,7 +605,7 @@ drm_syncobj_handle_to_fd_ioctl(struct drm_device *dev, void *data,
605 struct drm_syncobj_handle *args = data; 605 struct drm_syncobj_handle *args = data;
606 606
607 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) 607 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
608 return -ENODEV; 608 return -EOPNOTSUPP;
609 609
610 if (args->pad) 610 if (args->pad)
611 return -EINVAL; 611 return -EINVAL;
@@ -629,7 +629,7 @@ drm_syncobj_fd_to_handle_ioctl(struct drm_device *dev, void *data,
629 struct drm_syncobj_handle *args = data; 629 struct drm_syncobj_handle *args = data;
630 630
631 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) 631 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
632 return -ENODEV; 632 return -EOPNOTSUPP;
633 633
634 if (args->pad) 634 if (args->pad)
635 return -EINVAL; 635 return -EINVAL;
@@ -921,7 +921,7 @@ drm_syncobj_wait_ioctl(struct drm_device *dev, void *data,
921 int ret = 0; 921 int ret = 0;
922 922
923 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) 923 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
924 return -ENODEV; 924 return -EOPNOTSUPP;
925 925
926 if (args->flags & ~(DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL | 926 if (args->flags & ~(DRM_SYNCOBJ_WAIT_FLAGS_WAIT_ALL |
927 DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT)) 927 DRM_SYNCOBJ_WAIT_FLAGS_WAIT_FOR_SUBMIT))
@@ -955,7 +955,7 @@ drm_syncobj_reset_ioctl(struct drm_device *dev, void *data,
955 int ret; 955 int ret;
956 956
957 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) 957 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
958 return -ENODEV; 958 return -EOPNOTSUPP;
959 959
960 if (args->pad != 0) 960 if (args->pad != 0)
961 return -EINVAL; 961 return -EINVAL;
@@ -988,7 +988,7 @@ drm_syncobj_signal_ioctl(struct drm_device *dev, void *data,
988 int ret; 988 int ret;
989 989
990 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ)) 990 if (!drm_core_check_feature(dev, DRIVER_SYNCOBJ))
991 return -ENODEV; 991 return -EOPNOTSUPP;
992 992
993 if (args->pad != 0) 993 if (args->pad != 0)
994 return -EINVAL; 994 return -EINVAL;