diff --git a/radeon-modeset.patch b/radeon-modeset.patch index ac8becd..f58549b 100644 --- a/radeon-modeset.patch +++ b/radeon-modeset.patch @@ -1,3 +1,460 @@ +commit 1eb523e28c7a1f69a9fe7b247b7828399d7e6a75 +Author: Dave Airlie +Date: Fri Oct 10 14:44:39 2008 +1000 + + radeon: remove testing fallback + +commit ab876f2a090a5aabb0712aa5388f224e651c83e7 +Author: Kristian Høgsberg +Date: Fri Oct 10 10:57:47 2008 +1100 + + radeon: add copy fb contents patch + +commit 3bd7fcef66e093ecf2d5c2badf60b8f5bb3bdd4b +Author: Dave Airlie +Date: Fri Oct 10 10:57:20 2008 +1100 + + bufmgr: turn off debug + +commit 44fb767aa95e5f0725386106b89d0782fd53b768 +Author: Dave Airlie +Date: Fri Oct 10 10:38:38 2008 +1100 + + radeon: fixup modesetting code after rebasing to master + +commit fc5d27b1b7da64fbb4ba0b4156454291a3a243c5 +Author: Dave Airlie +Date: Thu Oct 9 16:34:52 2008 +1100 + + radeon: misc cleanups in exa + +commit c7c2e6f7b2b12c55d0153d9c64fcf39eda5e843e +Author: Dave Airlie +Date: Thu Oct 9 16:34:23 2008 +1100 + + radeon: fix UTS for non-modesetting + +commit 62fd7f4335474e7a3f47c6d9aaf6c162ebddc8a5 +Author: Dave Airlie +Date: Thu Oct 9 16:33:59 2008 +1100 + + radeon: fix exa limits problem - shouldn't have been resetting scissor + +commit 10602f918013e3799ef41284e71307863aae1aa6 +Author: Dave Airlie +Date: Wed Oct 1 11:21:53 2008 +1000 + + radeon: fixup for latest libdrm changes + +commit 088cad33ef83802f42dce1a5684eb813b9bfe251 +Author: Owen Taylor +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 ec7a5b4b701da283e84a899bcfaf35b202043f7b +Author: Dave Airlie +Date: Mon Sep 29 16:32:51 2008 +1000 + + radeon: hopefully fix textured xv + +commit eac0d78d462e49ce0ee178a87c06d0eb697ed8b8 +Author: Dave Airlie +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 8ad885b0f044bda60d38664a62c65f9d7a4f5c47 +Author: Dave Airlie +Date: Fri Sep 26 10:46:20 2008 +1000 + + radeon: fixup after mertge + +commit f3efa0c398d131458945b0b1a89c3fc7887e51f6 +Author: Dave Airlie +Date: Fri Sep 26 10:34:41 2008 +1000 + + radeon: fix issues with emitting DST PIPE on cards that don't use it + +commit ae03476547568e426c9448b0c13fa25ef3a6a2dd +Author: Dave Airlie +Date: Wed Sep 24 17:12:19 2008 +1000 + + modesetting: fixup bits of drmmode_display.c + +commit 5140bc984f98661ba6bc8e70025a9f43024a7551 +Author: Dave Airlie +Date: Wed Sep 24 15:42:01 2008 +1000 + + r600: fixup for kms + +commit bb0cfe3035c03d3703aa0a960790b6e5365759b4 +Author: Dave Airlie +Date: Sun Sep 7 08:01:56 2008 +1000 + + modeset: fix AddFB for current tree + +commit b90e88b455e250a2386320005385f3d70b2150f7 +Author: Dave Airlie +Date: Thu Aug 14 10:52:52 2008 +1000 + + radeon: disable overlay for modesetting for now + +commit 5c5736604e6a1bc280821bd92f3714e0c9e7d7d3 +Author: Dave Airlie +Date: Thu Aug 14 10:52:42 2008 +1000 + + radeon: no need for this anymore + +commit aa09c6d7bb28ce5fe3efbe23cf5aa9ce55275fc6 +Author: Dave Airlie +Date: Fri Sep 5 16:32:01 2008 +1000 + + radeon: fix up for suspend/resume - uses new API + +commit 3bf412b019c03e3e8d392a896e79d9fd9cf75a51 +Author: Dave Airlie +Date: Wed Aug 27 13:09:55 2008 +1000 + + radeon: update to proper domain + + this should fix 3d again for now at least + +commit 7e30990b969c5789d61bd61ec8d2d9955c5b9f86 +Author: Dave Airlie +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 fbb7f9cf4820bac91ad7a7684fcc8812dd8bc525 +Author: Dave Airlie +Date: Mon Aug 25 11:37:48 2008 +1000 + + radeon: add an initial GEM bufmgr + +commit f66550984636e426ff05d3f9109c55c36cf4ab42 +Author: Dave Airlie +Date: Mon Aug 25 11:37:20 2008 +1000 + + radeon: implement simple UTS + +commit 8e22a14716ba852e3945a6588df9b6b77ba10a4c +Author: Dave Airlie +Date: Fri Aug 22 15:34:58 2008 +1000 + + radeon: add read/write domains properly + +commit 6a5952e34df4c4d38404e6b88043cc749aeeba6a +Author: Dave Airlie +Date: Fri Aug 15 11:25:31 2008 +1000 + + radeon: fix some rotate bugs + +commit 22d4ea4b1b831f50fe2d2f9c90bd2a529a1f01cd +Author: Dave Airlie +Date: Fri Aug 15 11:16:18 2008 +1000 + + radeon: when create fake bos, they are already mapped + +commit 216cd29e2d7354181b8b32dde374bf0ad11dc90d +Author: Dave Airlie +Date: Fri Aug 15 11:15:58 2008 +1000 + + exa: remove wrong assert + +commit b3ac04aef5148856ecb7df2f83cb858fd1d8df29 +Author: Dave Airlie +Date: Tue Aug 12 19:27:44 2008 +1000 + + radeon: start to work on rotate pixmap support + +commit 043dd60d8ddcbc00367839be5d0cecf89533bfdf +Author: Dave Airlie +Date: Tue Aug 12 18:28:23 2008 +1000 + + radeon: port simple exa bufmgr + + exa pixmaps work now but they are slow + +commit 5b713057af6362d78c125a90f0cda727e9f511d1 +Author: Dave Airlie +Date: Thu Aug 7 17:52:04 2008 +1000 + + further pixmaps on EXA + +commit 9e245b41674e25c23dbefda37a3e13611206c05f +Author: Dave Airlie +Date: Thu Aug 7 11:22:46 2008 +1000 + + initial exa on gem hackx + + Conflicts: + + src/radeon_exa.c + src/radeon_memory.c + +commit 0569311ee032498ac73f176baebd716146b07342 +Author: Dave Airlie +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 9054524b3bdc8de3588f838401f56c49d1528757 +Author: Dave Airlie +Date: Tue Aug 12 14:40:18 2008 +1000 + + radeon: use buffer names + +commit eb6b80595c9dd731d001058ff997f5e5c35710e0 +Author: Dave Airlie +Date: Tue Aug 12 14:38:56 2008 +1000 + + ati: fix do adjust mode + +commit e44e62cde9c1e19811bd0f9a77068d8f0927e837 +Author: Dave Airlie +Date: Tue Aug 12 09:38:48 2008 +1000 + + FEDORA: update offsets in DRI private + +commit 0e27902438773facffc304e2f6bf43d6a926ab81 +Author: Dave Airlie +Date: Tue Aug 12 09:10:18 2008 +1000 + + radeon: add vt bind flag + +commit 648360f17f285bc5cd0498161dcb0cb61eae39cd +Author: Dave Airlie +Date: Wed Aug 6 13:30:54 2008 +1000 + + radeon: warning cleanups + +commit d425be2a405ffd1af684d50260b16c6877fdda56 +Author: Dave Airlie +Date: Wed Aug 6 13:18:52 2008 +1000 + + radeon: remove debugging + +commit fe75573b5cc05590430b7ffb8b7e10666547a438 +Author: Dave Airlie +Date: Wed Aug 6 13:17:31 2008 +1000 + + radeon: add code to set memory map and not futz with mappings + +commit 9e586c9e941d69bd5751647f4c891c43a893ac19 +Author: Dave Airlie +Date: Wed Aug 6 13:16:56 2008 +1000 + + drm: don't futz with framebuffer when no drm_mm + +commit 20e17c8f386fa25418ea5fa5265785d9e52ca97f +Author: Dave Airlie +Date: Tue Aug 5 16:47:21 2008 +1000 + + radeon: undef OUT_RELOC + +commit dc14747b1d7446fafe3bc0a639ee964c3944f310 +Author: Dave Airlie +Date: Tue Aug 5 16:37:52 2008 +1000 + + radeon: add stdint/lib to check for modesetting + +commit 5ad05af2c23e5cb267234d077c43bafb87c35a5c +Author: Dave Airlie +Date: Tue Aug 5 16:07:31 2008 +1000 + + fix whitespace + +commit 97bb89257ec8a5bac629b8e74435ab40389665df +Author: Dave Airlie +Date: Tue Aug 5 16:07:07 2008 +1000 + + radeon: fix build issue + +commit ccc8673d3e0c37e3ff8f8627d215086e607d0a60 +Author: Dave Airlie +Date: Mon Aug 4 16:27:55 2008 +1000 + + radeon: free all pinned memory on server shutdown + +commit 894aaf6ec6a8ba851d836358adc28cd122b5270a +Author: Dave Airlie +Date: Mon Aug 4 16:11:30 2008 +1000 + + radeon: get textured video working on the memory manager + +commit 2c9a7762718ef0560a383f2729ecf72baecb669b +Author: Dave Airlie +Date: Mon Aug 4 16:11:18 2008 +1000 + + radeon: convert bus addr to void pointer + +commit 32f376d062dea6eabb8eca23a23ec9f2967b2073 +Author: Dave Airlie +Date: Mon Aug 4 15:11:13 2008 +1000 + + radeon: avoid z cache flushes if not needed + +commit bbd6b19554096bd4880405aa9dfd378cbef8471e +Author: Dave Airlie +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 b419e9c91730c2c9bc94f9df8fba4310d0c4f554 +Author: Dave Airlie +Date: Tue Jul 29 16:50:03 2008 +1000 + + radeon: exa through the handle relocation function + +commit 0c2b073855ead62eca8757c4a52b3c7838d6ec3d +Author: Dave Airlie +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 bb18f9fb7232ab2182fb40d2aa79fb4afb1fc19b +Author: Dave Airlie +Date: Mon Jul 28 17:48:59 2008 +1000 + + new command submission attempt + +commit aca38e9562a307f7a668b3aeffc849bd3658eaab +Author: Dave Airlie +Date: Mon Jul 28 17:48:08 2008 +1000 + + radeon: fixup over fluishing problem + +commit 06494b222640cb4315231c31fa172a0345fb3497 +Author: Dave Airlie +Date: Mon Jul 28 17:44:51 2008 +1000 + + hack for now: divide texture size by 2 + +commit 7e2f6d6a14a7736151db128348b9578faeb3e134 +Author: Dave Airlie +Date: Fri Jul 25 17:07:20 2008 +1000 + + radeon: fix dri message + +commit 28d65fc64b1195aa3f3592979d9ed15d0b26847b +Author: Dave Airlie +Date: Fri Jul 25 15:11:58 2008 +1000 + + radeon: fix pool which caused memory corruption + +commit 2bb5310123a8fc4838ab17d6aa6fc0b30ec91d8a +Author: Dave Airlie +Date: Fri Jul 25 14:59:07 2008 +1000 + + radeon: get DRI to attempt to start up + +commit aa657a2e9698ae25e9ad985b205e9bf051338e3b +Author: Dave Airlie +Date: Fri Jul 25 14:58:23 2008 +1000 + + radeon: call the right sync function + +commit 02ff76a1adcfd1ea11798c545256a1021fbba1ce +Author: Dave Airlie +Date: Fri Jul 25 14:57:21 2008 +1000 + + radeon: unmap memory from objects + +commit cbb97ec98e1d67cab9fc10e4bb8e12a01972a041 +Author: Dave Airlie +Date: Wed Jul 23 10:59:16 2008 +1000 + + use CP for 3D engine with modeset + +commit a479fcf9c158e232cf2c97de007616a9854e455d +Author: Dave Airlie +Date: Wed Jul 23 10:59:04 2008 +1000 + + radeon: fix DFS + +commit 7b39d83234e7c87f59817e6bdc9f4ae8eae4df15 +Author: Dave Airlie +Date: Wed Jul 23 10:48:45 2008 +1000 + + radeon: get the fb location right + +commit 72dc11e13790d24e8da308231dc0643ce072771e +Author: Dave Airlie +Date: Tue Jul 22 18:08:25 2008 +1000 + + radeon: make at least the EXA stipple work.. + +commit 95b985e65164788ac76ef5c59e6b9b9cb8f931a1 +Author: Dave Airlie +Date: Tue Jul 22 18:07:15 2008 +1000 + + radeon: disable debugging for now + +commit 695387eaecb3c626d81ee4f326f49fb5093d65fe +Author: Dave Airlie +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 cf3caa7ca957fff69a9f11624e61017c30068f95 +Author: Dave Airlie +Date: Fri Jul 18 13:46:41 2008 +1000 + + modesetting step 1: have X and a cursor + +commit 409e8b3d156e16dd2300a11ae99f4d552dd84e20 +Author: Dave Airlie +Date: Thu Jul 17 09:59:19 2008 +1000 + + radeon: add radeon_memory.c + +commit ee9f68d728aae8fff4f4194d8e6d6d70f6168ce2 +Author: Dave Airlie +Date: Tue Jul 8 16:55:27 2008 +1000 + + remove mappings of some buffers. + + use drm gart code if available + +commit 8e4a09253d52e9c097871b06c522f1c7ef2b9b14 +Author: Dave Airlie +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 12e71eaf7999520d23d50cfbcfc0299b2bdf7a9d +Author: Dave Airlie +Date: Fri Jul 4 10:39:34 2008 +1000 + + port to using drm header files diff --git a/configure.ac b/configure.ac index b8c18a6..8b126b5 100644 --- a/configure.ac @@ -5610,7 +6067,7 @@ index 0f86fdd..708111d 100644 } #endif diff --git a/src/radeon_exa_funcs.c b/src/radeon_exa_funcs.c -index 62224d0..a613b1b 100644 +index 62224d0..31323f3 100644 --- a/src/radeon_exa_funcs.c +++ b/src/radeon_exa_funcs.c @@ -74,21 +74,69 @@ FUNC_NAME(RADEONSync)(ScreenPtr pScreen, int marker) @@ -5792,7 +6249,7 @@ index 62224d0..a613b1b 100644 } static Bool -@@ -187,9 +252,11 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, +@@ -187,7 +252,7 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, { RINFO_FROM_SCREEN(pDst->drawable.pScreen); uint32_t datatype, src_pitch_offset, dst_pitch_offset; @@ -5800,12 +6257,8 @@ index 62224d0..a613b1b 100644 + struct radeon_exa_pixmap_priv *driver_priv; TRACE; -+ RADEON_FALLBACK("ASS"); -+ info->accel_state->xdir = xdir; - info->accel_state->ydir = ydir; - -@@ -197,10 +264,19 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, +@@ -197,10 +262,19 @@ FUNC_NAME(RADEONPrepareCopy)(PixmapPtr pSrc, PixmapPtr pDst, RADEON_FALLBACK(("24bpp unsupported")); if (!RADEONGetDatatypeBpp(pDst->drawable.bitsPerPixel, &datatype)) RADEON_FALLBACK(("RADEONGetDatatypeBpp failed\n")); @@ -5827,7 +6280,7 @@ index 62224d0..a613b1b 100644 FUNC_NAME(RADEONDoPrepareCopy)(pScrn, src_pitch_offset, dst_pitch_offset, datatype, rop, planemask); -@@ -250,6 +326,8 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst) +@@ -250,6 +324,8 @@ FUNC_NAME(RADEONDoneCopy)(PixmapPtr pDst) OUT_ACCEL_REG(RADEON_WAIT_UNTIL, RADEON_WAIT_2D_IDLECLEAN | RADEON_WAIT_DMA_GUI_IDLE); FINISH_ACCEL(); @@ -5836,7 +6289,7 @@ index 62224d0..a613b1b 100644 } static Bool -@@ -260,6 +338,8 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h, +@@ -260,6 +336,8 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h, uint8_t *dst = info->FB + exaGetPixmapOffset(pDst); unsigned int dst_pitch = exaGetPixmapPitch(pDst); unsigned int bpp = pDst->drawable.bitsPerPixel; @@ -5845,7 +6298,7 @@ index 62224d0..a613b1b 100644 #ifdef ACCEL_CP unsigned int hpass; uint32_t buf_pitch, dst_pitch_off; -@@ -276,10 +356,45 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h, +@@ -276,10 +354,45 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h, if (bpp < 8) return FALSE; @@ -5894,7 +6347,7 @@ index 62224d0..a613b1b 100644 int cpp = bpp / 8; ACCEL_PREAMBLE(); -@@ -294,9 +409,10 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h, +@@ -294,9 +407,10 @@ FUNC_NAME(RADEONUploadToScreen)(PixmapPtr pDst, int x, int y, int w, int h, exaMarkSync(pDst->drawable.pScreen); return TRUE; @@ -5907,7 +6360,7 @@ index 62224d0..a613b1b 100644 /* Do we need that sync here ? probably not .... */ exaWaitSync(pDst->drawable.pScreen); -@@ -388,13 +504,17 @@ FUNC_NAME(RADEONDownloadFromScreen)(PixmapPtr pSrc, int x, int y, int w, int h, +@@ -388,13 +502,17 @@ FUNC_NAME(RADEONDownloadFromScreen)(PixmapPtr pSrc, int x, int y, int w, int h, TRACE; @@ -5926,7 +6379,7 @@ index 62224d0..a613b1b 100644 RADEONGetPixmapOffsetPitch(pSrc, &src_pitch_offset) && (scratch = RADEONCPGetBuffer(pScrn))) { -@@ -541,16 +661,21 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) +@@ -541,16 +659,21 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) info->accel_state->exa->MarkSync = FUNC_NAME(RADEONMarkSync); info->accel_state->exa->WaitMarker = FUNC_NAME(RADEONSync); info->accel_state->exa->UploadToScreen = FUNC_NAME(RADEONUploadToScreen); @@ -5952,7 +6405,7 @@ index 62224d0..a613b1b 100644 #ifdef RENDER if (info->RenderAccel) { -@@ -560,7 +685,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) +@@ -560,7 +683,7 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) else if (IS_R300_3D || IS_R500_3D) { if ((info->ChipFamily < CHIP_FAMILY_RS400) #ifdef XF86DRI @@ -5961,7 +6414,7 @@ index 62224d0..a613b1b 100644 #endif ) { xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Render acceleration " -@@ -595,6 +720,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) +@@ -595,6 +718,16 @@ Bool FUNC_NAME(RADEONDrawInit)(ScreenPtr pScreen) } #endif diff --git a/xorg-x11-drv-ati.spec b/xorg-x11-drv-ati.spec index 9bb4bcf..f3a7fae 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: 23%{?dist} +Release: 24%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X Hardware Support @@ -72,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/radeon.4* %changelog +* Fri Oct 10 2008 Dave Airlie 6.9.0-24 +- radeon-modeset.patch - fix silly debugging fallback. + * Fri Oct 10 2008 Dave Airlie 6.9.0-23 - rebase to upstream master - radeon-6.9.0-lvds-mapping.patch - merged upstream