XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-24 01:24:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

dri3: Always flush glamor before sharing pixmap storage with clients

Browse Source 
Even if glamor_gbm_bo_from_pixmap / glamor_fd_from_pixmap themselves
don't trigger any drawing, there could already be unflushed drawing to
the pixmap whose storage we share with a client.

(Ported from amdgpu commit 4b17533fcb30842caf0035ba593b7d986520cc85)
Acked-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2019-05-09 12:35:37 +02:00
parent d1d8e3c8d0
commit f758908db4
1 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/radeon_dri3.c
View File

@@ -220,29 +220,13 @@ static int radeon_dri3_fd_from_pixmap(ScreenPtr screen,
RADEONInfoPtr info = RADEONPTR(scrn); RADEONInfoPtr info = RADEONPTR(scrn);
if (info->use_glamor) { if (info->use_glamor) {
Bool need_flush = TRUE; int ret = glamor_fd_from_pixmap(screen, pixmap, stride, size);
int ret = -1;
#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,19,99,904,0)
struct gbm_bo *gbm_bo = glamor_gbm_bo_from_pixmap(screen, pixmap);
if (gbm_bo) { /* Any pending drawing operations need to be flushed to the
ret = gbm_bo_get_fd(gbm_bo); * kernel driver before the client starts using the pixmap
gbm_bo_destroy(gbm_bo); * storage for direct rendering.
if (ret >= 0)
need_flush = FALSE;
}
#endif
if (ret < 0)
ret = glamor_fd_from_pixmap(screen, pixmap, stride, size);
/* glamor might have needed to reallocate the pixmap storage and
* copy the pixmap contents to the new storage. The copy
* operation needs to be flushed to the kernel driver before the
* client starts using the pixmap storage for direct rendering.
*/ */
if (ret >= 0 && need_flush) if (ret >= 0)
radeon_cs_flush_indirect(scrn); radeon_cs_flush_indirect(scrn);
return ret; return ret;