Commit 71f49c48 authored by Ye Bin's avatar Ye Bin Committed by Alex Deucher
Browse files

drm/amd/display: Delete duplicated argument to '&&' or '||' 



Fixes coccicheck warnig:
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_rq_dlg_calc_30.c:282:12-42:
duplicated argument to && or ||
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:3240:12-42:
duplicated argument to && or ||
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5520:7-91:
duplicated argument to && or ||
drivers/gpu/drm/amd/display/dc/dml/dcn30/display_mode_vba_30.c:5309:86-122:
duplicated argument to && or ||

Fixes: 6725a88f ("drm/amd/display: Add DCN3 DML")
Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Signed-off-by: default avatarYe Bin <yebin10@huawei.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 8c4e4fd6

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

+3 −3
Original line number Diff line number Diff line
@@ -3237,7 +3237,7 @@ static bool CalculateBytePerPixelAnd256BBlockSizes( 
		*BytePerPixelDETC = 0;

		*BytePerPixelY = 4;

		*BytePerPixelC = 0;

	} else if (SourcePixelFormat == dm_444_16 || SourcePixelFormat == dm_444_16) {

	} else if (SourcePixelFormat == dm_444_16) {

		*BytePerPixelDETY = 2;

		*BytePerPixelDETC = 0;

		*BytePerPixelY = 2;
@@ -5307,7 +5307,7 @@ void dml30_ModeSupportAndSystemConfigurationFull(struct display_mode_lib *mode_l 
			ViewportExceedsSurface = true;



		if (v->SourcePixelFormat[k] != dm_444_64 && v->SourcePixelFormat[k] != dm_444_32 && v->SourcePixelFormat[k] != dm_444_16

				&& v->SourcePixelFormat[k] != dm_444_16 && v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {

				&& v->SourcePixelFormat[k] != dm_444_8 && v->SourcePixelFormat[k] != dm_rgbe) {

			if (v->ViewportWidthChroma[k] > v->SurfaceWidthC[k] || v->ViewportHeightChroma[k] > v->SurfaceHeightC[k]) {

				ViewportExceedsSurface = true;

			}
@@ -5517,7 +5517,7 @@ static void CalculateWatermarksAndDRAMSpeedChangeSupport( 
			if (WritebackPixelFormat[k] == dm_444_64) {

				WritebackDRAMClockChangeLatencyHiding = WritebackDRAMClockChangeLatencyHiding / 2;

			}

			if (mode_lib->vba.WritebackConfiguration == dm_whole_buffer_for_single_stream_interleave || mode_lib->vba.WritebackConfiguration == dm_whole_buffer_for_single_stream_interleave) {

			if (mode_lib->vba.WritebackConfiguration == dm_whole_buffer_for_single_stream_interleave) {

				WritebackDRAMClockChangeLatencyHiding = WritebackDRAMClockChangeLatencyHiding * 2;

			}

			WritebackDRAMClockChangeLatencyMargin = WritebackDRAMClockChangeLatencyHiding - mode_lib->vba.WritebackDRAMClockChangeWatermark;

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

+1 −1
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ static bool CalculateBytePerPixelAnd256BBlockSizes( 
		*BytePerPixelDETC = 0;

		*BytePerPixelY = 4;

		*BytePerPixelC = 0;

	} else if (SourcePixelFormat == dm_444_16 || SourcePixelFormat == dm_444_16) {

	} else if (SourcePixelFormat == dm_444_16) {

		*BytePerPixelDETY = 2;

		*BytePerPixelDETC = 0;

		*BytePerPixelY = 2;

CRA Git | Maintained and supported by SUSTech CRA and CCSE