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

sna: Avoid the intermediate allocation for PRIME pixmaps 

If we attempt to share an unused Pixmap, we first create an ordinary GPU
bo when migrating onto the GPU. Add a flag here to cause the migration
to create a Pixmap suitable for PRIME instead.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2014-10-06 08:18:24 +01:00
parent 649b233f12
commit ec2b9ac81a
2 changed files with 30 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sna/sna.h
View File

@ -709,6 +709,7 @@ sna_pixmap_undo_cow(struct sna *sna, struct sna_pixmap *priv, unsigned flags);
#define __MOVE_DRI 0x80
#define __MOVE_SCANOUT 0x100
#define __MOVE_TILED 0x200
#define __MOVE_PRIME 0x400
struct sna_pixmap *
sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int flags);

38
src/sna/sna_accel.c
View File

@ -1093,7 +1093,7 @@ sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, void **fd_handle)
DBG(("%s: pixmap=%ld\n", __FUNCTION__, pixmap->drawable.serialNumber));
priv = sna_pixmap_move_to_gpu(pixmap,
MOVE_READ | MOVE_WRITE | __MOVE_DRI | __MOVE_FORCE);
MOVE_READ | MOVE_WRITE | __MOVE_DRI | __MOVE_PRIME | __MOVE_FORCE);
if (priv == NULL)
return FALSE;
@ -1125,7 +1125,7 @@ sna_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, void **fd_handle)
pixmap->drawable.height,
pixmap->drawable.bitsPerPixel,
I915_TILING_NONE,
CREATE_GTT_MAP | CREATE_PRIME);
CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT);
if (bo == NULL) {
DBG(("%s: allocation failed\n", __FUNCTION__));
return FALSE;
@ -1244,7 +1244,7 @@ sna_create_pixmap_shared(struct sna *sna, ScreenPtr screen,
width, height,
pixmap->drawable.bitsPerPixel,
I915_TILING_NONE,
CREATE_GTT_MAP | CREATE_PRIME);
CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT);
if (priv->gpu_bo == NULL) {
free(priv);
FreePixmap(pixmap);
@ -1921,6 +1921,7 @@ sna_pixmap_undo_cow(struct sna *sna, struct sna_pixmap *priv, unsigned flags)
if (flags & MOVE_READ) {
PixmapPtr pixmap = priv->pixmap;
unsigned create, tiling;
BoxRec box;
DBG(("%s: copying cow\n", __FUNCTION__));
@ -1929,11 +1930,18 @@ sna_pixmap_undo_cow(struct sna *sna, struct sna_pixmap *priv, unsigned flags)
box.x2 = pixmap->drawable.width;
box.y2 = pixmap->drawable.height;
if (flags & __MOVE_PRIME) {
create|= CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT;
tiling = I915_TILING_NONE;
} else {
create = 0;
tiling = sna_pixmap_default_tiling(sna, pixmap);
}
bo = kgem_create_2d(&sna->kgem,
box.x2, box.y2,
pixmap->drawable.bitsPerPixel,
sna_pixmap_default_tiling(sna, pixmap),
0);
tiling, create);
if (bo == NULL) {
cow->refcnt++;
DBG(("%s: allocation failed\n", __FUNCTION__));
@ -4073,6 +4081,10 @@ static bool can_convert_to_gpu(struct sna_pixmap *priv, unsigned flags)
if (priv->cpu_bo->pitch & 63)
return false;
if (flags & __MOVE_PRIME)
if (priv->cpu_bo->pitch & 255)
return false;
return true;
}
@ -4160,10 +4172,16 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
assert(pixmap->drawable.height > 0);
assert(pixmap->drawable.bitsPerPixel >= 8);
is_linear = sna_pixmap_default_tiling(sna, pixmap) == I915_TILING_NONE;
if (is_linear && flags & __MOVE_TILED) {
DBG(("%s: not creating linear GPU bo\n", __FUNCTION__));
return NULL;
if (flags & __MOVE_PRIME) {
assert((flags & __MOVE_TILED) == 0);
is_linear = true;
} else {
is_linear = sna_pixmap_default_tiling(sna, pixmap) == I915_TILING_NONE;
if (is_linear && flags & __MOVE_TILED) {
DBG(("%s: not creating linear GPU bo\n",
__FUNCTION__));
return NULL;
}
}
if (is_linear &&
@ -4185,6 +4203,8 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
unsigned create = 0;
if (flags & MOVE_INPLACE_HINT || (priv->cpu_damage && priv->cpu_bo == NULL))
create = CREATE_GTT_MAP | CREATE_INACTIVE;
if (flags & __MOVE_PRIME)
create |= CREATE_GTT_MAP | CREATE_PRIME | CREATE_EXACT;
sna_pixmap_alloc_gpu(sna, pixmap, priv, create);
}