Commit ea2be5c0 authored by Baokun Li's avatar Baokun Li Committed by Alex Deucher
Browse files

drm/amd/display: fix warning: ‘update_dsc_caps’ and... 


drm/amd/display: fix warning: ‘update_dsc_caps’ and ‘apply_dsc_policy_for_stream’ defined but not used

Fixes gcc '-Wunused-function' warning:

‘update_dsc_caps’ and ‘apply_dsc_policy_for_stream’ are only used
if 'CONFIG_DRM_AMD_DC_DCN' is defined,

however, it's defined even if 'CONFIG_DRM_AMD_DC_DCN' is not defined.
Thus gcc will report following warning
if 'CONFIG_DRM_AMD_DC_DCN' is not defined:

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5572:13: warning:
‘apply_dsc_policy_for_stream’ defined but not used [-Wunused-function]

drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm.c:5556:13: warning:
‘update_dsc_caps’ defined but not used [-Wunused-function]

Thus move the definition of ‘update_dsc_caps’ and
‘apply_dsc_policy_for_stream’ inside define macro to fix it.

Signed-off-by: default avatarBaokun Li <libaokun1@huawei.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent d3892e20

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+2 −4
Original line number Diff line number Diff line
@@ -5543,6 +5543,7 @@ static void dm_enable_per_frame_crtc_master_sync(struct dc_state *context) 
	}

}



#if defined(CONFIG_DRM_AMD_DC_DCN)

static void update_dsc_caps(struct amdgpu_dm_connector *aconnector,

							struct dc_sink *sink, struct dc_stream_state *stream,

							struct dsc_dec_dpcd_caps *dsc_caps)
@@ -5550,12 +5551,10 @@ static void update_dsc_caps(struct amdgpu_dm_connector *aconnector, 
	stream->timing.flags.DSC = 0;



	if (aconnector->dc_link && sink->sink_signal == SIGNAL_TYPE_DISPLAY_PORT) {

#if defined(CONFIG_DRM_AMD_DC_DCN)

		dc_dsc_parse_dsc_dpcd(aconnector->dc_link->ctx->dc,

				      aconnector->dc_link->dpcd_caps.dsc_caps.dsc_basic_caps.raw,

				      aconnector->dc_link->dpcd_caps.dsc_caps.dsc_branch_decoder_caps.raw,

				      dsc_caps);

#endif

	}

}
@@ -5568,7 +5567,6 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, 


	link_bandwidth_kbps = dc_link_bandwidth_kbps(aconnector->dc_link,

							dc_link_get_link_cap(aconnector->dc_link));

#if defined(CONFIG_DRM_AMD_DC_DCN)

	/* Set DSC policy according to dsc_clock_en */

	dc_dsc_policy_set_enable_dsc_when_not_needed(

		aconnector->dsc_settings.dsc_force_enable == DSC_CLK_FORCE_ENABLE);
@@ -5599,8 +5597,8 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, 


	if (stream->timing.flags.DSC && aconnector->dsc_settings.dsc_bits_per_pixel)

		stream->timing.dsc_cfg.bits_per_pixel = aconnector->dsc_settings.dsc_bits_per_pixel;

#endif

}

#endif



static struct drm_display_mode *

get_highest_refresh_rate_mode(struct amdgpu_dm_connector *aconnector,