Skip to content

Commit 00f1bd5

Browse files
Timur Kristófgregkh
authored andcommitted
drm/amd/display: Properly clear SCL_*_FILTER_CONTROL on DCE6
[ Upstream commit c0aa7cf ] Previously, the code would set a bit field which didn't exist on DCE6 so it would be effectively a no-op. Fixes: b70aaf5 ("drm/amd/display: dce_transform: add DCE6 specific macros,functions") Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Timur Kristóf <[email protected]> Signed-off-by: Alex Deucher <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 56251bd commit 00f1bd5

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/gpu/drm/amd/display/dc/dce/dce_transform.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -527,8 +527,7 @@ static void dce60_transform_set_scaler(
527527
if (coeffs_v != xfm_dce->filter_v || coeffs_h != xfm_dce->filter_h) {
528528
/* 4. Program vertical filters */
529529
if (xfm_dce->filter_v == NULL)
530-
REG_SET(SCL_VERT_FILTER_CONTROL, 0,
531-
SCL_V_2TAP_HARDCODE_COEF_EN, 0);
530+
REG_WRITE(SCL_VERT_FILTER_CONTROL, 0);
532531
program_multi_taps_filter(
533532
xfm_dce,
534533
data->taps.v_taps,
@@ -542,8 +541,7 @@ static void dce60_transform_set_scaler(
542541

543542
/* 5. Program horizontal filters */
544543
if (xfm_dce->filter_h == NULL)
545-
REG_SET(SCL_HORZ_FILTER_CONTROL, 0,
546-
SCL_H_2TAP_HARDCODE_COEF_EN, 0);
544+
REG_WRITE(SCL_HORZ_FILTER_CONTROL, 0);
547545
program_multi_taps_filter(
548546
xfm_dce,
549547
data->taps.h_taps,

0 commit comments

Comments
 (0)