Attachment 36003 Details for Bug 28335 – Move non-phys cursors into the GTT

[patch] Move non-phys cursors into the GTT

0001-drm-i915-Move-non-phys-cursors-into-the-GTT.patch (text/plain), 1.84 KB, created by Chris Wilson on 2010-06-02 01:25:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Wilson

Created: 2010-06-02 01:25:35 UTC

Size: 1.84 KB

patch

obsolete

>From 0d03ba4d4c03568e70c0ad15548cf5244c095e7d Mon Sep 17 00:00:00 2001
>From: Chris Wilson <chris@chris-wilson.co.uk>
>Date: Wed, 2 Jun 2010 08:30:48 +0100
>Subject: [PATCH] drm/i915: Move non-phys cursors into the GTT
>
>Cursors need to be in the GTT domain when being accessed by the GPU.
>Previously this was a fortuitous byproduct of userspace using pwrite()
>to upload the image data into the cursor. The redundant clflush was
>removed in commit 9b8c4a and so the image was no longer being flushed
>out of the caches into main memory. One could also devise a scenario
>where the cursor was rendered by the GPU, prior to being attached as the
>cursor, resulting in similar corruption due to the missing MI_FLUSH.
>
>Fixes:
>
>  Bug 28335 - Cursor corruption caused by commit 9b8c4a0b21
>  https://bugs.freedesktop.org/show_bug.cgi?id=28335
>
>Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
>---
> drivers/gpu/drm/i915/intel_display.c |    9 +++++++++
> 1 files changed, 9 insertions(+), 0 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
>index b741a24..2e52692 100644
>--- a/drivers/gpu/drm/i915/intel_display.c
>+++ b/drivers/gpu/drm/i915/intel_display.c
>@@ -3959,6 +3959,13 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
> 			DRM_ERROR("failed to pin cursor bo\n");
> 			goto fail_locked;
> 		}
>+
>+		ret = i915_gem_object_set_to_gtt_domain(bo, 0);
>+		if (ret) {
>+			DRM_ERROR("failed to move cursor bo into the GTT\n");
>+			goto fail_unpin;
>+		}
>+
> 		addr = obj_priv->gtt_offset;
> 	} else {
> 		ret = i915_gem_attach_phys_object(dev, bo, (pipe == 0) ? I915_GEM_PHYS_CURSOR_0 : I915_GEM_PHYS_CURSOR_1);
>@@ -4002,6 +4009,8 @@ static int intel_crtc_cursor_set(struct drm_crtc *crtc,
> 	intel_crtc->cursor_bo = bo;
> 
> 	return 0;
>+fail_unpin:
>+	i915_gem_object_unpin(bo);
> fail_locked:
> 	mutex_unlock(&dev->struct_mutex);
> fail:
>-- 
>1.7.1
>

Actions: View | Splinter Review

Attachments on bug 28335: 36003

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.