aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorCharlene Liu <charlene.liu@amd.com>2017-04-11 22:24:44 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 17:23:43 -0400
commit1ce71fcd5dddf4a3198a96e422122edc210847e9 (patch)
treed791a96c1876a2e3f59cb1ea03952564e04deb0c /drivers/gpu/drm
parent209a885be018435a062403a08063672c9d77d8d1 (diff)
drm/amd/display: use full surface update when stream is NULL
Signed-off-by: Charlene Liu <charlene.liu@amd.com> Acked-by: Harry Wentland <Harry.Wentland@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/amd/display/dc/core/dc.c2
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 70dc02cf4dbb..6576137ee189 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1155,7 +1155,7 @@ enum surface_update_type dc_check_update_surfaces_for_stream(
1155 int i; 1155 int i;
1156 enum surface_update_type overall_type = UPDATE_TYPE_FAST; 1156 enum surface_update_type overall_type = UPDATE_TYPE_FAST;
1157 1157
1158 if (stream_status->surface_count != surface_count) 1158 if (stream_status == NULL || stream_status->surface_count != surface_count)
1159 return UPDATE_TYPE_FULL; 1159 return UPDATE_TYPE_FULL;
1160 1160
1161 if (stream_update) 1161 if (stream_update)
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
index 7430be502efd..1401331080c5 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c
@@ -1599,11 +1599,11 @@ enum dc_status dce110_apply_ctx_to_hw(
1599 apply_min_clocks(dc, context, &clocks_state, true); 1599 apply_min_clocks(dc, context, &clocks_state, true);
1600 1600
1601 if (context->dispclk_khz 1601 if (context->dispclk_khz
1602 > dc->current_context->dispclk_khz) 1602 > dc->current_context->dispclk_khz) {
1603 context->res_ctx.pool->display_clock->funcs->set_clock( 1603 context->res_ctx.pool->display_clock->funcs->set_clock(
1604 context->res_ctx.pool->display_clock, 1604 context->res_ctx.pool->display_clock,
1605 context->dispclk_khz * 115 / 100); 1605 context->dispclk_khz * 115 / 100);
1606 1606 }
1607 /* program audio wall clock. use HDMI as clock source if HDMI 1607 /* program audio wall clock. use HDMI as clock source if HDMI
1608 * audio active. Otherwise, use DP as clock source 1608 * audio active. Otherwise, use DP as clock source
1609 * first, loop to find any HDMI audio, if not, loop find DP audio 1609 * first, loop to find any HDMI audio, if not, loop find DP audio