Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1cff8f6b authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: properly check for MODESET for kms driver ioctls 



Also ditch the cargo-culted dev_priv checks - either we have a
giant hole in our setup code or this is useless. Plainly bogus
to check for it in either case.

v2: Chris Wilson noticed that I've missed one bogus dev_priv check.

v3: The check in the overlay code is redundant (Chris)

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 13a86b85

drivers/gpu/drm/i915/intel_display.c

+2 −5
Original line number Diff line number Diff line
@@ -6189,15 +6189,12 @@ static void intel_crtc_init(struct drm_device *dev, int pipe) 
int intel_get_pipe_from_crtc_id(struct drm_device *dev, void *data,

				struct drm_file *file)

{

	drm_i915_private_t *dev_priv = dev->dev_private;

	struct drm_i915_get_pipe_from_crtc_id *pipe_from_crtc_id = data;

	struct drm_mode_object *drmmode_obj;

	struct intel_crtc *crtc;



	if (!dev_priv) {

		DRM_ERROR("called with no initialization\n");

		return -EINVAL;

	}

	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	drmmode_obj = drm_mode_object_find(dev, pipe_from_crtc_id->crtc_id,

			DRM_MODE_OBJECT_CRTC);

drivers/gpu/drm/i915/intel_overlay.c

+2 −10
Original line number Diff line number Diff line
@@ -1122,11 +1122,7 @@ int intel_overlay_put_image(struct drm_device *dev, void *data, 
	struct put_image_params *params;

	int ret;



	if (!dev_priv) {

		DRM_ERROR("called with no initialization\n");

		return -EINVAL;

	}



	/* 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");
@@ -1323,11 +1319,7 @@ int intel_overlay_attrs(struct drm_device *dev, void *data, 
	struct overlay_registers __iomem *regs;

	int ret;



	if (!dev_priv) {

		DRM_ERROR("called with no initialization\n");

		return -EINVAL;

	}



	/* 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

+4 −6
Original line number Diff line number Diff line
@@ -558,14 +558,13 @@ int intel_sprite_set_colorkey(struct drm_device *dev, void *data, 
			      struct drm_file *file_priv)

{

	struct drm_intel_sprite_colorkey *set = data;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_mode_object *obj;

	struct drm_plane *plane;

	struct intel_plane *intel_plane;

	int ret = 0;



	if (!dev_priv)

		return -EINVAL;

	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))
@@ -592,14 +591,13 @@ int intel_sprite_get_colorkey(struct drm_device *dev, void *data, 
			      struct drm_file *file_priv)

{

	struct drm_intel_sprite_colorkey *get = data;

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct drm_mode_object *obj;

	struct drm_plane *plane;

	struct intel_plane *intel_plane;

	int ret = 0;



	if (!dev_priv)

		return -EINVAL;

	if (!drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	mutex_lock(&dev->mode_config.mutex);