rpms/xorg-x11-drv-ati/devel .cvsignore, 1.28, 1.29 import.log, 1.1, 1.2 radeon-modeset.patch, 1.44, 1.45 sources, 1.28, 1.29 xorg-x11-drv-ati.spec, 1.174, 1.175 gen_radeon.xinf, 1.1, NONE radeon-6.12.0-git-fixes.patch, 1.3, NONE radeon-6.9.0-panel-size-sanity.patch, 1.1, NONE radeon-6.9.0-remove-limit-heuristics.patch, 1.2, NONE

Adam Jackson ajax at fedoraproject.org
Mon Apr 13 17:50:49 UTC 2009 

Author: ajax

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

Modified Files:
	.cvsignore import.log radeon-modeset.patch sources 
	xorg-x11-drv-ati.spec 
Removed Files:
	gen_radeon.xinf radeon-6.12.0-git-fixes.patch 
	radeon-6.9.0-panel-size-sanity.patch 
	radeon-6.9.0-remove-limit-heuristics.patch 
Log Message:
radeon 6.12.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	1 Apr 2009 08:54:08 -0000	1.28
+++ .cvsignore	13 Apr 2009 17:50:18 -0000	1.29
@@ -1 +1 @@
-xf86-video-ati-6.12.1.tar.bz2
+xf86-video-ati-6.12.2.tar.bz2


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Aug 2008 04:14:20 -0000	1.1
+++ import.log	13 Apr 2009 17:50:18 -0000	1.2
@@ -1 +1,2 @@
 xorg-x11-drv-ati-6_9_0-1_fc10:HEAD:xorg-x11-drv-ati-6.9.0-1.fc10.src.rpm:1218428001
+xorg-x11-drv-ati-6_12_2-1_fc11:HEAD:xorg-x11-drv-ati-6.12.2-1.fc11.src.rpm:1239644931

radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.44 -r 1.45 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- radeon-modeset.patch	6 Apr 2009 08:48:25 -0000	1.44
+++ radeon-modeset.patch	13 Apr 2009 17:50:18 -0000	1.45
@@ -1,7 +1,6 @@
-diff --git a/configure.ac b/configure.ac
-index 660ea1f..4ddec1c 100644
---- a/configure.ac
-+++ b/configure.ac
+diff -up xf86-video-ati-6.12.2/configure.ac.modeset xf86-video-ati-6.12.2/configure.ac
+--- xf86-video-ati-6.12.2/configure.ac.modeset	2009-04-08 10:29:53.000000000 -0400
++++ xf86-video-ati-6.12.2/configure.ac	2009-04-13 13:24:51.000000000 -0400
 @@ -31,6 +31,7 @@ AM_CONFIG_HEADER([config.h])
  AC_CONFIG_AUX_DIR(.)
  
@@ -30,48 +29,9 @@
  save_CFLAGS="$CFLAGS"
  CFLAGS="$XORG_CFLAGS"
  AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 7cc2a6f..8a55d1c 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -90,12 +90,14 @@ radeon_drv_ladir = @moduledir@/drivers
- radeon_drv_la_SOURCES = \
- 	radeon_accel.c radeon_cursor.c radeon_dga.c radeon_legacy_memory.c \
- 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
--	radeon_vip.c radeon_misc.c radeon_probe.c \
-+	radeon_vip.c radeon_misc.c radeon_probe.c radeon_memory.c \
- 	legacy_crtc.c legacy_output.c \
- 	radeon_textured_video.c \
- 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
- 	$(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \
--	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c
-+	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c \
-+	atombios_crtc.c  drmmode_display.c radeon_bufmgr_gem.c \
-+	radeon_dri_bufmgr.c radeon_dri2.c
- 
- if XMODES
- radeon_drv_la_SOURCES += \
-@@ -144,6 +146,7 @@ EXTRA_DIST = \
- 	radeon_exa_render.c \
- 	radeon_exa_funcs.c \
- 	radeon.h \
-+	radeon_dri2.h \
- 	radeon_macros.h \
- 	radeon_probe.h \
- 	radeon_reg.h \
-@@ -164,4 +167,6 @@ EXTRA_DIST = \
- 	radeon_pci_device_match_gen.h \
- 	pcidb/ati_pciids.csv \
- 	pcidb/parse_pci_ids.pl \
--	radeon_atombios.h
-+	radeon_atombios.h \
-+	drmmode_display.h \
-+	radeon_dri_bufmgr.h
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-new file mode 100644
-index 0000000..14384ba
---- /dev/null
-+++ b/src/drmmode_display.c
+diff -up /dev/null xf86-video-ati-6.12.2/src/drmmode_display.c
+--- /dev/null	2009-04-02 14:26:50.181076715 -0400
++++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-13 13:24:51.000000000 -0400
 @@ -0,0 +1,921 @@
 +/*
 + * Copyright © 2007 Red Hat, Inc.
@@ -994,11 +954,9 @@
 +	return TRUE;
 +}
 +#endif
-diff --git a/src/drmmode_display.h b/src/drmmode_display.h
-new file mode 100644
-index 0000000..5ea904b
---- /dev/null
-+++ b/src/drmmode_display.h
+diff -up /dev/null xf86-video-ati-6.12.2/src/drmmode_display.h
+--- /dev/null	2009-04-02 14:26:50.181076715 -0400
++++ xf86-video-ati-6.12.2/src/drmmode_display.h	2009-04-13 13:24:51.000000000 -0400
 @@ -0,0 +1,74 @@
 +/*
 + * Copyright © 2007 Red Hat, Inc.
@@ -1074,11 +1032,46 @@
 +extern Bool drmmode_set_desired_modes(ScrnInfoPtr pScrn, drmmode_ptr drmmode);
 +#endif
 +#endif
-diff --git a/src/r600_textured_videofuncs.c b/src/r600_textured_videofuncs.c
-index 3dfe151..04b6457 100644
---- a/src/r600_textured_videofuncs.c
-+++ b/src/r600_textured_videofuncs.c
-@@ -215,7 +215,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
+diff -up xf86-video-ati-6.12.2/src/Makefile.am.modeset xf86-video-ati-6.12.2/src/Makefile.am
+--- xf86-video-ati-6.12.2/src/Makefile.am.modeset	2009-03-31 15:11:10.000000000 -0400
++++ xf86-video-ati-6.12.2/src/Makefile.am	2009-04-13 13:24:51.000000000 -0400
+@@ -90,12 +90,14 @@ radeon_drv_ladir = @moduledir@/drivers
+ radeon_drv_la_SOURCES = \
+ 	radeon_accel.c radeon_cursor.c radeon_dga.c radeon_legacy_memory.c \
+ 	radeon_driver.c radeon_video.c radeon_bios.c radeon_mm_i2c.c \
+-	radeon_vip.c radeon_misc.c radeon_probe.c \
++	radeon_vip.c radeon_misc.c radeon_probe.c radeon_memory.c \
+ 	legacy_crtc.c legacy_output.c \
+ 	radeon_textured_video.c \
+ 	radeon_crtc.c radeon_output.c radeon_modes.c radeon_tv.c \
+ 	$(RADEON_ATOMBIOS_SOURCES) radeon_atombios.c radeon_atomwrapper.c \
+-	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c atombios_crtc.c
++	$(RADEON_DRI_SRCS) $(RADEON_EXA_SOURCES) atombios_output.c \
++	atombios_crtc.c  drmmode_display.c radeon_bufmgr_gem.c \
++	radeon_dri_bufmgr.c radeon_dri2.c
+ 
+ if XMODES
+ radeon_drv_la_SOURCES += \
+@@ -144,6 +146,7 @@ EXTRA_DIST = \
+ 	radeon_exa_render.c \
+ 	radeon_exa_funcs.c \
+ 	radeon.h \
++	radeon_dri2.h \
+ 	radeon_macros.h \
+ 	radeon_probe.h \
+ 	radeon_reg.h \
+@@ -164,4 +167,6 @@ EXTRA_DIST = \
+ 	radeon_pci_device_match_gen.h \
+ 	pcidb/ati_pciids.csv \
+ 	pcidb/parse_pci_ids.pl \
+-	radeon_atombios.h
++	radeon_atombios.h \
++	drmmode_display.h \
++	radeon_dri_bufmgr.h
+diff -up xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c.modeset xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c
+--- xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c.modeset	2009-04-07 11:32:33.000000000 -0400
++++ xf86-video-ati-6.12.2/src/r600_textured_videofuncs.c	2009-04-13 13:24:51.000000000 -0400
+@@ -215,7 +215,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pSc
      switch(pPriv->id) {
      case FOURCC_YV12:
      case FOURCC_I420:
@@ -1087,7 +1080,7 @@
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
-@@ -316,7 +316,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv)
+@@ -316,7 +316,7 @@ R600DisplayTexturedVideo(ScrnInfoPtr pSc
      case FOURCC_UYVY:
      case FOURCC_YUY2:
      default:
@@ -1096,325 +1089,77 @@
  	accel_state->src_size[0] = accel_state->src_pitch[0] * pPriv->h;
  
  	/* flush texture cache */
-diff --git a/src/radeon.h b/src/radeon.h
-index d488429..d1bca2e 100644
---- a/src/radeon.h
-+++ b/src/radeon.h
-@@ -46,6 +46,8 @@
- #include "compiler.h"
- #include "xf86fbman.h"
- 
-+#include "drmmode_display.h"
-+
- 				/* PCI support */
- #include "xf86Pci.h"
- 
-@@ -75,6 +77,7 @@
- #include "dri.h"
- #include "GL/glxint.h"
- #include "xf86drm.h"
-+#include "radeon_dri2.h"
+diff -up xf86-video-ati-6.12.2/src/radeon_accel.c.modeset xf86-video-ati-6.12.2/src/radeon_accel.c
+--- xf86-video-ati-6.12.2/src/radeon_accel.c.modeset	2009-04-07 02:39:04.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_accel.c	2009-04-13 13:24:51.000000000 -0400
+@@ -92,6 +92,7 @@
  
- #ifdef DAMAGE
- #include "damage.h"
-@@ -85,6 +88,7 @@
- #include "xf86Crtc.h"
- #include "X11/Xatom.h"
+ 				/* X and server generic header files */
+ #include "xf86.h"
++#include "radeon_bufmgr_gem.h"
  
-+#include "radeon_bufmgr.h"
- 				/* Render support */
- #ifdef RENDER
- #include "picturestr.h"
-@@ -414,6 +418,14 @@ typedef enum {
+ static void R600EngineReset(ScrnInfoPtr pScrn);
  
- typedef struct _atomBiosHandle *atomBiosHandlePtr;
+@@ -373,6 +374,9 @@ void RADEONEngineRestore(ScrnInfoPtr pSc
+     RADEONInfoPtr  info       = RADEONPTR(pScrn);
+     unsigned char *RADEONMMIO = info->MMIO;
  
-+#define RADEON_POOL_GART 0
-+#define RADEON_POOL_VRAM 1
++    if (info->drm_mode_setting)
++      return;
 +
[...4807 lines suppressed...]
  #endif
-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
+diff -up xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c
+--- xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c.modeset	2009-04-07 11:32:12.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_textured_videofuncs.c	2009-04-13 13:24:51.000000000 -0400
 @@ -87,11 +87,25 @@ do {								\
  
  #endif /* !ACCEL_CP */
@@ -8011,7 +7970,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)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -101,19 +115,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
      int dstxoff, dstyoff, pixel_shift, vtx_count;
      BoxPtr pBox = REGION_RECTS(&pPriv->clip);
      int nBox = REGION_NUM_RECTS(&pPriv->clip);
@@ -8072,7 +8031,7 @@
  	    dst_pitch = pPixmap->devKind;
  	}
  
-@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -144,7 +196,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			  RADEON_WAIT_DMA_GUI_IDLE);
  	    FINISH_ACCEL();
  
@@ -8081,7 +8040,7 @@
  		RADEONInit3DEngine(pScrn);
  	}
  
-@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -222,15 +274,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	if (IS_R500_3D && ((pPriv->h - 1) & 0x800))
  	    txpitch |= R500_TXHEIGHT_11;
  
@@ -8104,7 +8063,7 @@
  	FINISH_ACCEL();
  
  	txenable = R300_TEX_0_ENABLE;
-@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -246,19 +302,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			R300_TX_MIN_FILTER_LINEAR |
  			R300_TX_MAG_FILTER_LINEAR);
  
@@ -8130,7 +8089,7 @@
  		FINISH_ACCEL();
  		txenable |= R300_TEX_1_ENABLE | R300_TEX_2_ENABLE;
  	}
-@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -279,13 +338,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			    R300_TX_MAG_FILTER_NEAREST |
  			    (1 << R300_TX_ID_SHIFT));
  
@@ -8152,7 +8111,7 @@
  		FINISH_ACCEL();
  
  		/* Enable tex 1 */
-@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1536,11 +1601,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	    }
  	}
  
@@ -8173,7 +8132,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)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1587,11 +1659,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	if (RADEONTilingEnabled(pScrn, pPixmap))
  	    colorpitch |= RADEON_COLOR_TILE_ENABLE;
  
@@ -8195,7 +8154,7 @@
  
  	OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
  
-@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1630,7 +1710,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8205,7 +8164,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)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1649,21 +1730,22 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8231,7 +8190,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)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1799,7 +1881,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			    R200_CLAMP_S_CLAMP_LAST |
  			    R200_CLAMP_T_CLAMP_LAST;
  
@@ -8241,7 +8200,7 @@
  
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE |
-@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1817,7 +1900,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			      (pPriv->w - 1) |
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8250,7 +8209,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)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1901,7 +1984,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  		FINISH_ACCEL();
  	    }
  	    else {
@@ -8260,7 +8219,7 @@
  		OUT_ACCEL_REG(RADEON_PP_CNTL,
  			      RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
  
-@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1922,7 +2006,7 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			      ((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
  		OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
  
@@ -8269,7 +8228,7 @@
  
  		OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
  			      R200_TXC_ARG_A_ZERO |
-@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1945,7 +2029,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  	    info->accel_state->texW[0] = 1;
  	    info->accel_state->texH[0] = 1;
  
@@ -8279,7 +8238,7 @@
  
  	    OUT_ACCEL_REG(RADEON_PP_CNTL,
  			  RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
-@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1959,8 +2044,9 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(Sc
  			  RADEON_CLAMP_S_CLAMP_LAST |
  			  RADEON_CLAMP_T_CLAMP_LAST |
  			  RADEON_YUV_TO_RGB);
@@ -8290,11 +8249,10 @@
  	    OUT_ACCEL_REG(RADEON_PP_TXCBLEND_0,
  			  RADEON_COLOR_ARG_A_ZERO |
  			  RADEON_COLOR_ARG_B_ZERO |
-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)
+diff -up xf86-video-ati-6.12.2/src/radeon_video.c.modeset xf86-video-ati-6.12.2/src/radeon_video.c
+--- xf86-video-ati-6.12.2/src/radeon_video.c.modeset	2009-04-07 11:31:32.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_video.c	2009-04-13 13:24:51.000000000 -0400
+@@ -284,7 +284,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
  
@@ -8303,7 +8261,7 @@
  	overlayAdaptor = RADEONSetupImageVideo(pScreen);
  	if (overlayAdaptor != NULL) {
  	    adaptors[num_adaptors++] = overlayAdaptor;
-@@ -297,9 +297,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -294,9 +294,12 @@ void RADEONInitVideo(ScreenPtr pScreen)
  	RADEONInitOffscreenImages(pScreen);
      }
  
@@ -8318,7 +8276,7 @@
  #endif
  	) {
  	texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2200,7 +2203,7 @@ RADEONCopyData(
+@@ -2197,7 +2200,7 @@ RADEONCopyData(
  
  #ifdef XF86DRI
  
@@ -8327,10 +8285,9 @@
      {
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
-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
+diff -up xf86-video-ati-6.12.2/src/radeon_video.h.modeset xf86-video-ati-6.12.2/src/radeon_video.h
+--- xf86-video-ati-6.12.2/src/radeon_video.h.modeset	2009-04-07 11:31:53.000000000 -0400
++++ xf86-video-ati-6.12.2/src/radeon_video.h	2009-04-13 13:31:13.000000000 -0400
 @@ -121,6 +121,9 @@ typedef struct {
      int w, h;
      int drw_x, drw_y;
@@ -8340,4 +8297,4 @@
 +    dri_bo *bicubic_bo;
  } RADEONPortPrivRec, *RADEONPortPrivPtr;
  
- int
+ xf86CrtcPtr


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	1 Apr 2009 08:54:08 -0000	1.28
+++ sources	13 Apr 2009 17:50:19 -0000	1.29
@@ -1 +1 @@
-2adf5988c5e5b6df5f4cb61006fa2bf1  xf86-video-ati-6.12.1.tar.bz2
+2bf50461378771497501ca7f678d36f3  xf86-video-ati-6.12.2.tar.bz2


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.174
retrieving revision 1.175
diff -u -r1.174 -r1.175
--- xorg-x11-drv-ati.spec	9 Apr 2009 15:54:20 -0000	1.174
+++ xorg-x11-drv-ati.spec	13 Apr 2009 17:50:19 -0000	1.175
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
-Version:   6.12.1
-Release:   10%{?dist}
+Version:   6.12.2
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -14,11 +14,8 @@
 Source0:   http://www.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   radeon.xinf
 
-Patch0:     radeon-6.12.0-git-fixes.patch
 Patch1:     radeon-modeset.patch
 Patch2:     radeon-modeset-fixes.patch
-#Patch4:     radeon-6.9.0-remove-limit-heuristics.patch
-Patch5:	    radeon-6.9.0-panel-size-sanity.patch
 Patch6:     radeon-6.9.0-bgnr-enable.patch
 Patch7:	    radeon-6.12.1-r600-fb-size.patch
 
@@ -42,11 +39,8 @@
 
 %prep
 %setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .fixes
 %patch1 -p1 -b .modeset
 %patch2 -p1 -b .modeset-fix
-#patch4 -p1 -b .remove-limit-heuristics
-#%patch5 -p1 -b .panel-size
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 
@@ -80,6 +74,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 6.12.2-1
+- radeon 6.12.2
+
 * Thu Apr 09 2009 Adam Jackson <ajax at redhat.com> 6.12.1-10
 - radeon-6.12.1-r600-fb-size.patch: Bump fb size max on R600+ when no KMS
   so single-link dualhead stands a chance of working.


--- gen_radeon.xinf DELETED ---


--- radeon-6.12.0-git-fixes.patch DELETED ---


--- radeon-6.9.0-panel-size-sanity.patch DELETED ---


--- radeon-6.9.0-remove-limit-heuristics.patch DELETED ---

More information about the fedora-extras-commits mailing list