diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-24 11:24:59 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2011-06-24 11:24:59 +0100 |
| commit | 28f6dc24d3c50aa399dd098a9ba6a18a95837800 (patch) | |
| tree | e590c02174784b918b89f95a4bbb7e8e15ac03e3 | |
| parent | 312460ea69792594fe9acca8591ead55baea7d99 (diff) | |
sna: Support depth-30 and some more logging to show the depth
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_display.c | 15 | ||||
| -rw-r--r-- | src/sna/sna_driver.c | 7 |
2 files changed, 18 insertions, 4 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index f92a1dbf..21554f1e 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -427,11 +427,19 @@ sna_crtc_restore(struct sna *sna) assert(bo->tiling != I915_TILING_Y); + DBG(("%s: create fb %dx%d@%d/%d\n", + __FUNCTION__, + sna->front->drawable.width, + sna->front->drawable.height, + sna->front->drawable.depth, + sna->front->drawable.bitsPerPixel)); + sna_mode_remove_fb(sna); if (drmModeAddFB(sna->kgem.fd, sna->front->drawable.width, sna->front->drawable.height, - scrn->depth, scrn->bitsPerPixel, + sna->front->drawable.depth, + sna->front->drawable.bitsPerPixel, bo->pitch, bo->handle, &sna->mode.fb_id)) return; @@ -590,6 +598,11 @@ sna_crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode, if (!bo) return FALSE; + DBG(("%s: create fb %dx%d@%d/%d\n", + __FUNCTION__, + scrn->virtualX, scrn->virtualY, + scrn->depth, scrn->bitsPerPixel)); + assert(bo->tiling != I915_TILING_Y); ret = drmModeAddFB(sna->kgem.fd, scrn->virtualX, scrn->virtualY, diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c index 4ae6b5fc..0ef4dff2 100644 --- a/src/sna/sna_driver.c +++ b/src/sna/sna_driver.c @@ -176,10 +176,10 @@ sna_load_palette(ScrnInfoPtr scrn, int numColors, int *indices, */ static Bool sna_create_screen_resources(ScreenPtr screen) { - ScrnInfoPtr scrn = xf86Screens[screen->myNum]; - struct sna *sna = to_sna(scrn); + struct sna *sna = to_sna_from_screen(screen); - DBG(("%s\n", __FUNCTION__)); + DBG(("%s(%dx%d@%d)\n", __FUNCTION__, + screen->width, screen->height, screen->rootDepth)); free(screen->devPrivate); screen->devPrivate = NULL; @@ -453,6 +453,7 @@ static Bool sna_pre_init(ScrnInfoPtr scrn, int flags) case 15: case 16: case 24: + case 30: break; default: xf86DrvMsg(scrn->scrnIndex, X_ERROR, |