rpms/kernel/F-11 drm-intel-tiling-transition.patch, NONE, 1.1 kernel.spec, 1.1576, 1.1577

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17949

Modified Files:
	kernel.spec 
Added Files:
	drm-intel-tiling-transition.patch 
Log Message:
* Tue Apr 28 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-115
- drm-intel-tiling-transition.patch: Fix transitions to linear mode.


drm-intel-tiling-transition.patch:

--- NEW FILE drm-intel-tiling-transition.patch ---
From: Keith Packard <keithp at keithp.com>
Date: Thu, 16 Apr 2009 22:17:39 +0000 (-0700)
Subject: drm/i915: fix transition to I915_TILING_NONE
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fanholt%2Fdrm-intel.git;a=commitdiff_plain;h=5b0bdd6f7284ed39ee553f8a8c4f0d372c87133a

drm/i915: fix transition to I915_TILING_NONE

Transitions to TILING_NONE skipped the call to unbind the object, which left
the fence register set and caused future CPU access through the GTT to
access the object in tiled mode.

Signed-off-by: Keith Packard <keithp at keithp.com>
Signed-off-by: Eric Anholt <eric at anholt.net>
---

diff --git a/drivers/gpu/drm/i915/i915_gem_tiling.c b/drivers/gpu/drm/i915/i915_gem_tiling.c
index f27e523..52a0593 100644
--- a/drivers/gpu/drm/i915/i915_gem_tiling.c
+++ b/drivers/gpu/drm/i915/i915_gem_tiling.c
@@ -283,7 +283,6 @@ i915_gem_set_tiling(struct drm_device *dev, void *data,
 	mutex_lock(&dev->struct_mutex);
 
 	if (args->tiling_mode == I915_TILING_NONE) {
-		obj_priv->tiling_mode = I915_TILING_NONE;
 		args->swizzle_mode = I915_BIT_6_SWIZZLE_NONE;
 	} else {
 		if (args->tiling_mode == I915_TILING_X)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-11/kernel.spec,v
retrieving revision 1.1576
retrieving revision 1.1577
diff -u -p -r1.1576 -r1.1577
--- kernel.spec	28 Apr 2009 15:01:24 -0000	1.1576
+++ kernel.spec	28 Apr 2009 21:18:46 -0000	1.1577
@@ -692,6 +692,7 @@ Patch1821: drm-intel-lying-systems-witho
 Patch1822: drm-intel-gen3-fb-hack.patch
 Patch1823: drm-intel-tiled-front.patch
 Patch1824: drm-intel-hdmi-edid-fix.patch
+Patch1825: drm-intel-tiling-transition.patch
 
 # kludge to make ich9 e1000 work
 Patch2000: linux-2.6-e1000-ich9.patch
@@ -1359,6 +1360,7 @@ ApplyPatch drm-intel-lying-systems-witho
 ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-intel-tiled-front.patch
 ApplyPatch drm-intel-hdmi-edid-fix.patch
+ApplyPatch drm-intel-tiling-transition.patch
 
 # linux1394 git patches
 ApplyPatch linux-2.6-firewire-git-update.patch
@@ -1993,6 +1995,9 @@ fi
 # and build.
 
 %changelog
+* Tue Apr 28 2009 Adam Jackson <ajax at redhat.com> 2.6.29.1-115
+- drm-intel-tiling-transition.patch: Fix transitions to linear mode.
+
 * Tue Apr 28 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.29.1-114
 - Make the kernel-vanilla package buildable again.