diff options
| author | Michel Dänzer <michel.daenzer@amd.com> | 2016-09-14 17:18:51 +0900 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2016-09-14 17:26:35 +0900 |
| commit | 0b3bde7f9e42577b6720cb290d03fab3b05614b4 (patch) | |
| tree | b9a0db0fc4b3b43b47cc1ad7426819415a133ec5 /src | |
| parent | 2e6e81aa8d4b33eb326e674dca4e29b3d638cac0 (diff) | |
DRI2: Add interpolated_vblanks in amdgpu_dri2_get_crtc_msc
We need that in amdgpu_dri2_drawable_crtc as well for priv->vblank_delta
to work as intended.
amdgpu_dri2_get_msc was already doing this.
Fixes hangs in some cases when using VDPAU via DRI2 and moving the
window between CRTCs.
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
(Cherry picked from commit abd1a7901c95e4bc78415cf1b7923623b9177152)
Diffstat (limited to 'src')
| -rw-r--r-- | src/amdgpu_dri2.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/amdgpu_dri2.c b/src/amdgpu_dri2.c index 06294fd..4a39ef8 100644 --- a/src/amdgpu_dri2.c +++ b/src/amdgpu_dri2.c @@ -402,10 +402,11 @@ static uint32_t amdgpu_get_msc_delta(DrawablePtr pDraw, xf86CrtcPtr crtc) */ static Bool amdgpu_dri2_get_crtc_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc) { + drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; + if (!amdgpu_crtc_is_enabled(crtc) || drmmode_crtc_get_ust_msc(crtc, ust, msc) != Success) { /* CRTC is not running, extrapolate MSC and timestamp */ - drmmode_crtc_private_ptr drmmode_crtc = crtc->driver_private; ScrnInfoPtr scrn = crtc->scrn; AMDGPUEntPtr pAMDGPUEnt = AMDGPUEntPriv(scrn); CARD64 now, delta_t, delta_seq; @@ -430,6 +431,8 @@ static Bool amdgpu_dri2_get_crtc_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc) *msc += delta_seq; } + *msc += drmmode_crtc->interpolated_vblanks; + return TRUE; } @@ -880,7 +883,8 @@ static int amdgpu_dri2_get_msc(DrawablePtr draw, CARD64 * ust, CARD64 * msc) if (!amdgpu_dri2_get_crtc_msc(crtc, ust, msc)) return FALSE; - *msc += amdgpu_get_msc_delta(draw, crtc); + if (draw && draw->type == DRAWABLE_WINDOW) + *msc += get_dri2_window_priv((WindowPtr)draw)->vblank_delta; *msc &= 0xffffffff; return TRUE; } |