rpms/xorg-x11-drv-ati/F-10 radeon-modeset.patch, 1.50, 1.51 xorg-x11-drv-ati.spec, 1.163, 1.164
Dave Airlie
airlied at fedoraproject.org
Sun Dec 21 23:33:43 UTC 2008
Author: airlied
Update of /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24068
Modified Files:
radeon-modeset.patch xorg-x11-drv-ati.spec
Log Message:
* Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 6.9.0-63
- radeon-modeset.patch: fix EXA with DRI disabled
radeon-modeset.patch:
Index: radeon-modeset.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/radeon-modeset.patch,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- radeon-modeset.patch 9 Dec 2008 04:38:42 -0000 1.50
+++ radeon-modeset.patch 21 Dec 2008 23:33:09 -0000 1.51
@@ -1,3 +1,17 @@
+commit 52249421d496bbdf67c80c3169e964d71437f49a
+Author: Dave Airlie <airlied at redhat.com>
+Date: Mon Dec 22 09:27:47 2008 +1000
+
+ radeon: setup 3D engine even when no DRI.
+
+ This should fix some missing font issues in EXA without DRI cases.
+
+commit 0db333f639cfbb71fa434a0ce08520c9172694f9
+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 97461ae1187e31f402a55d63fd55428abcc72ed8
Author: Dave Airlie <airlied at redhat.com>
Date: Tue Dec 9 13:29:18 2008 +1000
@@ -1824,7 +1838,7 @@
+#endif
+#endif
diff --git a/src/radeon.h b/src/radeon.h
-index f7ae1a8..a364e4a 100644
+index f7ae1a8..f90f54c 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -46,6 +46,8 @@
@@ -2054,7 +2068,7 @@
#define FLUSH_RING() \
do { \
if (RADEON_VERBOSE) \
-@@ -1289,6 +1388,43 @@ do { \
+@@ -1289,6 +1388,44 @@ do { \
#endif /* XF86DRI */
@@ -2084,8 +2098,9 @@
+ case EXA_ENGINEMODE_3D: \
+ break; \
+ } \
-+ if (flush && info->directRenderingEnabled) { \
-+ RADEONCPFlushIndirect(pScrn, 1); \
++ if (flush) { \
++ if (info->directRenderingEnabled) \
++ RADEONCPFlushIndirect(pScrn, 1); \
+ RADEONInit3DEngine(pScrn); \
+ } \
+ info->accel_state->engineMode = EXA_ENGINEMODE_3D; \
@@ -4519,7 +4534,7 @@
+
+#endif
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
-index c759bd6..9ff2988 100644
+index c759bd6..93f1346 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -67,7 +67,7 @@
@@ -5384,7 +5399,7 @@
xf86DrvMsg(scrnIndex, X_ERROR,
"Static buffer allocation failed. Disabling DRI.\n");
xf86DrvMsg(scrnIndex, X_ERROR,
-@@ -3443,15 +3579,41 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3443,15 +3579,42 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
}
}
@@ -5424,12 +5439,13 @@
}
}
+
-+ RADEONDRIDoMappings(pScreen);
++ if (info->directRenderingEnabled == TRUE)
++ RADEONDRIDoMappings(pScreen);
+
#endif
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"Initializing fb layer\n");
-@@ -3475,7 +3637,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3475,7 +3638,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
if (info->r600_shadow_fb == FALSE) {
/* Init fb layer */
@@ -5438,7 +5454,7 @@
pScrn->virtualX, pScrn->virtualY,
pScrn->xDpi, pScrn->yDpi, pScrn->displayWidth,
pScrn->bitsPerPixel))
-@@ -3517,8 +3679,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3517,8 +3680,10 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
/* restore the memory map here otherwise we may get a hang when
* initializing the drm below
*/
@@ -5451,7 +5467,7 @@
/* Backing store setup */
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -3528,7 +3692,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3528,7 +3693,7 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
/* DRI finalisation */
#ifdef XF86DRI
@@ -5460,7 +5476,7 @@
info->dri->pKernelDRMVersion->version_minor >= 19)
{
if (RADEONDRISetParam(pScrn, RADEON_SETPARAM_PCIGART_LOCATION, info->dri->pciGartOffset) < 0)
-@@ -3547,11 +3711,17 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3547,11 +3712,17 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
info->directRenderingEnabled = RADEONDRIFinishScreenInit(pScreen);
}
if (info->directRenderingEnabled) {
@@ -5479,7 +5495,7 @@
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Direct rendering enabled\n");
-@@ -3649,10 +3819,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
+@@ -3649,10 +3820,16 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
return FALSE;
}
}
@@ -5497,7 +5513,7 @@
/* Provide SaveScreen & wrap BlockHandler and CloseScreen */
/* Wrap CloseScreen */
-@@ -5133,7 +5309,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5133,7 +5310,7 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
#ifdef XF86DRI
Bool CPStarted = info->cp->CPStarted;
@@ -5506,7 +5522,7 @@
DRILock(pScrn->pScreen, 0);
RADEONCP_STOP(pScrn, info);
}
-@@ -5156,8 +5332,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5156,8 +5333,10 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
#endif
}
@@ -5519,7 +5535,7 @@
ret = xf86SetSingleMode (pScrn, mode, RR_Rotate_0);
-@@ -5169,15 +5347,18 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
+@@ -5169,15 +5348,18 @@ Bool RADEONSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
/* xf86SetRootClip would do, but can't access that here */
}
@@ -5545,7 +5561,7 @@
}
#endif
-@@ -5375,6 +5556,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
+@@ -5375,6 +5557,11 @@ void RADEONAdjustFrame(int scrnIndex, int x, int y, int flags)
xf86OutputPtr output = config->output[config->compat_output];
xf86CrtcPtr crtc = output->crtc;
@@ -5557,7 +5573,7 @@
#ifdef XF86DRI
if (info->cp->CPStarted && pScrn->pScreen) DRILock(pScrn->pScreen, 0);
#endif
-@@ -5410,67 +5596,92 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5410,67 +5597,92 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"RADEONEnterVT\n");
@@ -5695,7 +5711,7 @@
}
#endif
/* this will get XVideo going again, but only if XVideo was initialised
-@@ -5482,7 +5693,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
+@@ -5482,7 +5694,7 @@ Bool RADEONEnterVT(int scrnIndex, int flags)
RADEONEngineRestore(pScrn);
#ifdef XF86DRI
@@ -5704,7 +5720,7 @@
RADEONCP_START(pScrn, info);
DRIUnlock(pScrn->pScreen);
}
-@@ -5505,17 +5716,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5505,17 +5717,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
"RADEONLeaveVT\n");
#ifdef XF86DRI
if (RADEONPTR(pScrn)->directRenderingInited) {
@@ -5734,7 +5750,7 @@
/* Make sure 3D clients will re-upload textures to video RAM */
if (info->dri->textureSize) {
-@@ -5531,6 +5743,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5531,6 +5744,11 @@ void RADEONLeaveVT(int scrnIndex, int flags)
i = list[i].next;
} while (i != 0);
}
@@ -5746,7 +5762,7 @@
}
#endif
-@@ -5551,10 +5768,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
+@@ -5551,10 +5769,18 @@ void RADEONLeaveVT(int scrnIndex, int flags)
xf86_hide_cursors (pScrn);
@@ -5768,7 +5784,7 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"Ok, leaving now...\n");
-@@ -5599,7 +5824,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5599,7 +5825,8 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
#endif /* USE_XAA */
if (pScrn->vtSema) {
@@ -5778,7 +5794,7 @@
}
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
-@@ -5634,6 +5860,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
+@@ -5634,6 +5861,12 @@ static Bool RADEONCloseScreen(int scrnIndex, ScreenPtr pScreen)
info->DGAModes = NULL;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, RADEON_LOGLEVEL_DEBUG,
"Unmapping memory\n");
Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-ati/F-10/xorg-x11-drv-ati.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- xorg-x11-drv-ati.spec 9 Dec 2008 03:34:45 -0000 1.163
+++ xorg-x11-drv-ati.spec 21 Dec 2008 23:33:09 -0000 1.164
@@ -5,7 +5,7 @@
Summary: Xorg X11 ati video driver
Name: xorg-x11-drv-ati
Version: 6.9.0
-Release: 62%{?dist}
+Release: 63%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -86,6 +86,9 @@
%{_mandir}/man4/radeon.4*
%changelog
+* Mon Dec 22 2008 Dave Airlie <airlied at redhat.com> 6.9.0-63
+- radeon-modeset.patch: fix EXA with DRI disabled
+
* Tue Dec 09 2008 Dave Airlie <airlied at redhat.com> 6.9.0-62
- radeon-modeset.patch: fix resume with no DRI + another 2D/3D issue
More information about the fedora-extras-commits
mailing list