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

Use drmmode_crtc->scanout_id instead of 0 to check for scanout buffer

Browse Source 
Preparation for following change, no functional change intended.

(Ported from radeon commit aff267ee36cc6a703a532f91f82adc1ba1425ff3)
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2017-07-13 17:35:55 +09:00
parent e90721ba65
commit 88147c1a53
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/amdgpu_dri2.c
View File

@@ -608,7 +608,8 @@ can_exchange(ScrnInfoPtr pScrn, DrawablePtr draw,
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
if (crtc->enabled &&
(crtc->rotatedData || drmmode_crtc->scanout[0].bo))
(crtc->rotatedData ||
drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo))
return FALSE;
}
@@ -658,7 +659,7 @@ can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
continue;
if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
drmmode_crtc->scanout[0].bo)
drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
return FALSE;
if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)

4
src/amdgpu_kms.c
View File

@@ -635,7 +635,7 @@ amdgpu_prime_scanout_update(PixmapDirtyUpdatePtr dirty)
drmmode_crtc = xf86_crtc->driver_private;
if (drmmode_crtc->scanout_update_pending ||
!drmmode_crtc->scanout[0].pixmap ||
!drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap ||
drmmode_crtc->pending_dpms_mode != DPMSModeOn)
return;
@@ -921,7 +921,7 @@ amdgpu_scanout_update(xf86CrtcPtr xf86_crtc)
if (!xf86_crtc->enabled ||
drmmode_crtc->scanout_update_pending ||
!drmmode_crtc->scanout[0].pixmap ||
!drmmode_crtc->scanout[drmmode_crtc->scanout_id].pixmap ||
drmmode_crtc->pending_dpms_mode != DPMSModeOn)
return;

2
src/amdgpu_present.c
View File

@@ -234,7 +234,7 @@ amdgpu_present_check_unflip(ScrnInfoPtr scrn)
continue;
if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
drmmode_crtc->scanout[0].bo)
drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
return FALSE;
if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)