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

sna: Do not call an extra busy ioctl for scanout flushs 

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2015-04-02 08:55:19 +01:00
parent e47eb0c5e5
commit f63f739fec
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/sna/sna_accel.c
View File

@ -3271,7 +3271,9 @@ __sna_pixmap_for_gpu(struct sna *sna, PixmapPtr pixmap, unsigned flags)
return priv;
}
inline static void sna_pixmap_unclean(struct sna *sna, struct sna_pixmap *priv)
inline static void sna_pixmap_unclean(struct sna *sna,
struct sna_pixmap *priv,
unsigned flags)
{
struct drm_i915_gem_busy busy;
@ -3283,6 +3285,9 @@ inline static void sna_pixmap_unclean(struct sna *sna, struct sna_pixmap *priv)
sna_damage_destroy(&priv->cpu_damage);
list_del(&priv->flush_list);
if (flags & (__MOVE_DRI | __MOVE_SCANOUT))
return;
if (!priv->flush || priv->gpu_bo->exec)
return;
@ -3382,7 +3387,7 @@ sna_pixmap_move_area_to_gpu(PixmapPtr pixmap, const BoxRec *box, unsigned int fl
pixmap->drawable.width,
pixmap->drawable.height)) {
DBG(("%s: already all-damaged\n", __FUNCTION__));
sna_pixmap_unclean(sna, priv);
sna_pixmap_unclean(sna, priv, flags);
goto done;
}
@ -4200,7 +4205,7 @@ sna_pixmap_move_to_gpu(PixmapPtr pixmap, unsigned flags)
pixmap->drawable.width,
pixmap->drawable.height)) {
DBG(("%s: already all-damaged\n", __FUNCTION__));
sna_pixmap_unclean(sna, priv);
sna_pixmap_unclean(sna, priv, flags);
goto active;
}