summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@arm.linux.org.uk>2014-08-09 14:59:52 +0100
committerRussell King <rmk@arm.linux.org.uk>2014-08-14 01:11:23 +0100
commit5947abb35339099e0935198045ab954c7e0f05cf (patch)
tree9f11e8887e48eb0c69dbb8d17bcac848b7f32817
parent6f94ce02b4ce10105fec71ac894b93ced880a646 (diff)
downloadxf86-video-armada-5947abb35339099e0935198045ab954c7e0f05cf.tar.gz
vivante: use xf86ScreenToScrn(pScreen)
Use xf86ScreenToScrn(pScreen) rather than directly converting via xf86Screens. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--src/vivante.c2
-rw-r--r--src/vivante_dri2.c4
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;
}