Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1515a47b authored by Harry Wentland's avatar Harry Wentland Committed by Alex Deucher
Browse files

drm/amd/display: Rename firmware_info to dc_firmware_info 



This is to avoid conflicts with amdgpu's firmware_info once we
merge amdgpu_dm_types with amdgpu_dm.

Signed-off-by: default avatarHarry Wentland <harry.wentland@amd.com>
Reviewed-by: default avatarTony Cheng <Tony.Cheng@amd.com>
Acked-by: default avatarHarry Wentland <Harry.Wentland@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1c3fb02d

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c

+7 −7
Original line number Diff line number Diff line
@@ -622,17 +622,17 @@ static enum bp_result bios_parser_get_device_tag( 


static enum bp_result get_firmware_info_v1_4(

	struct bios_parser *bp,

	struct firmware_info *info);

	struct dc_firmware_info *info);

static enum bp_result get_firmware_info_v2_1(

	struct bios_parser *bp,

	struct firmware_info *info);

	struct dc_firmware_info *info);

static enum bp_result get_firmware_info_v2_2(

	struct bios_parser *bp,

	struct firmware_info *info);

	struct dc_firmware_info *info);



static enum bp_result bios_parser_get_firmware_info(

	struct dc_bios *dcb,

	struct firmware_info *info)

	struct dc_firmware_info *info)

{

	struct bios_parser *bp = BP_FROM_DCB(dcb);

	enum bp_result result = BP_RESULT_BADBIOSTABLE;
@@ -676,7 +676,7 @@ static enum bp_result bios_parser_get_firmware_info( 


static enum bp_result get_firmware_info_v1_4(

	struct bios_parser *bp,

	struct firmware_info *info)

	struct dc_firmware_info *info)

{

	ATOM_FIRMWARE_INFO_V1_4 *firmware_info =

		GET_IMAGE(ATOM_FIRMWARE_INFO_V1_4,
@@ -726,7 +726,7 @@ static enum bp_result get_ss_info_v3_1( 


static enum bp_result get_firmware_info_v2_1(

	struct bios_parser *bp,

	struct firmware_info *info)

	struct dc_firmware_info *info)

{

	ATOM_FIRMWARE_INFO_V2_1 *firmwareInfo =

		GET_IMAGE(ATOM_FIRMWARE_INFO_V2_1, DATA_TABLES(FirmwareInfo));
@@ -810,7 +810,7 @@ static enum bp_result get_firmware_info_v2_1( 


static enum bp_result get_firmware_info_v2_2(

	struct bios_parser *bp,

	struct firmware_info *info)

	struct dc_firmware_info *info)

{

	ATOM_FIRMWARE_INFO_V2_2 *firmware_info;

	struct spread_spectrum_info internal_ss;

drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c

+4 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static enum bp_result get_gpio_i2c_info(struct bios_parser *bp, 


static enum bp_result bios_parser_get_firmware_info(

	struct dc_bios *dcb,

	struct firmware_info *info);

	struct dc_firmware_info *info);



static enum bp_result bios_parser_get_encoder_cap_info(

	struct dc_bios *dcb,
@@ -90,7 +90,7 @@ static enum bp_result bios_parser_get_encoder_cap_info( 


static enum bp_result get_firmware_info_v3_1(

	struct bios_parser *bp,

	struct firmware_info *info);

	struct dc_firmware_info *info);



static struct atom_hpd_int_record *get_hpd_record(struct bios_parser *bp,

		struct atom_display_object_path_v2 *object);
@@ -1583,7 +1583,7 @@ static void bios_parser_set_scratch_critical_state( 


static enum bp_result bios_parser_get_firmware_info(

	struct dc_bios *dcb,

	struct firmware_info *info)

	struct dc_firmware_info *info)

{

	struct bios_parser *bp = BP_FROM_DCB(dcb);

	enum bp_result result = BP_RESULT_BADBIOSTABLE;
@@ -1615,7 +1615,7 @@ static enum bp_result bios_parser_get_firmware_info( 


static enum bp_result get_firmware_info_v3_1(

	struct bios_parser *bp,

	struct firmware_info *info)

	struct dc_firmware_info *info)

{

	struct atom_firmware_info_v3_1 *firmware_info;

	struct atom_display_controller_info_v4_1 *dce_info = NULL;

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+1 −1
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ struct resource_pool *dc_create_resource_pool( 
		break;

	}

	if (res_pool != NULL) {

		struct firmware_info fw_info = { { 0 } };

		struct dc_firmware_info fw_info = { { 0 } };



		if (dc->ctx->dc_bios->funcs->get_firmware_info(

				dc->ctx->dc_bios, &fw_info) == BP_RESULT_OK) {

drivers/gpu/drm/amd/display/dc/dc_bios_types.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct dc_vbios_funcs { 
		struct connector_device_tag_info *info);

	enum bp_result (*get_firmware_info)(

		struct dc_bios *bios,

		struct firmware_info *info);

		struct dc_firmware_info *info);

	enum bp_result (*get_spread_spectrum_info)(

		struct dc_bios *bios,

		enum as_signal_type signal,

drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c

+2 −2
Original line number Diff line number Diff line
@@ -1103,7 +1103,7 @@ static bool calc_pll_max_vco_construct( 
			struct calc_pll_clock_source_init_data *init_data)

{

	uint32_t i;

	struct firmware_info fw_info = { { 0 } };

	struct dc_firmware_info fw_info = { { 0 } };

	if (calc_pll_cs == NULL ||

			init_data == NULL ||

			init_data->bp == NULL)
@@ -1185,7 +1185,7 @@ bool dce110_clk_src_construct( 
	const struct dce110_clk_src_shift *cs_shift,

	const struct dce110_clk_src_mask *cs_mask)

{

	struct firmware_info fw_info = { { 0 } };

	struct dc_firmware_info fw_info = { { 0 } };

	struct calc_pll_clock_source_init_data calc_pll_cs_init_data_hdmi;

	struct calc_pll_clock_source_init_data calc_pll_cs_init_data;