Commit f1c1a982 authored by Roman Li's avatar Roman Li Committed by Alex Deucher
Browse files

drm/amd/display: Use max target bpp override option 



[Why]
Max target bpp override is an option for working around
DSC issues. It is supported on DC level, but was not
used in DM.

[How]
Use actual option value instead of 0.

Reviewed-by: default avatarRodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Acked-by: default avatarQingqing Zhuo <qingqing.zhuo@amd.com>
Signed-off-by: default avatarRoman Li <Roman.Li@amd.com>
Tested-by: default avatarDaniel Wheeler <Daniel.Wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bc204778

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

+7 −1
Original line number Diff line number Diff line
@@ -5753,9 +5753,15 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, 
{

	struct drm_connector *drm_connector = &aconnector->base;

	uint32_t link_bandwidth_kbps;

	uint32_t max_dsc_target_bpp_limit_override = 0;



	link_bandwidth_kbps = dc_link_bandwidth_kbps(aconnector->dc_link,

							dc_link_get_link_cap(aconnector->dc_link));



	if (stream->link && stream->link->local_sink)

		max_dsc_target_bpp_limit_override =

			stream->link->local_sink->edid_caps.panel_patch.max_dsc_target_bpp_limit;

	

	/* 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);
@@ -5765,7 +5771,7 @@ static void apply_dsc_policy_for_stream(struct amdgpu_dm_connector *aconnector, 
		if (dc_dsc_compute_config(aconnector->dc_link->ctx->dc->res_pool->dscs[0],

						dsc_caps,

						aconnector->dc_link->ctx->dc->debug.dsc_min_slice_height_override,

						0,

						max_dsc_target_bpp_limit_override,

						link_bandwidth_kbps,

						&stream->timing,

						&stream->timing.dsc_cfg)) {

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

+2 −2
Original line number Diff line number Diff line
@@ -547,7 +547,7 @@ static void set_dsc_configs_from_fairness_vars(struct dsc_mst_fairness_params *p 
					params[i].sink->ctx->dc->res_pool->dscs[0],

					&params[i].sink->dsc_caps.dsc_dec_caps,

					params[i].sink->ctx->dc->debug.dsc_min_slice_height_override,

					0,

					params[i].sink->edid_caps.panel_patch.max_dsc_target_bpp_limit,

					0,

					params[i].timing,

					&params[i].timing->dsc_cfg)) {
@@ -579,7 +579,7 @@ static int bpp_x16_from_pbn(struct dsc_mst_fairness_params param, int pbn) 
			param.sink->ctx->dc->res_pool->dscs[0],

			&param.sink->dsc_caps.dsc_dec_caps,

			param.sink->ctx->dc->debug.dsc_min_slice_height_override,

			0,

			param.sink->edid_caps.panel_patch.max_dsc_target_bpp_limit,

			(int) kbps, param.timing, &dsc_config);



	return dsc_config.bits_per_pixel;