Commit 28d2a14a authored by Alex Hung's avatar Alex Hung Committed by Alex Deucher
Browse files

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: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarFangzhi Zuo <jerry.zuo@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 70d98a20

drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c

+0 −9
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/amd/display/dc/dml/dml1_display_rq_dlg_calc.c

+1 −2
Original line number Diff line number Diff line
@@ -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;