xf86-video-ati: Branch 'master'
Dave Airlie
airlied at kemper.freedesktop.org
Wed May 23 00:50:36 PDT 2012
src/radeon.h | 4 ++--
src/radeon_accel.c | 36 ++++++++++++++++++------------------
src/radeon_driver.c | 4 ++--
3 files changed, 22 insertions(+), 22 deletions(-)
New commits:
commit 84c3900b5179a8d2cc5f925e94ed5b2bbdee1ad9
Author: Dave Airlie <airlied at redhat.com>
Date: Wed May 23 08:49:45 2012 +0100
radeon/xaa: drop scrnIndex parameter to some functions
This isn't needed, and makes api changes later easier.
Signed-off-by: Dave Airlie <airlied at redhat.com>
diff --git a/src/radeon.h b/src/radeon.h
index cb22875..cef09a2 100644
--- a/src/radeon.h
+++ b/src/radeon.h
@@ -1120,7 +1120,7 @@ extern void RADEONCPFlushIndirect(ScrnInfoPtr pScrn, int discard);
extern void RADEONCPReleaseIndirect(ScrnInfoPtr pScrn);
extern int RADEONCPStop(ScrnInfoPtr pScrn, RADEONInfoPtr info);
# ifdef USE_XAA
-extern Bool RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen);
+extern Bool RADEONSetupMemXAA_DRI(ScreenPtr pScreen);
# endif
uint32_t radeonGetPixmapOffset(PixmapPtr pPix);
#endif
@@ -1129,7 +1129,7 @@ extern int radeon_cs_space_remaining(ScrnInfoPtr pScrn);
#ifdef USE_XAA
/* radeon_accelfuncs.c */
extern void RADEONAccelInitMMIO(ScreenPtr pScreen, XAAInfoRecPtr a);
-extern Bool RADEONSetupMemXAA(int scrnIndex, ScreenPtr pScreen);
+extern Bool RADEONSetupMemXAA(ScreenPtr pScreen);
#endif
/* radeon_bios.c */
diff --git a/src/radeon_accel.c b/src/radeon_accel.c
index 784502d..44d797c 100644
--- a/src/radeon_accel.c
+++ b/src/radeon_accel.c
@@ -1150,7 +1150,7 @@ void RADEONInit3DEngine(ScrnInfoPtr pScrn)
#ifdef USE_XAA
#ifdef XF86DRI
Bool
-RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen)
+RADEONSetupMemXAA_DRI(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -1324,7 +1324,7 @@ RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen)
MemBox.y2 = scanlines;
if (!xf86InitFBManager(pScreen, &MemBox)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Memory manager initialization to "
"(%d,%d) (%d,%d) failed\n",
MemBox.x1, MemBox.y1, MemBox.x2, MemBox.y2);
@@ -1332,7 +1332,7 @@ RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen)
} else {
int width, height;
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Memory manager initialized to (%d,%d) (%d,%d)\n",
MemBox.x1, MemBox.y1, MemBox.x2, MemBox.y2);
/* why oh why can't we just request modes which are guaranteed to be 16 lines
@@ -1344,19 +1344,19 @@ RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen)
- pScrn->virtualY + 2 : 2,
0, NULL, NULL,
NULL))) {
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Reserved area from (%d,%d) to (%d,%d)\n",
fbarea->box.x1, fbarea->box.y1,
fbarea->box.x2, fbarea->box.y2);
} else {
- xf86DrvMsg(scrnIndex, X_ERROR, "Unable to reserve area\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to reserve area\n");
}
RADEONDRIAllocatePCIGARTTable(pScreen);
if (xf86QueryLargestOffscreenArea(pScreen, &width,
&height, 0, 0, 0)) {
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Largest offscreen area available: %d x %d\n",
width, height);
@@ -1370,28 +1370,28 @@ RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen)
- info->dri->depthTexLines);
info->dri->backArea = NULL;
} else {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Unable to determine largest offscreen area "
"available\n");
return FALSE;
}
}
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Will use front buffer at offset 0x%x\n",
info->dri->frontOffset);
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Will use back buffer at offset 0x%x\n",
info->dri->backOffset);
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Will use depth buffer at offset 0x%x\n",
info->dri->depthOffset);
if (info->cardType==CARD_PCIE)
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Will use %d kb for PCI GART table at offset 0x%x\n",
info->dri->pciGartSize/1024, (unsigned)info->dri->pciGartOffset);
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Will use %d kb for textures at offset 0x%x\n",
info->dri->textureSize/1024, info->dri->textureOffset);
@@ -1408,7 +1408,7 @@ RADEONSetupMemXAA_DRI(int scrnIndex, ScreenPtr pScreen)
#endif /* XF86DRI */
Bool
-RADEONSetupMemXAA(int scrnIndex, ScreenPtr pScreen)
+RADEONSetupMemXAA(ScreenPtr pScreen)
{
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
RADEONInfoPtr info = RADEONPTR(pScrn);
@@ -1433,7 +1433,7 @@ RADEONSetupMemXAA(int scrnIndex, ScreenPtr pScreen)
MemBox.y2 = 8191;
if (!xf86InitFBManager(pScreen, &MemBox)) {
- xf86DrvMsg(scrnIndex, X_ERROR,
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
"Memory manager initialization to "
"(%d,%d) (%d,%d) failed\n",
MemBox.x1, MemBox.y1, MemBox.x2, MemBox.y2);
@@ -1442,7 +1442,7 @@ RADEONSetupMemXAA(int scrnIndex, ScreenPtr pScreen)
int width, height;
FBAreaPtr fbarea;
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Memory manager initialized to (%d,%d) (%d,%d)\n",
MemBox.x1, MemBox.y1, MemBox.x2, MemBox.y2);
if ((fbarea = xf86AllocateOffscreenArea(pScreen,
@@ -1452,16 +1452,16 @@ RADEONSetupMemXAA(int scrnIndex, ScreenPtr pScreen)
- pScrn->virtualY + 2 : 2,
0, NULL, NULL,
NULL))) {
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Reserved area from (%d,%d) to (%d,%d)\n",
fbarea->box.x1, fbarea->box.y1,
fbarea->box.x2, fbarea->box.y2);
} else {
- xf86DrvMsg(scrnIndex, X_ERROR, "Unable to reserve area\n");
+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "Unable to reserve area\n");
}
if (xf86QueryLargestOffscreenArea(pScreen, &width, &height,
0, 0, 0)) {
- xf86DrvMsg(scrnIndex, X_INFO,
+ xf86DrvMsg(pScrn->scrnIndex, X_INFO,
"Largest offscreen area available: %d x %d\n",
width, height);
}
diff --git a/src/radeon_driver.c b/src/radeon_driver.c
index 077f9a4..5681f02 100644
--- a/src/radeon_driver.c
+++ b/src/radeon_driver.c
@@ -3636,14 +3636,14 @@ Bool RADEONScreenInit(int scrnIndex, ScreenPtr pScreen,
info->dri->textureSize = -1;
}
}
- if (!RADEONSetupMemXAA_DRI(scrnIndex, pScreen))
+ if (!RADEONSetupMemXAA_DRI(pScreen))
return FALSE;
pScrn->fbOffset = info->dri->frontOffset;
}
#endif
#ifdef USE_XAA
- if (!info->useEXA && !hasDRI && !RADEONSetupMemXAA(scrnIndex, pScreen))
+ if (!info->useEXA && !hasDRI && !RADEONSetupMemXAA(pScreen))
return FALSE;
#endif
More information about the xorg-commit
mailing list