rpms/xorg-x11-drv-ati/F-11 radeon-kms-compat.patch, 1.1, 1.2 xorg-x11-drv-ati.spec, 1.193, 1.194

Mon Jun 29 02:33:25 UTC 2009

Author: airlied

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

Modified Files:
	radeon-kms-compat.patch xorg-x11-drv-ati.spec 
Log Message:
* Mon Jun 29 2009 Dave Airlie <airlied at redhat.com> 6.12.2-18
- fix kms compat


radeon-kms-compat.patch:

Index: radeon-kms-compat.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-11/radeon-kms-compat.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2

--- radeon-kms-compat.patch	9 Jun 2009 02:43:49 -0000	1.1
+++ radeon-kms-compat.patch	29 Jun 2009 02:32:55 -0000	1.2
@@ -1,7 +1,6 @@
-diff --git a/configure.ac b/configure.ac
-index 4ddec1c..3da3f0a 100644
---- a/configure.ac
-+++ b/configure.ac
+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-06-25 15:55:13.000000000 +1000
++++ xf86-video-ati-6.12.2/configure.ac	2009-06-25 15:55:27.000000000 +1000
 @@ -117,7 +117,7 @@ if test "$DRI" = yes; then
  	fi
  
@@ -37,11 +36,10 @@ index 4ddec1c..3da3f0a 100644
 +echo ""
 +echo "        Run '${MAKE-make}' to build xf86-video-ati"
 +echo ""
-diff --git a/src/radeon_accel.c b/src/radeon_accel.c
-index 5577f84..882d4fa 100644
---- a/src/radeon_accel.c
-+++ b/src/radeon_accel.c
-@@ -423,6 +423,24 @@ void RADEONEngineRestore(ScrnInfoPtr pScrn)
+diff -up xf86-video-ati-6.12.2/src/radeon_accel.c.dave xf86-video-ati-6.12.2/src/radeon_accel.c
+--- xf86-video-ati-6.12.2/src/radeon_accel.c.dave	2009-06-25 15:55:13.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_accel.c	2009-06-25 15:55:27.000000000 +1000
+@@ -425,6 +425,24 @@ void RADEONEngineRestore(ScrnInfoPtr pSc
      info->accel_state->XInited3D = FALSE;
  }
  
@@ -66,7 +64,7 @@ index 5577f84..882d4fa 100644
  /* Initialize the acceleration hardware */
  void RADEONEngineInit(ScrnInfoPtr pScrn)
  {
-@@ -438,15 +456,9 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
+@@ -440,15 +458,9 @@ void RADEONEngineInit(ScrnInfoPtr pScrn)
  
  #ifdef XF86DRI
      if ((info->directRenderingEnabled || info->drm_mode_setting) && (IS_R300_3D || IS_R500_3D)) {
@@ -83,11 +81,10 @@ index 5577f84..882d4fa 100644
  	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
  		       "Failed to determine num pipes from DRM, falling back to "
  		       "manual look-up!\n");
-diff --git a/src/radeon_commonfuncs.c b/src/radeon_commonfuncs.c
-index 9e23463..219df9e 100644
---- a/src/radeon_commonfuncs.c
-+++ b/src/radeon_commonfuncs.c
-@@ -82,6 +82,7 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
+diff -up xf86-video-ati-6.12.2/src/radeon_commonfuncs.c.dave xf86-video-ati-6.12.2/src/radeon_commonfuncs.c
+--- xf86-video-ati-6.12.2/src/radeon_commonfuncs.c.dave	2009-06-25 15:55:13.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_commonfuncs.c	2009-06-25 15:55:27.000000000 +1000
+@@ -82,6 +82,7 @@ static void FUNC_NAME(RADEONInit3DEngine
  	case 1: gb_tile_config |= R300_PIPE_COUNT_RV350; break;
  	}
  
@@ -95,7 +92,7 @@ index 9e23463..219df9e 100644
  	size = (info->ChipFamily >= CHIP_FAMILY_R420) ? 5 : 4;
  	BEGIN_ACCEL(size);
  	OUT_ACCEL_REG(R300_GB_TILE_CONFIG, gb_tile_config);
-@@ -91,13 +92,20 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
+@@ -91,13 +92,16 @@ static void FUNC_NAME(RADEONInit3DEngine
  	OUT_ACCEL_REG(R300_GB_SELECT, 0);
  	OUT_ACCEL_REG(R300_GB_ENABLE, 0);
  	FINISH_ACCEL();
@@ -108,15 +105,11 @@ index 9e23463..219df9e 100644
  	    OUT_ACCEL_REG(R500_SU_REG_DEST, su_reg_dest);
  	    OUT_ACCEL_REG(R500_VAP_INDEX_OFFSET, 0);
  	    FINISH_ACCEL();
-+        } else {
-+	    BEGIN_ACCEL(1);
-+	    OUT_ACCEL_REG(R500_VAP_INDEX_OFFSET, 0);
-+	    FINISH_ACCEL();
 +        }
  	}
  
  	BEGIN_ACCEL(3);
-@@ -106,10 +114,13 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
+@@ -106,10 +110,13 @@ static void FUNC_NAME(RADEONInit3DEngine
  	OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_3D_IDLECLEAN);
  	FINISH_ACCEL();
  
@@ -131,7 +124,7 @@ index 9e23463..219df9e 100644
  	OUT_ACCEL_REG(R300_GB_MSPOS0, ((6 << R300_MS_X0_SHIFT) |
  				       (6 << R300_MS_Y0_SHIFT) |
  				       (6 << R300_MS_X1_SHIFT) |
-@@ -125,10 +136,11 @@ static void FUNC_NAME(RADEONInit3DEngine)(ScrnInfoPtr pScrn)
+@@ -125,10 +132,11 @@ static void FUNC_NAME(RADEONInit3DEngine
  				       (6 << R300_MS_X5_SHIFT) |
  				       (6 << R300_MS_Y5_SHIFT) |
  				       (6 << R300_MSBD1_SHIFT)));
@@ -145,10 +138,9 @@ index 9e23463..219df9e 100644
  	OUT_ACCEL_REG(R300_GA_POLY_MODE, R300_FRONT_PTYPE_TRIANGE | R300_BACK_PTYPE_TRIANGE);
  	OUT_ACCEL_REG(R300_GA_ROUND_MODE, (R300_GEOMETRY_ROUND_NEAREST |
  					   R300_COLOR_ROUND_NEAREST));
-diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
-index eb15ff2..da5d70b 100644
---- a/src/radeon_dri2.c
-+++ b/src/radeon_dri2.c
+diff -up xf86-video-ati-6.12.2/src/radeon_dri2.c.dave xf86-video-ati-6.12.2/src/radeon_dri2.c
+--- xf86-video-ati-6.12.2/src/radeon_dri2.c.dave	2009-06-25 15:55:13.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_dri2.c	2009-06-25 15:55:27.000000000 +1000
 @@ -36,15 +36,22 @@
  
  #include "radeon.h"
@@ -172,7 +164,7 @@ index eb15ff2..da5d70b 100644
  static DRI2BufferPtr
  radeon_dri2_create_buffers(DrawablePtr drawable,
                             unsigned int *attachments,
-@@ -103,12 +110,81 @@ radeon_dri2_create_buffers(DrawablePtr drawable,
+@@ -103,12 +110,81 @@ radeon_dri2_create_buffers(DrawablePtr d
          buffers[i].pitch = pixmap->devKind;
          buffers[i].cpp = pixmap->drawable.bitsPerPixel / 8;
          buffers[i].driverPrivate = &privates[i];
@@ -255,7 +247,7 @@ index eb15ff2..da5d70b 100644
  static void
  radeon_dri2_destroy_buffers(DrawablePtr drawable,
                              DRI2BufferPtr buffers,
-@@ -127,6 +203,23 @@ radeon_dri2_destroy_buffers(DrawablePtr drawable,
+@@ -127,6 +203,23 @@ radeon_dri2_destroy_buffers(DrawablePtr 
          xfree(buffers);
      }
  }
@@ -279,7 +271,7 @@ index eb15ff2..da5d70b 100644
  
  static void
  radeon_dri2_copy_region(DrawablePtr drawable,
-@@ -134,19 +227,29 @@ radeon_dri2_copy_region(DrawablePtr drawable,
+@@ -134,19 +227,29 @@ radeon_dri2_copy_region(DrawablePtr draw
                          DRI2BufferPtr dest_buffer,
                          DRI2BufferPtr src_buffer)
  {
@@ -313,7 +305,7 @@ index eb15ff2..da5d70b 100644
                           0, 0, drawable->width, drawable->height, 0, 0);
      FreeScratchGC(gc);
      RADEONCPReleaseIndirect(pScrn);
-@@ -207,16 +310,21 @@ radeon_dri2_screen_init(ScreenPtr pScreen)
+@@ -207,16 +310,21 @@ radeon_dri2_screen_init(ScreenPtr pScree
      }
      dri2_info.fd = info->dri2.drm_fd;
      dri2_info.deviceName = info->dri2.device_name;
@@ -337,11 +329,10 @@ index eb15ff2..da5d70b 100644
  {
      DRI2CloseScreen(pScreen);
  }
-diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 388ab5f..c174c7c 100644
---- a/src/radeon_driver.c
-+++ b/src/radeon_driver.c
-@@ -2826,15 +2826,23 @@ static Bool radeon_kernel_mode_enabled(ScrnInfoPtr pScrn)
+diff -up xf86-video-ati-6.12.2/src/radeon_driver.c.dave xf86-video-ati-6.12.2/src/radeon_driver.c
+--- xf86-video-ati-6.12.2/src/radeon_driver.c.dave	2009-06-25 15:55:13.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_driver.c	2009-06-25 15:55:27.000000000 +1000
+@@ -2816,15 +2816,23 @@ static Bool radeon_kernel_mode_enabled(S
      pEnt = xf86GetEntityInfo(pScrn->entityList[0]);
      PciInfo = xf86GetPciInfoForEntity(pEnt->index);
  
@@ -367,7 +358,7 @@ index 388ab5f..c174c7c 100644
      return TRUE;
  }
  #else
-@@ -3166,6 +3174,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -3116,6 +3124,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
      info->dri2.drm_fd = info->drmmode.fd;
      info->dri2.enabled = FALSE;
  	xfree(bus_id);
@@ -380,7 +371,7 @@ index 388ab5f..c174c7c 100644
  	 
          {
  	    struct drm_radeon_gem_info mminfo;
-@@ -3177,6 +3191,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -3127,6 +3141,7 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, in
  		ErrorF("initing gart:%llx vram: s:%llx v:%llx\n",
  		       mminfo.gart_size, mminfo.vram_size, mminfo.vram_visible);
  	    }
@@ -388,11 +379,10 @@ index 388ab5f..c174c7c 100644
  	    {
  	        struct drm_radeon_getparam gp;
  		int value;
-diff --git a/src/radeon_exa_render.c b/src/radeon_exa_render.c
-index e5cba8c..4d96ae5 100644
---- a/src/radeon_exa_render.c
-+++ b/src/radeon_exa_render.c
-@@ -2158,16 +2163,23 @@ static Bool FUNC_NAME(R300PrepareComposite)(int op, PicturePtr pSrcPicture,
+diff -up xf86-video-ati-6.12.2/src/radeon_exa_render.c.dave xf86-video-ati-6.12.2/src/radeon_exa_render.c
+--- xf86-video-ati-6.12.2/src/radeon_exa_render.c.dave	2009-06-25 15:55:13.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_exa_render.c	2009-06-25 15:55:27.000000000 +1000
+@@ -2163,16 +2163,23 @@ static Bool FUNC_NAME(R300PrepareComposi
      }
  
      /* Clear out scissoring */
@@ -424,4 +414,3 @@ index e5cba8c..4d96ae5 100644
  
      qwords = info->new_cs ? 4 : 3;
      BEGIN_ACCEL(qwords);
- 


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.193
retrieving revision 1.194
diff -u -p -r1.193 -r1.194
--- xorg-x11-drv-ati.spec	19 Jun 2009 19:05:21 -0000	1.193
+++ xorg-x11-drv-ati.spec	29 Jun 2009 02:32:55 -0000	1.194
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   17%{?dist}
+Release:   18%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -91,6 +91,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Mon Jun 29 2009 Dave Airlie <airlied at redhat.com> 6.12.2-18
+- fix kms compat
+
 * Fri Jun 19 2009 Adam Jackson <ajax at redhat.com> 6.12.2-17
 - Obsoletes: xorg-x11-drv-avivo
 


