rpms/kernel/devel linux-2.6.30-intel-watermark-fix.patch, NONE, 1.1 kernel.spec, 1.1683, 1.1684

[Adam Jackson]

Author: ajax

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18213

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6.30-intel-watermark-fix.patch 
Log Message:
* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
- (Attempt to) fix watermark setup on Intel 9xx parts.


linux-2.6.30-intel-watermark-fix.patch:
 intel_display.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.30-intel-watermark-fix.patch ---
diff -up linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c
--- linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c.jx	2009-08-03 11:45:19.000000000 -0400
+++ linux-2.6.30.noarch/drivers/gpu/drm/i915/intel_display.c	2009-08-03 11:50:19.000000000 -0400
@@ -1676,14 +1676,14 @@ static struct intel_watermark_params igd
 	IGD_FIFO_LINE_SIZE
 };
 static struct intel_watermark_params i945_wm_info = {
-	I915_FIFO_LINE_SIZE,
+	I945_FIFO_SIZE,
 	I915_MAX_WM,
 	1,
 	0,
 	IGD_FIFO_LINE_SIZE
 };
 static struct intel_watermark_params i915_wm_info = {
-	I945_FIFO_SIZE,
+	I915_FIFO_SIZE,
 	I915_MAX_WM,
 	1,
 	0,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1683
retrieving revision 1.1684
diff -u -p -r1.1683 -r1.1684
--- kernel.spec	3 Aug 2009 13:25:54 -0000	1.1683
+++ kernel.spec	3 Aug 2009 15:55:46 -0000	1.1684
@@ -674,6 +674,7 @@ Patch1819: drm-intel-big-hammer.patch
 Patch1820: drm-intel-gen3-fb-hack.patch
 Patch1821: drm-page-flip.patch
 Patch1822: drm-intel-pm.patch
+Patch1823: linux-2.6.30-intel-watermark-fix.patch
 
 # vga arb
 Patch1900: linux-2.6-vga-arb.patch
@@ -1283,6 +1284,7 @@ ApplyPatch drm-intel-big-hammer.patch
 ApplyPatch drm-intel-gen3-fb-hack.patch
 ApplyPatch drm-page-flip.patch
 ApplyPatch drm-intel-pm.patch
+ApplyPatch linux-2.6.30-intel-watermark-fix.patch
 
 # VGA arb + drm
 ApplyPatch linux-2.6-vga-arb.patch
@@ -1943,6 +1945,9 @@ fi
 # and build.
 
 %changelog
+* Mon Aug 03 2009 Adam Jackson <ajax at redhat.com>
+- (Attempt to) fix watermark setup on Intel 9xx parts.
+
 * Mon Aug 03 2009 Jarod Wilson <jarod at redhat.com>
 - make usbhid driver ignore all recent SoundGraph iMON devices, so the
   lirc_imon driver can grab them instead
@@ -2807,3 +2812,4 @@ fi
 # rpm-change-log-uses-utc: t
 # End:
 ###
+