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

Swap pixmap privates in radeon_dri2_exchange_buffers

Browse Source 
Instead of only the BOs.

This matches what amdgpu does, and fixes issues with DRI2 page flipping.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2018-07-10 17:23:24 +02:00
committed by Michel Dänzer
parent 3c4c0213c1
commit 413622bccc
1 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/radeon_dri2.c
View File

@@ -720,9 +720,8 @@ radeon_dri2_exchange_buffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPt
{
struct dri2_buffer_priv *front_priv = front->driverPrivate;
struct dri2_buffer_priv *back_priv = back->driverPrivate;
struct radeon_buffer *front_buffer, *back_buffer;
ScreenPtr screen;
RADEONInfoPtr info;
ScreenPtr screen = draw->pScreen;
RADEONInfoPtr info = RADEONPTR(xf86ScreenToScrn(screen));
RegionRec region;
int tmp;
@@ -737,24 +736,29 @@ radeon_dri2_exchange_buffers(DrawablePtr draw, DRI2BufferPtr front, DRI2BufferPt
front->name = back->name;
back->name = tmp;
/* Swap pixmap bos */
front_buffer = radeon_get_pixmap_bo(front_priv->pixmap);
back_buffer = radeon_get_pixmap_bo(back_priv->pixmap);
radeon_set_pixmap_bo(front_priv->pixmap, back_buffer);
radeon_set_pixmap_bo(back_priv->pixmap, front_buffer);
/* Swap pixmap privates */
#ifdef USE_GLAMOR
if (info->use_glamor) {
struct radeon_pixmap *front_pix, *back_pix;
/* Do we need to update the Screen? */
screen = draw->pScreen;
info = RADEONPTR(xf86ScreenToScrn(screen));
if (front_buffer == info->front_buffer) {
radeon_buffer_ref(back_buffer);
radeon_buffer_unref(&info->front_buffer);
info->front_buffer = back_buffer;
radeon_set_pixmap_bo(screen->GetScreenPixmap(screen), back_buffer);
front_pix = radeon_get_pixmap_private(front_priv->pixmap);
back_pix = radeon_get_pixmap_private(back_priv->pixmap);
radeon_set_pixmap_private(front_priv->pixmap, back_pix);
radeon_set_pixmap_private(back_priv->pixmap, front_pix);
radeon_glamor_exchange_buffers(front_priv->pixmap, back_priv->pixmap);
} else
#endif
{
struct radeon_exa_pixmap_priv driver_priv = *(struct radeon_exa_pixmap_priv*)
exaGetPixmapDriverPrivate(front_priv->pixmap);
*(struct radeon_exa_pixmap_priv*)exaGetPixmapDriverPrivate(front_priv->pixmap) =
*(struct radeon_exa_pixmap_priv*)exaGetPixmapDriverPrivate(back_priv->pixmap);
*(struct radeon_exa_pixmap_priv*)exaGetPixmapDriverPrivate(back_priv->pixmap) =
driver_priv;
}
radeon_glamor_exchange_buffers(front_priv->pixmap, back_priv->pixmap);
DamageRegionProcessPending(&front_priv->pixmap->drawable);
}