| Message ID | 20241009153424.15256-1-luanicaro@usp.br (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RFC] drm/amd/display/dc: Refactor remove duplications | expand |
Hi Luan, Sorry for the delay. Anyway, I ran your changes in our CI, and overall, everything looks good. I just have some comments for your V1. On 10/9/24 9:34 AM, Luan Icaro Pinto Arcanjo wrote: > From: LipArcanjo <luanicaroarcanjo@gmail.com> It looks like your Signed-off-by does not match with the author. > > All dce command_table_helper's shares a copy-pasted collection > of copy-pasted functions, which are: phy_id_to_atom, > clock_source_id_to_atom_phy_clk_src_id, and engine_bp_to_atom. > > This patch removes the multiple copy-pasted by creating a > common command table and make the command_table_helper's calls > the functions implemented by the common instead. > > The changes were not tested on actual hardware. I am only able > to verify that the changes keep the code compileable and do my > best to to look repeatedly if I am not actually changing any code. > > This is a re-sent PATCH, as I did not receive any reply to > the original one for about 2 months. > > Signed-off-by: Luan Icaro Pinto Arcanjo <luanicaro@usp.br> > --- > drivers/gpu/drm/amd/display/dc/bios/Makefile | 6 + > .../bios/dce110/command_table_helper_dce110.c | 104 +------------- > .../dce112/command_table_helper2_dce112.c | 104 +------------- > .../bios/dce112/command_table_helper_dce112.c | 104 +------------- > .../bios/dce60/command_table_helper_dce60.c | 106 +------------- > .../bios/dce80/command_table_helper_dce80.c | 106 +------------- > .../command_table_helper_dce_common.c | 133 ++++++++++++++++++ > .../command_table_helper_dce_common.h | 37 +++++ > 8 files changed, 183 insertions(+), 517 deletions(-) > create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.c > create mode 100644 drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.h > > diff --git a/drivers/gpu/drm/amd/display/dc/bios/Makefile b/drivers/gpu/drm/amd/display/dc/bios/Makefile > index ed6b5e9763f6..0d2f7ca1d0c2 100644 > --- a/drivers/gpu/drm/amd/display/dc/bios/Makefile > +++ b/drivers/gpu/drm/amd/display/dc/bios/Makefile > @@ -27,6 +27,7 @@ BIOS = bios_parser.o bios_parser_interface.o bios_parser_helper.o command_table > > BIOS += command_table2.o command_table_helper2.o bios_parser2.o > > + > AMD_DAL_BIOS = $(addprefix $(AMDDALPATH)/dc/bios/,$(BIOS)) > > AMD_DISPLAY_FILES += $(AMD_DAL_BIOS) > @@ -55,3 +56,8 @@ AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce110/command_table_helper_dce110.o > AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper_dce112.o > > AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper2_dce112.o > + > +############################################################################### > +# DCE COMMON > +############################################################################### > +AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce_common/command_table_helper_dce_common.o > diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c b/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c > index 11bf247bb180..6f8fec224b88 100644 > --- a/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c > +++ b/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c > @@ -31,38 +31,7 @@ > > #include "../command_table_helper.h" > > -static uint8_t phy_id_to_atom(enum transmitter t) > -{ > - uint8_t atom_phy_id; > - > - switch (t) { > - case TRANSMITTER_UNIPHY_A: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - case TRANSMITTER_UNIPHY_B: > - atom_phy_id = ATOM_PHY_ID_UNIPHYB; > - break; > - case TRANSMITTER_UNIPHY_C: > - atom_phy_id = ATOM_PHY_ID_UNIPHYC; > - break; > - case TRANSMITTER_UNIPHY_D: > - atom_phy_id = ATOM_PHY_ID_UNIPHYD; > - break; > - case TRANSMITTER_UNIPHY_E: > - atom_phy_id = ATOM_PHY_ID_UNIPHYE; > - break; > - case TRANSMITTER_UNIPHY_F: > - atom_phy_id = ATOM_PHY_ID_UNIPHYF; > - break; > - case TRANSMITTER_UNIPHY_G: > - atom_phy_id = ATOM_PHY_ID_UNIPHYG; > - break; > - default: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - } > - return atom_phy_id; > -} > +#include "../dce_common/command_table_helper_dce_common.h" > > static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > { > @@ -94,32 +63,6 @@ static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > return atom_dig_mode; > } > > -static uint8_t clock_source_id_to_atom_phy_clk_src_id( > - enum clock_source_id id) > -{ > - uint8_t atom_phy_clk_src_id = 0; > - > - switch (id) { > - case CLOCK_SOURCE_ID_PLL0: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; > - break; > - case CLOCK_SOURCE_ID_PLL1: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - case CLOCK_SOURCE_ID_PLL2: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; > - break; > - case CLOCK_SOURCE_ID_EXTERNAL: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; > - break; > - default: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - } > - > - return atom_phy_clk_src_id >> 2; > -} > - > static uint8_t hpd_sel_to_atom(enum hpd_source_id id) > { > uint8_t atom_hpd_sel = 0; > @@ -207,51 +150,6 @@ static bool clock_source_id_to_atom( > return result; > } > > -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) > -{ > - bool result = false; > - > - if (atom_engine_id != NULL) > - switch (id) { > - case ENGINE_ID_DIGA: > - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGB: > - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGC: > - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGD: > - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGE: > - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGF: > - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGG: > - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DACA: > - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; > - result = true; > - break; > - default: > - break; > - } > - > - return result; > -} > - > static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) > { > uint8_t atom_action = 0; > diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c > index 755b6e33140a..3392277ac3b6 100644 > --- a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c > +++ b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c > @@ -31,38 +31,7 @@ > > #include "../command_table_helper2.h" > > -static uint8_t phy_id_to_atom(enum transmitter t) > -{ > - uint8_t atom_phy_id; > - > - switch (t) { > - case TRANSMITTER_UNIPHY_A: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - case TRANSMITTER_UNIPHY_B: > - atom_phy_id = ATOM_PHY_ID_UNIPHYB; > - break; > - case TRANSMITTER_UNIPHY_C: > - atom_phy_id = ATOM_PHY_ID_UNIPHYC; > - break; > - case TRANSMITTER_UNIPHY_D: > - atom_phy_id = ATOM_PHY_ID_UNIPHYD; > - break; > - case TRANSMITTER_UNIPHY_E: > - atom_phy_id = ATOM_PHY_ID_UNIPHYE; > - break; > - case TRANSMITTER_UNIPHY_F: > - atom_phy_id = ATOM_PHY_ID_UNIPHYF; > - break; > - case TRANSMITTER_UNIPHY_G: > - atom_phy_id = ATOM_PHY_ID_UNIPHYG; > - break; > - default: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - } > - return atom_phy_id; > -} > +#include "../dce_common/command_table_helper_dce_common.h" > > static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > { > @@ -91,32 +60,6 @@ static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > return atom_dig_mode; > } > > -static uint8_t clock_source_id_to_atom_phy_clk_src_id( > - enum clock_source_id id) > -{ > - uint8_t atom_phy_clk_src_id = 0; > - > - switch (id) { > - case CLOCK_SOURCE_ID_PLL0: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; > - break; > - case CLOCK_SOURCE_ID_PLL1: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - case CLOCK_SOURCE_ID_PLL2: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; > - break; > - case CLOCK_SOURCE_ID_EXTERNAL: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; > - break; > - default: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - } > - > - return atom_phy_clk_src_id >> 2; > -} > - > static uint8_t hpd_sel_to_atom(enum hpd_source_id id) > { > uint8_t atom_hpd_sel = 0; > @@ -209,51 +152,6 @@ static bool clock_source_id_to_atom( > return result; > } > > -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) > -{ > - bool result = false; > - > - if (atom_engine_id != NULL) > - switch (id) { > - case ENGINE_ID_DIGA: > - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGB: > - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGC: > - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGD: > - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGE: > - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGF: > - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGG: > - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DACA: > - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; > - result = true; > - break; > - default: > - break; > - } > - > - return result; > -} > - > static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) > { > uint8_t atom_action = 0; > diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c > index 06b4f7fa4a50..39b199b388e4 100644 > --- a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c > +++ b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c > @@ -31,38 +31,7 @@ > > #include "../command_table_helper.h" > > -static uint8_t phy_id_to_atom(enum transmitter t) > -{ > - uint8_t atom_phy_id; > - > - switch (t) { > - case TRANSMITTER_UNIPHY_A: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - case TRANSMITTER_UNIPHY_B: > - atom_phy_id = ATOM_PHY_ID_UNIPHYB; > - break; > - case TRANSMITTER_UNIPHY_C: > - atom_phy_id = ATOM_PHY_ID_UNIPHYC; > - break; > - case TRANSMITTER_UNIPHY_D: > - atom_phy_id = ATOM_PHY_ID_UNIPHYD; > - break; > - case TRANSMITTER_UNIPHY_E: > - atom_phy_id = ATOM_PHY_ID_UNIPHYE; > - break; > - case TRANSMITTER_UNIPHY_F: > - atom_phy_id = ATOM_PHY_ID_UNIPHYF; > - break; > - case TRANSMITTER_UNIPHY_G: > - atom_phy_id = ATOM_PHY_ID_UNIPHYG; > - break; > - default: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - } > - return atom_phy_id; > -} > +#include "../dce_common/command_table_helper_dce_common.h" > > static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > { > @@ -91,32 +60,6 @@ static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > return atom_dig_mode; > } > > -static uint8_t clock_source_id_to_atom_phy_clk_src_id( > - enum clock_source_id id) > -{ > - uint8_t atom_phy_clk_src_id = 0; > - > - switch (id) { > - case CLOCK_SOURCE_ID_PLL0: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; > - break; > - case CLOCK_SOURCE_ID_PLL1: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - case CLOCK_SOURCE_ID_PLL2: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; > - break; > - case CLOCK_SOURCE_ID_EXTERNAL: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; > - break; > - default: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - } > - > - return atom_phy_clk_src_id >> 2; > -} > - > static uint8_t hpd_sel_to_atom(enum hpd_source_id id) > { > uint8_t atom_hpd_sel = 0; > @@ -209,51 +152,6 @@ static bool clock_source_id_to_atom( > return result; > } > > -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) > -{ > - bool result = false; > - > - if (atom_engine_id != NULL) > - switch (id) { > - case ENGINE_ID_DIGA: > - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGB: > - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGC: > - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGD: > - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGE: > - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGF: > - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGG: > - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DACA: > - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; > - result = true; > - break; > - default: > - break; > - } > - > - return result; > -} > - > static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) > { > uint8_t atom_action = 0; > diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c b/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c > index 710221b4f5c5..49b3c6fd648d 100644 > --- a/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c > +++ b/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c > @@ -33,6 +33,8 @@ > > #include "../command_table_helper.h" > > +#include "../dce_common/command_table_helper_dce_common.h" > + > static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) > { > uint8_t atom_action = 0; > @@ -58,51 +60,6 @@ static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) > return atom_action; > } > > -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) > -{ > - bool result = false; > - > - if (atom_engine_id != NULL) > - switch (id) { > - case ENGINE_ID_DIGA: > - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGB: > - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGC: > - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGD: > - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGE: > - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGF: > - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGG: > - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DACA: > - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; > - result = true; > - break; > - default: > - break; > - } > - > - return result; > -} > - > static bool clock_source_id_to_atom( > enum clock_source_id id, > uint32_t *atom_pll_id) > @@ -149,32 +106,6 @@ static bool clock_source_id_to_atom( > return result; > } > > -static uint8_t clock_source_id_to_atom_phy_clk_src_id( > - enum clock_source_id id) > -{ > - uint8_t atom_phy_clk_src_id = 0; > - > - switch (id) { > - case CLOCK_SOURCE_ID_PLL0: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; > - break; > - case CLOCK_SOURCE_ID_PLL1: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - case CLOCK_SOURCE_ID_PLL2: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; > - break; > - case CLOCK_SOURCE_ID_EXTERNAL: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; > - break; > - default: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - } > - > - return atom_phy_clk_src_id >> 2; > -} > - > static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > { > uint8_t atom_dig_mode = ATOM_TRANSMITTER_DIGMODE_V5_DP; > @@ -270,39 +201,6 @@ static uint8_t dig_encoder_sel_to_atom(enum engine_id id) > return atom_dig_encoder_sel; > } > > -static uint8_t phy_id_to_atom(enum transmitter t) > -{ > - uint8_t atom_phy_id; > - > - switch (t) { > - case TRANSMITTER_UNIPHY_A: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - case TRANSMITTER_UNIPHY_B: > - atom_phy_id = ATOM_PHY_ID_UNIPHYB; > - break; > - case TRANSMITTER_UNIPHY_C: > - atom_phy_id = ATOM_PHY_ID_UNIPHYC; > - break; > - case TRANSMITTER_UNIPHY_D: > - atom_phy_id = ATOM_PHY_ID_UNIPHYD; > - break; > - case TRANSMITTER_UNIPHY_E: > - atom_phy_id = ATOM_PHY_ID_UNIPHYE; > - break; > - case TRANSMITTER_UNIPHY_F: > - atom_phy_id = ATOM_PHY_ID_UNIPHYF; > - break; > - case TRANSMITTER_UNIPHY_G: > - atom_phy_id = ATOM_PHY_ID_UNIPHYG; > - break; > - default: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - } > - return atom_phy_id; > -} > - > static uint8_t disp_power_gating_action_to_atom( > enum bp_pipe_control_action action) > { > diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c b/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c > index 8b30b558cf1f..f8c66e3a8f08 100644 > --- a/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c > +++ b/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c > @@ -33,6 +33,8 @@ > > #include "../command_table_helper.h" > > +#include "../dce_common/command_table_helper_dce_common.h" > + > static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) > { > uint8_t atom_action = 0; > @@ -58,51 +60,6 @@ static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) > return atom_action; > } > > -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) > -{ > - bool result = false; > - > - if (atom_engine_id != NULL) > - switch (id) { > - case ENGINE_ID_DIGA: > - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGB: > - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGC: > - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGD: > - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGE: > - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGF: > - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DIGG: > - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; > - result = true; > - break; > - case ENGINE_ID_DACA: > - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; > - result = true; > - break; > - default: > - break; > - } > - > - return result; > -} > - > static bool clock_source_id_to_atom( > enum clock_source_id id, > uint32_t *atom_pll_id) > @@ -149,32 +106,6 @@ static bool clock_source_id_to_atom( > return result; > } > > -static uint8_t clock_source_id_to_atom_phy_clk_src_id( > - enum clock_source_id id) > -{ > - uint8_t atom_phy_clk_src_id = 0; > - > - switch (id) { > - case CLOCK_SOURCE_ID_PLL0: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; > - break; > - case CLOCK_SOURCE_ID_PLL1: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - case CLOCK_SOURCE_ID_PLL2: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; > - break; > - case CLOCK_SOURCE_ID_EXTERNAL: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; > - break; > - default: > - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > - break; > - } > - > - return atom_phy_clk_src_id >> 2; > -} > - > static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) > { > uint8_t atom_dig_mode = ATOM_TRANSMITTER_DIGMODE_V5_DP; > @@ -270,39 +201,6 @@ static uint8_t dig_encoder_sel_to_atom(enum engine_id id) > return atom_dig_encoder_sel; > } > > -static uint8_t phy_id_to_atom(enum transmitter t) > -{ > - uint8_t atom_phy_id; > - > - switch (t) { > - case TRANSMITTER_UNIPHY_A: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - case TRANSMITTER_UNIPHY_B: > - atom_phy_id = ATOM_PHY_ID_UNIPHYB; > - break; > - case TRANSMITTER_UNIPHY_C: > - atom_phy_id = ATOM_PHY_ID_UNIPHYC; > - break; > - case TRANSMITTER_UNIPHY_D: > - atom_phy_id = ATOM_PHY_ID_UNIPHYD; > - break; > - case TRANSMITTER_UNIPHY_E: > - atom_phy_id = ATOM_PHY_ID_UNIPHYE; > - break; > - case TRANSMITTER_UNIPHY_F: > - atom_phy_id = ATOM_PHY_ID_UNIPHYF; > - break; > - case TRANSMITTER_UNIPHY_G: > - atom_phy_id = ATOM_PHY_ID_UNIPHYG; > - break; > - default: > - atom_phy_id = ATOM_PHY_ID_UNIPHYA; > - break; > - } > - return atom_phy_id; > -} > - > static uint8_t disp_power_gating_action_to_atom( > enum bp_pipe_control_action action) > { > diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.c b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.c > new file mode 100644 > index 000000000000..44793c3a28e0 > --- /dev/null > +++ b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.c > @@ -0,0 +1,133 @@ > +/* > + * Copyright 2012-15 Advanced Micro Devices, Inc. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + * > + * Authors: AMD > + * > + */ > + Just use: // SPDX-License-Identifier: MIT > +#include "dm_services.h" > +#include "atom.h" > + > +#include "command_table_helper_dce_common.h" > + > +uint8_t phy_id_to_atom(enum transmitter t) > +{ > + uint8_t atom_phy_id; > + > + switch (t) { > + case TRANSMITTER_UNIPHY_A: > + atom_phy_id = ATOM_PHY_ID_UNIPHYA; > + break; > + case TRANSMITTER_UNIPHY_B: > + atom_phy_id = ATOM_PHY_ID_UNIPHYB; > + break; > + case TRANSMITTER_UNIPHY_C: > + atom_phy_id = ATOM_PHY_ID_UNIPHYC; > + break; > + case TRANSMITTER_UNIPHY_D: > + atom_phy_id = ATOM_PHY_ID_UNIPHYD; > + break; > + case TRANSMITTER_UNIPHY_E: > + atom_phy_id = ATOM_PHY_ID_UNIPHYE; > + break; > + case TRANSMITTER_UNIPHY_F: > + atom_phy_id = ATOM_PHY_ID_UNIPHYF; > + break; > + case TRANSMITTER_UNIPHY_G: > + atom_phy_id = ATOM_PHY_ID_UNIPHYG; > + break; > + default: > + atom_phy_id = ATOM_PHY_ID_UNIPHYA; > + break; > + } > + return atom_phy_id; > +} > + > +uint8_t clock_source_id_to_atom_phy_clk_src_id( > + enum clock_source_id id) > +{ > + uint8_t atom_phy_clk_src_id = 0; > + > + switch (id) { > + case CLOCK_SOURCE_ID_PLL0: > + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; > + break; > + case CLOCK_SOURCE_ID_PLL1: > + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > + break; > + case CLOCK_SOURCE_ID_PLL2: > + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; > + break; > + case CLOCK_SOURCE_ID_EXTERNAL: > + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; > + break; > + default: > + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; > + break; > + } > + > + return atom_phy_clk_src_id >> 2; > +} > + > +bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) > +{ > + bool result = false; > + > + if (atom_engine_id != NULL) > + switch (id) { > + case ENGINE_ID_DIGA: > + *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; > + result = true; > + break; > + case ENGINE_ID_DIGB: > + *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; > + result = true; > + break; > + case ENGINE_ID_DIGC: > + *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; > + result = true; > + break; > + case ENGINE_ID_DIGD: > + *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; > + result = true; > + break; > + case ENGINE_ID_DIGE: > + *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; > + result = true; > + break; > + case ENGINE_ID_DIGF: > + *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; > + result = true; > + break; > + case ENGINE_ID_DIGG: > + *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; > + result = true; > + break; > + case ENGINE_ID_DACA: > + *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; > + result = true; > + break; > + default: > + break; > + } > + > + return result; > +} > diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.h b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.h > new file mode 100644 > index 000000000000..6c9246a6e4e6 > --- /dev/null > +++ b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.h > @@ -0,0 +1,37 @@ > +/* > + * Copyright 2012-15 Advanced Micro Devices, Inc. > + * > + * Permission is hereby granted, free of charge, to any person obtaining a > + * copy of this software and associated documentation files (the "Software"), > + * to deal in the Software without restriction, including without limitation > + * the rights to use, copy, modify, merge, publish, distribute, sublicense, > + * and/or sell copies of the Software, and to permit persons to whom the > + * Software is furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL > + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR > + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, > + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR > + * OTHER DEALINGS IN THE SOFTWARE. > + * > + * Authors: AMD > + * > + */ Just use /* SPDX-License-Identifier: MIT */ Thanks Siqueira > + > +#ifndef __DAL_COMMAND_TABLE_HELPER_DCE_COMMON_H__ > +#define __DAL_COMMAND_TABLE_HELPER_DCE_COMMON_H__ > + > + > +uint8_t phy_id_to_atom(enum transmitter t); > + > +uint8_t clock_source_id_to_atom_phy_clk_src_id( > + enum clock_source_id id); > + > +bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id); > + > +#endif
diff --git a/drivers/gpu/drm/amd/display/dc/bios/Makefile b/drivers/gpu/drm/amd/display/dc/bios/Makefile index ed6b5e9763f6..0d2f7ca1d0c2 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/Makefile +++ b/drivers/gpu/drm/amd/display/dc/bios/Makefile @@ -27,6 +27,7 @@ BIOS = bios_parser.o bios_parser_interface.o bios_parser_helper.o command_table BIOS += command_table2.o command_table_helper2.o bios_parser2.o + AMD_DAL_BIOS = $(addprefix $(AMDDALPATH)/dc/bios/,$(BIOS)) AMD_DISPLAY_FILES += $(AMD_DAL_BIOS) @@ -55,3 +56,8 @@ AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce110/command_table_helper_dce110.o AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper_dce112.o AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce112/command_table_helper2_dce112.o + +############################################################################### +# DCE COMMON +############################################################################### +AMD_DISPLAY_FILES += $(AMDDALPATH)/dc/bios/dce_common/command_table_helper_dce_common.o diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c b/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c index 11bf247bb180..6f8fec224b88 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c +++ b/drivers/gpu/drm/amd/display/dc/bios/dce110/command_table_helper_dce110.c @@ -31,38 +31,7 @@ #include "../command_table_helper.h" -static uint8_t phy_id_to_atom(enum transmitter t) -{ - uint8_t atom_phy_id; - - switch (t) { - case TRANSMITTER_UNIPHY_A: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - case TRANSMITTER_UNIPHY_B: - atom_phy_id = ATOM_PHY_ID_UNIPHYB; - break; - case TRANSMITTER_UNIPHY_C: - atom_phy_id = ATOM_PHY_ID_UNIPHYC; - break; - case TRANSMITTER_UNIPHY_D: - atom_phy_id = ATOM_PHY_ID_UNIPHYD; - break; - case TRANSMITTER_UNIPHY_E: - atom_phy_id = ATOM_PHY_ID_UNIPHYE; - break; - case TRANSMITTER_UNIPHY_F: - atom_phy_id = ATOM_PHY_ID_UNIPHYF; - break; - case TRANSMITTER_UNIPHY_G: - atom_phy_id = ATOM_PHY_ID_UNIPHYG; - break; - default: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - } - return atom_phy_id; -} +#include "../dce_common/command_table_helper_dce_common.h" static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) { @@ -94,32 +63,6 @@ static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) return atom_dig_mode; } -static uint8_t clock_source_id_to_atom_phy_clk_src_id( - enum clock_source_id id) -{ - uint8_t atom_phy_clk_src_id = 0; - - switch (id) { - case CLOCK_SOURCE_ID_PLL0: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; - break; - case CLOCK_SOURCE_ID_PLL1: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - case CLOCK_SOURCE_ID_PLL2: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; - break; - case CLOCK_SOURCE_ID_EXTERNAL: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; - break; - default: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - } - - return atom_phy_clk_src_id >> 2; -} - static uint8_t hpd_sel_to_atom(enum hpd_source_id id) { uint8_t atom_hpd_sel = 0; @@ -207,51 +150,6 @@ static bool clock_source_id_to_atom( return result; } -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) -{ - bool result = false; - - if (atom_engine_id != NULL) - switch (id) { - case ENGINE_ID_DIGA: - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGB: - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGC: - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGD: - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGE: - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGF: - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGG: - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DACA: - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; - result = true; - break; - default: - break; - } - - return result; -} - static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) { uint8_t atom_action = 0; diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c index 755b6e33140a..3392277ac3b6 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c +++ b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper2_dce112.c @@ -31,38 +31,7 @@ #include "../command_table_helper2.h" -static uint8_t phy_id_to_atom(enum transmitter t) -{ - uint8_t atom_phy_id; - - switch (t) { - case TRANSMITTER_UNIPHY_A: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - case TRANSMITTER_UNIPHY_B: - atom_phy_id = ATOM_PHY_ID_UNIPHYB; - break; - case TRANSMITTER_UNIPHY_C: - atom_phy_id = ATOM_PHY_ID_UNIPHYC; - break; - case TRANSMITTER_UNIPHY_D: - atom_phy_id = ATOM_PHY_ID_UNIPHYD; - break; - case TRANSMITTER_UNIPHY_E: - atom_phy_id = ATOM_PHY_ID_UNIPHYE; - break; - case TRANSMITTER_UNIPHY_F: - atom_phy_id = ATOM_PHY_ID_UNIPHYF; - break; - case TRANSMITTER_UNIPHY_G: - atom_phy_id = ATOM_PHY_ID_UNIPHYG; - break; - default: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - } - return atom_phy_id; -} +#include "../dce_common/command_table_helper_dce_common.h" static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) { @@ -91,32 +60,6 @@ static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) return atom_dig_mode; } -static uint8_t clock_source_id_to_atom_phy_clk_src_id( - enum clock_source_id id) -{ - uint8_t atom_phy_clk_src_id = 0; - - switch (id) { - case CLOCK_SOURCE_ID_PLL0: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; - break; - case CLOCK_SOURCE_ID_PLL1: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - case CLOCK_SOURCE_ID_PLL2: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; - break; - case CLOCK_SOURCE_ID_EXTERNAL: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; - break; - default: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - } - - return atom_phy_clk_src_id >> 2; -} - static uint8_t hpd_sel_to_atom(enum hpd_source_id id) { uint8_t atom_hpd_sel = 0; @@ -209,51 +152,6 @@ static bool clock_source_id_to_atom( return result; } -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) -{ - bool result = false; - - if (atom_engine_id != NULL) - switch (id) { - case ENGINE_ID_DIGA: - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGB: - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGC: - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGD: - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGE: - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGF: - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGG: - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DACA: - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; - result = true; - break; - default: - break; - } - - return result; -} - static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) { uint8_t atom_action = 0; diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c index 06b4f7fa4a50..39b199b388e4 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c +++ b/drivers/gpu/drm/amd/display/dc/bios/dce112/command_table_helper_dce112.c @@ -31,38 +31,7 @@ #include "../command_table_helper.h" -static uint8_t phy_id_to_atom(enum transmitter t) -{ - uint8_t atom_phy_id; - - switch (t) { - case TRANSMITTER_UNIPHY_A: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - case TRANSMITTER_UNIPHY_B: - atom_phy_id = ATOM_PHY_ID_UNIPHYB; - break; - case TRANSMITTER_UNIPHY_C: - atom_phy_id = ATOM_PHY_ID_UNIPHYC; - break; - case TRANSMITTER_UNIPHY_D: - atom_phy_id = ATOM_PHY_ID_UNIPHYD; - break; - case TRANSMITTER_UNIPHY_E: - atom_phy_id = ATOM_PHY_ID_UNIPHYE; - break; - case TRANSMITTER_UNIPHY_F: - atom_phy_id = ATOM_PHY_ID_UNIPHYF; - break; - case TRANSMITTER_UNIPHY_G: - atom_phy_id = ATOM_PHY_ID_UNIPHYG; - break; - default: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - } - return atom_phy_id; -} +#include "../dce_common/command_table_helper_dce_common.h" static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) { @@ -91,32 +60,6 @@ static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) return atom_dig_mode; } -static uint8_t clock_source_id_to_atom_phy_clk_src_id( - enum clock_source_id id) -{ - uint8_t atom_phy_clk_src_id = 0; - - switch (id) { - case CLOCK_SOURCE_ID_PLL0: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; - break; - case CLOCK_SOURCE_ID_PLL1: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - case CLOCK_SOURCE_ID_PLL2: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; - break; - case CLOCK_SOURCE_ID_EXTERNAL: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; - break; - default: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - } - - return atom_phy_clk_src_id >> 2; -} - static uint8_t hpd_sel_to_atom(enum hpd_source_id id) { uint8_t atom_hpd_sel = 0; @@ -209,51 +152,6 @@ static bool clock_source_id_to_atom( return result; } -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) -{ - bool result = false; - - if (atom_engine_id != NULL) - switch (id) { - case ENGINE_ID_DIGA: - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGB: - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGC: - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGD: - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGE: - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGF: - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGG: - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DACA: - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; - result = true; - break; - default: - break; - } - - return result; -} - static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) { uint8_t atom_action = 0; diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c b/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c index 710221b4f5c5..49b3c6fd648d 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c +++ b/drivers/gpu/drm/amd/display/dc/bios/dce60/command_table_helper_dce60.c @@ -33,6 +33,8 @@ #include "../command_table_helper.h" +#include "../dce_common/command_table_helper_dce_common.h" + static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) { uint8_t atom_action = 0; @@ -58,51 +60,6 @@ static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) return atom_action; } -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) -{ - bool result = false; - - if (atom_engine_id != NULL) - switch (id) { - case ENGINE_ID_DIGA: - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGB: - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGC: - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGD: - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGE: - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGF: - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGG: - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DACA: - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; - result = true; - break; - default: - break; - } - - return result; -} - static bool clock_source_id_to_atom( enum clock_source_id id, uint32_t *atom_pll_id) @@ -149,32 +106,6 @@ static bool clock_source_id_to_atom( return result; } -static uint8_t clock_source_id_to_atom_phy_clk_src_id( - enum clock_source_id id) -{ - uint8_t atom_phy_clk_src_id = 0; - - switch (id) { - case CLOCK_SOURCE_ID_PLL0: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; - break; - case CLOCK_SOURCE_ID_PLL1: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - case CLOCK_SOURCE_ID_PLL2: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; - break; - case CLOCK_SOURCE_ID_EXTERNAL: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; - break; - default: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - } - - return atom_phy_clk_src_id >> 2; -} - static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) { uint8_t atom_dig_mode = ATOM_TRANSMITTER_DIGMODE_V5_DP; @@ -270,39 +201,6 @@ static uint8_t dig_encoder_sel_to_atom(enum engine_id id) return atom_dig_encoder_sel; } -static uint8_t phy_id_to_atom(enum transmitter t) -{ - uint8_t atom_phy_id; - - switch (t) { - case TRANSMITTER_UNIPHY_A: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - case TRANSMITTER_UNIPHY_B: - atom_phy_id = ATOM_PHY_ID_UNIPHYB; - break; - case TRANSMITTER_UNIPHY_C: - atom_phy_id = ATOM_PHY_ID_UNIPHYC; - break; - case TRANSMITTER_UNIPHY_D: - atom_phy_id = ATOM_PHY_ID_UNIPHYD; - break; - case TRANSMITTER_UNIPHY_E: - atom_phy_id = ATOM_PHY_ID_UNIPHYE; - break; - case TRANSMITTER_UNIPHY_F: - atom_phy_id = ATOM_PHY_ID_UNIPHYF; - break; - case TRANSMITTER_UNIPHY_G: - atom_phy_id = ATOM_PHY_ID_UNIPHYG; - break; - default: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - } - return atom_phy_id; -} - static uint8_t disp_power_gating_action_to_atom( enum bp_pipe_control_action action) { diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c b/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c index 8b30b558cf1f..f8c66e3a8f08 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c +++ b/drivers/gpu/drm/amd/display/dc/bios/dce80/command_table_helper_dce80.c @@ -33,6 +33,8 @@ #include "../command_table_helper.h" +#include "../dce_common/command_table_helper_dce_common.h" + static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) { uint8_t atom_action = 0; @@ -58,51 +60,6 @@ static uint8_t encoder_action_to_atom(enum bp_encoder_control_action action) return atom_action; } -static bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) -{ - bool result = false; - - if (atom_engine_id != NULL) - switch (id) { - case ENGINE_ID_DIGA: - *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGB: - *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGC: - *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGD: - *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGE: - *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGF: - *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DIGG: - *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; - result = true; - break; - case ENGINE_ID_DACA: - *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; - result = true; - break; - default: - break; - } - - return result; -} - static bool clock_source_id_to_atom( enum clock_source_id id, uint32_t *atom_pll_id) @@ -149,32 +106,6 @@ static bool clock_source_id_to_atom( return result; } -static uint8_t clock_source_id_to_atom_phy_clk_src_id( - enum clock_source_id id) -{ - uint8_t atom_phy_clk_src_id = 0; - - switch (id) { - case CLOCK_SOURCE_ID_PLL0: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; - break; - case CLOCK_SOURCE_ID_PLL1: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - case CLOCK_SOURCE_ID_PLL2: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; - break; - case CLOCK_SOURCE_ID_EXTERNAL: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; - break; - default: - atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; - break; - } - - return atom_phy_clk_src_id >> 2; -} - static uint8_t signal_type_to_atom_dig_mode(enum signal_type s) { uint8_t atom_dig_mode = ATOM_TRANSMITTER_DIGMODE_V5_DP; @@ -270,39 +201,6 @@ static uint8_t dig_encoder_sel_to_atom(enum engine_id id) return atom_dig_encoder_sel; } -static uint8_t phy_id_to_atom(enum transmitter t) -{ - uint8_t atom_phy_id; - - switch (t) { - case TRANSMITTER_UNIPHY_A: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - case TRANSMITTER_UNIPHY_B: - atom_phy_id = ATOM_PHY_ID_UNIPHYB; - break; - case TRANSMITTER_UNIPHY_C: - atom_phy_id = ATOM_PHY_ID_UNIPHYC; - break; - case TRANSMITTER_UNIPHY_D: - atom_phy_id = ATOM_PHY_ID_UNIPHYD; - break; - case TRANSMITTER_UNIPHY_E: - atom_phy_id = ATOM_PHY_ID_UNIPHYE; - break; - case TRANSMITTER_UNIPHY_F: - atom_phy_id = ATOM_PHY_ID_UNIPHYF; - break; - case TRANSMITTER_UNIPHY_G: - atom_phy_id = ATOM_PHY_ID_UNIPHYG; - break; - default: - atom_phy_id = ATOM_PHY_ID_UNIPHYA; - break; - } - return atom_phy_id; -} - static uint8_t disp_power_gating_action_to_atom( enum bp_pipe_control_action action) { diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.c b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.c new file mode 100644 index 000000000000..44793c3a28e0 --- /dev/null +++ b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.c @@ -0,0 +1,133 @@ +/* + * Copyright 2012-15 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Authors: AMD + * + */ + +#include "dm_services.h" +#include "atom.h" + +#include "command_table_helper_dce_common.h" + +uint8_t phy_id_to_atom(enum transmitter t) +{ + uint8_t atom_phy_id; + + switch (t) { + case TRANSMITTER_UNIPHY_A: + atom_phy_id = ATOM_PHY_ID_UNIPHYA; + break; + case TRANSMITTER_UNIPHY_B: + atom_phy_id = ATOM_PHY_ID_UNIPHYB; + break; + case TRANSMITTER_UNIPHY_C: + atom_phy_id = ATOM_PHY_ID_UNIPHYC; + break; + case TRANSMITTER_UNIPHY_D: + atom_phy_id = ATOM_PHY_ID_UNIPHYD; + break; + case TRANSMITTER_UNIPHY_E: + atom_phy_id = ATOM_PHY_ID_UNIPHYE; + break; + case TRANSMITTER_UNIPHY_F: + atom_phy_id = ATOM_PHY_ID_UNIPHYF; + break; + case TRANSMITTER_UNIPHY_G: + atom_phy_id = ATOM_PHY_ID_UNIPHYG; + break; + default: + atom_phy_id = ATOM_PHY_ID_UNIPHYA; + break; + } + return atom_phy_id; +} + +uint8_t clock_source_id_to_atom_phy_clk_src_id( + enum clock_source_id id) +{ + uint8_t atom_phy_clk_src_id = 0; + + switch (id) { + case CLOCK_SOURCE_ID_PLL0: + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P0PLL; + break; + case CLOCK_SOURCE_ID_PLL1: + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; + break; + case CLOCK_SOURCE_ID_PLL2: + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P2PLL; + break; + case CLOCK_SOURCE_ID_EXTERNAL: + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_REFCLK_SRC_EXT; + break; + default: + atom_phy_clk_src_id = ATOM_TRANSMITTER_CONFIG_V5_P1PLL; + break; + } + + return atom_phy_clk_src_id >> 2; +} + +bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id) +{ + bool result = false; + + if (atom_engine_id != NULL) + switch (id) { + case ENGINE_ID_DIGA: + *atom_engine_id = ASIC_INT_DIG1_ENCODER_ID; + result = true; + break; + case ENGINE_ID_DIGB: + *atom_engine_id = ASIC_INT_DIG2_ENCODER_ID; + result = true; + break; + case ENGINE_ID_DIGC: + *atom_engine_id = ASIC_INT_DIG3_ENCODER_ID; + result = true; + break; + case ENGINE_ID_DIGD: + *atom_engine_id = ASIC_INT_DIG4_ENCODER_ID; + result = true; + break; + case ENGINE_ID_DIGE: + *atom_engine_id = ASIC_INT_DIG5_ENCODER_ID; + result = true; + break; + case ENGINE_ID_DIGF: + *atom_engine_id = ASIC_INT_DIG6_ENCODER_ID; + result = true; + break; + case ENGINE_ID_DIGG: + *atom_engine_id = ASIC_INT_DIG7_ENCODER_ID; + result = true; + break; + case ENGINE_ID_DACA: + *atom_engine_id = ASIC_INT_DAC1_ENCODER_ID; + result = true; + break; + default: + break; + } + + return result; +} diff --git a/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.h b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.h new file mode 100644 index 000000000000..6c9246a6e4e6 --- /dev/null +++ b/drivers/gpu/drm/amd/display/dc/bios/dce_common/command_table_helper_dce_common.h @@ -0,0 +1,37 @@ +/* + * Copyright 2012-15 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + * Authors: AMD + * + */ + +#ifndef __DAL_COMMAND_TABLE_HELPER_DCE_COMMON_H__ +#define __DAL_COMMAND_TABLE_HELPER_DCE_COMMON_H__ + + +uint8_t phy_id_to_atom(enum transmitter t); + +uint8_t clock_source_id_to_atom_phy_clk_src_id( + enum clock_source_id id); + +bool engine_bp_to_atom(enum engine_id id, uint32_t *atom_engine_id); + +#endif