OSDN Git Service

drm/amd/display: change dml numdpp var to uint
authorDmytro Laktyushkin <Dmytro.Laktyushkin@amd.com>
Fri, 13 Oct 2017 16:53:38 +0000 (12:53 -0400)
committerAlex Deucher <alexander.deucher@amd.com>
Sat, 21 Oct 2017 20:52:27 +0000 (16:52 -0400)
Signed-off-by: Dmytro Laktyushkin <Dmytro.Laktyushkin@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>
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.c
drivers/gpu/drm/amd/display/dc/dml/display_mode_vba.h

index 117ec11..ffd1d8d 100644 (file)
@@ -1158,7 +1158,7 @@ static bool CalculatePrefetchSchedule(
                else if (PageTableLevels == 3)
                        *Tno_bw = UrgentExtraLatency;
                else
-                       Tno_bw = 0;
+                       *Tno_bw = 0;
        } else if (DCCEnable)
                *Tno_bw = LineTime;
        else
@@ -4721,14 +4721,14 @@ static void ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_
                                        && mode_lib->vba.SwathWidthYSingleDPP[k]
                                                        <= mode_lib->vba.MaximumSwathWidth[k]
                                        && mode_lib->vba.ODMCombineEnablePerState[i][k] == false) {
-                               mode_lib->vba.NoOfDPP[i][k] = 1.0;
+                               mode_lib->vba.NoOfDPP[i][k] = 1;
                                mode_lib->vba.RequiredDPPCLK[i][k] =
                                                mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
                                                                * (1.0
                                                                                + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading
                                                                                                / 100.0);
                        } else {
-                               mode_lib->vba.NoOfDPP[i][k] = 2.0;
+                               mode_lib->vba.NoOfDPP[i][k] = 2;
                                mode_lib->vba.RequiredDPPCLK[i][k] =
                                                mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
                                                                * (1.0
@@ -4790,14 +4790,14 @@ static void ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_
                                                                <= mode_lib->vba.MaximumSwathWidth[k]
                                                && mode_lib->vba.ODMCombineEnablePerState[i][k]
                                                                == false) {
-                                       mode_lib->vba.NoOfDPP[i][k] = 1.0;
+                                       mode_lib->vba.NoOfDPP[i][k] = 1;
                                        mode_lib->vba.RequiredDPPCLK[i][k] =
                                                        mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
                                                                        * (1.0
                                                                                        + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading
                                                                                                        / 100.0);
                                } else {
-                                       mode_lib->vba.NoOfDPP[i][k] = 2.0;
+                                       mode_lib->vba.NoOfDPP[i][k] = 2;
                                        mode_lib->vba.RequiredDPPCLK[i][k] =
                                                        mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
                                                                        * (1.0
@@ -4833,14 +4833,14 @@ static void ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_
                                mode_lib->vba.ODMCombineEnablePerState[i][k] = false;
                                if (mode_lib->vba.SwathWidthYSingleDPP[k]
                                                <= mode_lib->vba.MaximumSwathWidth[k]) {
-                                       mode_lib->vba.NoOfDPP[i][k] = 1.0;
+                                       mode_lib->vba.NoOfDPP[i][k] = 1;
                                        mode_lib->vba.RequiredDPPCLK[i][k] =
                                                        mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
                                                                        * (1.0
                                                                                        + mode_lib->vba.DISPCLKDPPCLKDSCCLKDownSpreading
                                                                                                        / 100.0);
                                } else {
-                                       mode_lib->vba.NoOfDPP[i][k] = 2.0;
+                                       mode_lib->vba.NoOfDPP[i][k] = 2;
                                        mode_lib->vba.RequiredDPPCLK[i][k] =
                                                        mode_lib->vba.MinDPPCLKUsingSingleDPP[k]
                                                                        * (1.0
index 63ad4a7..4b8c1b9 100644 (file)
@@ -489,7 +489,7 @@ struct vba_vars_st {
        double CursorBufferSize;
        double CursorChunkSize;
        unsigned int Mode;
-       double NoOfDPP[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
+       unsigned int NoOfDPP[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
        double OutputLinkDPLanes[DC__NUM_DPP__MAX];
        double SwathWidthYPerState[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];
        double SwathHeightYPerState[DC__VOLTAGE_STATES + 1][DC__NUM_DPP__MAX];