frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Dave Airlie 2012-05-23 11:21:55 +01:00
parent 3e46d578d8
commit ef47a1b3bf
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hw/xfree86/drivers/modesetting/driver.c
View File

@ -348,7 +348,7 @@ GetRec(ScrnInfoPtr pScrn)
static void dispatch_dirty(ScreenPtr pScreen) static void dispatch_dirty(ScreenPtr pScreen)
{ {
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr scrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(scrn); modesettingPtr ms = modesettingPTR(scrn);
RegionPtr dirty = DamageRegion(ms->damage); RegionPtr dirty = DamageRegion(ms->damage);
unsigned num_cliprects = REGION_NUM_RECTS(dirty); unsigned num_cliprects = REGION_NUM_RECTS(dirty);
@ -393,7 +393,7 @@ static void msBlockHandler(int i, pointer blockData, pointer pTimeout,
pointer pReadmask) pointer pReadmask)
{ {
ScreenPtr pScreen = screenInfo.screens[i]; ScreenPtr pScreen = screenInfo.screens[i];
modesettingPtr ms = modesettingPTR(xf86Screens[pScreen->myNum]); modesettingPtr ms = modesettingPTR(xf86ScreenToScrn(pScreen));
pScreen->BlockHandler = ms->BlockHandler; pScreen->BlockHandler = ms->BlockHandler;
pScreen->BlockHandler(i, blockData, pTimeout, pReadmask); pScreen->BlockHandler(i, blockData, pTimeout, pReadmask);
@ -586,7 +586,7 @@ static void *
msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode, msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
CARD32 *size, void *closure) CARD32 *size, void *closure)
{ {
ScrnInfoPtr pScrn = xf86Screens[screen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(screen);
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
int stride; int stride;
@ -599,7 +599,7 @@ msShadowWindow(ScreenPtr screen, CARD32 row, CARD32 offset, int mode,
static Bool static Bool
CreateScreenResources(ScreenPtr pScreen) CreateScreenResources(ScreenPtr pScreen)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
PixmapPtr rootPixmap; PixmapPtr rootPixmap;
Bool ret; Bool ret;
@ -660,7 +660,7 @@ msShadowInit(ScreenPtr pScreen)
static Bool static Bool
ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
{ {
ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
modesettingPtr ms = modesettingPTR(pScrn); modesettingPtr ms = modesettingPTR(pScrn);
VisualPtr visual; VisualPtr visual;
int ret; int ret;

4
hw/xfree86/drivers/modesetting/drmmode_display.c
View File

@ -938,7 +938,7 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scrn, int width, int height)
drmmode_ptr drmmode = drmmode_crtc->drmmode; drmmode_ptr drmmode = drmmode_crtc->drmmode;
struct dumb_bo *old_front = NULL; struct dumb_bo *old_front = NULL;
Bool ret; Bool ret;
ScreenPtr screen = screenInfo.screens[scrn->scrnIndex]; ScreenPtr screen = xf86ScrnToScreen(scrn);
uint32_t old_fb_id; uint32_t old_fb_id;
int i, pitch, old_width, old_height, old_pitch; int i, pitch, old_width, old_height, old_pitch;
int cpp = (scrn->bitsPerPixel + 7) / 8; int cpp = (scrn->bitsPerPixel + 7) / 8;
@ -1229,7 +1229,7 @@ drmmode_handle_uevents(int fd, void *closure)
if (!dev) if (!dev)
return; return;
RRGetInfo(screenInfo.screens[scrn->scrnIndex], TRUE); RRGetInfo(xf86ScrnToScreen(scrn), TRUE);
udev_device_unref(dev); udev_device_unref(dev);
} }
#endif #endif