rpms/xorg-x11-drv-nouveau/F-12 nouveau-randr-unify.patch,1.1,1.2

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1826

Modified Files:
	nouveau-randr-unify.patch 
Log Message:
grr, how'd that sneak in...


nouveau-randr-unify.patch:
 drmmode_display.c |   13 +++++++------
 nv_driver.c       |    6 +++---
 nv_proto.h        |    2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

Index: nouveau-randr-unify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-12/nouveau-randr-unify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- nouveau-randr-unify.patch	10 Feb 2010 22:39:44 -0000	1.1
+++ nouveau-randr-unify.patch	10 Feb 2010 22:50:48 -0000	1.2
@@ -50,19 +50,6 @@ index fe2539d..1b6e869 100644
  }
  
  static Bool
-diff --git a/src/nv10_exa.c b/src/nv10_exa.c
-index fe86fd7..497d7ab 100644
---- a/src/nv10_exa.c
-+++ b/src/nv10_exa.c
-@@ -466,7 +466,7 @@ static Bool NV10SetBuffer(NVPtr pNv, PicturePtr Pict, PixmapPtr pixmap)
- #else
- 	OUT_RINGf (chan, 65536.0);
- #endif
--	BEGIN_RING(chan, celsius, NV10TCL_VIEWPORT_SCALE_X, 4);
-+//	BEGIN_RING(chan, celsius, NV10TCL_VIEWPORT_SCALE_X, 4);
- 	OUT_RINGf (chan, -2048.0);
- 	OUT_RINGf (chan, -2048.0);
- 	OUT_RINGf (chan, 0);
 diff --git a/src/nv_driver.c b/src/nv_driver.c
 index c907015..8a77fd9 100644
 --- a/src/nv_driver.c