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

sna: Only allow mappable pixmaps to be mapped 

If we did not allocate the pixel data, such as for wedged pixmaps or
scratch buffers, then we cannot perform the pointer dance nor do we want
to create the GPU buffer.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-01-04 12:33:09 +00:00
parent 2cbc97d28a
commit a7c35fa4c3
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/sna/sna_accel.c
View File

@ -225,11 +225,14 @@ sna_pixmap_alloc_cpu(struct sna *sna,
done:
pixmap->devPrivate.ptr = priv->ptr;
pixmap->devKind = priv->stride;
assert(priv->stride);
return priv->ptr != NULL;
}
static void sna_pixmap_free_cpu(struct sna *sna, struct sna_pixmap *priv)
{
assert(priv->stride);
if (priv->cpu_bo) {
DBG(("%s: discarding CPU buffer, handle=%d, size=%d\n",
__FUNCTION__, priv->cpu_bo->handle, priv->cpu_bo->size));
@ -941,7 +944,7 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
}
}
if (priv->gpu_bo == NULL &&
if (priv->gpu_bo == NULL && priv->stride &&
sna_pixmap_choose_tiling(pixmap) != I915_TILING_NONE &&
region_inplace(sna, pixmap, region, priv) &&
sna_pixmap_create_mappable_gpu(pixmap)) {