drm/amd/display: Remove always-false branches

[WHAT & HOW]
MacroTileSizeBytes is set to either 256 or 65535 and it is never
4096. Its branch is not taken, and should be removed. Similarly,
mode_422 is always 0 and thus ppe will always be 1. The ternary
operator should be removed.

This fixes 2 DEADCODE issues reported by Coverity.

Reviewed-by: Rodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Fangzhi Zuo <jerry.zuo@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 1c10ba4dcddea421a5580f1b1a78effb4474c493..4822fad6ce3a131eb0083181bc315054e22e2bcd 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
@@ -1775,15 +1775,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;

diff --git a/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c b/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
index d8bfc85e5dcd0f2390bd8dbf38a1c0a6cf7b44e7..88dc2b97e7bf5bd85b73bdea23436fba167defeb 100644 (file)
--- a/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
+++ b/drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c
@@ -559,12 +559,11 @@ static void get_surf_rq_param(
                const struct _vcs_dpi_display_pipe_source_params_st *pipe_src_param,
                bool is_chroma)
 {
-       bool mode_422 = 0;
        unsigned int vp_width = 0;
        unsigned int vp_height = 0;
        unsigned int data_pitch = 0;
        unsigned int meta_pitch = 0;
-       unsigned int ppe = mode_422 ? 2 : 1;
+       unsigned int ppe = 1;
        bool surf_linear;
        bool surf_vert;
        unsigned int bytes_per_element;