drm/amd/display: Force always scale chroma, set always_scaled to false

This allows us to not always have scaling on, which causes issues with
validation and causes the text to blur slightly.

Signed-off-by: Andrew Jiang <Andrew.Jiang@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>

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
index 9d9604f..f9e43e6 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_dpp.c
@@ -159,10 +159,11 @@ bool dpp_get_optimal_number_of_taps(
                        scl_data->taps.h_taps = 1;
                if (IDENTITY_RATIO(scl_data->ratios.vert))
                        scl_data->taps.v_taps = 1;
-               if (IDENTITY_RATIO(scl_data->ratios.horz_c))
-                       scl_data->taps.h_taps_c = 1;
-               if (IDENTITY_RATIO(scl_data->ratios.vert_c))
-                       scl_data->taps.v_taps_c = 1;
+               /*
+                * Spreadsheet doesn't handle taps_c is one properly,
+                * need to force Chroma to always be scaled to pass
+                * bandwidth validation.
+                */
        }
 
        return true;

diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
index dc878f7..4f124dc 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c
@@ -420,10 +420,6 @@ static const struct dc_debug debug_defaults_drv = {
                .force_abm_enable = false,
                .timing_trace = false,
                .clock_trace = true,
-               /* spread sheet doesn't handle taps_c is one properly,
-                * need to enable scaler for video surface to pass
-                * bandwidth validation.*/
-               .always_scale = true,
                .disable_pplib_clock_request = true,
                .disable_pplib_wm_range = false,
 #if defined(CONFIG_DRM_AMD_DC_DCN1_0)