Commit 96454cfb authored by Wenjing Liu's avatar Wenjing Liu Committed by Alex Deucher

drm/amd/display: remove target_dpp hack for dsc

Remove dc_dsc hack for MST policy
Signed-off-by: default avatarWenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: default avatarNikola Cornij <Nikola.Cornij@amd.com>
Acked-by: default avatarBhawanpreet Lakha <Bhawanpreet.Lakha@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 390fdfbd
...@@ -490,7 +490,7 @@ static int fit_num_slices_up(union dsc_enc_slice_caps slice_caps, int num_slices ...@@ -490,7 +490,7 @@ static int fit_num_slices_up(union dsc_enc_slice_caps slice_caps, int num_slices
* dsc_enc_caps - DSC encoder capabilities * dsc_enc_caps - DSC encoder capabilities
* *
* target_bandwidth - Target bandwidth to fit the stream into. * target_bandwidth - Target bandwidth to fit the stream into.
* If 0, use maximum compression as per DSC policy. * If 0, do not calculate target bpp.
* *
* timing - The stream timing to fit into 'target_bandwidth' or apply * timing - The stream timing to fit into 'target_bandwidth' or apply
* maximum compression to, if 'target_badwidth == 0' * maximum compression to, if 'target_badwidth == 0'
...@@ -517,7 +517,6 @@ static bool setup_dsc_config( ...@@ -517,7 +517,6 @@ static bool setup_dsc_config(
int slice_width; int slice_width;
int target_bpp; int target_bpp;
int sink_per_slice_throughput; int sink_per_slice_throughput;
// TODO DSC: See if it makes sense to use 2.4% for SST
bool is_dsc_possible = false; bool is_dsc_possible = false;
int num_slices_v; int num_slices_v;
int pic_height; int pic_height;
...@@ -534,20 +533,11 @@ static bool setup_dsc_config( ...@@ -534,20 +533,11 @@ static bool setup_dsc_config(
if (target_bandwidth > 0) { if (target_bandwidth > 0) {
is_dsc_possible = decide_dsc_target_bpp_x16(&dsc_policy, &dsc_common_caps, target_bandwidth, timing, &target_bpp); is_dsc_possible = decide_dsc_target_bpp_x16(&dsc_policy, &dsc_common_caps, target_bandwidth, timing, &target_bpp);
} else if (timing->pix_clk_100hz * 12 <= dc_bandwidth_in_kbps_from_timing(timing) * 10) { dsc_cfg->bits_per_pixel = target_bpp;
/* use 12 target bpp for MST display
* TODO: implement new MST DSC target bpp policy */
target_bpp = 16*12;
is_dsc_possible = true;
} else {
is_dsc_possible = false;
} }
if (!is_dsc_possible) if (!is_dsc_possible)
goto done; goto done;
dsc_cfg->bits_per_pixel = target_bpp;
sink_per_slice_throughput = 0; sink_per_slice_throughput = 0;
// Validate available DSC settings against the mode timing // Validate available DSC settings against the mode timing
...@@ -773,18 +763,13 @@ bool dc_dsc_compute_config( ...@@ -773,18 +763,13 @@ bool dc_dsc_compute_config(
struct dc_dsc_config *dsc_cfg) struct dc_dsc_config *dsc_cfg)
{ {
bool is_dsc_possible = false; bool is_dsc_possible = false;
struct dsc_enc_caps dsc_enc_caps; struct dsc_enc_caps dsc_enc_caps;
struct dsc_enc_caps dsc_common_caps;
get_dsc_enc_caps(dc, &dsc_enc_caps, timing->pix_clk_100hz); get_dsc_enc_caps(dc, &dsc_enc_caps, timing->pix_clk_100hz);
is_dsc_possible = dc_intersect_dsc_caps(dsc_sink_caps, &dsc_enc_caps, is_dsc_possible = setup_dsc_config(dsc_sink_caps,
timing->pixel_encoding, &dsc_common_caps); &dsc_enc_caps,
if (is_dsc_possible) target_bandwidth,
is_dsc_possible = setup_dsc_config(dsc_sink_caps, timing, dsc_cfg);
&dsc_enc_caps,
target_bandwidth,
timing, dsc_cfg);
return is_dsc_possible; return is_dsc_possible;
} }
#endif /* CONFIG_DRM_AMD_DC_DSC_SUPPORT */ #endif /* CONFIG_DRM_AMD_DC_DSC_SUPPORT */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment