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

Commit c4119642 authored by Chris Wilson's avatar Chris Wilson Committed by Keith Packard
Browse files

drm/i915: Mark the cursor and the overlay as being part of the display planes 



Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e4ffd173

drivers/gpu/drm/i915/intel_display.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -5440,7 +5440,7 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc, 
			goto fail_locked;

			goto fail_locked;

		}

		}





		ret = i915_gem_object_set_to_gtt_domain(obj, 0);

		ret = i915_gem_object_set_to_display_plane(obj, NULL);

		if (ret) {

		if (ret) {

			DRM_ERROR("failed to move cursor bo into the GTT\n");

			DRM_ERROR("failed to move cursor bo into the GTT\n");

			goto fail_unpin;

			goto fail_unpin;

drivers/gpu/drm/i915/intel_overlay.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -777,7 +777,7 @@ static int intel_overlay_do_put_image(struct intel_overlay *overlay, 
	if (ret != 0)

	if (ret != 0)

		return ret;

		return ret;





	ret = i915_gem_object_set_to_gtt_domain(new_bo, 0);

	ret = i915_gem_object_set_to_display_plane(new_bo, NULL);

	if (ret != 0)

	if (ret != 0)

		goto out_unpin;

		goto out_unpin;