drm/amd/display: correct DML calc error

[Why]
DML calculation is different from HW formula.

[How]
Correct the bug to keep it same as HW formula.

Reviewed-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Sherry Wang <Yao.Wang1@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
index 7d0626e42ea68995edff1a9c3ee45fa4a4b71acd..dea2b84e5ebee98dcdd1e523b07d9fa706d40641 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c
@@ -4939,8 +4939,8 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
                                        }
                                        v->TotImmediateFlipBytes = 0.0;
                                        for (k = 0; k <= v->NumberOfActivePlanes - 1; k++) {
-                                               v->TotImmediateFlipBytes = v->TotImmediateFlipBytes + v->NoOfDPP[i][j][k] * v->PDEAndMetaPTEBytesPerFrame[i][j][k]
-                                                               + v->MetaRowBytes[i][j][k] + v->DPTEBytesPerRow[i][j][k];
+                                               v->TotImmediateFlipBytes = v->TotImmediateFlipBytes + v->NoOfDPP[i][j][k] * (v->PDEAndMetaPTEBytesPerFrame[i][j][k]
+                                                               + v->MetaRowBytes[i][j][k] + v->DPTEBytesPerRow[i][j][k]);
                                        }
 
                                        for (k = 0; k <= v->NumberOfActivePlanes - 1; k++) {

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
index bd674dc30df333059ccbfed4561d63003fb63c21..330b089d6a86ff6b8f9e763134713b7fad1e9b1e 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn31/display_mode_vba_31.c
@@ -5274,8 +5274,8 @@ void dml31_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l
                                        v->TotImmediateFlipBytes = 0.0;
                                        for (k = 0; k < v->NumberOfActivePlanes; k++) {
                                                v->TotImmediateFlipBytes = v->TotImmediateFlipBytes
-                                                               + v->NoOfDPP[i][j][k] * v->PDEAndMetaPTEBytesPerFrame[i][j][k] + v->MetaRowBytes[i][j][k]
-                                                               + v->DPTEBytesPerRow[i][j][k];
+                                                               + v->NoOfDPP[i][j][k] * (v->PDEAndMetaPTEBytesPerFrame[i][j][k] + v->MetaRowBytes[i][j][k]
+                                                               + v->DPTEBytesPerRow[i][j][k]);
                                        }
 
                                        for (k = 0; k < v->NumberOfActivePlanes; k++) {

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c
index 7eb2173b7691e8bc5ab733911fc622c3b3ec394f..27b83162ae452d5799fcb57fc105dfa904f4d9e2 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn314/display_mode_vba_314.c
@@ -5371,8 +5371,8 @@ void dml314_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_
                                        v->TotImmediateFlipBytes = 0.0;
                                        for (k = 0; k < v->NumberOfActivePlanes; k++) {
                                                v->TotImmediateFlipBytes = v->TotImmediateFlipBytes
-                                                               + v->NoOfDPP[i][j][k] * v->PDEAndMetaPTEBytesPerFrame[i][j][k] + v->MetaRowBytes[i][j][k]
-                                                               + v->DPTEBytesPerRow[i][j][k];
+                                                               + v->NoOfDPP[i][j][k] * (v->PDEAndMetaPTEBytesPerFrame[i][j][k] + v->MetaRowBytes[i][j][k]
+                                                               + v->DPTEBytesPerRow[i][j][k]);
                                        }
 
                                        for (k = 0; k < v->NumberOfActivePlanes; k++) {