From: Dillon Varone <[email protected]> [WHY&HOW] Add project ID to distinguish dcn42b from dcn42.
Reviewed-by: Austin Zheng <[email protected]> Signed-off-by: Dillon Varone <[email protected]> Signed-off-by: Roman Li <[email protected]> --- drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h | 1 + .../amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c | 1 + .../display/dc/dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 1 + .../display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 + .../amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 + .../amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c | 1 + .../display/dc/dml2_0/dml21/src/dml2_top/dml2_top_interfaces.c | 1 + .../dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c | 1 + 8 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h index 5a8550f592ca..75a24a85775e 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/inc/dml_top_types.h @@ -20,6 +20,7 @@ enum dml2_project_id { dml2_project_dcn4x_stage2, dml2_project_dcn4x_stage2_auto_drr_svp, dml2_project_dcn42, + dml2_project_dcn42b, dml2_project_dcn4x_utm, dml2_project_dcn5x, dml2_project_dcn5x_utm, diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c index 92cdc11c1892..ddf4f55cc261 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c @@ -16,6 +16,7 @@ bool dml2_cga_create(enum dml2_project_id project_id, struct dml2_clock_granular switch (project_id) { case dml2_project_dcn4x_stage1: case dml2_project_dcn42: + case dml2_project_dcn42b: case dml2_project_dcn4x_stage2: case dml2_project_dcn4x_stage2_auto_drr_svp: case dml2_project_dcn4x_utm: diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_factory.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_factory.c index 0800c667f204..320f60cfa165 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_factory.c +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_core/dml2_core_factory.c @@ -35,6 +35,7 @@ bool dml2_core_create(enum dml2_project_id project_id, struct dml2_core_instance result = true; break; case dml2_project_dcn42: + case dml2_project_dcn42b: out->initialize = &core_dcn42_initialize; out->mode_support = &core_dcn4_mode_support; out->mode_programming = &core_dcn4_mode_programming; diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c index 528ebadb87e1..ec09c69482ec 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c @@ -45,6 +45,7 @@ bool dml2_dpmm_create(enum dml2_project_id project_id, struct dml2_dpmm_instance result = true; break; case dml2_project_dcn42: + case dml2_project_dcn42b: out->map_mode_to_soc_dpm = &dpmm_dcn4_map_mode_to_soc_dpm; out->map_watermarks = &dpmm_dcn42_map_watermarks; result = true; diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c index a1d63148b6e5..0105fb890792 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c @@ -33,6 +33,7 @@ bool dml2_mcg_create(enum dml2_project_id project_id, struct dml2_mcg_instance * result = true; break; case dml2_project_dcn42: + case dml2_project_dcn42b: out->build_min_clock_table = &mcg_dcn42_build_min_clock_table; result = true; break; diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c index 44438792931c..997a2be30ef9 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c @@ -63,6 +63,7 @@ bool dml2_pmo_create(enum dml2_project_id project_id, struct dml2_pmo_instance * result = true; break; case dml2_project_dcn42: + case dml2_project_dcn42b: out->initialize = pmo_dcn42_initialize; out->init_for_vmin = pmo_dcn4_fams2_init_for_vmin; diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_interfaces.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_interfaces.c index aaca0a450f0e..95558710a834 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_interfaces.c +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_top/dml2_top_interfaces.c @@ -19,6 +19,7 @@ bool dml2_initialize_instance(struct dml2_initialize_instance_in_out *in_out) case dml2_project_dcn4x_stage2: case dml2_project_dcn4x_stage2_auto_drr_svp: case dml2_project_dcn42: + case dml2_project_dcn42b: return dml2_top_soc15_initialize_instance(in_out); case dml2_project_dcn5x_utm: case dml2_project_dcn6x_soc_var_a: diff --git a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c index 2faf28f753fe..68a6b1a4f2a7 100644 --- a/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c +++ b/drivers/gpu/drm/amd/display/dc/dml2_0/dml21/src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c @@ -20,6 +20,7 @@ bool dml2_utm_soc_bb_create(enum dml2_project_id project_id, struct dml2_utm_soc case dml2_project_dcn5x: case dml2_project_dcn4x_stage1: case dml2_project_dcn42: + case dml2_project_dcn42b: case dml2_project_dcn4x_stage2: case dml2_project_dcn4x_stage2_auto_drr_svp: case dml2_project_invalid: -- 2.34.1
