Commit ebfdf0d0 authored by Alex Deucher's avatar Alex Deucher Committed by Alex Deucher

drm/amd/display/dc: add DCE_VERSION for DCE8 APUs

DCE 8.1 = Kaveri
DCE 8.3 = Kabini/Mullins
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ea062558
...@@ -37,6 +37,8 @@ bool dal_bios_parser_init_cmd_tbl_helper( ...@@ -37,6 +37,8 @@ bool dal_bios_parser_init_cmd_tbl_helper(
{ {
switch (dce) { switch (dce) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
*h = dal_cmd_tbl_helper_dce80_get_table(); *h = dal_cmd_tbl_helper_dce80_get_table();
return true; return true;
......
...@@ -39,6 +39,8 @@ bool dal_bios_parser_init_cmd_tbl_helper2( ...@@ -39,6 +39,8 @@ bool dal_bios_parser_init_cmd_tbl_helper2(
{ {
switch (dce) { switch (dce) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
*h = dal_cmd_tbl_helper_dce80_get_table(); *h = dal_cmd_tbl_helper_dce80_get_table();
return true; return true;
......
...@@ -50,9 +50,16 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id) ...@@ -50,9 +50,16 @@ enum dce_version resource_parse_asic_id(struct hw_asic_id asic_id)
switch (asic_id.chip_family) { switch (asic_id.chip_family) {
case FAMILY_CI: case FAMILY_CI:
case FAMILY_KV:
dc_version = DCE_VERSION_8_0; dc_version = DCE_VERSION_8_0;
break; break;
case FAMILY_KV:
if (ASIC_REV_IS_KALINDI(asic_id.hw_internal_rev) ||
ASIC_REV_IS_BHAVANI(asic_id.hw_internal_rev) ||
ASIC_REV_IS_GODAVARI(asic_id.hw_internal_rev))
dc_version = DCE_VERSION_8_3;
else
dc_version = DCE_VERSION_8_1;
break;
case FAMILY_CZ: case FAMILY_CZ:
dc_version = DCE_VERSION_11_0; dc_version = DCE_VERSION_11_0;
break; break;
...@@ -94,6 +101,8 @@ struct resource_pool *dc_create_resource_pool( ...@@ -94,6 +101,8 @@ struct resource_pool *dc_create_resource_pool(
switch (dc_version) { switch (dc_version) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
res_pool = dce80_create_resource_pool( res_pool = dce80_create_resource_pool(
num_virtual_links, dc); num_virtual_links, dc);
break; break;
......
...@@ -578,6 +578,8 @@ static uint32_t dce110_get_pix_clk_dividers( ...@@ -578,6 +578,8 @@ static uint32_t dce110_get_pix_clk_dividers(
switch (cs->ctx->dce_version) { switch (cs->ctx->dce_version) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
case DCE_VERSION_10_0: case DCE_VERSION_10_0:
case DCE_VERSION_11_0: case DCE_VERSION_11_0:
pll_calc_error = pll_calc_error =
...@@ -862,6 +864,8 @@ static bool dce110_program_pix_clk( ...@@ -862,6 +864,8 @@ static bool dce110_program_pix_clk(
switch (clock_source->ctx->dce_version) { switch (clock_source->ctx->dce_version) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
case DCE_VERSION_10_0: case DCE_VERSION_10_0:
case DCE_VERSION_11_0: case DCE_VERSION_11_0:
bp_pc_params.reference_divider = pll_settings->reference_divider; bp_pc_params.reference_divider = pll_settings->reference_divider;
...@@ -1209,6 +1213,8 @@ bool dce110_clk_src_construct( ...@@ -1209,6 +1213,8 @@ bool dce110_clk_src_construct(
switch (clk_src->base.ctx->dce_version) { switch (clk_src->base.ctx->dce_version) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
case DCE_VERSION_10_0: case DCE_VERSION_10_0:
case DCE_VERSION_11_0: case DCE_VERSION_11_0:
......
...@@ -66,6 +66,8 @@ bool dal_hw_factory_init( ...@@ -66,6 +66,8 @@ bool dal_hw_factory_init(
switch (dce_version) { switch (dce_version) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
dal_hw_factory_dce80_init(factory); dal_hw_factory_dce80_init(factory);
return true; return true;
......
...@@ -65,6 +65,8 @@ bool dal_hw_translate_init( ...@@ -65,6 +65,8 @@ bool dal_hw_translate_init(
switch (dce_version) { switch (dce_version) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
dal_hw_translate_dce80_init(translate); dal_hw_translate_dce80_init(translate);
return true; return true;
case DCE_VERSION_10_0: case DCE_VERSION_10_0:
......
...@@ -79,6 +79,8 @@ struct i2caux *dal_i2caux_create( ...@@ -79,6 +79,8 @@ struct i2caux *dal_i2caux_create(
switch (ctx->dce_version) { switch (ctx->dce_version) {
case DCE_VERSION_8_0: case DCE_VERSION_8_0:
case DCE_VERSION_8_1:
case DCE_VERSION_8_3:
return dal_i2caux_dce80_create(ctx); return dal_i2caux_dce80_create(ctx);
case DCE_VERSION_11_2: case DCE_VERSION_11_2:
return dal_i2caux_dce112_create(ctx); return dal_i2caux_dce112_create(ctx);
......
...@@ -35,6 +35,8 @@ struct dc_bios; ...@@ -35,6 +35,8 @@ struct dc_bios;
enum dce_version { enum dce_version {
DCE_VERSION_UNKNOWN = (-1), DCE_VERSION_UNKNOWN = (-1),
DCE_VERSION_8_0, DCE_VERSION_8_0,
DCE_VERSION_8_1,
DCE_VERSION_8_3,
DCE_VERSION_10_0, DCE_VERSION_10_0,
DCE_VERSION_11_0, DCE_VERSION_11_0,
DCE_VERSION_11_2, DCE_VERSION_11_2,
......
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