summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorYongqiang Sun <yongqiang.sun@amd.com>2017-11-03 23:02:50 +0300
committerAlex Deucher <alexander.deucher@amd.com>2017-12-06 20:47:35 +0300
commite58d866e8d6322e9c6f098a538548bd7cf8801c2 (patch)
treeebec633e6600bf08085848b7156ad82b2c66abb4 /drivers
parentc12eefc25757e97335177c26cca934c308c0899e (diff)
downloadlinux-e58d866e8d6322e9c6f098a538548bd7cf8801c2.tar.xz
drm/amd/display: Fixed not set scaler bug.
New scaler parameter assign to dpp is after early return, cause next flip scaler not program. Signed-off-by: Yongqiang Sun <yongqiang.sun@amd.com> Reviewed-by: Tony Cheng <Tony.Cheng@amd.com> Acked-by: Harry Wentland <harry.wentland@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
index 242a568294e2..4b5b70907202 100644
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp_dscl.c
@@ -650,6 +650,9 @@ void dpp1_dscl_set_scaler_manual_scale(
if (memcmp(&dpp->scl_data, scl_data, sizeof(*scl_data)) == 0)
return;
+
+ dpp->scl_data = *scl_data;
+
/* Recout */
dpp1_dscl_set_recout(dpp, &scl_data->recout);
@@ -701,5 +704,4 @@ void dpp1_dscl_set_scaler_manual_scale(
SCL_H_NUM_TAPS_C, scl_data->taps.h_taps_c - 1);
dpp1_dscl_set_scl_filter(dpp, scl_data, ycbcr);
- dpp->scl_data = *scl_data;
}