diff options
| author | Dave Airlie <airlied@redhat.com> | 2012-05-23 11:21:55 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-05-23 11:21:55 +0100 |
| commit | 93f59c6eb5d3bbacdde8676eb016329644005596 (patch) | |
| tree | b82693b1cd662687d2ae5aa75ce1623dafc3f248 | |
| parent | 5a8b7966729f114b354dd6606cfb340035cd82f5 (diff) | |
modesetting: convert to new scrn conversion APIs.
Generated with util/modular/x-driver-screen-scrn-conv.sh
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | src/driver.c | 10 | ||||
| -rw-r--r-- | src/drmmode_display.c | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/driver.c b/src/driver.c index ce4cdec..61e0615 100644 --- a/src/driver.c +++ b/src/driver.c @@ -348,7 +348,7 @@ GetRec(ScrnInfoPtr pScrn) static void dispatch_dirty(ScreenPtr pScreen) { - ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen); modesettingPtr ms = modesettingPTR(scrn); RegionPtr dirty = DamageRegion(ms->damage); unsigned num_cliprects = REGION_NUM_RECTS(dirty); @@ -393,7 +393,7 @@ static void msBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask) { ScreenPtr pScreen = screenInfo.screens[i]; - modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]); + modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen)); pScreen->BlockHandler = ms->BlockHandler; pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); @@ -586,7 +586,7 @@ static void * msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode, CARD32 *size, void *closure) { - ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(screen); modesettingPtr ms = modesettingPTR(pScrn); int stride; @@ -599,7 +599,7 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode, static Bool CreateScreenResources(ScreenPtr pScreen) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); modesettingPtr ms = modesettingPTR(pScrn); PixmapPtr rootPixmap; Bool ret; @@ -660,7 +660,7 @@ msShadowInit(ScreenPtr pScreen) static Bool ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) { - ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; + ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); modesettingPtr ms = modesettingPTR(pScrn); VisualPtr visual; int ret; diff --git a/src/drmmode_display.c b/src/drmmode_display.c index 22fc66a..c0cc06b 100644 --- a/src/drmmode_display.c +++ b/src/drmmode_display.c @@ -938,7 +938,7 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height) drmmode_ptr drmmode = drmmode_crtc->drmmode; struct dumb_bo *old_front = NULL; Bool ret; - ScreenPtr screen = screenInfo.screens[scrn->scrnIndex]; + ScreenPtr screen = xf86ScrnToScreen(scrn); uint32_t old_fb_id; int i, pitch, old_width, old_height, old_pitch; int cpp = (scrn->bitsPerPixel + 7) / 8; @@ -1229,7 +1229,7 @@ drmmode_handle_uevents(int fd, void *closure) if (!dev) return; - RRGetInfo(screenInfo.screens[scrn->scrnIndex], TRUE); + RRGetInfo(xf86ScrnToScreen(scrn), TRUE); udev_device_unref(dev); } #endif |