From: Tony Cheng <[email protected]> Add an inst member and initialize it to 0 in every hubbub*_construct() from DCN10 through DCN60.
No functional change. Reviewed-by: Jun Lei <[email protected]> Reviewed-by: Alex Hung <[email protected]> Signed-off-by: Tony Cheng <[email protected]> Signed-off-by: George Zhang <[email protected]> --- drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 1 + drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c | 2 ++ drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + 13 files changed, 24 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c index d683d0740c13..4e33648f74bb 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c @@ -933,6 +933,8 @@ void hubbub1_construct(struct hubbub *hubbub, hubbub1->base.ctx = ctx; + hubbub1->base.inst = 0; + hubbub1->base.funcs = &hubbub1_funcs; hubbub1->regs = hubbub_regs; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c index 9fb2907361c3..e5b55fe502ca 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c @@ -680,6 +680,8 @@ void hubbub2_construct(struct dcn20_hubbub *hubbub, { hubbub->base.ctx = ctx; + hubbub->base.inst = 0; + hubbub->base.funcs = &hubbub2_funcs; hubbub->regs = hubbub_regs; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c index 63798132ed95..e6b527cd2047 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn201/dcn201_hubbub.c @@ -96,6 +96,8 @@ void hubbub201_construct(struct dcn20_hubbub *hubbub, { hubbub->base.ctx = ctx; + hubbub->base.inst = 0; + hubbub->base.funcs = &hubbub201_funcs; hubbub->regs = hubbub_regs; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c index d790d6ee359a..881e91e9385d 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c @@ -712,6 +712,8 @@ void hubbub21_construct(struct dcn20_hubbub *hubbub, { hubbub->base.ctx = ctx; + hubbub->base.inst = 0; + hubbub->base.funcs = &hubbub21_funcs; hubbub->regs = hubbub_regs; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c index 6a7c1bee5747..582d647da812 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c @@ -478,6 +478,8 @@ void hubbub3_construct(struct dcn20_hubbub *hubbub3, const struct dcn_hubbub_mask *hubbub_mask) { hubbub3->base.ctx = ctx; + + hubbub3->base.inst = 0; hubbub3->base.funcs = &hubbub30_funcs; hubbub3->regs = hubbub_regs; hubbub3->shifts = hubbub_shift; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c index c1959672df50..f432874b32dd 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn301/dcn301_hubbub.c @@ -74,6 +74,8 @@ void hubbub301_construct(struct dcn20_hubbub *hubbub3, const struct dcn_hubbub_mask *hubbub_mask) { hubbub3->base.ctx = ctx; + + hubbub3->base.inst = 0; hubbub3->base.funcs = &hubbub301_funcs; hubbub3->regs = hubbub_regs; hubbub3->shifts = hubbub_shift; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c index 35c94ca8335a..8dd4b7b9ba36 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c @@ -1080,6 +1080,7 @@ void hubbub31_construct(struct dcn20_hubbub *hubbub31, int pixel_chunk_size_kb, int config_return_buffer_size_kb) { + hubbub31->base.inst = 0; hubbub3_construct(hubbub31, ctx, hubbub_regs, hubbub_shift, hubbub_mask); hubbub31->base.funcs = &hubbub31_funcs; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c index 237331b35378..dd9bc1f08b56 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c @@ -1050,6 +1050,8 @@ void hubbub32_construct(struct dcn20_hubbub *hubbub2, int config_return_buffer_size_kb) { hubbub2->base.ctx = ctx; + + hubbub2->base.inst = 0; hubbub2->base.funcs = &hubbub32_funcs; hubbub2->regs = hubbub_regs; hubbub2->shifts = hubbub_shift; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c index 466bab437e37..ad333cd3241b 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c @@ -655,6 +655,8 @@ void hubbub35_construct(struct dcn20_hubbub *hubbub2, int config_return_buffer_size_kb) { hubbub2->base.ctx = ctx; + + hubbub2->base.inst = 0; hubbub2->base.funcs = &hubbub35_funcs; hubbub2->regs = hubbub_regs; hubbub2->shifts = hubbub_shift; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c index e9ff20c02b1e..d948525bc09e 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c @@ -1264,6 +1264,8 @@ void hubbub401_construct(struct dcn20_hubbub *hubbub2, int config_return_buffer_size_kb) { hubbub2->base.ctx = ctx; + + hubbub2->base.inst = 0; hubbub2->base.funcs = &hubbub4_01_funcs; hubbub2->regs = hubbub_regs; hubbub2->shifts = hubbub_shift; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c index 71bc926c7035..b8657de84d31 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c @@ -555,6 +555,8 @@ void hubbub42_construct(struct dcn20_hubbub *hubbub2, int config_return_buffer_size_kb) { hubbub2->base.ctx = ctx; + + hubbub2->base.inst = 0; hubbub2->base.funcs = &hubbub42_funcs; hubbub2->regs = hubbub_regs; hubbub2->shifts = hubbub_shift; diff --git a/drivers/gpu/drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c b/drivers/gpu/drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c index c89c8ff42185..639c71cf1123 100644 --- a/drivers/gpu/drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c +++ b/drivers/gpu/drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c @@ -1982,6 +1982,8 @@ void hubbub60_construct(struct dcn20_hubbub *hubbub2, int config_return_buffer_size_kb) { hubbub2->base.ctx = ctx; + + hubbub2->base.inst = 0; hubbub2->base.funcs = &hubbub60_funcs; hubbub2->regs = hubbub_regs; hubbub2->shifts = hubbub_shift; diff --git a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h index 22a0e3dcb25c..8d1024a875a7 100644 --- a/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h +++ b/drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h @@ -301,6 +301,7 @@ struct hubbub_funcs { struct hubbub { const struct hubbub_funcs *funcs; struct dc_context *ctx; + int inst; bool riommu_active; }; -- 2.55.0
