rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.20, 1.21 xorg-x11-drv-ati.spec, 1.127, 1.128

[Dave Airlie]

Author: airlied

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

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Sun Oct 19 2008 Dave Airlie <airlied at redhat.com> 6.9.0-28
- fix set tex offset for non modesetting cases


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- radeon-modeset.patch	15 Oct 2008 07:06:57 -0000	1.20
+++ radeon-modeset.patch	19 Oct 2008 08:36:11 -0000	1.21
@@ -1,3 +1,9 @@
+commit dab489dc784bb14ef4a64b3ecec1c46568210c22
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Oct 19 18:27:53 2008 +1000
+
+    radeon: fixup tex offset for no modeset
+
 commit 6b66d506a63c49abf781c390261c460f2183cd84
 Author: Dave Airlie <airlied at redhat.com>
 Date:   Wed Oct 15 17:01:34 2008 +1000
@@ -5562,7 +5568,7 @@
 +
  #endif
 diff --git a/src/radeon_exa.c b/src/radeon_exa.c
-index 0f86fdd..708111d 100644
+index 0f86fdd..f7b890f 100644
 --- a/src/radeon_exa.c
 +++ b/src/radeon_exa.c
 @@ -43,7 +43,11 @@
@@ -5626,7 +5632,7 @@
 +
 +	    if (radeon_bufmgr_gem_in_vram (driver_priv->bo))
 +		RADEONCPFlushIndirect(pScrn, 0);
-+
+ 
 +	    //radeon_bufmgr_gem_wait_rendering(driver_priv->bo);
 +
 +	    /* flush IB */
@@ -5639,7 +5645,7 @@
 +	    pPix->devPrivate.ptr = driver_priv->bo->virtual;
 +	}
 +    }
- 
++
 +#if X_BYTE_ORDER == X_BIG_ENDIAN
      /* Front buffer is always set with proper swappers */
      if (offset == 0)
@@ -5657,7 +5663,7 @@
      uint32_t offset = exaGetPixmapOffset(pPix);
      int soff;
 +    struct radeon_exa_pixmap_priv *driver_priv;
- 
++
 +    driver_priv = exaGetPixmapDriverPrivate(pPix);
 +
 +    if (driver_priv) {
@@ -5665,7 +5671,7 @@
 +    pPix->devPrivate.ptr = NULL;
 +    }
 +
-+
+ 
 +#if X_BYTE_ORDER == X_BIG_ENDIAN
      /* Front buffer is always set with proper swappers */
      if (offset == 0)
@@ -6049,20 +6055,21 @@
  unsigned long long
  RADEONTexOffsetStart(PixmapPtr pPix)
  {
+-    exaMoveInPixmap(pPix);
 +    struct radeon_exa_pixmap_priv *driver_priv;
 +    uint32_t offset;
 +    driver_priv = exaGetPixmapDriverPrivate(pPix);
 +
 +    if (driver_priv) {
++        //offset = dri_bo_get_handle(driver_priv->bo);
 +        offset = driver_priv->bo->offset;
-+	
++        
 +    } else {
++    	exaMoveInPixmap(pPix);
 +        offset = exaGetPixmapOffset(pPix);
 +    	offset += RADEONPTR(xf86Screens[pPix->drawable.pScreen->myNum])->fbLocation;
 +    }
-     exaMoveInPixmap(pPix);
      ExaOffscreenMarkUsed(pPix);
-+    
  
 -    return RADEONPTR(xf86Screens[pPix->drawable.pScreen->myNum])->fbLocation +
 -	exaGetPixmapOffset(pPix);


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.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- xorg-x11-drv-ati.spec	15 Oct 2008 07:06:57 -0000	1.127
+++ xorg-x11-drv-ati.spec	19 Oct 2008 08:36:11 -0000	1.128
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.9.0
-Release:   27%{?dist}
+Release:   28%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -72,6 +72,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Sun Oct 19 2008 Dave Airlie <airlied at redhat.com> 6.9.0-28
+- fix set tex offset for non modesetting cases
+
 * Wed Oct 15 2008 Dave Airlie <airlied at redhat.com> 6.9.0-27
 - modeset - radeon add support for basic r100/r200 EXA
 - modeset - add Download from screen accel.