From 5947abb35339099e0935198045ab954c7e0f05cf Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 9 Aug 2014 14:59:52 +0100 Subject: vivante: use xf86ScreenToScrn(pScreen) Use xf86ScreenToScrn(pScreen) rather than directly converting via xf86Screens. Signed-off-by: Russell King --- src/vivante.c | 2 +- src/vivante_dri2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/vivante.c b/src/vivante.c index 127212d..f68e2c8 100644 --- a/src/vivante.c +++ b/src/vivante.c @@ -565,7 +565,7 @@ vivante_Composite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst, Bool vivante_ScreenInit(ScreenPtr pScreen, struct drm_armada_bufmgr *mgr) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); #ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); #endif diff --git a/src/vivante_dri2.c b/src/vivante_dri2.c index 7747de3..98e83e1 100644 --- a/src/vivante_dri2.c +++ b/src/vivante_dri2.c @@ -422,8 +422,8 @@ vivante_dri2_vblank(int fd, unsigned frame, unsigned tv_sec, unsigned tv_usec, break; default: - xf86DrvMsg(xf86Screens[draw->pScreen->myNum]->scrnIndex, X_WARNING, - "%s: unknown vblank event received\n", + xf86DrvMsg(xf86ScreenToScrn(draw->pScreen)->scrnIndex, + X_WARNING, "%s: unknown vblank event received\n", __FUNCTION__); break; } -- cgit v1.2.3