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

sna: Allow DRI to force allocation of a GPU bo and backing pixmap 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2012-07-26 14:43:33 +01:00
parent 2069384f9f
commit efe3c8ff48
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/sna/sna.h
View File

@ -425,6 +425,7 @@ void sna_pixmap_destroy(PixmapPtr pixmap);
#define MOVE_SOURCE_HINT 0x10
#define MOVE_WHOLE_HINT 0x20
#define __MOVE_FORCE 0x40
#define __MOVE_DRI 0x80
struct sna_pixmap *sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags);
static inline struct sna_pixmap *

13
src/sna/sna_accel.c
View File

@ -2671,7 +2671,18 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
priv = sna_pixmap(pixmap);
if (priv == NULL) {
DBG(("%s: not attached\n", __FUNCTION__));
return NULL;
if ((flags & __MOVE_DRI) == 0)
return NULL;
DBG(("%s: forcing the creation on the GPU\n", __FUNCTION__));
priv = sna_pixmap_attach(pixmap);
if (priv == NULL)
return NULL;
sna_damage_all(&priv->cpu_damage,
pixmap->drawable.width,
pixmap->drawable.height);
}
if (sna_damage_is_all(&priv->gpu_damage,

18
src/sna/sna_dri.c
View File

@ -154,13 +154,21 @@ static struct kgem_bo *sna_pixmap_set_dri(struct sna *sna,
struct sna_pixmap *priv;
int tiling;
priv = sna_pixmap(pixmap);
if (priv == NULL || priv->shm)
return NULL;
DBG(("%s: attaching DRI client to pixmap=%ld\n",
__FUNCTION__, pixmap->drawable.serialNumber));
priv = sna_pixmap_force_to_gpu(pixmap, MOVE_READ | MOVE_WRITE);
if (priv == NULL)
priv = sna_pixmap(pixmap);
if (priv != NULL && priv->shm) {
DBG(("%s: SHM Pixmap, BadAlloc\n", __FUNCTION__));
return NULL;
}
priv = sna_pixmap_move_to_gpu(pixmap,
MOVE_READ | MOVE_WRITE | __MOVE_FORCE | __MOVE_DRI);
if (priv == NULL) {
DBG(("%s: failed to move to GPU, BadAlloc\n", __FUNCTION__));
return NULL;
}
if (priv->flush++)
return priv->gpu_bo;