summaryrefslogtreecommitdiff
path: root/src/mga_exa.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mga_exa.c')
-rw-r--r--src/mga_exa.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mga_exa.c b/src/mga_exa.c
index 6cb4ae6..f4a6eb2 100644
--- a/src/mga_exa.c
+++ b/src/mga_exa.c
@@ -53,10 +53,10 @@
#endif
#define PMGA(x) \
- MGAPtr pMga = xf86Screens[x->drawable.pScreen->myNum]->driverPrivate;
+ MGAPtr pMga = xf86ScreenToScrn(x->drawable.pScreen)->driverPrivate;
#define QUIESCE_DMA(x) \
- CHECK_DMA_QUIESCENT(pMga, xf86Screens[x->drawable.pScreen->myNum]);
+ CHECK_DMA_QUIESCENT(pMga, xf86ScreenToScrn(x->drawable.pScreen));
/* stuff stolen from mga_storm.c */
#define BLIT_LEFT 1
@@ -354,7 +354,7 @@ static Bool
mgaCheckComposite(int op, PicturePtr pSrcPict, PicturePtr pMaskPict,
PicturePtr pDstPict)
{
- MGAPtr pMga = xf86Screens[pSrcPict->pDrawable->pScreen->myNum]->driverPrivate;
+ MGAPtr pMga = xf86ScreenToScrn(pSrcPict->pDrawable->pScreen)->driverPrivate;
if (op >= sizeof(mgaBlendOp) / sizeof(mgaBlendOp[0])) {
DEBUG_MSG(("unsupported op %x\n", op));
@@ -751,7 +751,7 @@ mgaDownloadFromScreen(PixmapPtr pSrc, int x, int y, int w, int h,
static void
mgaWaitMarker(ScreenPtr pScreen, int marker)
{
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
MGAPtr pMga = pScrn->driverPrivate;
WAITFIFO(1);
@@ -842,7 +842,7 @@ Bool
mgaExaInit(ScreenPtr pScreen)
{
ExaDriverPtr pExa;
- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
MGAPtr pMga = pScrn->driverPrivate;
pExa = exaDriverAlloc();