From 2380cf66a314f5541e330f763a8a20a8185ec99d Mon Sep 17 00:00:00 2001 From: Harry Wentland Date: Thu, 25 May 2017 18:00:37 -0400 Subject: [PATCH 0481/4131] drm/amd/display: Don't commit surfaces if no stream Signed-off-by: Harry Wentland Reviewed-by: Tony Cheng Acked-by: Harry Wentland Signed-off-by: Alex Deucher --- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c index bb452ad..d93c17f 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_types.c @@ -2711,6 +2711,9 @@ void amdgpu_dm_atomic_commit_tail( WARN_ON(!status); WARN_ON(!status->surface_count); + if (!acrtc->stream) + continue; + /*TODO How it works with MPO ?*/ if (!dc_commit_surfaces_to_stream( dm->dc, @@ -2768,8 +2771,12 @@ void amdgpu_dm_atomic_commit_tail( } /* update planes when needed per crtc*/ - for_each_crtc_in_state(state, pcrtc, old_crtc_state, j) - amdgpu_dm_commit_surfaces(state, dev, dm, pcrtc, &wait_for_vblank); + for_each_crtc_in_state(state, pcrtc, old_crtc_state, j) { + struct amdgpu_crtc *acrtc = to_amdgpu_crtc(pcrtc); + + if (acrtc->stream) + amdgpu_dm_commit_surfaces(state, dev, dm, pcrtc, &wait_for_vblank); + } for (i = 0; i < new_crtcs_count; i++) { /* -- 2.7.4