rpms/xorg-x11-drv-ati/devel radeon-modeset.patch, 1.45, 1.46 xorg-x11-drv-ati.spec, 1.175, 1.176 radeon-modeset-fixes.patch, 1.1, NONE

Dave Airlie airlied at fedoraproject.org
Wed Apr 15 02:54:25 UTC 2009 

Author: airlied

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

Modified Files:
	radeon-modeset.patch xorg-x11-drv-ati.spec 
Removed Files:
	radeon-modeset-fixes.patch 
Log Message:
* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-2
- radeon-modeset.patch: fix rotation + cache mmap uninit var path


radeon-modeset.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.45 -r 1.46 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- radeon-modeset.patch	13 Apr 2009 17:50:18 -0000	1.45
+++ radeon-modeset.patch	15 Apr 2009 02:54:23 -0000	1.46
@@ -1,6 +1,6 @@
-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
+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
 @@ -31,6 +31,7 @@ AM_CONFIG_HEADER([config.h])
  AC_CONFIG_AUX_DIR(.)
  
@@ -30,9 +30,9 @@
  CFLAGS="$XORG_CFLAGS"
  AC_CHECK_HEADER(xf86Modes.h,[XMODES=yes],[XMODES=no],[#include "xorg-server.h"])
 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 @@
+--- /dev/null	2009-04-15 09:55:06.267190488 +1000
++++ xf86-video-ati-6.12.2/src/drmmode_display.c	2009-04-15 12:46:30.000000000 +1000
+@@ -0,0 +1,929 @@
 +/*
 + * Copyright © 2007 Red Hat, Inc.
 + *
@@ -65,6 +65,7 @@
 +#endif
 +
 +#ifdef XF86DRM_MODE
++#include <sys/ioctl.h>
 +#include "radeon.h"
 +#include "radeon_reg.h"
 +#include "radeon_drm.h"
@@ -136,89 +137,116 @@
 +static void
 +drmmode_crtc_dpms(xf86CrtcPtr crtc, int mode)
 +{
++#if 0
 +	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
-+	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
-+	drmmode_ptr drmmode = drmmode_crtc->drmmode;
++//	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
++//	drmmode_ptr drmmode = drmmode_crtc->drmmode;
 +
 +	/* bonghits in the randr 1.2 - uses dpms to disable crtc - bad buzz */
 +	if (mode == DPMSModeOff) {
 +//		drmModeSetCrtc(drmmode->fd, drmmode_crtc->mode_crtc->crtc_id,
 +//			       0, 0, 0, NULL, 0, NULL);
 +	}
++#endif
 +}
 +
 +static PixmapPtr
-+create_pixmap_for_fb(drmmode_ptr drmmode, ScrnInfoPtr pScrn, drmModeFBPtr fb)
++create_pixmap_for_fbcon(drmmode_ptr drmmode,
++			ScrnInfoPtr pScrn, int crtc_id)
 +{
++	xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
++	drmmode_crtc_private_ptr drmmode_crtc;
 +	ScreenPtr pScreen = pScrn->pScreen;
-+	PixmapPtr pPixmap;
-+	struct radeon_exa_pixmap_priv *driver_priv;
++	PixmapPtr pixmap;
 +	dri_bo *bo;
++	drmModeFBPtr fbcon;
++	struct drm_gem_flink flink;
++	
++	drmmode_crtc = xf86_config->crtc[crtc_id]->driver_private;
 +
-+	pPixmap = (*pScreen->CreatePixmap)(pScreen, 0, 0, fb->depth, 0);
-+	driver_priv = exaGetPixmapDriverPrivate(pPixmap);
-+	if (!driver_priv) {
-+		(*pScreen->DestroyPixmap)(pPixmap);
++	fbcon = drmModeGetFB(drmmode->fd, drmmode_crtc->mode_crtc->buffer_id);
++	if (fbcon == NULL)
 +		return NULL;
-+	}
 +
-+	miModifyPixmapHeader(pPixmap, fb->width, fb->height, fb->depth,
-+                             pScrn->bitsPerPixel, fb->pitch, NULL);
-+
-+	bo = radeon_bo_gem_create_from_handle(drmmode->bufmgr,
-+					      fb->handle,
-+					      fb->pitch * fb->height);
-+	driver_priv->bo = bo;
++	flink.handle = fbcon->handle;
++	if (ioctl(drmmode->fd, DRM_IOCTL_GEM_FLINK, &flink) < 0) {
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			   "Couldn't flink fbcon handle\n");
++		return NULL;
++	}
++	
++	bo = radeon_bo_gem_create_from_name(drmmode->bufmgr, "fbcon",
++					    flink.name);
 +	if (bo == NULL) {
-+		(*pScreen->DestroyPixmap)(pPixmap);
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			   "Couldn't allocate bo for fbcon handle\n");
++		return NULL;
++	}
++
++	pixmap = GetScratchPixmapHeader(pScreen,
++					fbcon->width, fbcon->height,
++					fbcon->depth, fbcon->bpp,
++					fbcon->pitch, NULL);
++	if (pixmap == NULL) {
++		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
++			   "Couldn't allocate pixmap fbcon contents\n");
 +		return NULL;
 +	}
 +
-+    	return pPixmap;
++	radeon_set_pixmap_bo(pixmap, bo);
++	
++	dri_bo_unreference(bo);
++	drmModeFreeFB(fbcon);
++    	return pixmap;
 +}
 +
-+static void
-+copy_fb_contents (drmmode_ptr drmmode,
-+		  ScrnInfoPtr pScrn,
-+		  unsigned int dest_id, int x, int y, unsigned int src_id)
++void drmmode_copy_fb(ScrnInfoPtr pScrn, drmmode_ptr drmmode)
 +{
++	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(pScrn);
 +	RADEONInfoPtr info = RADEONPTR(pScrn);
-+	drmModeFBPtr dest_fb, src_fb;
-+	dri_bo *dest_bo, *src_bo;
-+	PixmapPtr src_pixmap, dest_pixmap;
++	PixmapPtr src, dst;
 +	ScreenPtr pScreen = pScrn->pScreen;
++	int crtc_id = 0;
++	int i;
++	int pitch = pScrn->displayWidth * info->CurrentLayout.pixel_bytes;
 +
 +	if (info->ChipFamily >= CHIP_FAMILY_R600)
 +		return;
 +
-+	dest_fb = drmModeGetFB(drmmode->fd, dest_id);
-+	src_fb = drmModeGetFB(drmmode->fd, src_id);
-+	if (src_fb == NULL || dest_fb == NULL) {
-+		ErrorF("failed to get old fb, id %d\n", src_id);
-+		return;
-+	}
++	for (i = 0; i < xf86_config->num_crtc; i++) {
++		xf86CrtcPtr crtc = xf86_config->crtc[i];
++		drmmode_crtc_private_ptr drmmode_crtc;
 +
-+	dest_pixmap = create_pixmap_for_fb(drmmode, pScrn, dest_fb);
-+	src_pixmap = create_pixmap_for_fb(drmmode, pScrn, src_fb);
++		drmmode_crtc = crtc->driver_private;
++		if (drmmode_crtc->mode_crtc->buffer_id)
++			crtc_id = i;
++	}
++			
++	src = create_pixmap_for_fbcon(drmmode, pScrn, crtc_id);
 +
-+	info->accel_state->exa->PrepareCopy (src_pixmap, dest_pixmap,
-+					     0, 0, GXcopy, 0xffffff);
-+	info->accel_state->exa->Copy (dest_pixmap, 0, 0, x, y,
-+			 	      src_fb->width, src_fb->height);
-+	info->accel_state->exa->DoneCopy (dest_pixmap);
++	dst = GetScratchPixmapHeader(pScreen,
++				     pScrn->virtualX, pScrn->virtualY,
++				     pScrn->depth, pScrn->bitsPerPixel,
++				     pitch, NULL);
++	radeon_set_pixmap_bo(dst, info->mm.front_buffer);
++	info->accel_state->exa->PrepareCopy (src, dst,
++					     -1, -1, GXcopy, FB_ALLONES);
++	info->accel_state->exa->Copy (dst, 0, 0, 0, 0,
++			 	      pScrn->virtualX, pScrn->virtualY);
++	info->accel_state->exa->DoneCopy (dst);
 +	RADEONCPFlushIndirect(pScrn, 0);
 +
-+	(*pScreen->DestroyPixmap)(dest_pixmap);
-+	(*pScreen->DestroyPixmap)(src_pixmap);
++	(*pScreen->DestroyPixmap)(dst);
++	(*pScreen->DestroyPixmap)(src);
 +
-+	drmFree(dest_fb);
-+	drmFree(src_fb);
 +}
 +
 +static Bool
 +drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
 +		     Rotation rotation, int x, int y)
 +{
++	ScrnInfoPtr pScrn = crtc->scrn;
++	RADEONInfoPtr info = RADEONPTR(pScrn);
 +	xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(crtc->scrn);
 +	drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
 +	drmmode_ptr drmmode = drmmode_crtc->drmmode;
@@ -231,6 +259,19 @@
[...1885 lines suppressed...]
 +	    }
 +
-+	    if (radeon_map_memory(pScrn, info->mm.cursor[c])) {
-+		ErrorF("Failed to map front buffer memory\n");
++	    if (dri_bo_map(info->mm.cursor[c], 1)) {
++	      ErrorF("Failed to map cursor buffer memory\n");
 +	    }
 +	    
-+	    if (!info->drm_mode_setting) {
-+		xf86CrtcPtr crtc = xf86_config->crtc[c];
-+		RADEONCrtcPrivatePtr radeon_crtc = crtc->driver_private;
-+		radeon_crtc->cursor = info->mm.cursor[c];
-+	    } else {
-+		drmmode_set_cursor(pScrn, &info->drmmode, c, (void *)info->mm.cursor[c]->map, info->mm.cursor[c]->kernel_bo_handle);
-+	    }
++	    drmmode_set_cursor(pScrn, &info->drmmode, c, info->mm.cursor[c]);
 +	    total_size_bytes += cursor_size;
 +	}
 +    }
@@ -7735,14 +7465,12 @@
 +
 +    ErrorF("fb size is %dK %dK\n", fb_size_bytes / 1024, total_size_bytes / 1024);
 +
-+    info->mm.front_buffer = radeon_allocate_memory(pScrn, RADEON_POOL_VRAM, fb_size_bytes, 0, 1, "Front Buffer", 1);
-+    if (!info->mm.front_buffer) {
-+	return FALSE;
-+    }
++    info->mm.front_buffer = dri_bo_alloc(info->bufmgr, "front", screen_size,
++					 0, RADEON_GEM_DOMAIN_VRAM);
 +
-+    drmmode_set_fb(pScrn, &info->drmmode, pScrn->virtualX, RADEON_ALIGN(pScrn->virtualY, 16), stride, info->mm.front_buffer->kernel_bo_handle);
++    //    drmmode_set_fb(pScrn, &info->drmmode, pScrn->virtualX, RADEON_ALIGN(pScrn->virtualY, 16), stride, info->mm.front_buffer);
 +
-+    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK at 0x%08x\n", info->mm.front_buffer->size/1024, info->mm.front_buffer->offset);
++    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Front buffer size: %dK\n", info->mm.front_buffer->size/1024);
 +    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Remaining VRAM size (used for pixmaps): %dK\n", remain_size_bytes/1024);
 +
 +    /* set the emit limit at 90% of VRAM */
@@ -7753,48 +7481,28 @@
 +}
 +
 +
-diff -up xf86-video-ati-6.12.2/src/radeon_probe.h.modeset xf86-video-ati-6.12.2/src/radeon_probe.h
---- xf86-video-ati-6.12.2/src/radeon_probe.h.modeset	2009-04-04 18:44:00.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/radeon_probe.h	2009-04-13 13:24:51.000000000 -0400
-@@ -146,6 +146,26 @@ typedef struct
-     Bool hw_capable;
- } RADEONI2CBusRec, *RADEONI2CBusPtr;
- 
-+struct radeon_memory {
-+    int pool; // memory is VRAM vs GART
-+    unsigned long offset;
-+    unsigned long end;
-+
-+    unsigned long size;
-+    unsigned long allocated_size;
-+    void *map;
-+    int key;
-+
-+    Bool bound;
-+    unsigned long agp_offset;
-+    unsigned int pitch;
-+    char *name;
-+    struct radeon_memory *next, *prev;
-+    uint32_t alignment;
-+    uint32_t kernel_bo_handle;
-+    uint32_t kernel_name;
-+};
-+
- typedef struct _RADEONCrtcPrivateRec {
-     void *crtc_rotate_mem;
-     void *cursor_mem;
-@@ -159,6 +179,8 @@ typedef struct _RADEONCrtcPrivateRec {
+diff -up xf86-video-ati-6.12.2/src/radeon_probe.h.dave xf86-video-ati-6.12.2/src/radeon_probe.h
+--- xf86-video-ati-6.12.2/src/radeon_probe.h.dave	2009-04-05 08:44:00.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_probe.h	2009-04-15 12:46:30.000000000 +1000
+@@ -50,6 +50,7 @@
+ #include "xaa.h"
+ #endif
+ 
++#include "radeon_dri_bufmgr.h"
+ extern DriverRec RADEON;
+ 
+ #define RADEON_MAX_CRTC 2
+@@ -159,6 +160,7 @@ typedef struct _RADEONCrtcPrivateRec {
      int can_tile;
      Bool enabled;
      Bool initialized;
-+    struct radeon_memory *cursor;
 +
  } RADEONCrtcPrivateRec, *RADEONCrtcPrivatePtr;
  
  typedef struct _radeon_encoder {
-diff -up xf86-video-ati-6.12.2/src/radeon_textured_video.c.modeset xf86-video-ati-6.12.2/src/radeon_textured_video.c
---- xf86-video-ati-6.12.2/src/radeon_textured_video.c.modeset	2009-03-27 01:13:04.000000000 -0400
-+++ xf86-video-ati-6.12.2/src/radeon_textured_video.c	2009-04-13 13:24:51.000000000 -0400
+diff -up xf86-video-ati-6.12.2/src/radeon_textured_video.c.dave xf86-video-ati-6.12.2/src/radeon_textured_video.c
+--- xf86-video-ati-6.12.2/src/radeon_textured_video.c.dave	2009-03-27 15:13:04.000000000 +1000
++++ xf86-video-ati-6.12.2/src/radeon_textured_video.c	2009-04-15 12:46:30.000000000 +1000
 @@ -40,6 +40,7 @@
  #include "radeon_macros.h"
  #include "radeon_probe.h"
@@ -7847,7 +7555,7 @@
      }
  
      if (pDraw->type == DRAWABLE_WINDOW)
-@@ -451,11 +461,22 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -451,11 +461,21 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
      left = (x1 >> 16) & ~1;
      npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
  
@@ -7859,13 +7567,12 @@
 +    pPriv->src_offset = pPriv->video_offset;
 +    if (info->new_cs) {
 +	int ret;
++	radeon_bufmgr_gem_wait_rendering(pPriv->src_bo);
 +	ret = dri_bo_map(pPriv->src_bo, 1);
 +	if (ret) 
 +	    return BadAlloc;
 +      
 +	pPriv->src_addr = pPriv->src_bo->virtual;
-+    } else if (info->drm_mm) {
-+        pPriv->src_addr = (uint8_t *)(info->mm.front_buffer->map + pPriv->video_offset + (top * dstPitch));
 +    } else {
 +        if (info->ChipFamily >= CHIP_FAMILY_R600)
 +            pPriv->src_addr = (uint8_t *)(info->FB + pPriv->video_offset);
@@ -7875,7 +7582,7 @@
      pPriv->src_pitch = dstPitch;
      pPriv->planeu_offset = dstPitch * dst_height;
      pPriv->planev_offset = pPriv->planeu_offset + dstPitch2 * ((dst_height + 1) >> 1);
-@@ -481,12 +502,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -481,12 +501,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
  	    if (info->DMAForXv) {
  		if (id == FOURCC_YV12)
  		    R600CopyPlanarHW(pScrn, buf, buf + s3offset, buf + s2offset,
@@ -7890,7 +7597,7 @@
  				     srcPitch, srcPitch2, pPriv->src_pitch,
  				     width, height);
  	    } else {
-@@ -548,7 +569,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -548,7 +568,7 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
      default:
  	if (info->ChipFamily >= CHIP_FAMILY_R600) {
  	    if (info->DMAForXv)
@@ -7899,7 +7606,7 @@
  				 2 * width, pPriv->src_pitch,
  				 width, height);
  	    else
-@@ -566,9 +587,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
+@@ -566,9 +586,25 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn
  
      /* Upload bicubic filter tex */
      if (pPriv->bicubic_enabled) {
@@ -7911,6 +7618,7 @@
 +	   int ret;
 +
 +	   if (info->new_cs) {
++	       radeon_bufmgr_gem_wait_rendering(pPriv->bicubic_bo);
 +	       ret = dri_bo_map(pPriv->bicubic_bo, 1);
 +	       if (ret)
 +		   return BadAlloc;
@@ -7941,9 +7649,9 @@
  	RADEONDisplayTexturedVideoCP(pScrn, pPriv);
      else
  #endif
-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
+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
 @@ -87,11 +87,25 @@ do {								\
  
  #endif /* !ACCEL_CP */
@@ -8249,9 +7957,9 @@
  	    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.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
+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)
      memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
      adaptors = newAdaptors;
@@ -8285,9 +7993,9 @@
      {
  	uint8_t *buf;
  	uint32_t bufPitch, dstPitchOff;
-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
+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
 @@ -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/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -r1.175 -r1.176
--- xorg-x11-drv-ati.spec	13 Apr 2009 17:50:19 -0000	1.175
+++ xorg-x11-drv-ati.spec	15 Apr 2009 02:54:23 -0000	1.176
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.12.2
-Release:   1%{?dist}
+Release:   2%{?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-fixes.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-fix
 %patch6 -p1 -b .bgnr
 %patch7 -p1 -b .r600-fb-size
 
@@ -74,6 +72,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Apr 15 2009 Dave Airlie <airlied at redhat.com> 6.12.2-2
+- radeon-modeset.patch: fix rotation + cache mmap uninit var path
+
 * Mon Apr 13 2009 Adam Jackson <ajax at redhat.com> 6.12.2-1
 - radeon 6.12.2
 


--- radeon-modeset-fixes.patch DELETED ---

More information about the fedora-extras-commits mailing list