drm/amd/display: Properly clear SCL_*_FILTER_CONTROL on DCE6

[ Upstream commit c0aa7cf49dd6cb302fe28e7183992b772cb7420c ]

Previously, the code would set a bit field which didn't exist
on DCE6 so it would be effectively a no-op.

Fixes: b70aaf5586f2 ("drm/amd/display: dce_transform: add DCE6 specific macros,functions")
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
index 670d5ab9d9984f73bf662d463ad289b30eecaf3a..b761dda491d54de8ed9f3517cbeaf89e387c60de 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
+++ b/drivers/gpu/drm/amd/display/dc/dce/dce_transform.c
@@ -527,8 +527,7 @@ static void dce60_transform_set_scaler(
                if (coeffs_v != xfm_dce->filter_v || coeffs_h != xfm_dce->filter_h) {
                        /* 4. Program vertical filters */
                        if (xfm_dce->filter_v == NULL)
-                               REG_SET(SCL_VERT_FILTER_CONTROL, 0,
-                                               SCL_V_2TAP_HARDCODE_COEF_EN, 0);
+                               REG_WRITE(SCL_VERT_FILTER_CONTROL, 0);
                        program_multi_taps_filter(
                                        xfm_dce,
                                        data->taps.v_taps,
@@ -542,8 +541,7 @@ static void dce60_transform_set_scaler(
 
                        /* 5. Program horizontal filters */
                        if (xfm_dce->filter_h == NULL)
-                               REG_SET(SCL_HORZ_FILTER_CONTROL, 0,
-                                               SCL_H_2TAP_HARDCODE_COEF_EN, 0);
+                               REG_WRITE(SCL_HORZ_FILTER_CONTROL, 0);
                        program_multi_taps_filter(
                                        xfm_dce,
                                        data->taps.h_taps,