[kernel] r16720 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Mon Dec 20 10:28:37 2010
New Revision: 16720

Log:
drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.

2.6.35 longterm fix

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-overlay-ensure-that-the-reg_bo-is-in-the-gtt-prior-to-writing.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/30

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:30 2010	(r16719)
+++ dists/sid/linux-2.6/debian/changelog	Mon Dec 20 10:28:37 2010	(r16720)
@@ -21,6 +21,7 @@
   * drm/radeon/kms: make sure blit addr masks are 64 bit.
   * drm/radeon/kms: fix handling of tex lookup disable in cs checker on r2xx.
   * drm/i915: Free hardware status page on unload when physically mapped.
+  * drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 12 Dec 2010 03:23:48 +0000
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-overlay-ensure-that-the-reg_bo-is-in-the-gtt-prior-to-writing.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/drm-i915-overlay-ensure-that-the-reg_bo-is-in-the-gtt-prior-to-writing.patch	Mon Dec 20 10:28:37 2010	(r16720)
@@ -0,0 +1,48 @@
+From 0ddc1289f3ffd779779ddd3922f26ae7d0a21604 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Thu, 12 Aug 2010 09:35:00 +0100
+Subject: drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.
+
+From: Chris Wilson <chris at chris-wilson.co.uk>
+
+commit 0ddc1289f3ffd779779ddd3922f26ae7d0a21604 upstream.
+
+Just makes sure that writes are not being aliased by the CPU cache and
+do make it out to main memory.
+
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+Signed-off-by: Andi Kleen <ak at linux.intel.com>
+Reviewed-by: Daniel Vetter <daniel.vetter at ffwll.ch>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=24977
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+
+---
+ drivers/gpu/drm/i915/intel_overlay.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+Index: linux/drivers/gpu/drm/i915/intel_overlay.c
+===================================================================
+--- linux.orig/drivers/gpu/drm/i915/intel_overlay.c
++++ linux/drivers/gpu/drm/i915/intel_overlay.c
+@@ -1364,6 +1364,12 @@ void intel_setup_overlay(struct drm_devi
+                         goto out_free_bo;
+                 }
+ 		overlay->flip_addr = overlay->reg_bo->gtt_offset;
++
++		ret = i915_gem_object_set_to_gtt_domain(reg_bo, true);
++		if (ret) {
++                        DRM_ERROR("failed to move overlay register bo into the GTT\n");
++                        goto out_unpin_bo;
++                }
+ 	} else {
+ 		ret = i915_gem_attach_phys_object(dev, reg_bo,
+ 				I915_GEM_PHYS_OVERLAY_REGS);
+@@ -1395,6 +1401,8 @@ void intel_setup_overlay(struct drm_devi
+ 	DRM_INFO("initialized overlay support\n");
+ 	return;
+ 
++out_unpin_bo:
++	i915_gem_object_unpin(reg_bo);
+ out_free_bo:
+ 	drm_gem_object_unreference(reg_bo);
+ out_free:

Modified: dists/sid/linux-2.6/debian/patches/series/30
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:30 2010	(r16719)
+++ dists/sid/linux-2.6/debian/patches/series/30	Mon Dec 20 10:28:37 2010	(r16720)
@@ -9,3 +9,4 @@
 + bugfix/all/drm-radeon-kms-make-sure-blit-addr-masks-are-64-bit.patch
 + bugfix/all/drm-radeon-kms-fix-handling-of-tex-lookup-disable-in-cs-checker-on-r2xx.patch
 + bugfix/all/drm-i915-free-hardware-status-page-on-unload-when-physically-mapped.patch
++ bugfix/all/drm-i915-overlay-ensure-that-the-reg_bo-is-in-the-gtt-prior-to-writing.patch