drm/amd/display: Drive-by fixes for display_mode_vba

Fixes for the following:
- Incorrect pointer type (unsigned int instead of double)
- Incorrect DSC number of slices setting

Signed-off-by: Ilya Bakoulin <Ilya.Bakoulin@amd.com>
Reviewed-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
index 4df885d..a21608c 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
@@ -564,7 +564,6 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib)
                if (src->is_hsplit) {
                        for (k = j + 1; k < mode_lib->vba.cache_num_pipes; ++k) {
                                display_pipe_source_params_st *src_k = &pipes[k].pipe.src;
-                               display_output_params_st *dout_k = &pipes[k].dout;
 
                                if (src_k->is_hsplit && !visited[k]
                                                && src->hsplit_grp == src_k->hsplit_grp) {
@@ -579,8 +578,6 @@ static void fetch_pipe_params(struct display_mode_lib *mode_lib)
                                                mode_lib->vba.ViewportHeight[mode_lib->vba.NumberOfActivePlanes] +=
                                                                src_k->viewport_height;
 
-                                       mode_lib->vba.NumberOfDSCSlices[mode_lib->vba.NumberOfActivePlanes] +=
-                                                       dout_k->dsc_slices;
                                        visited[k] = true;
                                }
                        }

diff --git a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
index 7502800..faf33e7 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
+++ b/drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h
@@ -455,7 +455,7 @@ struct vba_vars_st {
        double TotalNumberOfActiveOTG;
        double FECOverhead;
        double EffectiveFECOverhead;
-       unsigned int Outbpp;
+       double Outbpp;
        unsigned int OutbppDSC;
        double TotalDSCUnitsRequired;
        double bpp;
@@ -538,7 +538,7 @@ struct vba_vars_st {
        bool RequiresDSC[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
        unsigned int NumberOfDSCSlice[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
        double RequiresFEC[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
-       unsigned int OutputBppPerState[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
+       double OutputBppPerState[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
        double DSCDelayPerState[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
        bool ViewportSizeSupport[DC__VOLTAGE_STATES + 1];
        unsigned int Read256BlockHeightY[DC__NUM_DPP__MAX];