rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.41, 1.42 xorg-x11-drv-ati.spec, 1.163, 1.164

Dave Airlie airlied at fedoraproject.org
Wed Apr 1 12:03:35 UTC 2009 

Author: airlied

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

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Log Message:
* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-2
- attempt to fix r100/r200 xv better


radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- radeon-modeset.patch	1 Apr 2009 08:54:08 -0000	1.41
+++ radeon-modeset.patch	1 Apr 2009 12:03:34 -0000	1.42
@@ -8137,7 +8137,7 @@
      else
  #endif
 diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index 05acb93..b7a8513 100644
+index 05acb93..852f4ac 100644
 --- a/src/radeon_textured_videofuncs.c
 +++ b/src/radeon_textured_videofuncs.c
 @@ -87,11 +87,25 @@ do {								\
@@ -8328,16 +8328,29 @@
  	OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1591,6 +1663,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 	if (RADEONTilingEnabled(pScrn, pPixmap))
+ 	    colorpitch |= RADEON_COLOR_TILE_ENABLE;
+ 
+-	BEGIN_ACCEL(4);
++	qwords = info->new_cs ? 5 : 4;
++	BEGIN_ACCEL(qwords);
  
  	OUT_ACCEL_REG(RADEON_RB3D_CNTL,
  		      dst_format /*| RADEON_ALPHA_BLEND_ENABLE*/);
+-	OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
 +
-+	dst_offset += info->fbLocation + pScrn->fbOffset;
- 	OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
++	if (info->new_cs) {
++	    OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, 0);
++	    OUT_RELOC(dst_bo, 0, RADEON_GEM_DOMAIN_VRAM);
++	} else {
++	    dst_offset += info->fbLocation + pScrn->fbOffset;
++	    OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
++	}
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
-@@ -1630,7 +1704,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+ 
+@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8347,7 +8360,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_1_ENABLE | RADEON_TEX_2_ENABLE |
-@@ -1649,21 +1724,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8373,7 +8386,7 @@
  
  		/* similar to r300 code. Note the big problem is that hardware constants
  		 * are 8 bits only, representing 0.0-1.0. We can get that up (using bias
-@@ -1799,7 +1875,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8383,7 +8396,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE |
-@@ -1817,7 +1894,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8392,7 +8405,7 @@
  
  		/* MAD temp1 / 2, const0.a * 2, temp0.ggg, -const0.rgb */
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
-@@ -1901,7 +1978,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  		FINISH_ACCEL();
  	    }
  	    else {
@@ -8402,7 +8415,7 @@
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  
-@@ -1922,7 +2000,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
  
@@ -8411,7 +8424,7 @@
  
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
  			      R200_TXC_ARG_A_ZERO |
-@@ -1945,7 +2023,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    info->accel_state->texW[0] = 1;
  	    info->accel_state->texH[0] = 1;
  
@@ -8421,7 +8434,7 @@
  
  	    OUT_ACCEL_REG(RADEON_PP_CNTL,
  			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1959,8 +2038,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_CLAMP_S_CLAMP_LAST |
  			  RADEON_CLAMP_T_CLAMP_LAST |
  			  RADEON_YUV_TO_RGB);


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.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- xorg-x11-drv-ati.spec	1 Apr 2009 08:54:08 -0000	1.163
+++ xorg-x11-drv-ati.spec	1 Apr 2009 12:03:34 -0000	1.164
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.1
-Release:   1%{?dist}
+Release:   2%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -76,6 +76,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-2
+- attempt to fix r100/r200 xv better
+
 * Wed Apr 01 2009 Dave Airlie <airlied at redhat.com> 6.12.1-1
 - rebase to upstream + fix FUS on DRI2 + video on r100/r200 hopefully

More information about the fedora-extras-commits mailing list