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

Add drmmode_crtc_can_flip helper

Browse Source 
To reduce code duplication between DRI2 and Present. No functional
change intended yet.

Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Michel Dänzer
2017-07-27 15:46:41 +09:00
committed by Michel Dänzer
parent c2d2689069
commit 9bc3eef744
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/drmmode_display.h
View File

@@ -139,6 +139,17 @@ enum drmmode_flip_sync {
};
/* Can the page flip ioctl be used for this CRTC? */
static inline Bool
drmmode_crtc_can_flip(xf86CrtcPtr crtc)
{
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
return crtc->enabled &&
drmmode_crtc->pending_dpms_mode == DPMSModeOn;
}
static inline void
drmmode_fb_reference_loc(int drm_fd, struct drmmode_fb **old, struct drmmode_fb *new,
const char *caller, unsigned line)

5
src/radeon_dri2.c
View File

@@ -774,14 +774,11 @@ can_flip(ScrnInfoPtr pScrn, DrawablePtr draw,
xf86CrtcPtr crtc = config->crtc[i];
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
if (!crtc->enabled)
continue;
if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
return FALSE;
if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)
if (drmmode_crtc_can_flip(crtc))
num_crtcs_on++;
}

8
src/radeon_present.c
View File

@@ -243,16 +243,14 @@ radeon_present_check_unflip(ScrnInfoPtr scrn)
return FALSE;
for (i = 0, num_crtcs_on = 0; i < config->num_crtc; i++) {
drmmode_crtc_private_ptr drmmode_crtc = config->crtc[i]->driver_private;
if (!config->crtc[i]->enabled)
continue;
xf86CrtcPtr crtc = config->crtc[i];
drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private;
if (!drmmode_crtc || drmmode_crtc->rotate.bo ||
drmmode_crtc->scanout[drmmode_crtc->scanout_id].bo)
return FALSE;
if (drmmode_crtc->pending_dpms_mode == DPMSModeOn)
if (drmmode_crtc_can_flip(crtc))
num_crtcs_on++;
}