rpms/xorg-x11-drv-ati/devel radeon-6.9.0-to-git.patch, 1.6, 1.7 radeon-modeset.patch, 1.30, 1.31 xorg-x11-drv-ati.spec, 1.141, 1.142 radeon-6.9.0-add-hd3300.patch, 1.1, NONE radeon-6.9.0-dig1-hdmi.patch, 1.2, NONE radeon-6.9.0-quirk-agp.patch, 1.2, NONE
Dave Airlie
airlied at fedoraproject.org
Fri Dec 19 23:23:20 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23831
Modified Files:
radeon-6.9.0-to-git.patch radeon-modeset.patch
xorg-x11-drv-ati.spec
Removed Files:
radeon-6.9.0-add-hd3300.patch radeon-6.9.0-dig1-hdmi.patch
radeon-6.9.0-quirk-agp.patch
Log Message:
* Sat Dec 20 2008 Dave Airlie <airlied at redhat.com> 6.9.0-63
- rebase F11 patch to upstream master + modesetting bits
radeon-6.9.0-to-git.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.6 -r 1.7 radeon-6.9.0-to-git.patch
Index: radeon-6.9.0-to-git.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-6.9.0-to-git.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- radeon-6.9.0-to-git.patch 15 Oct 2008 07:06:56 -0000 1.6
+++ radeon-6.9.0-to-git.patch 19 Dec 2008 23:23:19 -0000 1.7
@@ -1,18 +1,1624 @@
+commit 2346fd7cbd90dcdce2b361d374a53da064fa6a12
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Dec 18 16:35:13 2008 +1000
+
+ radeon: add all new pci ids for rv730/rv710 families
+
+commit b2b43905a5385a8bb0b59b8e50952863d8dacb59
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed Dec 17 00:59:52 2008 -0500
+
+ Pre-avivo: fix FP setup
+
+ - make sure to clear various shadow timing bits
+ - crtc1 select bit was set wrong.
+ - should fix bugs like 19100
+
+commit 3754cc23abac99880eda87d06aa42e16081b6c8a
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed Dec 17 00:56:19 2008 -0500
+
+ R2xx: switch EXA composite to rects rather quads
+
+ For conistency with Xv path and to reduce potential diagonal tearing
+
+commit e3b08cb59716b525b3063b184eab70e32b9d66f0
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 16 15:43:16 2008 +1000
+
+ atombios: correct fix for previous issue.
+
+ I committed an old patch.
+
+commit 1431bc6900b0e0d7f486b5b3ba281873472b3fdc
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 16 15:31:34 2008 +1000
+
+ atombios: fix issue with Clearing of MM_INDEX 0.
+
+ While playing with tv-out I discovered this issue with clearing
+ the MM_INDEX register.
+
+commit f72367aff2d09161d30066a00673ba291b292a36
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 16 12:32:24 2008 +1000
+
+ radeon: add initial rv730 pciids.
+
+ Lots more to come, this just adds a few to start.
+
+commit 4d2429f3ec4d7d3e1512b268c7ff5cbff8d186b4
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Dec 16 12:19:00 2008 +1000
+
+ DCE32: add support for DCE3.2 digital outputs.
+
+ This adds support for the digital outputs on the RV730.
+
+commit 4d3792fd1b9f733107582436540f483d8993199f
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Dec 12 10:34:57 2008 +1000
+
+ radeon: fixes from Alex for some output engines
+ (cherry picked from commit 1e8ac6ea7b35ccbc3649c96ead60f69158f66ebc)
+
+commit f892154dbd0d8b6dd8abdf2196ab0c7c18327412
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Dec 15 19:41:32 2008 -0500
+
+ R3xx-R5xx: switch back to quad rendering for Xv
+
+ The large clipped triangle trick hits the guardband limits on
+ large displays. This gets textured video working again
+ until we sort out how to deal with the situation better.
+
+ See bug 19046
+
+commit 62344e460f5d0cac81f94c535cda77d3d76528a9
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Dec 15 11:30:42 2008 -0500
+
+ Remove remnants of unused DDCMode option
+
+commit f1efee6a11dc9436276fb12cfb90aa79ada1192b
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Mon Dec 15 11:27:17 2008 -0500
+
+ Remove mention of MergedFB from server log
+
+ noticed by Fabio, bug 19098
+
+commit 94bffac6968057cdedc792f8540fe44cb6ecfd7c
+Author: Fabio <fabio.ped at libero.it>
+Date: Mon Dec 15 11:22:56 2008 -0500
+
+ man page updates
+
+ from bug 19098 with some minor fixes from me
+
+commit c7899905ec824071f9cabbd1e271c4d76010b733
+Author: Fabio <fabio.ped at libero.it>
+Date: Mon Dec 15 10:58:23 2008 -0500
+
+ Remove duplicate ATI in some device names
+
+ from bug 19098
+
+commit 89a8fd5337c77abf1f3166e69ed061d85b5c20f0
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Dec 15 14:41:10 2008 +1000
+
+ r600: don't idle engine
+ (cherry picked from commit b77729448e487d37707ce028d8edc59352d1cc2d)
+
+commit 4ce255a9db8027f2471ba50e57724d3e4d5b16ba
+Author: Fabio <fabio.ped at libero.it>
+Date: Fri Dec 12 09:53:33 2008 -0500
+
+ Fix formatting in man page
+
+ fixes bug 19039
+
+commit 0e99017cb9a6d46b891705df73678c2705439532
+Author: Joseph Adams <joeyadams3.14159 at gmail.com>
+Date: Thu Dec 11 00:57:03 2008 -0500
+
+ Add more eMac modes, fix crash in last patch
+
+commit fb46c30d316ab3ec54c54f3aec91d5164070a423
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed Dec 10 17:16:56 2008 -0500
+
+ Add support for Apple eMacs
+
+ Thanks to Joseph Adams for helping me sort this out.
+ Verified on eMac G4/1.0 with radeon 7500
+ Later eMacs with radeon 9200 or 9600 chips may have
+ different ddc setups. Need to verify.
+
+commit c0bcea9150ef215fa614733cef9a5b71a55a33bd
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed Dec 10 11:40:47 2008 -0500
+
+ Add another AGP quirk
+
+ fixes bug 12544
+
+commit 607b02d6abf78147902a5944bd006897ad95e982
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Wed Dec 10 03:54:35 2008 -0500
+
+ Add randr 1.3 panning support
+
+commit 24007acbf36bcfd09cb5e74ce4a8d918d393cf34
+Author: Benjamin Close <Benjamin.Close at clearchain.com>
+Date: Wed Dec 10 02:17:56 2008 -0500
+
+ [PATCH] xf86misc extension has been removed, update driver to reflect it
+
+commit 69e445f7f2ebd299070e44457b434bbc28b7e05c
+Author: Dave Airlie <airlied at linux.ie>
+Date: Tue Dec 9 18:59:11 2008 +1000
+
+ radeon: memset the pll setting function
+
+ Thanks to Peter Zijlstra for making me debug this and providing
+ feedback.
+
+commit c72b732a2f5597cd72bd4ebe207799ae07f2681e
+Author: Adrian Friedli <adi at koalatux.ch>
+Date: Mon Dec 8 10:42:46 2008 -0500
+
+ Add another AGP quirk
+
+commit 979ad04d901676cb41aea5cf47a8a2e9c19064dd
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Fri Dec 5 17:53:57 2008 -0500
+
+ Add missing .TP in man page
+
+commit b89d434011787fb71593395f462d142375783e35
+Author: Pierre Ossman <pierre at ossman.eu>
+Date: Fri Dec 5 17:52:02 2008 -0500
+
+ Fix scissor setup for Xv
+
+ We need to adjust the scissoring for each clip box, so move the setup
+ to inside the while loop.
+
+commit 83c1115333cbe763f86422fa5aabf4ab21951e68
+Author: Alex Deucher <alexdeucher at gmail.com>
+Date: Fri Dec 5 11:52:18 2008 -0500
[...9897 lines suppressed...]
-@@ -1654,8 +1635,19 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
+@@ -1654,8 +1665,19 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
unsigned char *RADEONMMIO = info->MMIO;
RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
@@ -16799,7 +21987,7 @@
REGION_EMPTY(pScrn->pScreen, &pPriv->clip);
-@@ -1675,7 +1667,7 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
+@@ -1675,7 +1697,7 @@ RADEONStopVideo(ScrnInfoPtr pScrn, pointer data, Bool cleanup)
if(pPriv->i2c != NULL) RADEON_board_setmisc(pPriv);
}
if (pPriv->video_memory != NULL) {
@@ -16808,7 +21996,7 @@
pPriv->video_memory = NULL;
}
pPriv->videoStatus = 0;
-@@ -1699,9 +1691,6 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn,
+@@ -1699,9 +1721,6 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn,
Bool setAlpha = FALSE;
unsigned char *RADEONMMIO = info->MMIO;
@@ -16818,7 +22006,7 @@
RADEON_SYNC(info, pScrn);
#define RTFSaturation(a) (1.0 + ((a)*1.0)/1000.0)
-@@ -1928,7 +1917,7 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn,
+@@ -1928,7 +1947,7 @@ RADEONSetPortAttribute(ScrnInfoPtr pScrn,
if(pPriv->fi1236!=NULL){
xf86_fi1236_dump_status(pPriv->fi1236);
}
@@ -16827,7 +22015,7 @@
else if(attribute == xvAdjustment)
{
pPriv->adjustment=value;
-@@ -1973,9 +1962,6 @@ RADEONGetPortAttribute(ScrnInfoPtr pScrn,
+@@ -1973,9 +1992,6 @@ RADEONGetPortAttribute(ScrnInfoPtr pScrn,
RADEONInfoPtr info = RADEONPTR(pScrn);
RADEONPortPrivPtr pPriv = (RADEONPortPrivPtr)data;
@@ -16837,7 +22025,7 @@
if (info->accelOn) RADEON_SYNC(info, pScrn);
if(attribute == xvAutopaintColorkey)
-@@ -2433,120 +2419,13 @@ RADEONCopyMungedData(
+@@ -2433,120 +2449,13 @@ RADEONCopyMungedData(
}
}
@@ -16959,7 +22147,7 @@
int offset1, int offset2,
int offset3, int offset4,
int offset5, int offset6,
-@@ -2715,6 +2594,20 @@ RADEONDisplayVideo(
+@@ -2715,6 +2624,20 @@ RADEONDisplayVideo(
}
#endif
@@ -16980,7 +22168,7 @@
/* keep everything in 16.16 */
if (is_planar) {
-@@ -2846,6 +2739,12 @@ RADEONDisplayVideo(
+@@ -2846,6 +2769,12 @@ RADEONDisplayVideo(
src_w >>= 1;
OUTREG(RADEON_OV0_P2_X_START_END, (src_w + leftuv - 1) | (leftuv << 16));
OUTREG(RADEON_OV0_P3_X_START_END, (src_w + leftuv - 1) | (leftuv << 16));
@@ -16993,7 +22181,7 @@
OUTREG(RADEON_OV0_VID_BUF0_BASE_ADRS, offset1);
OUTREG(RADEON_OV0_VID_BUF1_BASE_ADRS, offset2);
OUTREG(RADEON_OV0_VID_BUF2_BASE_ADRS, offset3);
-@@ -3038,9 +2937,9 @@ RADEONPutImage(
+@@ -3038,9 +2967,9 @@ RADEONPutImage(
if (idconv == FOURCC_YV12 || id == FOURCC_I420) {
new_size += (dstPitch >> 1) * ((height + 1) & ~1);
}
@@ -17006,7 +22194,7 @@
if (pPriv->video_offset == 0)
return BadAlloc;
-@@ -3150,9 +3049,10 @@ RADEONPutImage(
+@@ -3150,9 +3079,10 @@ RADEONPutImage(
/* FIXME: someone should look at these offsets, I don't think it makes sense how
they are handled throughout the source. */
@@ -17020,7 +22208,7 @@
pPriv->videoStatus = CLIENT_VIDEO_ON;
-@@ -3233,7 +3133,7 @@ RADEONVideoTimerCallback(ScrnInfoPtr pScrn, Time now)
+@@ -3233,7 +3163,7 @@ RADEONVideoTimerCallback(ScrnInfoPtr pScrn, Time now)
} else { /* FREE_TIMER */
if(pPriv->freeTime < now) {
if (pPriv->video_memory != NULL) {
@@ -17029,7 +22217,7 @@
pPriv->video_memory = NULL;
}
pPriv->videoStatus = 0;
-@@ -3268,7 +3168,7 @@ RADEONAllocateSurface(
+@@ -3268,7 +3198,7 @@ RADEONAllocateSurface(
pitch = ((w << 1) + 15) & ~15;
size = pitch * h;
@@ -17038,7 +22226,7 @@
if (offset == 0)
return BadAlloc;
-@@ -3276,18 +3176,18 @@ RADEONAllocateSurface(
+@@ -3276,18 +3206,18 @@ RADEONAllocateSurface(
surface->height = h;
if(!(surface->pitches = xalloc(sizeof(int)))) {
@@ -17060,7 +22248,7 @@
return BadAlloc;
}
-@@ -3328,7 +3228,8 @@ RADEONFreeSurface(
+@@ -3328,7 +3258,8 @@ RADEONFreeSurface(
if(pPriv->isOn)
RADEONStopSurface(surface);
@@ -17070,7 +22258,7 @@
xfree(surface->pitches);
xfree(surface->offsets);
xfree(surface->devPrivate.ptr);
-@@ -3417,8 +3318,9 @@ RADEONDisplaySurface(
+@@ -3417,8 +3348,9 @@ RADEONDisplaySurface(
surface->offsets[0], surface->offsets[0],
surface->offsets[0], surface->offsets[0],
surface->offsets[0], surface->offsets[0],
@@ -17082,7 +22270,7 @@
if (portPriv->autopaint_colorkey)
xf86XVFillKeyHelper(pScrn->pScreen, portPriv->colorKey, clipBoxes);
-@@ -3602,9 +3504,9 @@ RADEONPutVideo(
+@@ -3602,9 +3534,9 @@ RADEONPutVideo(
if (pPriv->capture_vbi_data)
alloc_size += 2 * 2 * vbi_line_width * 21;
@@ -17095,7 +22283,7 @@
if (pPriv->video_offset == 0)
return BadAlloc;
-@@ -3705,10 +3607,12 @@ RADEONPutVideo(
+@@ -3705,10 +3637,12 @@ RADEONPutVideo(
RADEONFillKeyHelper(pDraw, pPriv->colorKey, clipBoxes);
}
@@ -17113,7 +22301,7 @@
RADEONWaitForFifo(pScrn, 1);
OUTREG(RADEON_OV0_REG_LOAD_CNTL, RADEON_REG_LD_CTL_LOCK);
diff --git a/src/radeon_video.h b/src/radeon_video.h
-index 096de37..11b8029 100644
+index 096de37..7f1891e 100644
--- a/src/radeon_video.h
+++ b/src/radeon_video.h
@@ -13,6 +13,10 @@
@@ -17154,7 +22342,7 @@
#define METHOD_BOB 0
#define METHOD_SINGLE 1
#define METHOD_WEAVE 2
-@@ -82,13 +86,16 @@ typedef struct {
+@@ -82,13 +86,20 @@ typedef struct {
xf86CrtcPtr desired_crtc;
int size;
@@ -17170,18 +22358,29 @@
+ int bicubic_offset;
+ Bool bicubic_enabled;
+ uint32_t bicubic_src_offset;
++ int bicubic_state;
++#define BICUBIC_OFF 0
++#define BICUBIC_ON 1
++#define BICUBIC_AUTO 2
+
Atom device_id, location_id, instance_id;
/* textured video */
-@@ -106,18 +113,12 @@ typedef struct {
+@@ -104,8 +115,13 @@ typedef struct {
+ int src_w, src_h, dst_w, dst_h;
+ int w, h;
int drw_x, drw_y;
++ int vsync;
} RADEONPortPrivRec, *RADEONPortPrivPtr;
--
++int
++radeon_covering_crtc_num(ScrnInfoPtr pScrn,
++ int x1, int x2, int y1, int y2,
++ xf86CrtcPtr desired);
+
void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
void RADEONResetI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
-
+@@ -113,11 +129,6 @@ void RADEONResetI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
void RADEONVIP_init(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
void RADEONVIP_reset(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
radeon-modeset.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.30 -r 1.31 radeon-modeset.patch
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/devel/radeon-modeset.patch,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- radeon-modeset.patch 31 Oct 2008 21:01:04 -0000 1.30
+++ radeon-modeset.patch 19 Dec 2008 23:23:19 -0000 1.31
@@ -1,58 +1,306 @@
-commit e3b394a58329df2efe1b57f369cefe6803b5f853
+commit 5b9a9a964c92859cce4f31e3121cb26b11b4bc63
+Author: Dave Airlie <airlied at linux.ie>
+Date: Sat Dec 20 09:14:05 2008 +1000
+
+ radeon: drop old CS2 setup
+
+commit 80a220979642ff99a23cd0af59b0fcafc74da2e2
+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 399da3eeea3d273db920e67bffc47c11b688ca7d
+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 6105102abaa70b1e9c1c24a6f48ba9b4f6a63496
+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 aef93b70e7b1d0b1d393582273d549551be198f6
+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 4fb18164866698d9d42f8cf41fdad3cf10ff34f4
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Nov 26 16:09:29 2008 +1100
+
+ radeon: set touched flag on pinned buffers
+
+commit 26ea3f4afcf90fbb25abbbd4b5ac2433a63425c0
+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 86447551a72e216df71fca64f5e16ded22c5a1ad
+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 049244cc1a430e46497ad730c54a5e1e66bb7a4c
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Nov 25 17:20:44 2008 +1100
+
+ radeon: rs690 stabilisation fixes.
+
+ Flush the VAP due a IB hang on the VAP setup regs.
+ Flush the TX earlier.
+ Emit a right to SC_CLIP_RULE to flush as per r500 docs.
+
+commit ba06b37bde0ad00f8a6b12003d56aeb603227143
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Nov 23 17:56:02 2008 +1000
+
+ radeon: wait for rendering before doing UTS
+
+commit f36db245fac91aad08b4cd2c131e0c47c21bb950
+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 b1121141af82075ec16edfdd6095320000f4504b
+Author: Dave Airlie <airlied at redhat.com>
+Date: Sun Nov 23 17:52:42 2008 +1000
+
+ radeon: return flush for conflicting domains
+
+commit d7f1cebb0cf2d5a8110606e7ef22284cc256df72
+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 0f58052bcdce741aa0f6bb63566c390d7c246632
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Nov 20 16:48:33 2008 +1000
+
+ flush on UTS if any references
+
+commit a29231ab45efc153b6ab1ad19e960d2294aa85ab
+Author: Dave Airlie <airlied at redhat.com>
+Date: Thu Nov 20 16:44:40 2008 +1000
+
+ radeon: add gart vs vram writes
+
+commit 298e92586d11439bc22aab2cb2f7f61f1e80d70f
+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 2737e395af3fac9707ea7e05e1dd6aaf2dcc303e
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Nov 19 14:49:44 2008 +1000
+
+ radeon: scrap state on LeaveVT not EnterVT
+
+commit 99e240bbfe3990be735cfa90c7c9e2d560c7ea6e
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Nov 19 11:08:34 2008 +1000
+
+ radeon: even more typos
+
+commit 523e6ae553b4ddffdf82d3759d6b6b63a0230144
+Author: Dave Airlie <airlied at redhat.com>
+Date: Wed Nov 19 07:51:03 2008 +1000
+
+ radeon: oops bad typo
+
+commit 05a8c61ef69d4270606129426e45d17bf77d0bbc
+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 52459be7e841e38e609dd4abad9a67848399219e
+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 9910bcbe2b85e3242e2373111605d117e6f3a29d
+Author: Dave Airlie <airlied at redhat.com>
+Date: Tue Nov 18 14:33:44 2008 +1000
+
+ radeon: I fail at uint32_t division
+
+commit f3f4b0574cf9eb01b69c8ebe7a7da0e05b32f1e4
+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 d75dafc38eda798bf4f91b5f8e040d8894631d7c
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 17 19:19:43 2008 +1000
+
+ radeon: set emit limit to 90% VRAM
+
+commit 53eb14298f7b493968462606318301bfa3d62a81
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Nov 17 16:16:51 2008 +1000
+
+ radeon: use get/set master ioctls
+
+commit 4c154285ebbda9ff5848f02397ff698dc9e57bf3
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Nov 14 15:56:16 2008 +1000
+
+ radeon: make space accounting a lot smarter
+
+commit 5c7b6f8b8e5a50f49f42658553a66d5fbcd7ae8d
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Nov 14 15:55:12 2008 +1000
+
+ radeon: retry on CS2 EAGAIN
+
+commit 99e9d3981c323ada2aa0c1bbe976a0e4a9c450e5
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Nov 14 15:20:59 2008 +1000
+
+ radeon: add src/mask/dest to fallbacks
+
+commit 455e9f5f6e5a3e648ffd6135570fbc53abd25609
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Nov 14 15:20:37 2008 +1000
+
+ radeon_memory: align all allocations
+
+commit 16a417dfeda8d991fb32770280bfe614f5c79f96
+Author: Dave Airlie <airlied at redhat.com>
+Date: Fri Nov 14 11:03:34 2008 +1000
+
+ radeon: force gtt for mmap after fallbacks
+
[...5337 lines suppressed...]
pPriv->bicubic_src_offset = pPriv->bicubic_offset + info->fbLocation + pScrn->fbOffset;
if (pPriv->bicubic_offset == 0)
pPriv->bicubic_enabled = FALSE;
@@ -7917,7 +8770,7 @@
}
if (pDraw->type == DRAWABLE_WINDOW)
-@@ -248,8 +259,19 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -279,8 +290,19 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
left = (x1 >> 16) & ~1;
npixels = ((((x2 + 0xffff) >> 16) + 1) & ~1) - left;
@@ -7939,7 +8792,7 @@
pPriv->src_pitch = dstPitch;
pPriv->size = size;
pPriv->pDraw = pDraw;
-@@ -290,8 +312,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -321,8 +343,24 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
}
/* Upload bicubic filter tex */
@@ -7966,7 +8819,7 @@
/* update cliplist */
if (!REGION_EQUAL(pScrn->pScreen, &pPriv->clip, clipBoxes)) {
-@@ -308,8 +346,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
+@@ -339,8 +377,10 @@ RADEONPutImageTextured(ScrnInfoPtr pScrn,
pPriv->w = width;
pPriv->h = height;
@@ -7979,25 +8832,60 @@
else
#endif
diff --git a/src/radeon_textured_videofuncs.c b/src/radeon_textured_videofuncs.c
-index c5ad0e1..61fecc8 100644
+index 410430c..b51637a 100644
--- a/src/radeon_textured_videofuncs.c
+++ b/src/radeon_textured_videofuncs.c
-@@ -95,6 +95,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -92,6 +92,11 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
{
RADEONInfoPtr info = RADEONPTR(pScrn);
PixmapPtr pPixmap = pPriv->pPixmap;
+ struct radeon_exa_pixmap_priv *driver_priv;
++ struct radeon_space_check bos[2];
++ int i, ret;
++ int retry_count = 0;
+ dri_bo *dst_bo;
uint32_t txformat;
uint32_t txfilter, txformat0, txformat1, txoffset, txpitch;
uint32_t dst_offset, dst_pitch, dst_format;
-@@ -103,19 +105,25 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -100,19 +105,57 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
int dstxoff, dstyoff, pixel_shift, vtx_count;
BoxPtr pBox = REGION_RECTS(&pPriv->clip);
int nBox = REGION_NUM_RECTS(&pPriv->clip);
+ int qwords;
ACCEL_PREAMBLE();
++ retry:
++ if (info->new_cs) {
++
++ i = 0;
++ bos[i].buf = pPriv->src_bo;
++ bos[i].read_domains = RADEON_GEM_DOMAIN_GTT | RADEON_GEM_DOMAIN_VRAM;
++ bos[i].write_domain = 0;
++ i++;
++
++ driver_priv = exaGetPixmapDriverPrivate(pPixmap);
++ dst_bo = driver_priv->bo;
++ bos[i].buf = driver_priv->bo;
++ bos[i].read_domains = 0;
++ bos[i].write_domain = RADEON_GEM_DOMAIN_VRAM;;
++ i++;
++
++ ret = dri_bufmgr_check_aperture_space(bos, i);
++ if (ret == BUFMGR_SPACE_OP_TO_BIG) {
++ ErrorF("Not enough RAM to hw accel composite operation\n");
++ return;
++ }
++ if (ret == BUFMGR_SPACE_FLUSH) {
++ RADEONCPFlushIndirect(pScrn, 1);
++ retry_count++;
++ if (retry_count == 2) {
++ ErrorF("Not enough RAM to hw accel composite operation\n");
++ return;
++ }
++ goto retry;
++ }
++ }
++
pixel_shift = pPixmap->drawable.bitsPerPixel >> 4;
#ifdef USE_EXA
@@ -8020,7 +8908,7 @@
dst_pitch = pPixmap->devKind;
}
-@@ -210,13 +218,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -213,13 +256,20 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
txoffset = pPriv->src_offset;
@@ -8043,7 +8931,7 @@
FINISH_ACCEL();
txenable = R300_TEX_0_ENABLE;
-@@ -237,13 +252,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -240,13 +290,19 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
R300_TX_MAG_FILTER_NEAREST |
(1 << R300_TX_ID_SHIFT));
@@ -8065,7 +8953,7 @@
FINISH_ACCEL();
/* Enable tex 1 */
-@@ -980,11 +1001,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1332,11 +1388,18 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
}
}
@@ -8086,7 +8974,7 @@
OUT_ACCEL_REG(R300_RB3D_COLORPITCH0, colorpitch);
blendcntl = RADEON_SRC_BLEND_GL_ONE | RADEON_DST_BLEND_GL_ZERO;
-@@ -1029,6 +1057,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1381,6 +1444,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
RADEON_TEX_0_ENABLE | RADEON_TEX_BLEND_0_ENABLE);
OUT_ACCEL_REG(RADEON_RB3D_CNTL,
dst_format | RADEON_ALPHA_BLEND_ENABLE);
@@ -8095,7 +8983,7 @@
OUT_ACCEL_REG(RADEON_RB3D_COLOROFFSET, dst_offset);
OUT_ACCEL_REG(RADEON_RB3D_COLORPITCH, colorpitch);
-@@ -1066,7 +1096,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1418,7 +1483,8 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
((pPriv->h - 1) << RADEON_TEX_VSIZE_SHIFT));
OUT_ACCEL_REG(R200_PP_TXPITCH_0, pPriv->src_pitch - 32);
@@ -8105,7 +8993,7 @@
OUT_ACCEL_REG(R200_PP_TXCBLEND_0,
R200_TXC_ARG_A_ZERO |
-@@ -1099,8 +1130,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
+@@ -1451,8 +1517,10 @@ FUNC_NAME(RADEONDisplayTexturedVideo)(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv
RADEON_CLAMP_S_CLAMP_LAST |
RADEON_CLAMP_T_CLAMP_LAST |
RADEON_YUV_TO_RGB);
@@ -8118,10 +9006,10 @@
RADEON_COLOR_ARG_A_ZERO |
RADEON_COLOR_ARG_B_ZERO |
diff --git a/src/radeon_video.c b/src/radeon_video.c
-index 6249cea..5874335 100644
+index 423ea28..ae62549 100644
--- a/src/radeon_video.c
+++ b/src/radeon_video.c
-@@ -257,7 +257,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -287,7 +287,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
memcpy(newAdaptors, adaptors, num_adaptors * sizeof(XF86VideoAdaptorPtr));
adaptors = newAdaptors;
@@ -8130,7 +9018,7 @@
overlayAdaptor = RADEONSetupImageVideo(pScreen);
if (overlayAdaptor != NULL) {
adaptors[num_adaptors++] = overlayAdaptor;
-@@ -270,7 +270,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
+@@ -300,7 +300,7 @@ void RADEONInitVideo(ScreenPtr pScreen)
if (info->ChipFamily != CHIP_FAMILY_RV250) {
if ((info->ChipFamily < CHIP_FAMILY_RS400)
#ifdef XF86DRI
@@ -8139,7 +9027,7 @@
#endif
) {
texturedAdaptor = RADEONSetupImageTexturedVideo(pScreen);
-@@ -2173,7 +2173,7 @@ RADEONCopyData(
+@@ -2203,7 +2203,7 @@ RADEONCopyData(
#ifdef XF86DRI
@@ -8149,16 +9037,16 @@
uint8_t *buf;
uint32_t bufPitch, dstPitchOff;
diff --git a/src/radeon_video.h b/src/radeon_video.h
-index 11b8029..a1bd20c 100644
+index 7f1891e..7a5f740 100644
--- a/src/radeon_video.h
+++ b/src/radeon_video.h
-@@ -111,6 +111,9 @@ typedef struct {
- int src_w, src_h, dst_w, dst_h;
+@@ -116,6 +116,9 @@ typedef struct {
int w, h;
int drw_x, drw_y;
+ int vsync;
+
+ dri_bo *src_bo;
+ dri_bo *bicubic_bo;
} RADEONPortPrivRec, *RADEONPortPrivPtr;
- void RADEONInitI2C(ScrnInfoPtr pScrn, RADEONPortPrivPtr pPriv);
+ int
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.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- xorg-x11-drv-ati.spec 31 Oct 2008 21:01:04 -0000 1.141
+++ xorg-x11-drv-ati.spec 19 Dec 2008 23:23:19 -0000 1.142
@@ -5,7 +5,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.9.0
-Release: 41%{?dist}
+Release: 63%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -19,9 +19,6 @@
Patch4: radeon-6.9.0-remove-limit-heuristics.patch
Patch5: radeon-6.9.0-panel-size-sanity.patch
Patch6: radeon-6.9.0-bgnr-enable.patch
-Patch7: radeon-6.9.0-add-hd3300.patch
-Patch8: radeon-6.9.0-quirk-agp.patch
-Patch9: radeon-6.9.0-dig1-hdmi.patch
ExcludeArch: s390 s390x
@@ -48,9 +45,6 @@
%patch4 -p1 -b .remove-limit-heuristics
%patch5 -p1 -b .panel-size
%patch6 -p1 -b .bgnr
-%patch7 -p1 -b .pciid
-%patch8 -p1 -b .quirk
-%patch9 -p1 -b .hdmi
%build
autoreconf
@@ -82,6 +76,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Sat Dec 20 2008 Dave Airlie <airlied at redhat.com> 6.9.0-63
+- rebase F11 patch to upstream master + modesetting bits
+
* Sat Nov 01 2008 Dave Airlie <airlied at redhat.com> 6.9.0-41
- radeon-modeset.patch - hopefully speed up mozilla again
--- radeon-6.9.0-add-hd3300.patch DELETED ---
--- radeon-6.9.0-dig1-hdmi.patch DELETED ---
--- radeon-6.9.0-quirk-agp.patch DELETED ---
More information about the fedora-extras-commits
mailing list