rpms/xorg-x11-drv-ati/devel radeon-6.11.0-git.patch, 1.3, 1.4 radeon-modeset.patch, 1.36, 1.37 xorg-x11-drv-ati.spec, 1.154, 1.155

Dave Airlie airlied at fedoraproject.org
Tue Mar 10 02:05:22 UTC 2009


Author: airlied

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

Modified Files:
	radeon-6.11.0-git.patch radeon-modeset.patch 
	xorg-x11-drv-ati.spec 
Log Message:
* Tue Mar 10 2009 Dave Airlie <airlied at redhat.com> 6.11.0-6
- master fixes for panning + enable r600 accel by default


radeon-6.11.0-git.patch:

Index: radeon-6.11.0-git.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.11.0-git.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- radeon-6.11.0-git.patch	6 Mar 2009 23:50:06 -0000	1.3
+++ radeon-6.11.0-git.patch	10 Mar 2009 02:04:50 -0000	1.4
@@ -50,9 +50,15 @@
  #define PCI_VENDOR_IBM			0x1014
  #define PCI_VENDOR_AMD			0x1022
 diff --git a/src/atombios_crtc.c b/src/atombios_crtc.c
-index 5c26ef8..bf207bf 100644
+index 5c26ef8..c004719 100644
 --- a/src/atombios_crtc.c
 +++ b/src/atombios_crtc.c
+@@ -1,4 +1,4 @@
+- /*
++/*
+  * Copyright © 2007 Red Hat, Inc.
+  * Copyright 2007  Advanced Micro Devices, Inc.
+  *
 @@ -186,7 +186,7 @@ atombios_set_crtc_timing(atomBiosHandlePtr atomBIOS, SET_CRTC_TIMING_PARAMETERS_
      conv_param.ucOverscanRight		= crtc_param->ucOverscanRight;
      conv_param.ucOverscanLeft		= crtc_param->ucOverscanLeft;
@@ -97,7 +103,16 @@
  	}
      }
  
-@@ -484,7 +481,7 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
+@@ -472,6 +469,8 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
+ 	OUTREG(AVIVO_D1GRPH_ENABLE + radeon_crtc->crtc_offset, 1);
+ 
+ 	OUTREG(AVIVO_D1MODE_DESKTOP_HEIGHT + radeon_crtc->crtc_offset, mode->VDisplay);
++	x &= ~3;
++	y &= ~1;
+ 	OUTREG(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset, (x << 16) | y);
+ 	OUTREG(AVIVO_D1MODE_VIEWPORT_SIZE + radeon_crtc->crtc_offset,
+ 	       (mode->HDisplay << 16) | mode->VDisplay);
+@@ -484,7 +483,7 @@ atombios_crtc_mode_set(xf86CrtcPtr crtc,
  		   0);
      }
  
@@ -10947,7 +10962,7 @@
      }
  }
 diff --git a/src/radeon_crtc.c b/src/radeon_crtc.c
-index 5a7c730..a87e99b 100644
+index 5a7c730..3a9432f 100644
 --- a/src/radeon_crtc.c
 +++ b/src/radeon_crtc.c
 @@ -410,6 +410,14 @@ radeon_crtc_shadow_allocate (xf86CrtcPtr crtc, int width, int height)
@@ -10974,7 +10989,16 @@
  /**
   * Creates a pixmap for this CRTC's rotated shadow framebuffer.
   */
-@@ -587,8 +595,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask)
+@@ -499,6 +507,8 @@ radeon_crtc_set_origin(xf86CrtcPtr crtc, int x, int y)
+     unsigned char *RADEONMMIO = info->MMIO;
+ 
+     if (IS_AVIVO_VARIANT) {
++	x &= ~3;
++	y &= ~1;
+ 	atombios_lock_crtc(info->atomBIOS, radeon_crtc->crtc_id, 1);
+ 	OUTREG(AVIVO_D1MODE_VIEWPORT_START + radeon_crtc->crtc_offset, (x << 16) | y);
+ 	atombios_lock_crtc(info->atomBIOS, radeon_crtc->crtc_id, 0);
+@@ -587,8 +597,7 @@ Bool RADEONAllocateControllers(ScrnInfoPtr pScrn, int mask)
      RADEONEntPtr pRADEONEnt = RADEONEntPriv(pScrn);
      RADEONInfoPtr  info = RADEONPTR(pScrn);
  
@@ -11346,7 +11370,7 @@
      RADEONDRICPInit(pScrn);
  }
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 32cb307..0842164 100644
+index 32cb307..e8d28f0 100644
 --- a/src/radeon_driver.c
 +++ b/src/radeon_driver.c
 @@ -578,7 +578,7 @@ unsigned RADEONINMC(ScrnInfoPtr pScrn, int addr)
@@ -11580,39 +11604,50 @@
  	xf86DrvMsg(pScrn->scrnIndex, X_DEFAULT,
 -	    "No acceleration support available on R600 yet.\n");
 -	return TRUE;
-+	    "Experimental R6xx/R7xx EXA support.\n");
++	    "Will attempt to use R6xx/R7xx EXA support if DRI is enabled.\n");
 +	info->useEXA = TRUE;
      }
  
      if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
-@@ -2146,16 +2148,23 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
+@@ -2145,17 +2147,15 @@ static Bool RADEONPreInitDRI(ScrnInfoPtr pScrn)
+         return FALSE;
  
      if (info->Chipset == PCI_CHIP_RN50_515E ||
- 	info->Chipset == PCI_CHIP_RN50_5969 ||
+-	info->Chipset == PCI_CHIP_RN50_5969 ||
 -	info->ChipFamily == CHIP_FAMILY_RS600 ||
- 	info->ChipFamily >= CHIP_FAMILY_R600) {
+-	info->ChipFamily >= CHIP_FAMILY_R600) {
++	info->Chipset == PCI_CHIP_RN50_5969) {
  	if (xf86ReturnOptValBool(info->Options, OPTION_DRI, FALSE)) {
  	    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 -		"Direct rendering for RN50/RS600/R600 forced on -- "
-+		"Direct rendering for RN50/R600 forced on -- "
++		"Direct rendering for RN50 forced on -- "
  		"This is NOT officially supported at the hardware level "
  		"and may cause instability or lockups\n");
  	} else {
  	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
 -		"Direct rendering not officially supported on RN50/RS600/R600\n");
-+		"Direct rendering not officially supported on RN50/R600\n");
-+
-+	    if (info->ChipFamily >= CHIP_FAMILY_R600) {
-+		info->r600_shadow_fb = TRUE;
-+		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
-+			   "using shadow framebuffer\n");
-+		if (!xf86LoadSubModule(pScrn, "shadow"))
-+		    info->r600_shadow_fb = FALSE;
-+	    }
++		"Direct rendering not officially supported on RN50\n");
  	    return FALSE;
  	}
      }
-@@ -2952,6 +2961,24 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2887,6 +2887,16 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+      */
+     info->directRenderingEnabled = RADEONPreInitDRI(pScrn);
+ #endif
++    if (!info->directRenderingEnabled) {
++	if (info->ChipFamily >= CHIP_FAMILY_R600) {
++	    info->r600_shadow_fb = TRUE;
++	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++			   "using shadow framebuffer\n");
++	    if (!xf86LoadSubModule(pScrn, "shadow"))
++		info->r600_shadow_fb = FALSE;
++	}
++    }
++
+     if (!RADEONPreInitVRAM(pScrn))
+ 	goto fail;
+ 
+@@ -2952,6 +2962,24 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
        goto fail;
     }
  
@@ -11637,7 +11672,7 @@
      ErrorF("after xf86InitialConfiguration\n");
  
      RADEONSetPitch(pScrn);
-@@ -3644,11 +3671,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3644,11 +3672,9 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      RADEONDGAInit(pScreen);
  
      /* Init Xv */
@@ -11652,7 +11687,7 @@
  
      if (info->r600_shadow_fb == TRUE) {
          if (!shadowSetup(pScreen)) {
-@@ -3771,9 +3796,10 @@ void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn,
+@@ -3771,9 +3797,10 @@ void RADEONRestoreMemMapRegisters(ScrnInfoPtr pScrn,
  	    } else {
  		OUTREG(R600_HDP_NONSURFACE_BASE, (restore->mc_fb_location << 16) & 0xff0000);
  	    }
@@ -11665,7 +11700,7 @@
  	}
      } else {
  
-@@ -3958,7 +3984,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save)
+@@ -3958,7 +3985,7 @@ static void RADEONAdjustMemMapRegisters(ScrnInfoPtr pScrn, RADEONSavePtr save)
      }
  
  #ifdef USE_EXA
@@ -11674,7 +11709,7 @@
      {
  	drm_radeon_getparam_t gp;
  	int gart_base;
-@@ -4419,15 +4445,40 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save)
+@@ -4419,15 +4446,40 @@ avivo_save(ScrnInfoPtr pScrn, RADEONSavePtr save)
  	    state->aux_cntl2[j] = INREG(i + 0x040);
  	    state->aux_cntl3[j] = INREG(i + 0x400);
  	    state->aux_cntl4[j] = INREG(i + 0x440);
@@ -11719,7 +11754,7 @@
  	}
  	j = 0;
  	/* save PHY,LINK regs */
-@@ -4770,15 +4821,40 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore)
+@@ -4770,15 +4822,40 @@ avivo_restore(ScrnInfoPtr pScrn, RADEONSavePtr restore)
  	    OUTREG((i + 0x040), state->aux_cntl2[j]);
  	    OUTREG((i + 0x400), state->aux_cntl3[j]);
  	    OUTREG((i + 0x440), state->aux_cntl4[j]);
@@ -11764,7 +11799,7 @@
  	}
  	j = 0;
  	/* save PHY,LINK regs */
-@@ -5046,8 +5122,10 @@ static void RADEONRestore(ScrnInfoPtr pScrn)
+@@ -5046,8 +5123,10 @@ static void RADEONRestore(ScrnInfoPtr pScrn)
  		   "RADEONRestore\n");
  
  #if X_BYTE_ORDER == X_BIG_ENDIAN
@@ -11777,7 +11812,7 @@
  #endif
  
      RADEONBlank(pScrn);
-@@ -5220,7 +5298,8 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5220,7 +5299,8 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  
      if (info->accelOn) {
          RADEON_SYNC(info, pScrn);
@@ -11787,7 +11822,7 @@
      }
  
  #ifdef XF86DRI
-@@ -5424,6 +5503,10 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5424,6 +5504,10 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
      xf86OutputPtr  output = config->output[config->compat_output];
      xf86CrtcPtr	crtc = output->crtc;
  
@@ -11798,7 +11833,7 @@
  #ifdef XF86DRI
      if (info->cp->CPStarted && pScrn->pScreen) DRILock(pScrn->pScreen, 0);
  #endif
-@@ -5536,9 +5619,12 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5536,9 +5620,12 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
      if (info->adaptor)
  	RADEONResetVideo(pScrn);
  

radeon-modeset.patch:

Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- radeon-modeset.patch	6 Mar 2009 23:50:06 -0000	1.36
+++ radeon-modeset.patch	10 Mar 2009 02:04:50 -0000	1.37
@@ -1,3 +1,904 @@
+commit 792123c802991e2a0ef6f37361ceccf9373ce81f
+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 25471f05a590bf0aff31d29cd1ac0de4bf4409b9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 3 15:30:21 2009 +1000
+
+    radeon: initial framebuffer resize support
+    
+    This relies on the kernel pinning everything which the latest
+    rawhide kernel should do fine
+
+commit 7d0a186543661e10167590b1743459754fdda75d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 3 09:20:30 2009 +1000
+
+    radeon: do get sarea until we know we aren't DRI2
+
+commit 92d98c27fb82debf303e90dd29fbb691bb112cc3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Mar 3 09:12:30 2009 +1000
+
+    radeon: no need to do any of this for DRI2
+
+commit 633e5bf4a81449e8800d4deea1166fddb75a9fb2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Feb 27 12:00:29 2009 +1000
+
+    fixup issues post rebase
+
+commit 36c1522b08722de1c2164481ce418bd1f08c5261
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Feb 26 10:47:42 2009 +1000
+
+    radeon: don't init 3d engine in Xv path for drm mm
+
+commit d21c95cd5ffa21568bd18d2b3f6efaf9c9b571f3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Feb 17 19:14:27 2009 +1000
+
+    radeon: fix vt switch for legacy paths
+
+commit 181b0eed3c247f4ac3fceb8b75aeaae92e5926aa
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Feb 17 19:13:05 2009 +1000
+
+    radeon: only init gart heap for non-kms
+
+commit bf389fd99a9b9ef1895cc77b213db5817cca7b3d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Jan 11 09:29:44 2009 +1000
+
+    radeon: drop CS1
+
+commit 06952498f6cc23e29a40a9f62af2edd7ecb090e2
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Wed Nov 12 14:36:52 2008 +0100
+
+    radeon: enable dri2 only if memory manager is present
+    (cherry picked from commit fd4bb9b7b639befd63e7acd37254011b9e46732d)
+
+commit ed9d3d1f442ac68dd46d62a5e8f2236e851204b0
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Mon Nov 10 22:16:57 2008 +0100
+
+    radeon: flush command stream in block handler and in dri2 copy callback
+    (cherry picked from commit 13fa5ab73a707af52e71af400ea186073022f8b7)
+
+commit b7b3ef60fc68a52627be2211700e6c8332889d48
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Fri Nov 14 12:44:29 2008 +0100
+
+    radeon: bufmgr exa doesn't exist
+    (cherry picked from commit 8a00de47a186db1707b82a5977da8cbf2e8e0c80)
+
+commit 19ce13951371b8576f51da9b4e6d8a70b7edb0f6
+Author: Jerome Glisse <glisse at freedesktop.org>
+Date:   Thu Nov 6 00:25:18 2008 +0100
+
+    radeon: initial dri2 support
+
+commit 972cfd240fde82d9b6e2259c9e622e13b261a29d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Dec 1 19:15:41 2008 +1000
+
+    radeno: fixup unpinned buffers
+    (cherry picked from commit d9759ca976cad48e6c8fd3c7d17ce38588522c34)
+
+commit 37d665b6f3193929afae7608a92f7a05dc830a76
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Dec 22 16:16:16 2008 +1000
+
+    radeon: fix for 1.6 server
+
+commit 2e27c619191ff42698662b538863237df557c3a6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Dec 19 12:37:01 2008 +1100
+
+    radeon: only do mappings if direct rendering is enabled
+
+commit 80308a43b19966cdc1e9b58249ced45080f7e6ba
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Dec 9 13:29:18 2008 +1000
+
+    radeon: upstream fix for Init3D vs switch to/from 2d/3d
+
+commit 0ccd8d665d2b11a4af35586d86c8cb7742ad14e0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Dec 8 14:19:47 2008 +1000
+
+    radeon: only update dri buffers if DRI enabled
+
+commit 19f0842e41a81a8cd883048f9fae8736734ea3f4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Dec 1 15:31:08 2008 +1100
+
+    radeon: don't have 2D and 3D in one CS buffer
+
+commit 5a09cdbd0dee2513dfde9da4e11cbc9ba85b28d6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 26 16:09:29 2008 +1100
+
+    radeon: set touched flag on pinned buffers
+
+commit b1153a6c85856db565791e8937b60214d32eff3b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 26 16:04:35 2008 +1100
+
+    radeon: fix up some of the touched by gpu handling and force gtt handling
+    
+    this fixes DFS on the rs690
+
+commit cd04e7dd7067b5ab067a5252884e85bef8d7f60b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 26 12:52:24 2008 +1100
+
+    radeon: brutal attempt to fix RS4xx and RS6xx by flushing more often
+    
+    this might take more CPU but hopefully leads to stabler GPU
+
+commit ea31830a208ff187d86a131236d3a681551c8de3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Nov 23 17:56:02 2008 +1000
+
+    radeon: wait for rendering before doing UTS
+
+commit aa6f7f49f8a7576bdbd05e440126aa61e614a1a0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Nov 23 17:54:27 2008 +1000
+
+    radeon: stop this_op_read from going negative
+
+commit d49164d6cfe4b75706fe5700b1d572bcb24ff3c1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Nov 23 17:52:42 2008 +1000
+
+    radeon: return flush for conflicting domains
+
+commit fa9c42e37adc3755ae64e0362faa6b2c8daefe2c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Nov 23 17:50:47 2008 +1000
+
+    radeon: only reset state2d before emitting cache flush
+
+commit 152939e563e77a90a1154669fa7b9af4c0392d63
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Nov 20 16:48:33 2008 +1000
+
+    flush on UTS if any references
+
+commit 41a16e4646f422e5cc76e44631ec17a5fd5d019f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Nov 20 16:44:40 2008 +1000
+
+    radeon: add gart vs vram writes
+
+commit 64ced4a986b8c5c6534b4a27830e3a1e6119e269
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Nov 20 16:37:07 2008 +1000
+
+    radeon: improve DFS performance for non-vram objects
+
+commit 9f9545dd3b926b0edbef6dbe8f7b4c544e8f2631
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 19 14:49:44 2008 +1000
+
+    radeon: scrap state on LeaveVT not EnterVT
+
+commit 9d80e58ee16d56d7b6c5d1dcbf6e8dafc4ce09ae
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 19 11:08:34 2008 +1000
+
+    radeon: even more typos
+
+commit 1823d254a3a07ceea9cf7c6d70b0b22193fe4b27
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Nov 19 07:51:03 2008 +1000
+
+    radeon: oops bad typo
+
+commit 61285e439341b3ac357b46086b7535f8a3c6252c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Nov 18 16:09:10 2008 +1000
+
+    radeon: even if kernels fails, struggle onwards
+    
+    try and keep the session going even if visual glitches happen
+
+commit e97d0ee5deb8dd8b681c491c5ef5505ae24db3a0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Nov 18 15:46:46 2008 +1000
+
+    radeon_bufmgr: much more complete size check functionality
+
+commit 60806b5a76582478323be5649aeee510f0043328
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Nov 18 14:33:44 2008 +1000
+
+    radeon: I fail at uint32_t division
+
+commit 7402017c10bb3ef0d02dd81a940df1d97f14ec42
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Nov 18 12:06:02 2008 +1000
+
+    radeon: workaround O(wtf) logic in post_submit bufmgr
+
+commit 86265d8a8134e16211c8e179d2b5af11af77646e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 17 19:19:43 2008 +1000
+
+    radeon: set emit limit to 90% VRAM
+
+commit dc74e4f790a30fed364b06e37978384bc5708149
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 17 16:16:51 2008 +1000
+
+    radeon: use get/set master ioctls
+
+commit 57af898aece299faf54bb36de26b5b9df7a23570
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 14 15:56:16 2008 +1000
+
+    radeon: make space accounting a lot smarter
+
+commit 45ecaf81e28f47c3e49fbdaf94a205b827f7de8a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 14 15:55:12 2008 +1000
+
+    radeon: retry on CS2 EAGAIN
+
+commit d494dcfeff48b2ede9c0149b7b329cc764c16946
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 14 15:20:59 2008 +1000
+
+    radeon: add src/mask/dest to fallbacks
+
+commit 3e94797cd315f138473a8e259c852ead40ab2826
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 14 15:20:37 2008 +1000
+
+    radeon_memory: align all allocations
+
+commit 99f552fbb084b39df01495917c8799fd960238ff
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 14 11:03:34 2008 +1000
+
+    radeon: force gtt for mmap after fallbacks
+
+commit 6b3c66d4ce4e8e63927dd3a0ce3b483241ec491b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 10 14:18:17 2008 +1000
+
+    radeon: add more buffer info + fix read objects too big fallback
+
+commit e33b4410b0913ed9b614b54ccb884c00c2370615
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 10 11:47:02 2008 +1000
+
+    radeon: remove old exa bufmgr not used anymore code
+
+commit e8fad094a7d481cdfc712d55a31f8d8dbaf0b930
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 10 11:18:27 2008 +1000
+
+    radeon: fix crtc dpms
+    
+    need to find a better way to switch displays off
+
+commit 877935b871232545e84e32fc9d02fcff72552295
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sat Nov 8 14:48:29 2008 +1000
+
+    radeon: add DPMS support for connectors
+
+commit 6093bcb92e2b2439827300493f7179f8c1ce573f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Nov 7 16:20:09 2008 +1000
+
+    radeon: fix rotation of right-of heads
+
+commit 5408002d2647353f9a8efe7f80371813810e1cc0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Nov 3 14:51:43 2008 +1000
+
+    radeon: respect fb tex percent + trust kernel values
+
+commit 939f818aa364c381ff50f7d46094986fc606ce58
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 31 15:05:14 2008 +1000
+
+    radeon: remove workaround hack since kernel is hopefully fixed
+
+commit 492f3bb44de6676d68afbaca2f352ba4e22c0925
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 31 15:04:31 2008 +1000
+
+    radeon: workaround use after free
+
+commit 10188b4331bbe466e4bce9ece9e512f4872a4331
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 30 13:53:02 2008 +1000
+
+    radeon: setup accel dfs for PCIE cards only if drm_mm
+
+commit fda1c3d0db74e7dac72d73fce481baae365aeec5
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 30 10:00:10 2008 +1000
+
+    radeon: fixup name handling for bufmgr
+
+commit 10cf6444c73542a28255072bea0a090197ef3493
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 30 09:59:11 2008 +1000
+
+    radeon: fix memory leak in CS2 code
+
+commit d8589d2a8a5aa96e8799b0baa176804f60491f0c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 20:35:19 2008 +1000
+
+    return on empty IBs, flush happen in the kernel
+
+commit 6feee544fb530b78c255357268bb0e9aa34e5430
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 10:16:09 2008 +1000
+
+    radeon: remove some debugging
+
+commit 98a17f1cc7326e35c17712ed318e79d7816eb817
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 28 06:40:31 2008 +1000
+
+    radeon: enable gem wait rendering.
+
+commit 9f884ba97fe517b52148198df4ed0aceaabe4618
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 27 16:51:00 2008 +1000
+
+    radeon: add new CS submission scheme
+
+commit bbbc0e7e21668684cb60649d0ebf0be36d94b5e4
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Thu Oct 23 17:05:12 2008 +1000
+
+    radeon: really rough effort at vram limit setting
+
+commit 619eca79f15c36e1e50ca8d2e28a451327810216
+Author: Dave Airlie <airlied at dhcp-1-203.bne.redhat.com>
+Date:   Thu Oct 23 17:04:51 2008 +1000
+
+    radeon: this shouldn't fail but it did once while debugging so patch up
+
+commit 6bb16c3a3bcba75557fa45567d28d5dda5463875
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 23 10:43:09 2008 +1000
+
+    radeon: fixup some memory allocation issues
+    
+    hopefully since the alignment got fixed this doesn't break anything
+
+commit 790e378c46b133e9a30d12e5b036ff9d1ec97181
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 21 15:50:17 2008 +1000
+
+    radeon: cleanup reserved space calcs
+
+commit 5d0cdb6321c301ab94e9b9c49912562299efe9f3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Oct 21 15:49:48 2008 +1000
+
+    radeon: fixup Owen's optimisation - this fixes corruption
+    
+    I haven't a good explaination why mapping the buffer twice in a row
+    seems to cause this failure. but I probably don't have time to track
+    it down before release.
+
+commit 79134741c9bd31d19d1ca887464a41625a4b9256
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Oct 19 18:27:53 2008 +1000
+
+    radeon: fixup tex offset for no modeset
+
+commit bc7abf58eb5f9497f70c337709631d4f991552e0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 15 17:01:34 2008 +1000
+
+    radeon: add DFS support for CS
+
+commit 977018370d2626aca452894b7d0cf7cc9b773d77
+Author: airlied <airlied at unused-12-220.bne.redhat.com>
+Date:   Wed Oct 15 23:55:13 2008 +1000
+
+    radeon: add r100/r200 support for EXA render
+
+commit 82c18e976f825c93aaec2208feb92877db13084b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Oct 13 16:59:02 2008 +1000
+
+    radeon: fix switch mode path so nexuiz starts
+
+commit 7e2f98ba5bf205e395518a6a283095918620f099
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 10 15:29:24 2008 +1000
+
+    remove gem buf caching useless on radeon
+
+commit 1dda85f41012139539b135af0c7280e703aa025c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 10 15:18:41 2008 +1000
+
+    radeon: drmmode make names same as for non-kms drivers
+
+commit a26a20f9a0ad340f3032c8420249c36b02de4fc4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 10 15:10:28 2008 +1000
+
+    radeon: fix rotation under kms
+
+commit 34a711886a77724f49cd3b8793922dc1b60d41ae
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 10 14:44:39 2008 +1000
+
+    radeon: remove testing fallback
+
+commit 14e85e9202c0ea048877cd317db762e60a9586a3
+Author: Kristian Høgsberg <krh at redhat.com>
+Date:   Fri Oct 10 10:57:47 2008 +1100
+
+    radeon: add copy fb contents patch
+
+commit 08ee251f5ef124562eb496c966e5c5ab24de079c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 10 10:57:20 2008 +1100
+
+    bufmgr: turn off debug
+
+commit 19ecc7092fa7830ef19e3664c363d312a8112175
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Oct 10 10:38:38 2008 +1100
+
+    radeon: fixup modesetting code after rebasing to master
+
+commit 42ab306a892601460d69dd3a15ac459c902bfea3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 9 16:34:52 2008 +1100
+
+    radeon: misc cleanups in exa
+
+commit 4d7a61c0567d7d71c4df29d21e4e8731caa5af0c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 9 16:34:23 2008 +1100
+
+    radeon: fix UTS for non-modesetting
+
+commit d15a38541dfc34dd5156a727706eeef015346de2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Oct 9 16:33:59 2008 +1100
+
+    radeon: fix exa limits problem - shouldn't have been resetting scissor
+
+commit c1ae7fbc398dd01c03621b7bf9b13df1c0da680e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Oct 1 11:21:53 2008 +1000
+
+    radeon: fixup for latest libdrm changes
+
+commit 35b8f71d6181c2207ab523b78224c6c9b9a950b6
+Author: Owen Taylor <otaylor at localhost.localdomain>
+Date:   Fri Sep 26 16:17:49 2008 -0400
+
+    Don't flush when mapping a newly created pixmap into system ram If we have a pixmap that has never been mapped into vram (and thus never written to by the GPU), there is no need to flush the graphics pipeline and wait for idle before starting to write to it.
+
+commit c8750ddbe1c91fcfb1b2aefcb75f0d5f86fee8a1
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Sep 29 16:32:51 2008 +1000
+
+    radeon: hopefully fix textured xv
+
+commit 8a5a10bdd9e4f83047cc87353fa313f1299a601f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 26 11:38:36 2008 +1000
+
+    radeon: fix the offset checks for command submission
+    
+    since we are relocating in the kernel we don't need these
+
+commit 5636af08d3aa2294e25b574738d89859ad7e5d58
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 26 10:46:20 2008 +1000
+
+    radeon: fixup after mertge
+
+commit 3785954990de17d4d1fd4972ea2f52a08df67c3f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 26 10:34:41 2008 +1000
+
+    radeon: fix issues with emitting DST PIPE on cards that don't use it
+
+commit 930633213ec71f48e30142185815df11ff945dba
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Sep 24 17:12:19 2008 +1000
+
+    modesetting: fixup bits of drmmode_display.c
+
+commit 442c52e9cc396a0c2c97f96e37fa97621d6ef81d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Sep 24 15:42:01 2008 +1000
+
+    r600: fixup for kms
+
+commit e4e80616398db33614e38d58d47c8a5a8adaddce
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Sun Sep 7 08:01:56 2008 +1000
+
+    modeset: fix AddFB for current tree
+
+commit f7cac11fc7f2b91d39f58dd0d03c7b7c8bf46450
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 10:52:52 2008 +1000
+
+    radeon: disable overlay for modesetting for now
+
+commit 8ab5cc31e41a5d181f6c47b88c6f64764d44a346
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 14 10:52:42 2008 +1000
+
+    radeon: no need for this anymore
+
+commit 35d4ee0ab5c3d6e3a76bde048a385b22da5996f0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Sep 5 16:32:01 2008 +1000
+
+    radeon: fix up for suspend/resume - uses new API
+
+commit aaa954b49c92dafb4c24df67477d54f7b982c79b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 27 13:09:55 2008 +1000
+
+    radeon: update to proper domain
+    
+    this should fix 3d again for now at least
+
+commit da197aabd20d47dedabe18734da8c487f4875c8d
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 26 18:29:23 2008 +1000
+
+    ddx: move to using new gem interface
+    
+    add a GEM bufmgr backend along the lines of Intels one.
+    
+    The buffer reuse is disabled and I'll probably rip it out for radeon
+    as we can't just re-use buffers that might have ended up in VRAM etc.
+    
+    Probably need some sort of in-kernel re-use.
+
+commit 4e5fc75c73c388a0840720ce0fc27db3a19c86cf
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 25 11:37:48 2008 +1000
+
+    radeon: add an initial GEM bufmgr
+
+commit 90a4d7d67767f2dfef516868d28b533b37e9bb93
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 25 11:37:20 2008 +1000
+
+    radeon: implement simple UTS
+
+commit 6042177580839fdb7578200ba3ed39ec55312203
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 22 15:34:58 2008 +1000
+
+    radeon: add read/write domains properly
+
+commit a7bb412bdca1bc915794ddae7276ebb59be6b4f7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 15 11:25:31 2008 +1000
+
+    radeon: fix some rotate bugs
+
+commit 05ec9ff3b85e3f526e2f803600ffb8db707aaf6c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 15 11:16:18 2008 +1000
+
+    radeon: when create fake bos, they are already mapped
+
+commit dfca01f53644333444c9364716e1024fc0ed3a3a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Aug 15 11:15:58 2008 +1000
+
+    exa: remove wrong assert
+
+commit ad3cfb887815361be0ee61e1e8559781c8ebf026
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 19:27:44 2008 +1000
+
+    radeon: start to work on rotate pixmap support
+
+commit dfeeb56293d4480e9b875334a7a8509f173e95cc
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 18:28:23 2008 +1000
+
+    radeon: port simple exa bufmgr
+    
+    exa pixmaps work now but they are slow
+
+commit c612788007beaa5f09602c87f1b2f3bd517551be
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 7 17:52:04 2008 +1000
+
+    further pixmaps on EXA
+
+commit 3ca79597ec6357571b01c143f75054624952c107
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Aug 7 11:22:46 2008 +1000
+
+    initial exa on gem hackx
+    
+    Conflicts:
+    
+    	src/radeon_exa.c
+    	src/radeon_memory.c
+
+commit fb6f4e2dbf6a3c96493f1c85d0383954549b5ab6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 15:31:03 2008 +1000
+
+    radeon: initial rotate pixmap
+    
+    This doesn't work, we really need EXA pixmaps for this stuff
+
+commit 9de349249ff9f175e703b3d975e5f6a9fa332d40
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 14:40:18 2008 +1000
+
+    radeon: use buffer names
+
+commit 18a3c5cc114b9af53c5d15301787dd67738e97b8
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 14:38:56 2008 +1000
+
+    ati: fix do adjust mode
+
+commit 96f754c15ce3ac2c8477a1e46f7e013a67c68bb3
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 09:38:48 2008 +1000
+
+    FEDORA: update offsets in DRI private
+
+commit 6636f4511635df967ad83c91ed5c5584b4fd70e0
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 12 09:10:18 2008 +1000
+
+    radeon: add vt bind flag
+
+commit 97e41f34e01fa38f98d5a1b85a03e4fe61c341b2
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 6 13:30:54 2008 +1000
+
+    radeon: warning cleanups
+
+commit 349c56d5229927317c4c533247bb13b22ef876f9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 6 13:18:52 2008 +1000
+
+    radeon: remove debugging
+
+commit 26705852d8be63f6d9f237b4023487089392c4ae
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 6 13:17:31 2008 +1000
+
+    radeon: add code to set memory map and not futz with mappings
+
+commit c5a452276fc86beabc81d64d3da04afbe3e6b370
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Aug 6 13:16:56 2008 +1000
+
+    drm: don't futz with framebuffer when no drm_mm
+
+commit 558864d7647f69f610f6815368c7b8c23bf1808e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 5 16:47:21 2008 +1000
+
+    radeon: undef OUT_RELOC
+
+commit 1a67c636f39c62e7438958d07aa9e13893d529e4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 5 16:37:52 2008 +1000
+
+    radeon: add stdint/lib to check for modesetting
+
+commit cc426003d5ebf1ef6c3bf439ae00bcd0c8d08788
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 5 16:07:31 2008 +1000
+
+    fix whitespace
+
+commit 9c1cb1d7a83a4fea9796acdceb792a7e0821554c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Aug 5 16:07:07 2008 +1000
+
+    radeon: fix build issue
+
+commit fb90c1c7c2d9bb7c374080362a66947e0893751b
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 4 16:27:55 2008 +1000
+
+    radeon: free all pinned memory on server shutdown
+
+commit bf5dbb81ba35ecbd1a215910404bd91dcc389e32
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 4 16:11:30 2008 +1000
+
+    radeon: get textured video working on the memory manager
+
+commit 562c15131f0b47af3e60649e7bb0f63d0f8ce905
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 4 16:11:18 2008 +1000
+
+    radeon: convert bus addr to void pointer
+
+commit dd5a36b4116f83ae1f406693b55ebacc90a96ba7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Aug 4 15:11:13 2008 +1000
+
+    radeon: avoid z cache flushes if not needed
+
+commit 203cb77f84e2b6f449789adbc64609ec739522cf
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Jul 30 17:04:22 2008 +1000
+
+    radeon: update DRI support, so mappings get added
+    
+    We only add fake frontbuffer mapping as DRI clients expect one.
+
+commit d09e37bed190f3e4cf3c5fe415082b5af627ee73
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Jul 29 16:50:03 2008 +1000
+
+    radeon: exa through the handle relocation function
+
+commit 348cb50fb0ff61c42a55f1adaeb7e6521931a5b6
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Jul 29 14:58:22 2008 +1000
+
+    radeon: keep track of 2D state
+    
+    This lets the kernel use the 2D blit engine in theory
+
+commit 4ffb66c161f17b4a275a99e46dda6e9904ba0293
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Jul 28 17:48:59 2008 +1000
+
+    new command submission attempt
+
+commit 2db6760e425efedad537f33276553efa693b5f93
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Jul 28 17:48:08 2008 +1000
+
+    radeon: fixup over fluishing problem
+
+commit 34e98ac507605fee60f9811c25cd4eed531f3d8c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Jul 28 17:44:51 2008 +1000
+
+    hack for now: divide texture size by 2
+
+commit 347cf1dfa7ce4f98e25af3d83b865208186cd41e
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Jul 25 17:07:20 2008 +1000
+
+    radeon: fix dri message
+
+commit 03e469920c0908e62c5fa76f892d6fc969026492
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Jul 25 15:11:58 2008 +1000
+
+    radeon: fix pool which caused memory corruption
+
+commit 4a214f115890170ffbd8c710067e165d4106cb5c
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Jul 25 14:59:07 2008 +1000
+
+    radeon: get DRI to attempt to start up
+
+commit f06e03e4b909b4a7a68365330b6b19937abe1506
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Jul 25 14:58:23 2008 +1000
+
+    radeon: call the right sync function
+
+commit b08f5b921676570a357cdbf2c9411b6b56fd564f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Jul 25 14:57:21 2008 +1000
+
+    radeon: unmap memory from objects
+
+commit 869ce0cd2d28673eb30c92c8b79ada5870ff4c4f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Jul 23 10:59:16 2008 +1000
+
+    use CP for 3D engine with modeset
+
+commit 7dedbf4a3abdba120cff59785e232d28ff324887
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Jul 23 10:59:04 2008 +1000
+
+    radeon: fix DFS
+
+commit 66581330987a8a6fa50df6be4edb41efdb998bd9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Wed Jul 23 10:48:45 2008 +1000
+
+    radeon: get the fb location right
+
+commit 3438a51e0d87a25dd1f747212ac9612149f49d3f
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Jul 22 18:08:25 2008 +1000
+
+    radeon: make at least the EXA stipple work..
+
+commit fce2c06070101243f8228574907f9f67826633d7
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Jul 22 18:07:15 2008 +1000
+
+    radeon: disable debugging for now
+
+commit 3d779c1a27ae4691a13ee8da83f6f06922afb83a
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Jul 21 18:40:14 2008 +1000
+
+    radeon: initial indirect buffer use.
+    
+    Move EXA and front allocation into one big buffer to workaround
+    EXA issues - need to move to driver pixmap hooks.
+    
+    Add new indirect GEM to take indirect buffers.
+    
+    doesn't work think the offsets are all wrong.
+
+commit 181dec8fe5651fd7feb4efa1674fa0ef3685a7b4
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Jul 18 13:46:41 2008 +1000
+
+    modesetting step 1: have X and a cursor
+
+commit 8b5a5b041bc58c085d45aecedda4df11c94716f5
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Thu Jul 17 09:59:19 2008 +1000
+
+    radeon: add radeon_memory.c
+
+commit 415ef83b9c2954fe7110e9dc6e2b2d6b4ce52bfb
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Tue Jul 8 16:55:27 2008 +1000
+
+    remove mappings of some buffers.
+    
+    use drm gart code if available
+
+commit dff36e2075f948d9002b882aa6c9e3098a3481c9
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Mon Jul 7 16:54:35 2008 +1000
+
+    add initial support for a kernel memory manager
+    
+    This just pins all the current allocations via the kernel memory manager
+    instead of trying to do them all in userspace.
+    
+    useful steps towards getting kernel modesetting
+
+commit c12eccd5889541e9aa1a700f97c1de38920794c8
+Author: Dave Airlie <airlied at redhat.com>
+Date:   Fri Jul 4 10:39:34 2008 +1000
+
+    port to using drm header files
 diff --git a/configure.ac b/configure.ac
 index b094a50..29a19e3 100644
 --- a/configure.ac
@@ -4062,7 +4963,7 @@
 +
 +#endif
 diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index 0842164..c61a722 100644
+index e8d28f0..caea901 100644
 --- a/src/radeon_driver.c
 +++ b/src/radeon_driver.c
 @@ -67,7 +67,7 @@
@@ -4274,7 +5175,7 @@
      info->cp->CPInUse = FALSE;
      info->cp->CPStarted = FALSE;
      info->cp->CPusecTimeout = RADEON_DEFAULT_CP_TIMEOUT;
-@@ -2701,6 +2732,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
+@@ -2692,6 +2723,37 @@ static const xf86CrtcConfigFuncsRec RADEONCRTCResizeFuncs = {
      RADEONCRTCResize
  };
  
@@ -4312,7 +5213,7 @@
  Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  {
      xf86CrtcConfigPtr   xf86_config;
-@@ -2721,6 +2783,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2712,6 +2774,8 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      info               = RADEONPTR(pScrn);
      info->MMIO         = NULL;
  
@@ -4321,7 +5222,7 @@
      info->IsSecondary  = FALSE;
      info->IsPrimary = FALSE;
  
-@@ -2755,62 +2819,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2746,62 +2810,63 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      }
  
      info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
@@ -4432,7 +5333,7 @@
  
      if (xf86RegisterResources(info->pEnt->index, 0, ResExclusive))
  	goto fail;
-@@ -2820,10 +2885,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2811,10 +2876,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      pScrn->racMemFlags = RAC_FB | RAC_COLORMAP | RAC_VIEWPORT | RAC_CURSOR;
      pScrn->monitor     = pScrn->confScreen->monitor;
  
@@ -4449,7 +5350,7 @@
  
      if (!RADEONPreInitVisual(pScrn))
  	goto fail;
-@@ -2837,154 +2904,216 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -2828,164 +2895,224 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
      memcpy(info->Options, RADEONOptions, sizeof(RADEONOptions));
      xf86ProcessOptions(pScrn->scrnIndex, pScrn->options, info->Options);
  
@@ -4562,6 +5463,20 @@
 +	 */
 +	info->directRenderingEnabled = RADEONPreInitDRI(pScrn);
  #endif
+-    if (!info->directRenderingEnabled) {
+-	if (info->ChipFamily >= CHIP_FAMILY_R600) {
+-	    info->r600_shadow_fb = TRUE;
+-	    xf86DrvMsg(pScrn->scrnIndex, X_INFO,
++	if (!info->directRenderingEnabled) {
++	    if (info->ChipFamily >= CHIP_FAMILY_R600) {
++		info->r600_shadow_fb = TRUE;
++		xf86DrvMsg(pScrn->scrnIndex, X_INFO,
+ 			   "using shadow framebuffer\n");
+-	    if (!xf86LoadSubModule(pScrn, "shadow"))
+-		info->r600_shadow_fb = FALSE;
+-	}
+-    }
+-
 -    if (!RADEONPreInitVRAM(pScrn))
 -	goto fail;
 -
@@ -4577,25 +5492,10 @@
 -		info->allowColorTiling = FALSE;
 -		xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
 -			   "Requested desktop size exceeds surface limts for tiling, ColorTiling disabled\n");
-+	
-+	if (!RADEONPreInitVRAM(pScrn))
-+	    goto fail;
-+	
-+	RADEONPreInitColorTiling(pScrn);
-+	
-+	/* we really need an FB manager... */
-+	if (pScrn->display->virtualX) {
-+	    crtc_max_X = pScrn->display->virtualX;
-+	    crtc_max_Y = pScrn->display->virtualY;
-+	    if (info->allowColorTiling) {
-+		if (crtc_max_X > info->MaxSurfaceWidth ||
-+		    crtc_max_Y > info->MaxLines) {
-+		    info->allowColorTiling = FALSE;
-+		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
-+			       "Requested desktop size exceeds surface limts for tiling, ColorTiling disabled\n");
-+		}
++		if (!xf86LoadSubModule(pScrn, "shadow"))
++		    info->r600_shadow_fb = FALSE;
  	    }
--	}
+ 	}
 -	if (crtc_max_X > 8192)
 -	    crtc_max_X = 8192;
 -	if (crtc_max_Y > 8192)
@@ -4614,6 +5514,24 @@
 -	} else if (IS_AVIVO_VARIANT) {
 -	    crtc_max_X = 2560;
 -	    crtc_max_Y = 1600;
++	
++	if (!RADEONPreInitVRAM(pScrn))
++	    goto fail;
++	
++	RADEONPreInitColorTiling(pScrn);
++	
++	/* we really need an FB manager... */
++	if (pScrn->display->virtualX) {
++	    crtc_max_X = pScrn->display->virtualX;
++	    crtc_max_Y = pScrn->display->virtualY;
++	    if (info->allowColorTiling) {
++		if (crtc_max_X > info->MaxSurfaceWidth ||
++		    crtc_max_Y > info->MaxLines) {
++		    info->allowColorTiling = FALSE;
++		    xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
++			       "Requested desktop size exceeds surface limts for tiling, ColorTiling disabled\n");
++		}
++	    }
 +	    if (crtc_max_X > 8192)
 +		crtc_max_X = 8192;
 +	    if (crtc_max_Y > 8192)
@@ -4676,31 +5594,30 @@
 +		xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n");
 +		goto fail;
 +	}
++	
++	/* fix up cloning on rn50 cards
++	 * since they only have one crtc sometimes the xserver doesn't assign
++	 * a crtc to one of the outputs even though both outputs have common modes
++	 * which results in only one monitor being enabled.  Assign a crtc here so
++	 * that both outputs light up.
++	 */
++	if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) {
++	    int i;
  
 -    ErrorF("before xf86InitialConfiguration\n");
-+        /* fix up cloning on rn50 cards
-+         * since they only have one crtc sometimes the xserver doesn't assign
-+         * a crtc to one of the outputs even though both outputs have common modes
-+         * which results in only one monitor being enabled.  Assign a crtc here so
-+         * that both outputs light up.
-+         */
-+        if (info->ChipFamily == CHIP_FAMILY_RV100 && !pRADEONEnt->HasCRTC2) {
-+            int i;
-+
 +	    for (i = 0; i < xf86_config->num_output; i++) {
-+	        xf86OutputPtr output = xf86_config->output[i];
-+
-+	        /* XXX: double check crtc mode */
-+	        if ((output->probed_modes != NULL) && (output->crtc == NULL))
-+		    output->crtc = xf86_config->crtc[0];
-+	    }
-+        }
++		xf86OutputPtr output = xf86_config->output[i];
  
 -    if (!xf86InitialConfiguration (pScrn, FALSE))
 -   {
 -      xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "No valid modes.\n");
 -      goto fail;
 -   }
++		/* XXX: double check crtc mode */
++		if ((output->probed_modes != NULL) && (output->crtc == NULL))
++		    output->crtc = xf86_config->crtc[0];
++	    }
++	}
 +	ErrorF("after xf86InitialConfiguration\n");
  
 -    /* fix up cloning on rn50 cards
@@ -4716,19 +5633,14 @@
 +	char *bus_id;
 +   	 if (!radeon_alloc_dri(pScrn))
 +		return FALSE;
- 
--	for (i = 0; i < xf86_config->num_output; i++) {
--	    xf86OutputPtr output = xf86_config->output[i];
++
 +	bus_id = DRICreatePCIBusID(info->PciInfo);
 +	if (drmmode_pre_init(pScrn, &info->drmmode, bus_id, "radeon", pScrn->bitsPerPixel / 8) == FALSE) {
 +	    xfree(bus_id);
 +	    xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Kernel modesetting setup failed\n");
 +	    goto fail;
 +	}
- 
--	    /* XXX: double check crtc mode */
--	    if ((output->probed_modes != NULL) && (output->crtc == NULL))
--		output->crtc = xf86_config->crtc[0];
++
 +	info->dri->drmFD = info->drmmode.fd;
 +    info->dri2.drm_fd = info->drmmode.fd;
 +    info->dri2.enabled = FALSE;
@@ -4749,11 +5661,16 @@
 +	    {
 +	        struct drm_radeon_getparam gp;
 +		int value;
-+
+ 
+-	for (i = 0; i < xf86_config->num_output; i++) {
+-	    xf86OutputPtr output = xf86_config->output[i];
 +		memset(&gp, 0, sizeof(gp));
 +		gp.param = RADEON_PARAM_FB_LOCATION;
 +		gp.value = &value;
-+
+ 
+-	    /* XXX: double check crtc mode */
+-	    if ((output->probed_modes != NULL) && (output->crtc == NULL))
+-		output->crtc = xf86_config->crtc[0];
 +		if (drmCommandWriteRead(info->dri->drmFD, DRM_RADEON_GETPARAM, &gp,
 +					sizeof(gp)) < 0) {
 +		    goto fail;
@@ -4785,7 +5702,7 @@
  
  	/* Get ScreenInit function */
      if (!xf86LoadSubModule(pScrn, "fb")) return FALSE;
-@@ -2999,10 +3128,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -3000,10 +3127,12 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
  	if (!RADEONPreInitXv(pScrn))                 goto fail;
      }
  
@@ -4802,7 +5719,7 @@
      }
  
      if (pScrn->modes == NULL) {
-@@ -3155,6 +3286,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
+@@ -3156,6 +3285,9 @@ static void RADEONBlockHandler(int i, pointer blockData,
  
  #ifdef USE_EXA
      info->accel_state->engineMode = EXA_ENGINEMODE_UNKNOWN;
@@ -4812,7 +5729,7 @@
  #endif
  }
  
-@@ -3243,7 +3377,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3244,7 +3376,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      int            subPixelOrder = SubPixelUnknown;
      char*          s;
  #endif
@@ -4821,7 +5738,7 @@
  
      info->accelOn      = FALSE;
  #ifdef USE_XAA
-@@ -3263,58 +3397,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3264,58 +3396,61 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  		   "RADEONScreenInit %lx %ld\n",
  		   pScrn->memPhysBase, pScrn->fbOffset);
  #endif
@@ -4922,7 +5839,7 @@
      /* Visual setup */
      miClearVisualTypes();
      if (!miSetVisualTypes(pScrn->depth,
-@@ -3348,19 +3485,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3349,19 +3484,21 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      hasDRI = info->directRenderingEnabled;
  #endif /* XF86DRI */
  
@@ -4956,7 +5873,7 @@
  	}
      }
  
-@@ -3397,7 +3536,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3398,7 +3535,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #ifdef XF86DRI
  	if (hasDRI) {
  	    info->accelDFS = xf86ReturnOptValBool(info->Options, OPTION_ACCEL_DFS,
@@ -4968,7 +5885,7 @@
  
  	    /* Reserve approx. half of offscreen memory for local textures by
  	     * default, can be overridden with Option "FBTexPercent".
-@@ -3423,7 +3565,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3424,7 +3564,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #if defined(XF86DRI) && defined(USE_XAA)
@@ -4977,7 +5894,7 @@
  	info->dri->textureSize = -1;
  	if (xf86GetOptValInteger(info->Options, OPTION_FBTEX_PERCENT,
  				 &(info->dri->textureSize))) {
-@@ -3441,7 +3583,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3442,7 +3582,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  #endif
  
  #ifdef USE_XAA
@@ -4986,7 +5903,7 @@
  	return FALSE;
  #endif
  
-@@ -3462,7 +3604,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3463,7 +3603,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			    info->CurrentLayout.pixel_bytes);
  	int  maxy        = info->FbMapSize / width_bytes;
  
@@ -4995,7 +5912,7 @@
  	    xf86DrvMsg(scrnIndex, X_ERROR,
  		       "Static buffer allocation failed.  Disabling DRI.\n");
  	    xf86DrvMsg(scrnIndex, X_ERROR,
-@@ -3472,19 +3614,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3473,19 +3613,54 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  			info->CurrentLayout.pixel_bytes * 3 + 1023) / 1024);
  	    info->directRenderingEnabled = FALSE;
  	} else {
@@ -5054,7 +5971,7 @@
  #endif
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Initializing fb layer\n");
-@@ -3508,7 +3685,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3509,7 +3684,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      if (info->r600_shadow_fb == FALSE) {
  	/* Init fb layer */
@@ -5063,7 +5980,7 @@
  			  pScrn->virtualX, pScrn->virtualY,
  			  pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
  			  pScrn->bitsPerPixel))
-@@ -3550,8 +3727,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3551,8 +3726,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      /* restore the memory map here otherwise we may get a hang when
       * initializing the drm below
       */
@@ -5076,7 +5993,7 @@
  
      /* Backing store setup */
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -3561,7 +3740,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3562,7 +3739,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
  
      /* DRI finalisation */
  #ifdef XF86DRI
@@ -5085,7 +6002,7 @@
          info->dri->pKernelDRMVersion->version_minor >= 19)
      {
        if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
-@@ -3577,14 +3756,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3578,14 +3755,24 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
      if (info->directRenderingEnabled) {
          xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		       "DRI Finishing init !\n");
@@ -5111,7 +6028,7 @@
  
  	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
  
-@@ -3680,10 +3869,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3681,10 +3868,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
              return FALSE;
          }
      }
@@ -5121,15 +6038,15 @@
 -    if (!xf86SetDesiredModes (pScrn))
 +    if (info->drm_mode_setting) {
 +      if (!drmmode_set_desired_modes(pScrn, &info->drmmode))
- 	return FALSE;
++	return FALSE;
 +    } else {
 +      if (!xf86SetDesiredModes (pScrn))
-+	return FALSE;
+ 	return FALSE;
 +    }
  
      /* Provide SaveScreen & wrap BlockHandler and CloseScreen */
      /* Wrap CloseScreen */
-@@ -5260,7 +5455,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5261,7 +5454,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #ifdef XF86DRI
      Bool           CPStarted   = info->cp->CPStarted;
  
@@ -5138,7 +6055,7 @@
  	DRILock(pScrn->pScreen, 0);
  	RADEONCP_STOP(pScrn, info);
      }
-@@ -5283,8 +5478,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5284,8 +5477,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  #endif
      }
  
@@ -5151,7 +6068,7 @@
  
      ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0);
  
-@@ -5296,16 +5493,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5297,16 +5492,19 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
  	/* xf86SetRootClip would do, but can't access that here */
      }
  
@@ -5179,7 +6096,7 @@
      }
  #endif
  
-@@ -5503,6 +5703,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5504,6 +5702,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
      xf86OutputPtr  output = config->output[config->compat_output];
      xf86CrtcPtr	crtc = output->crtc;
  
@@ -5191,7 +6108,7 @@
      /* not handled */
      if (IS_AVIVO_VARIANT)
  	return;
-@@ -5542,76 +5747,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5543,76 +5746,103 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "RADEONEnterVT\n");
  
@@ -5344,7 +6261,7 @@
      }
  #endif
      /* this will get XVideo going again, but only if XVideo was initialised
-@@ -5626,7 +5858,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5627,7 +5857,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
  	info->accel_state->XInited3D = FALSE;
  
  #ifdef XF86DRI
@@ -5353,7 +6270,7 @@
  	RADEONCP_START(pScrn, info);
  	DRIUnlock(pScrn->pScreen);
      }
-@@ -5649,26 +5881,28 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5650,26 +5880,28 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  		   "RADEONLeaveVT\n");
  #ifdef XF86DRI
      if (RADEONPTR(pScrn)->directRenderingInited) {
@@ -5397,7 +6314,7 @@
  
  	/* Make sure 3D clients will re-upload textures to video RAM */
  	if (info->dri->textureSize) {
-@@ -5684,6 +5918,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5685,6 +5917,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  		i = list[i].next;
  	    } while (i != 0);
  	}
@@ -5409,7 +6326,7 @@
      }
  #endif
  
-@@ -5710,10 +5949,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5711,10 +5948,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
  
      xf86_hide_cursors (pScrn);
  
@@ -5431,7 +6348,7 @@
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Ok, leaving now...\n");
-@@ -5767,7 +6014,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5768,7 +6013,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
  #endif /* USE_XAA */
  
      if (pScrn->vtSema) {
@@ -5441,7 +6358,7 @@
      }
  
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5802,6 +6050,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5803,6 +6049,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
      info->DGAModes = NULL;
      xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
  		   "Unmapping memory\n");
@@ -8006,7 +8923,7 @@
  
  typedef struct _radeon_encoder {
 diff --git a/src/radeon_textured_video.c b/src/radeon_textured_video.c
-index 2df299f..72d60e2 100644
+index 2df299f..79b80de 100644
 --- a/src/radeon_textured_video.c
 +++ b/src/radeon_textured_video.c
 @@ -40,6 +40,7 @@
@@ -8089,35 +9006,35 @@
      pPriv->src_pitch = dstPitch;
      pPriv->size = size;
      pPriv->pDraw = pDraw;
-@@ -510,10 +531,23 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
-     }
+@@ -511,9 +532,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
  
      /* Upload bicubic filter tex */
--    if (pPriv->bicubic_enabled) {
+     if (pPriv->bicubic_enabled) {
 -	if (info->ChipFamily < CHIP_FAMILY_R600)
 -	    RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512,
 -			   (uint8_t *)(info->FB + pPriv->bicubic_offset), 1024, 1024, 1, 512, 2);
-+    if (pPriv->bicubic_enabled && info->ChipFamily < CHIP_FAMILY_R600) {
-+	uint8_t *bicubic_addr;
-+	int ret;
-+
-+	if (info->new_cs) {
-+	    ret = dri_bo_map(pPriv->bicubic_bo, 1);
-+	    if (ret)
-+		return BadAlloc;
-+
-+	    bicubic_addr = pPriv->bicubic_bo->virtual;
-+	} else
-+	    bicubic_addr = (uint8_t *)(info->FB + pPriv->bicubic_offset);
-+	
-+	RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, bicubic_addr, 1024, 1024, 1, 512, 2);
-+	
-+	if (info->new_cs)
-+	    dri_bo_unmap(pPriv->bicubic_bo);
++       if (info->ChipFamily < CHIP_FAMILY_R600) {
++	   uint8_t *bicubic_addr;
++	   int ret;
++
++	   if (info->new_cs) {
++	       ret = dri_bo_map(pPriv->bicubic_bo, 1);
++	       if (ret)
++		   return BadAlloc;
++
++	       bicubic_addr = pPriv->bicubic_bo->virtual;
++	   } else
++	       bicubic_addr = (uint8_t *)(info->FB + pPriv->bicubic_offset);
++	
++	   RADEONCopyData(pScrn, (uint8_t *)bicubic_tex_512, bicubic_addr, 1024, 1024, 1, 512, 2);
++	   
++	   if (info->new_cs)
++	       dri_bo_unmap(pPriv->bicubic_bo);
++       }
      }
  
      /* update cliplist */
-@@ -531,10 +565,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -531,10 +567,12 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
      pPriv->w = width;
      pPriv->h = height;
  


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.154
retrieving revision 1.155
diff -u -r1.154 -r1.155
--- xorg-x11-drv-ati.spec	6 Mar 2009 23:50:06 -0000	1.154
+++ xorg-x11-drv-ati.spec	10 Mar 2009 02:04:50 -0000	1.155
@@ -5,7 +5,7 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.11.0
-Release:   5%{?dist}
+Release:   6%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -76,6 +76,9 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Tue Mar 10 2009 Dave Airlie <airlied at redhat.com> 6.11.0-6
+- master fixes for panning + enable r600 accel by default
+
 * Sat Mar 07 2009 Dave Airlie <airlied at redhat.com> 6.11.0-5
 - pull in more fixes from master
 




More information about the fedora-extras-commits mailing list