rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.4, 1.5 xorg-x11-drv-ati.spec, 1.93, 1.94

[Dave Airlie (airlied)]

Author: airlied

Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16287

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Fri Aug 01 2008 Dave Airlie <airlied at redhat.com> 6.8.0-20
- DDX modesetting code


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- radeon-modeset.patch	5 Aug 2008 06:40:20 -0000	1.4
+++ radeon-modeset.patch	5 Aug 2008 06:50:13 -0000	1.5
@@ -4536,7 +4536,7 @@
 +typedef drm_radeon_sarea_t RADEONSAREAPriv, *RADEONSAREAPrivPtr;
 +#endif
 diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
-index cfa349d..521c3e9 100644
+index cfa349d..2ec4cc1 100644
 --- a/src/radeon_textured_video.c
 +++ b/src/radeon_textured_video.c
 @@ -85,6 +85,7 @@ static __inline__ uint32_t F_TO_DW(float val)
@@ -4547,7 +4547,15 @@
  #define FINISH_VIDEO()
  
  #include "radeon_textured_videofuncs.c"
-@@ -105,6 +106,7 @@ static __inline__ uint32_t F_TO_DW(float val)
+@@ -93,6 +94,7 @@ static __inline__ uint32_t F_TO_DW(float val)
+ #undef VIDEO_PREAMBLE
+ #undef BEGIN_VIDEO
+ #undef OUT_VIDEO_REG
++#undef OUT_RELOC
+ #undef FINISH_VIDEO
+ 
+ #ifdef XF86DRI
+@@ -105,6 +107,7 @@ static __inline__ uint32_t F_TO_DW(float val)
  #define OUT_VIDEO_REG(reg, val)	OUT_RING_REG(reg, val)
  #define FINISH_VIDEO()		ADVANCE_RING()
  #define OUT_VIDEO_RING_F(x) OUT_RING(F_TO_DW(x))
@@ -4555,7 +4563,7 @@
  
  #include "radeon_textured_videofuncs.c"
  
-@@ -179,7 +181,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -179,7 +182,8 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      }
  
  #ifdef XF86DRI
@@ -4565,7 +4573,7 @@
         /* The upload blit only supports multiples of 64 bytes */
         dstPitch = (dstPitch + 63) & ~63;
     else
-@@ -226,8 +229,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -226,8 +230,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      left = (x1 >> 16) & ~1;
      npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
  
@@ -4580,7 +4588,7 @@
      pPriv->src_pitch = dstPitch;
      pPriv->size = size;
      pPriv->pDraw = pDraw;
-@@ -283,7 +290,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -283,7 +291,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      pPriv->h = height;
  
  #ifdef XF86DRI


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- xorg-x11-drv-ati.spec	1 Aug 2008 07:00:59 -0000	1.93
+++ xorg-x11-drv-ati.spec	5 Aug 2008 06:50:13 -0000	1.94
@@ -57,7 +57,7 @@
 %patch200 -p1 -b .mach64-ia64
 
 %build
-aclocal ; automake -a ; autoconf
+autoreconf
 %configure --disable-static
 make %{?_smp_mflags}