drm/amd/display: Remove always-false branches

[WHAT & HOW]
req128_c is always set to false and its branch is never taken.
Similarly, MacroTileSizeBytes is set to either 256 or 65535 and it is
never 4096 and it's branch is not taken.

Therefore, their branches are removed.

This fixes 3 DEADCODE issues reported by Coverity.

Acked-by: Alex Hung <alex.hung@amd.com>
Reviewed-by: Alvin Lee <alvin.lee2@amd.com>
Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Alex Hung <alex.hung@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/dcn20/display_rq_dlg_calc_20.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
index e7019c95ba79ec654532e53dc3e18b9a8ac0ed36..4fce64a030b60ac09f82b18c118608e1b1fabd3a 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20.c
@@ -313,9 +313,6 @@ static void handle_det_buf_split(struct display_mode_lib *mode_lib,
 
                if (swath_height_c > 0)
                        log2_swath_height_c = dml_log2(swath_height_c);
-
-               if (req128_c && log2_swath_height_c > 0)
-                       log2_swath_height_c -= 1;
        }
 
        rq_param->dlg.rq_l.swath_height = 1 << log2_swath_height_l;

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
index ae52510417280130cf3100da7a1232a1d642c77b..3fa9a5da02f6a43eab859b675290b5791f4ed154 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dcn20/display_rq_dlg_calc_20v2.c
@@ -313,9 +313,6 @@ static void handle_det_buf_split(struct display_mode_lib *mode_lib,
 
                if (swath_height_c > 0)
                        log2_swath_height_c = dml_log2(swath_height_c);
-
-               if (req128_c && log2_swath_height_c > 0)
-                       log2_swath_height_c -= 1;
        }
 
        rq_param->dlg.rq_l.swath_height = 1 << log2_swath_height_l;

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 0b132ce1d2cdcdcf869813c72c5afdb38c8fdd74..2b275e6803797ac3d82d9ef0f05cfd35fe5fe718 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
@@ -1924,15 +1924,6 @@ static unsigned int CalculateVMAndRowBytes(
                *PixelPTEReqWidth = 32768.0 / BytePerPixel;
                *PTERequestSize = 64;
                FractionOfPTEReturnDrop = 0;
-       } else if (MacroTileSizeBytes == 4096) {
-               PixelPTEReqHeightPTEs = 1;
-               *PixelPTEReqHeight = MacroTileHeight;
-               *PixelPTEReqWidth = 8 * *MacroTileWidth;
-               *PTERequestSize = 64;
-               if (ScanDirection != dm_vert)
-                       FractionOfPTEReturnDrop = 0;
-               else
-                       FractionOfPTEReturnDrop = 7.0 / 8;
        } else if (GPUVMMinPageSize == 4 && MacroTileSizeBytes > 4096) {
                PixelPTEReqHeightPTEs = 16;
                *PixelPTEReqHeight = 16 * BlockHeight256Bytes;