rpms/xorg-x11-drv-ati/F-11 radeon-modeset.patch, 1.46, 1.47 xorg-x11-drv-ati.spec, 1.177, 1.178 radeon-modeset-zaphod.patch, 1.1, NONE

Dave Airlie airlied at fedoraproject.org
Thu Apr 16 08:19:04 UTC 2009 

Author: airlied

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

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-modeset-zaphod.patch 
Log Message:
* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 6.12.2-4
- radeon-modeset.patch: fix stupid idle drawing corrupt since mmap cache


radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.46 -r 1.47 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-modeset.patch,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- radeon-modeset.patch	15 Apr 2009 02:54:23 -0000	1.46
+++ radeon-modeset.patch	16 Apr 2009 08:18:33 -0000	1.47
@@ -1,6 +1,1084 @@
-diff -up xf86-video-ati-6.12.2/configure.ac.dave xf86-video-ati-6.12.2/configure.ac
---- xf86-video-ati-6.12.2/configure.ac.dave	2009-04-09 00:29:53.000000000 +1000
-+++ xf86-video-ati-6.12.2/configure.ac	2009-04-15 12:46:30.000000000 +1000
+commit 4f6eff7a49eb66bb701eda8f378a94c9dc7478f2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 16 18:03:03 2009 +1000
+
+    radeon: make drmmode palette code
+    
+    valgrind pointed out I'd missed this before.
+    
+    still some work left to do
+
+commit f2f1862719dd3438d96822bdd0dd8863321a15d0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Apr 16 16:32:21 2009 +1000
+
+    radeon: change wait idle return code.
+    
+    this returns EBUSY which may or may not be the coorect answer
+
+commit c2ec15d95b27fa28bb01bd915110574a745e5567
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 21:28:31 2009 +1000
+
+    radeon: remove some unneeded comments
+
+commit d3b5de69ea1283e0949d10d4bcbe260dad4f1066
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 17:21:57 2009 +1000
+
+    radeon: todo gamma crtc set
+
+commit 9bc652046201fb67d2f96569137f50120c578c3f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 17:13:40 2009 +1000
+
+    radeon: add zaphod support for kms
+    
+    wow that was a lot easier than I thought
+
+commit d8c115adcaf6e8775d812c3f6e94f894920d47b2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 12:39:39 2009 +1000
+
+    radeon: fixup bo map caching hopefully
+
+commit ebd92d5ba4c19cd0af0a237d4367ae0cda63d1e1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 12:04:19 2009 +1000
+
+    radeon: fix kms rotation properly
+
+commit 356083345a8c8b2b75e62c0c0643855fb05c9f38
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 15 11:37:33 2009 +1000
+
+    radeon: remove pointless memory/bo abstraction
+
+commit a322a475ed97d0ee212ea136b0387f49e1103026
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 11:17:46 2009 +1000
+
+    radeon: cache mmaps
+
+commit add7f96a096ac2403aae259a5a457137207015d4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 10:48:48 2009 +1000
+
+    radeon: mismerge accel dfs only if we have non-agp
+
+commit 982598d830691cd1b39e5aa2c9c409786e059fd3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Apr 7 09:15:08 2009 +1000
+
+    radeon: remove function
+
+commit 41fbe7ce72bf978092dd4f6d0410178cc21e441f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 18:39:27 2009 +1000
+
+    radeon: add config.h to fix mmap
+
+commit bb15e058079254a88a2194d70659f6694f59262f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 15:19:13 2009 +1000
+
+    radeon: drop lots of unused code
+
+commit 8695b9394e5597d393007165552f8cd77ca55002
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 13:03:46 2009 +1000
+
+    radeon: fixup mmap for new kernel API
+
+commit 783f402a7b248f1aea9c8f267a3a69e1f95bdc8b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Apr 6 10:18:41 2009 +1000
+
+    radeon DDX: update API
+
+commit 9c81d3fb250610c1979122ff50bd8b4173b9547a
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Sun Apr 5 11:11:19 2009 +1000
+
+    radeon: fix compile
+
+commit 842c290e17d2096a82319731afc1e043aa8e1df4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Apr 3 20:34:05 2009 +1100
+
+    r600: fix src offsets after kms changes
+
+commit af04b0d061123ccb763975c368fb0dda38977fe6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 21:55:46 2009 +1000
+
+    radeon: fix r100/r200 xv better
+
+commit 666f8ee5f9201282e3a2f2b02e1c9699e8bf9b82
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 18:14:27 2009 +1000
+
+    radeon: fixup textured video hopefully for kms
+
+commit d50d3ab2d09a15dab26698450bc1b900fd421682
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Apr 1 17:12:05 2009 +1000
+
+    radeon: make FUS work with DRI2
+
+commit 63f5c44278db2e42286402ab507c9494665084a6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 25 14:02:42 2009 +1000
+
+    reenable UTS
+
+commit 21db8c83ff6c6b66c0d4b1f3ae35e642fb19b66d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Mar 25 13:57:18 2009 +1000
+
+    radeon: remove drm_mm paths, assume mm = kms for now
+
+commit 0d598ea813c2422ed16d0020ecc04a15438e917f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 24 15:35:53 2009 +1000
+
+    radeon: fix mismerge in kms paths
+
+commit 7a6cf9ade0f6ce5416aa635a8518b25d58cf32a8
+Author: Adam Jackson <ajax at redhat.com>
+Date:   Fri Mar 13 14:04:59 2009 +1000
+
+    radeon: make shadowfb run on kms r600
+
+commit 6d24c7a78c346086c6cca889b599c4124229a42d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Mar 13 14:01:07 2009 +1000
+
+    radeon: do some rotate fixups - still not perfect
+
+commit de55e58c72e53948d5fdbc252ea3ea3f7e3377af
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Mar 13 14:00:13 2009 +1000
+
+    kms: explicitly dpms on after mode setting
+
+commit 5e1bc153cd49ae56c0910e934a915f16caf5d232
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Mar 13 13:59:43 2009 +1000
+
+    radeon: update for drm mode api change
+
+commit 86af107d30daccd5f6e2b5fe8017621197e095f8
+Author: Dave Airlie <airlied at linux.ie>
+Date:   Tue Mar 10 22:33:51 2009 +1000
+
+    r600: fix merge issue that breaks Xv
+
+commit a49b34e1155ee757aef942e3303186d950fb3256
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Mar 5 16:05:41 2009 +1000
+
+    radeon: add support for relocatable CRTC inside VLINE
+    
+    We cannot let userspace decide which CRTC it wants because its userspace
+    and might not own the crtc, so we need to provide a way to relocate it
+
+commit 09b179b6d45c040d4b33b97c9dfc5bbec3c226ba
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 3 15:30:21 2009 +1000
[...6064 lines suppressed...]
      pPriv->w = width;
      pPriv->h = height;
  
@@ -7649,9 +8901,10 @@
  	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
      else
  #endif
-diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dave xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
---- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.dave	2009-04-08 01:32:12.000000000 +1000
-+++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-15 12:46:30.000000000 +1000
+diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
+index 05acb93..852f4ac 100644
+--- a/src/radeon_textured_videofuncs.c
++++ b/src/radeon_textured_videofuncs.c
 @@ -87,11 +87,25 @@ do {								\
  
  #endif /* !ACCEL_CP */
@@ -7678,7 +8931,7 @@
      uint32_t txformat;
      uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
      uint32_t dst_offset, dst_pitch, dst_format;
-@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
      int dstxoff, dstyoff, pixel_shift, vtx_count;
      BoxPtr pBox = REGION_RECTS(&pPriv->clip);
      int nBox = REGION_NUM_RECTS(&pPriv->clip);
@@ -7739,7 +8992,7 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
-@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			  RADEON_WAIT_DMA_GUI_IDLE);
  	    FINISH_ACCEL();
  
@@ -7748,7 +9001,7 @@
  		RADEONInit3DEngine(pScrn);
  	}
  
-@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	if (IS_R500_3D && ((pPriv->h - 1) & 0x800))
  	    txpitch |= R500_TXHEIGHT_11;
  
@@ -7771,7 +9024,7 @@
  	FINISH_ACCEL();
  
  	txenable = R300_TEX_0_ENABLE;
-@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			R300_TX_MIN_FILTER_LINEAR |
  			R300_TX_MAG_FILTER_LINEAR);
  
@@ -7797,7 +9050,7 @@
  		FINISH_ACCEL();
  		txenable |= R300_TEX_1_ENABLE | R300_TEX_2_ENABLE;
  	}
-@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R300_TX_MAG_FILTER_NEAREST |
  			    (1 << R300_TX_ID_SHIFT));
  
@@ -7819,7 +9072,7 @@
  		FINISH_ACCEL();
  
  		/* Enable tex 1 */
-@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    }
  	}
  
@@ -7840,7 +9093,7 @@
  	OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
  
  	blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	if (RADEONTilingEnabled(pScrn, pPixmap))
  	    colorpitch |= RADEON_COLOR_TILE_ENABLE;
  
@@ -7862,7 +9115,7 @@
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
  
-@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -7872,7 +9125,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_1_ENABLE | RADEON_TEX_2_ENABLE |
-@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -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);
@@ -7898,7 +9151,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 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -7908,7 +9161,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE |
-@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -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);
@@ -7917,7 +9170,7 @@
  
  		/* MAD temp1 / 2, const0.a * 2, temp0.ggg, -const0.rgb */
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
-@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  		FINISH_ACCEL();
  	    }
  	    else {
@@ -7927,7 +9180,7 @@
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  
-@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -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);
  
@@ -7936,7 +9189,7 @@
  
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
  			      R200_TXC_ARG_A_ZERO |
-@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
  	    info->accel_state->texW[0] = 1;
  	    info->accel_state->texH[0] = 1;
  
@@ -7946,7 +9199,7 @@
  
  	    OUT_ACCEL_REG(RADEON_PP_CNTL,
  			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
+@@ -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);
@@ -7957,10 +9210,11 @@
  	    OUT_ACCEL_REG(RADEON_PP_TXCBLEND_0,
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
-diff -up xf86-video-ati-6.12.2/src/radeon_video.c.dave xf86-video-ati-6.12.2/src/radeon_video.c
---- xf86-video-ati-6.12.2/src/radeon_video.c.dave	2009-04-08 01:31:32.000000000 +1000
-+++ xf86-video-ati-6.12.2/src/radeon_video.c	2009-04-15 12:46:30.000000000 +1000
-@@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+diff --git a/src/radeon_video.c b/src/radeon_video.c
+index 42aa036..bd6408d 100644
+--- a/src/radeon_video.c
++++ b/src/radeon_video.c
+@@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
  
@@ -7969,7 +9223,7 @@
  	overlayAdaptor = RADEONSetupImageVideo(pScreen);
  	if (overlayAdaptor != NULL) {
  	    adaptors[num_adaptors++] = overlayAdaptor;
-@@ -294,9 +294,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -297,9 +297,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
  	RADEONInitOffscreenImages(pScreen);
      }
  
@@ -7984,7 +9238,7 @@
  #endif
  	) {
  	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2197,7 +2200,7 @@ RADEONCopyData(
+@@ -2200,7 +2203,7 @@ RADEONCopyData(
  
  #ifdef XF86DRI
  
@@ -7993,9 +9247,10 @@
      {
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
-diff -up xf86-video-ati-6.12.2/src/radeon_video.h.dave xf86-video-ati-6.12.2/src/radeon_video.h
---- xf86-video-ati-6.12.2/src/radeon_video.h.dave	2009-04-08 01:31:53.000000000 +1000
-+++ xf86-video-ati-6.12.2/src/radeon_video.h	2009-04-15 12:46:30.000000000 +1000
+diff --git a/src/radeon_video.h b/src/radeon_video.h
+index 34fb07f..7b75ec3 100644
+--- a/src/radeon_video.h
++++ b/src/radeon_video.h
 @@ -121,6 +121,9 @@ typedef struct {
      int w, h;
      int drw_x, drw_y;


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/xorg-x11-drv-ati.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- xorg-x11-drv-ati.spec	15 Apr 2009 11:35:43 -0000	1.177
+++ xorg-x11-drv-ati.spec	16 Apr 2009 08:18:34 -0000	1.178
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -15,7 +15,6 @@
 Source1:   radeon.xinf
 
 Patch1:     radeon-modeset.patch
-Patch2:	    radeon-modeset-zaphod.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
@@ -40,7 +39,6 @@
 %prep
 %setup -q -n %{tarball}-%{version}
 %patch1 -p1 -b .modeset
-%patch2 -p1 -b .modeset-zaphod
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 
@@ -74,6 +72,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Thu Apr 16 2009 Dave Airlie <airlied at redhat.com> 6.12.2-4
+- radeon-modeset.patch: fix stupid idle drawing corrupt since mmap cache
+
 * Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-3
 - radeon-modeset-zaphod.patch: fix zaphod under kms in theory
 


--- radeon-modeset-zaphod.patch DELETED ---

More information about the scm-commits mailing list