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

Commit e391ea88 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Daniel Vetter
Browse files

drm/i915: Fix not checking cursor and object sizes 



Even if the fb is the same we should still check if the sizes are
valid to be set.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 757f9a3e

drivers/gpu/drm/i915/intel_display.c

+3 −3
Original line number Diff line number Diff line
@@ -11923,9 +11923,6 @@ intel_check_cursor_plane(struct drm_plane *plane, 
	if (!obj)

		return 0;



	if (fb == crtc->cursor->fb)

		return 0;



	/* Check for which cursor types we support */

	crtc_w = drm_rect_width(&state->orig_dst);

	crtc_h = drm_rect_height(&state->orig_dst);
@@ -11940,6 +11937,9 @@ intel_check_cursor_plane(struct drm_plane *plane, 
		return -ENOMEM;

	}



	if (fb == crtc->cursor->fb)

		return 0;



	/* we only need to pin inside GTT if cursor is non-phy */

	mutex_lock(&dev->struct_mutex);

	if (!INTEL_INFO(dev)->cursor_needs_physical && obj->tiling_mode) {