Commit 3f52c6ed authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: Remove DRIVER_MODESET checks from modeset code 



Mostly just checks in i915-private modeset ioctls.

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@intel.com>
Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 8634bd4a

drivers/gpu/drm/i915/intel_display.c

+0 −3
Original line number Diff line number Diff line
@@ -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) {

drivers/gpu/drm/i915/intel_opregion.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

		}



		/* Notify BIOS we are ready to handle ACPI video ext notifs.

		 * Right now, all the events are handled by the ACPI video module.

drivers/gpu/drm/i915/intel_overlay.c

+0 −2
Original line number Diff line number Diff line
@@ -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");

drivers/gpu/drm/i915/intel_sprite.c

+0 −6
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE