diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2017-03-14 16:23:45 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2017-07-11 15:39:05 +0900 |
| commit | aff267ee36cc6a703a532f91f82adc1ba1425ff3 (patch) | |
| tree | 2c895ab69238f2ad6a9fd758de502ac2e4c52731 /src | |
| parent | df88d51c5005476e6fbfca3f31b54be079ec5aaa (diff) | |
Use drmmode_crtc->scanout_id instead of 0 to check for scanout buffer
Preparation for following change, no functional change intended.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/radeon_dri2.c | 5 | ||||
| -rw-r--r-- | src/radeon_kms.c | 4 | ||||
| -rw-r--r-- | src/radeon_present.c | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c index 435bf539..35fb60d9 100644 --- a/src/radeon_dri2.c +++ b/src/radeon_dri2.c @@ -728,7 +728,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; } @@ -777,7 +778,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) diff --git a/src/radeon_kms.c b/src/radeon_kms.c index 3f14b462..955efc62 100644 --- a/src/radeon_kms.c +++ b/src/radeon_kms.c @@ -733,7 +733,7 @@ radeon_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; @@ -1027,7 +1027,7 @@ radeon_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; diff --git a/src/radeon_present.c b/src/radeon_present.c index e637d786..e3a8f7e2 100644 --- a/src/radeon_present.c +++ b/src/radeon_present.c @@ -249,7 +249,7 @@ radeon_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) |