Commit 5fbdb1f3 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Alex Deucher
Browse files

drm/amd/display: Don't take the address of skip_scdc_overwrite in dc_link_detect_helper 

Clang warns:

../drivers/gpu/drm/amd/amdgpu/../display/dc/core/dc_link.c:980:36:
warning: address of 'sink->edid_caps.panel_patch.skip_scdc_overwrite'
will always evaluate to 'true' [-Wpointer-bool-conversion]
                if (&sink->edid_caps.panel_patch.skip_scdc_overwrite)
                ~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~
1 warning generated.

This is probably not what was intended so remove the address of
operator, which matches how skip_scdc_overwrite is handled in the rest
of the driver.

While we're here, drop an extra newline after this if block.

Fixes: a760fc1b ("drm/amd/display: add monitor patch to disable SCDC read/write")
Link: https://github.com/ClangBuiltLinux/linux/issues/879



Signed-off-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarZhan Liu <zhan.liu@amd.com>
Reviewed-by: default avatarZhan Liu <zhan.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent c16904b0

drivers/gpu/drm/amd/display/dc/core/dc_link.c

+1 −2
Original line number Diff line number Diff line
@@ -977,10 +977,9 @@ static bool dc_link_detect_helper(struct dc_link *link, 
		if ((prev_sink != NULL) && ((edid_status == EDID_THE_SAME) || (edid_status == EDID_OK)))

			same_edid = is_same_edid(&prev_sink->dc_edid, &sink->dc_edid);



		if (&sink->edid_caps.panel_patch.skip_scdc_overwrite)

		if (sink->edid_caps.panel_patch.skip_scdc_overwrite)

			link->ctx->dc->debug.hdmi20_disable = true;





		if (link->connector_signal == SIGNAL_TYPE_DISPLAY_PORT &&

			sink_caps.transaction_type == DDC_TRANSACTION_TYPE_I2C_OVER_AUX) {

			/*