drm/amdgpu/display: clean up dcn2*_pp_smu functions
Subsystems (3)
PATCH 1/1 drm/amdgpu/display: clean up dcn2*_pp_smu functions
Use the dcn21 functions in dcn21_resource.c and make the dcn20 functions static since they are only used in dcn20_resource now.
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 6 ++++-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 3 --- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +4 -2
@@ -1156,6 +1156,8 @@ static const struct resource_create_funcs res_create_maximus_funcs = { .create_hwseq = dcn20_hwseq_create, }; +static void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu); +void dcn20_clock_source_destroy (struct clock_source **clk_src) {kfree (TO_DCE110_CLK_SRC (*clk_src));
@@ -2928,7 +2930,7 @@ bool dcn20_mmhubbub_create(struct dc_context *ctx, struct resource_pool *pool)return true; } -struct pp_smu_funcs *dcn20_pp_smu_create (struct dc_context *ctx) +static struct pp_smu_funcs *dcn20_pp_smu_create (struct dc_context *ctx) {struct pp_smu_funcs *pp_smu =kzalloc (sizeof (*pp_smu),GFP_KERNEL );
@@ -2943,7 +2945,7 @@ struct pp_smu_funcs *dcn20_pp_smu_create(struct dc_context *ctx)return pp_smu; } -void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu) +static void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu) {if (pp_smu && *pp_smu) {kfree (*pp_smu);
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +0 -3
@@ -95,9 +95,6 @@ struct display_stream_compressor *dcn20_dsc_create( struct dc_context *ctx, uint32_t inst);void dcn20_dsc_destroy (struct display_stream_compressor **dsc); -struct pp_smu_funcs *dcn20_pp_smu_create (struct dc_context *ctx); -void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu); -struct hubp *dcn20_hubp_create (struct dc_context *ctx,uint32_t inst);
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +3 -1
@@ -636,6 +636,8 @@ static const struct dcn10_stream_encoder_mask se_mask = { SE_COMMON_MASK_SH_LIST_DCN20(_MASK) }; +static void dcn21_pp_smu_destroy (struct pp_smu_funcs **pp_smu); +static struct input_pixel_processor *dcn21_ipp_create (struct dc_context *ctx,uint32_t inst) {
@@ -939,7 +941,7 @@ static void destruct(struct dcn21_resource_pool *pool)dcn_dccg_destroy (&pool->base.dccg);if (pool->base.pp_smu !=NULL ) -dcn20_pp_smu_destroy (&pool->base.pp_smu); +dcn21_pp_smu_destroy (&pool->base.pp_smu); }
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 20191010151041.32711-1-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Harry Wentland
Reviewed-byQuoted 6 lines · Alex Deucher
Use the dcn21 functions in
dcn21_resource.cand make the dcn20 functions static since they are only used indcn20_resourcenow.Signed-off-by Alex Deucher <[email protected]>
Reviewed-by Harry Wentland <[email protected]>
Harry
Quoted 66 lines
--- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 6 ++++-- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 3 --- drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 4 +++- 3 files changed, 7 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.c +4
-2@@ -1156,6 +1156,8 @@ static const struct resource_create_funcs res_create_maximus_funcs = { .create_hwseq = dcn20_hwseq_create, }; +static void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu); +void dcn20_clock_source_destroy (struct clock_source **clk_src) {kfree (TO_DCE110_CLK_SRC (*clk_src));@@ -2928,7 +2930,7 @@ bool dcn20_mmhubbub_create(struct dc_context *ctx, struct resource_pool *pool)return true; } -struct pp_smu_funcs *dcn20_pp_smu_create (struct dc_context *ctx) +static struct pp_smu_funcs *dcn20_pp_smu_create (struct dc_context *ctx) {struct pp_smu_funcs *pp_smu =kzalloc (sizeof (*pp_smu),GFP_KERNEL );@@ -2943,7 +2945,7 @@ struct pp_smu_funcs *dcn20_pp_smu_create(struct dc_context *ctx)return pp_smu; } -void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu) +static void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu) {if (pp_smu && *pp_smu) {kfree (*pp_smu);drivers/gpu/drm/amd/display/dc/dcn20/dcn20_resource.h +0
-3@@ -95,9 +95,6 @@ struct display_stream_compressor *dcn20_dsc_create( struct dc_context *ctx, uint32_t inst);void dcn20_dsc_destroy (struct display_stream_compressor **dsc); -struct pp_smu_funcs *dcn20_pp_smu_create (struct dc_context *ctx); -void dcn20_pp_smu_destroy (struct pp_smu_funcs **pp_smu); -struct hubp *dcn20_hubp_create (struct dc_context *ctx,uint32_t inst);drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +2
-0@@ -636,6 +636,8 @@ static const struct dcn10_stream_encoder_mask se_mask = { SE_COMMON_MASK_SH_LIST_DCN20(_MASK) }; +static void dcn21_pp_smu_destroy (struct pp_smu_funcs **pp_smu); +static struct input_pixel_processor *dcn21_ipp_create (struct dc_context *ctx,uint32_t inst) {
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c static void destruct(struct dcn21_resource_pool *pool) · line 947
Quoted 8 lines
drivers/gpu/drm/amd/display/dc/dcn21/dcn21_resource.c +1
-1@@ -939,7 +941,7 @@ static void destruct(struct dcn21_resource_pool *pool)dcn_dccg_destroy (&pool->base.dccg);if (pool->base.pp_smu !=NULL ) -dcn20_pp_smu_destroy (&pool->base.pp_smu); +dcn21_pp_smu_destroy (&pool->base.pp_smu); }
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx