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>

4 files changed, 2 insertions, 15 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 93f1ff05a6f4..ca6a24064cab 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12394,9 +12394,6 @@ int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,
         struct drm_crtc *drmmode_crtc;
         struct intel_crtc *crtc;
 
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -ENODEV;
-
         drmmode_crtc = drm_crtc_find(dev, pipe_from_crtc_id->crtc_id);
 
         if (!drmmode_crtc) {
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index d8de1d5140a7..71e87abdcae7 100644
--- a/drivers/gpu/drm/i915/intel_opregion.c
+++ b/drivers/gpu/drm/i915/intel_opregion.c
@@ -744,10 +744,8 @@ void intel_opregion_init(struct drm_device *dev)
                 return;
 
         if (opregion->acpi) {
-                if (drm_core_check_feature(dev, DRIVER_MODESET)) {
-                        intel_didl_outputs(dev);
-                        intel_setup_cadls(dev);
-                }
+                intel_didl_outputs(dev);
+                intel_setup_cadls(dev);
 
                 /* Notify BIOS we are ready to handle ACPI video ext notifs.
                  * Right now, all the events are handled by the ACPI video module.
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
index f93dfc174495..823d1d97a000 100644
--- a/drivers/gpu/drm/i915/intel_overlay.c
+++ b/drivers/gpu/drm/i915/intel_overlay.c
@@ -1065,7 +1065,6 @@ int intel_overlay_put_image(struct drm_device *dev, void *data,
         struct put_image_params *params;
         int ret;
 
-        /* No need to check for DRIVER_MODESET - we don't set it up then. */
         overlay = dev_priv->overlay;
         if (!overlay) {
                 DRM_DEBUG("userspace bug: no overlay\n");
@@ -1261,7 +1260,6 @@ int intel_overlay_attrs(struct drm_device *dev, void *data,
         struct overlay_registers __iomem *regs;
         int ret;
 
-        /* No need to check for DRIVER_MODESET - we don't set it up then. */
         overlay = dev_priv->overlay;
         if (!overlay) {
                 DRM_DEBUG("userspace bug: no overlay\n");
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,
         struct intel_plane *intel_plane;
         int ret = 0;
 
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -ENODEV;
-
         /* Make sure we don't try to enable both src & dest simultaneously */
         if ((set->flags & (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE)) == (I915_SET_COLORKEY_DESTINATION | I915_SET_COLORKEY_SOURCE))
                 return -EINVAL;
@@ -1332,9 +1329,6 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data,
         struct intel_plane *intel_plane;
         int ret = 0;
 
-        if (!drm_core_check_feature(dev, DRIVER_MODESET))
-                return -ENODEV;
-
         drm_modeset_lock_all(dev);
 
         plane = drm_plane_find(dev, get->plane_id);