From: Rodrigo Siqueira <rodrigo.sique...@amd.com>

This commit adds some minor code style changes just to reduce the merge
conflicts we have when we upstream some of the VBA code.

Reviewed-by: Aurabindo Pillai <aurabindo.pil...@amd.com>
Signed-off-by: Rodrigo Siqueira <rodrigo.sique...@amd.com>
---
 .../drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c   | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c 
b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
index 8316b1b914c6..11d5750e15af 100644
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_32.c
@@ -2476,8 +2476,6 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct 
display_mode_lib *mode_l
                                        mode_lib->vba.PixelClock[k], 
mode_lib->vba.PixelClockBackEnd[k]);
                }
 
-               m = 0;
-
                for (k = 0; k <= mode_lib->vba.NumberOfActiveSurfaces - 1; k++) 
{
                        for (m = 0; m <= mode_lib->vba.NumberOfActiveSurfaces - 
1; m++) {
                                for (j = 0; j <= 
mode_lib->vba.NumberOfActiveSurfaces - 1; j++) {
@@ -2854,8 +2852,6 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct 
display_mode_lib *mode_l
                }
        }
 
-       m = 0;
-
        //Calculate Return BW
        for (i = 0; i < (int) v->soc.num_states; ++i) {
                for (j = 0; j <= 1; ++j) {
@@ -3616,11 +3612,10 @@ void dml32_ModeSupportAndSystemConfigurationFull(struct 
display_mode_lib *mode_l
                        mode_lib->vba.ModeIsSupported = 
mode_lib->vba.ModeSupport[i][0] == true
                                        || mode_lib->vba.ModeSupport[i][1] == 
true;
 
-                       if (mode_lib->vba.ModeSupport[i][0] == true) {
+                       if (mode_lib->vba.ModeSupport[i][0] == true)
                                MaximumMPCCombine = 0;
-                       } else {
+                       else
                                MaximumMPCCombine = 1;
-                       }
                }
        }
 
-- 
2.37.2

Reply via email to