diff --git a/radeon-modeset.patch b/radeon-modeset.patch index 1bf1196..6babf3e 100644 --- a/radeon-modeset.patch +++ b/radeon-modeset.patch @@ -1,3 +1,9 @@ +commit 1714b8e5443da01d838e9804166b67fcb3a6ec45 +Author: Dave Airlie +Date: Tue Oct 28 10:16:09 2008 +1000 + + radeon: remove some debugging + commit 17b7b76a702640462a3878ae745fd1f5ddd32f19 Author: Dave Airlie Date: Tue Oct 28 06:40:31 2008 +1000 @@ -1688,7 +1694,7 @@ index f7ae1a8..a437b55 100644 do { \ if (RADEON_VERBOSE) \ diff --git a/src/radeon_accel.c b/src/radeon_accel.c -index a6e332d..a22181f 100644 +index a6e332d..23c17ed 100644 --- a/src/radeon_accel.c +++ b/src/radeon_accel.c @@ -311,6 +311,9 @@ void RADEONEngineRestore(ScrnInfoPtr pScrn) @@ -1824,7 +1830,7 @@ index a6e332d..a22181f 100644 switch (info->CurrentLayout.pixel_code) { case 8: datatype = 2; break; -@@ -550,6 +556,146 @@ int RADEONCPStop(ScrnInfoPtr pScrn, RADEONInfoPtr info) +@@ -550,6 +556,144 @@ int RADEONCPStop(ScrnInfoPtr pScrn, RADEONInfoPtr info) } } @@ -1880,8 +1886,6 @@ index a6e332d..a22181f 100644 + chunk[1].length_dw = info->cp->relocs.num_reloc * RADEON_RELOC_SIZE; + chunk[1].chunk_id = RADEON_CHUNK_ID_RELOCS; + -+ ErrorF("lengths %d %d\n", chunk[0].length_dw, chunk[1].length_dw); -+ + chunk_array[0] = (uint64_t)(unsigned long)&chunk[0]; + chunk_array[1] = (uint64_t)(unsigned long)&chunk[1]; + @@ -1971,7 +1975,7 @@ index a6e332d..a22181f 100644 /* Get an indirect buffer for the CP 2D acceleration commands */ drmBufPtr RADEONCPGetBuffer(ScrnInfoPtr pScrn) { -@@ -560,6 +706,9 @@ drmBufPtr RADEONCPGetBuffer(ScrnInfoPtr pScrn) +@@ -560,6 +704,9 @@ drmBufPtr RADEONCPGetBuffer(ScrnInfoPtr pScrn) int size = 0; int i = 0; int ret; @@ -1981,7 +1985,7 @@ index a6e332d..a22181f 100644 #if 0 /* FIXME: pScrn->pScreen has not been initialized when this is first -@@ -625,6 +774,11 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard) +@@ -625,6 +772,11 @@ void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard) if (!buffer) return; if (start == buffer->used && !discard) return; @@ -1993,7 +1997,7 @@ index a6e332d..a22181f 100644 if (RADEON_VERBOSE) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Flushing buffer %d\n", buffer->idx); -@@ -659,10 +813,16 @@ void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn) +@@ -659,10 +811,16 @@ void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn) int start = info->cp->indirectStart; drm_radeon_indirect_t indirect; @@ -2010,7 +2014,7 @@ index a6e332d..a22181f 100644 if (RADEON_VERBOSE) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Releasing buffer %d\n", -@@ -789,6 +949,7 @@ RADEONHostDataBlit( +@@ -789,6 +947,7 @@ RADEONHostDataBlit( ret = ( uint8_t* )&__head[__count]; __count += dwords; @@ -2018,7 +2022,7 @@ index a6e332d..a22181f 100644 ADVANCE_RING(); *y += *hpass; -@@ -926,7 +1087,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen) +@@ -926,7 +1085,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen) #ifdef USE_EXA if (info->useEXA) { # ifdef XF86DRI @@ -2027,7 +2031,7 @@ index a6e332d..a22181f 100644 if (!RADEONDrawInitCP(pScreen)) return FALSE; } else -@@ -947,7 +1108,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen) +@@ -947,7 +1106,7 @@ Bool RADEONAccelInit(ScreenPtr pScreen) } #ifdef XF86DRI @@ -2036,7 +2040,7 @@ index a6e332d..a22181f 100644 RADEONAccelInitCP(pScreen, a); else #endif /* XF86DRI */ -@@ -969,11 +1130,13 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn) +@@ -969,11 +1128,13 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn) RADEONInfoPtr info = RADEONPTR (pScrn); #ifdef XF86DRI @@ -2054,7 +2058,7 @@ index a6e332d..a22181f 100644 RADEONInit3DEngineCP(pScrn); } else #endif -@@ -981,7 +1144,7 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn) +@@ -981,7 +1142,7 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn) info->accel_state->XInited3D = TRUE; } @@ -2453,10 +2457,10 @@ index 0000000..0d79b58 +#endif diff --git a/src/radeon_bufmgr_gem.c b/src/radeon_bufmgr_gem.c new file mode 100644 -index 0000000..7ad911d +index 0000000..8e8cad0 --- /dev/null +++ b/src/radeon_bufmgr_gem.c -@@ -0,0 +1,533 @@ +@@ -0,0 +1,532 @@ +/************************************************************************** + * + * Copyright © 2007-2008 Red Hat Inc. @@ -2987,7 +2991,6 @@ index 0000000..7ad911d +{ + dri_bufmgr_gem *bufmgr_gem = (dri_bufmgr_gem *)bufmgr; + -+ ErrorF("setting vram limit to %d\n", vram_limit); + bufmgr_gem->vram_limit = vram_limit; +} diff --git a/src/radeon_bufmgr_gem.h b/src/radeon_bufmgr_gem.h diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 70b0368..8cfcc23 100644 --- a/xorg-x11-drv-ati.spec +++ b/xorg-x11-drv-ati.spec @@ -5,7 +5,7 @@ Summary: Xorg X11 ati video driver Name: xorg-x11-drv-ati Version: 6.9.0 -Release: 33%{?dist} +Release: 34%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Tue Oct 28 2008 Dave Airlie 6.9.0-34 +- remove some left over debug + * Tue Oct 28 2008 Dave Airlie 6.9.0-33 - add support for wait for rendering