diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-23 06:03:31 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2015-02-27 12:10:53 -0500 |
commit | 3f52c6edf7d72ef71d82c1f5ad4038ec83a31549 (patch) | |
tree | b8d8e2a67f0815fa508a6ce2d27614340fcce2bd /drivers/gpu/drm/i915/intel_sprite.c | |
parent | 8634bd4aea1b59777e5fd63be15300107ab454cc (diff) |
drm/i915: Remove DRIVER_MODESET checks from modeset code
Mostly just checks in i915-private modeset ioctls.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_sprite.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_sprite.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c index 5ae56ecbca72..f0b06c09da40 100644 --- a/drivers/gpu/drm/i915/intel_sprite.c +++ b/drivers/gpu/drm/i915/intel_sprite.c | |||
@@ -1301,9 +1301,6 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data, | |||
1301 | struct intel_plane *intel_plane; | 1301 | struct intel_plane *intel_plane; |
1302 | int ret = 0; | 1302 | int ret = 0; |
1303 | 1303 | ||
1304 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | ||
1305 | return -ENODEV; | ||
1306 | |||
1307 | /* Make sure we don't try to enable both src & dest simultaneously */ | 1304 | /* Make sure we don't try to enable both src & dest simultaneously */ |
1308 | if ((set->flags & (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) | 1305 | if ((set->flags & (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) |
1309 | return -EINVAL; | 1306 | return -EINVAL; |
@@ -1332,9 +1329,6 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data, | |||
1332 | struct intel_plane *intel_plane; | 1329 | struct intel_plane *intel_plane; |
1333 | int ret = 0; | 1330 | int ret = 0; |
1334 | 1331 | ||
1335 | if (!drm_core_check_feature(dev, DRIVER_MODESET)) | ||
1336 | return -ENODEV; | ||
1337 | |||
1338 | drm_modeset_lock_all(dev); | 1332 | drm_modeset_lock_all(dev); |
1339 | 1333 | ||
1340 | plane = drm_plane_find(dev, get->plane_id); | 1334 | plane = drm_plane_find(dev, get->plane_id); |