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

Use correct ScrnInfoPtr in redisplay_dirty

Browse Source 
We used the destination pixmap's screen for flushing drawing commands.
But when we are the master screen, the destination pixmap is from the
slave screen.

Fixes crash when the slave screen isn't using the same acceleration
architecture as us.

Bugzilla: https://bugs.freedesktop.org/103613
Fixes: 01b040b4a8 ("Adapt to PixmapDirtyUpdateRec::src being a
                     DrawablePtr")
(Ported from amdgpu commit 3a4f7422913093ed9e26b73ecd7f9e773478cb1e)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2017-11-15 18:01:29 +01:00
parent 6441210bc5
commit 15350bd553
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/radeon_kms.c
View File

@@ -570,7 +570,11 @@ dirty_region(PixmapDirtyUpdatePtr dirty)
static void
redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
{
ScrnInfoPtr pScrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen);
#ifdef HAS_DIRTYTRACKING_DRAWABLE_SRC
ScrnInfoPtr src_scrn = xf86ScreenToScrn(dirty->src->pScreen);
#else
ScrnInfoPtr src_scrn = xf86ScreenToScrn(dirty->src->drawable.pScreen);
#endif
if (RegionNil(region))
goto out;
@@ -584,7 +588,7 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region)
PixmapSyncDirtyHelper(dirty, region);
#endif
radeon_cs_flush_indirect(pScrn);
radeon_cs_flush_indirect(src_scrn);
if (dirty->slave_dst->master_pixmap)
DamageRegionProcessPending(&dirty->slave_dst->drawable);