diff options
| author | Wenjing Liu <Wenjing.Liu@amd.com> | 2019-05-06 14:22:39 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-06-22 09:34:12 -0500 |
| commit | ba32c50f04466463258546a8e75ff8ddd6776bd5 (patch) | |
| tree | 7ea80d48af1865c9cf13434c50bf60ff9ba3ea72 /drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | |
| parent | 1621f4c417bf31e2b741a3d876b1d61435a41e18 (diff) | |
drm/amd/display: decouple dsc adjustment out of enablement
[why]
dsc adjustment is allowed via stream update sequence.
dsc enablement is only allowed via commit stream sequence.
with the current unified dsc set function, it is hard
to determine which sequence it is called by.
The solution is to decouple dsc adjustment out of enablement
sequence so we can handle them separately.
[how]
decouple dsc adjustment out of enablement.
Signed-off-by: Wenjing Liu <Wenjing.Liu@amd.com>
Reviewed-by: Nikola Cornij <Nikola.Cornij@amd.com>
Acked-by: Leo Li <sunpeng.li@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c index 266d2ea50882..f2c2cbf4114b 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c @@ -1318,7 +1318,7 @@ static void release_dsc(struct resource_context *res_ctx, #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT -enum dc_status dcn20_add_dsc_to_stream_resource(struct dc *dc, +static enum dc_status add_dsc_to_stream_resource(struct dc *dc, struct dc_state *dc_ctx, struct dc_stream_state *dc_stream) { @@ -1348,7 +1348,7 @@ enum dc_status dcn20_add_dsc_to_stream_resource(struct dc *dc, } -enum dc_status dcn20_remove_dsc_from_stream_resource(struct dc *dc, +static enum dc_status remove_dsc_from_stream_resource(struct dc *dc, struct dc_state *new_ctx, struct dc_stream_state *dc_stream) { @@ -1390,7 +1390,7 @@ enum dc_status dcn20_add_stream_to_ctx(struct dc *dc, struct dc_state *new_ctx, #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT /* Get a DSC if required and available */ if (result == DC_OK && dc_stream->timing.flags.DSC) - result = dcn20_add_dsc_to_stream_resource(dc, new_ctx, dc_stream); + result = add_dsc_to_stream_resource(dc, new_ctx, dc_stream); #endif if (result == DC_OK) @@ -1405,7 +1405,7 @@ enum dc_status dcn20_remove_stream_from_ctx(struct dc *dc, struct dc_state *new_ enum dc_status result = DC_OK; #ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT - result = dcn20_remove_dsc_from_stream_resource(dc, new_ctx, dc_stream); + result = remove_dsc_from_stream_resource(dc, new_ctx, dc_stream); #endif return result; @@ -2435,10 +2435,6 @@ static struct resource_funcs dcn20_res_pool_funcs = { .populate_dml_writeback_from_context = dcn20_populate_dml_writeback_from_context, .get_default_swizzle_mode = dcn20_get_default_swizzle_mode, .set_mcif_arb_params = dcn20_set_mcif_arb_params, -#ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT - .add_dsc_to_stream_resource = dcn20_add_dsc_to_stream_resource, - .remove_dsc_from_stream_resource = dcn20_remove_dsc_from_stream_resource, -#endif .find_first_free_match_stream_enc_for_link = dcn10_find_first_free_match_stream_enc_for_link }; |