aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYongqiang Sun <[email protected]>2017-09-22 13:41:13 -0400
committerAlex Deucher <[email protected]>2017-10-21 16:43:07 -0400
commit671a6246e0d3652c024f99d5641c7cf427b0b5a5 (patch)
treee1490fa7be8d8c0ae3a391cdc01d95f69663b1c7
parent69b516c91cbf459e5fd4b8b6e97cfdfa7ea25126 (diff)
drm/amd/display: Early return when turn off a plane.
In case of two monitor connected and turn off one of the monitors, OTG0 is locked after graphic plane off due to redundant programming front end regs. Signed-off-by: Yongqiang Sun <[email protected]> Reviewed-by: Tony Cheng <[email protected]> Acked-by: Harry Wentland <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 2cea8de9c9be..ffc36f5ac50c 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1190,8 +1190,14 @@ static void commit_planes_for_stream(struct dc *dc,
}
}
- if (surface_count == 0)
+ if (surface_count == 0) {
+ /*
+ * In case of turning off screen, no need to program front end a second time.
+ * just return after program front end.
+ */
dc->hwss.apply_ctx_for_surface(dc, stream, surface_count, context);
+ return;
+ }
/* Lock pipes for provided surfaces, or all active if full update*/
for (i = 0; i < surface_count; i++) {