Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna: Use a stack allocated PixmapRec for the fbcon copy 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2013-07-04 21:39:33 +01:00
parent ea508c177c
commit f5529ea61b
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/sna/sna_display.c
View File

@ -987,7 +987,7 @@ void sna_copy_fbcon(struct sna *sna)
{
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(sna->scrn);
struct drm_mode_fb_cmd fbcon;
PixmapPtr scratch;
PixmapRec scratch;
struct sna_pixmap *priv;
struct kgem_bo *bo;
BoxRec box;
@ -1041,27 +1041,22 @@ void sna_copy_fbcon(struct sna *sna)
DBG(("%s: found fbcon, size=%dx%d, depth=%d, bpp=%d\n",
__FUNCTION__, fbcon.width, fbcon.height, fbcon.depth, fbcon.bpp));
/* Wrap the fbcon in a pixmap so that we select the right formats
* in the render copy in case we need to preserve the fbcon
* across a depth change upon starting X.
*/
scratch = GetScratchPixmapHeader(sna->scrn->pScreen,
fbcon.width, fbcon.height,
fbcon.depth, fbcon.bpp,
0, NULL);
if (scratch == NullPixmap)
bo = sna_create_bo_for_fbcon(sna, &fbcon);
if (bo == NULL)
return;
DBG(("%s: fbcon handle=%d\n", __FUNCTION__, bo->handle));
scratch.drawable.width = fbcon.width;
scratch.drawable.height = fbcon.height;
scratch.drawable.depth = fbcon.depth;
scratch.drawable.bitsPerPixel = fbcon.bpp;
scratch.devPrivate.ptr = NULL;
box.x1 = box.y1 = 0;
box.x2 = min(fbcon.width, sna->front->drawable.width);
box.y2 = min(fbcon.height, sna->front->drawable.height);
bo = sna_create_bo_for_fbcon(sna, &fbcon);
if (bo == NULL)
goto cleanup_scratch;
DBG(("%s: fbcon handle=%d\n", __FUNCTION__, bo->handle));
sx = dx = 0;
if (box.x2 < (uint16_t)fbcon.width)
sx = (fbcon.width - box.x2) / 2;
@ -1075,7 +1070,7 @@ void sna_copy_fbcon(struct sna *sna)
dy = (sna->front->drawable.height - box.y2) / 2;
ok = sna->render.copy_boxes(sna, GXcopy,
scratch, bo, sx, sy,
&scratch, bo, sx, sy,
sna->front, priv->gpu_bo, dx, dy,
&box, 1, 0);
if (!DAMAGE_IS_ALL(priv->gpu_damage))
@ -1086,9 +1081,6 @@ void sna_copy_fbcon(struct sna *sna)
#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(10, 0)
sna->scrn->pScreen->canDoBGNoneRoot = ok;
#endif
cleanup_scratch:
FreeScratchPixmapHeader(scratch);
}
static bool use_shadow(struct sna *sna, xf86CrtcPtr crtc)