UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Harry Wentland <harry.wentland@amd.com>
Reviewed-by: Tony Cheng <Tony.Cheng@amd.com>
Acked-by: Harry Wentland <Harry.Wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Harry Wentland 2017-07-26 19:31:53 -04:00 committed by Alex Deucher
parent 1c3fb02d25
commit 1515a47b44
11 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
View File

@ -622,17 +622,17 @@ static enum bp_result bios_parser_get_device_tag(
static enum bp_result get_firmware_info_v1_4( static enum bp_result get_firmware_info_v1_4(
struct bios_parser *bp, struct bios_parser *bp,
struct firmware_info *info); struct dc_firmware_info *info);
static enum bp_result get_firmware_info_v2_1( static enum bp_result get_firmware_info_v2_1(
struct bios_parser *bp, struct bios_parser *bp,
struct firmware_info *info); struct dc_firmware_info *info);
static enum bp_result get_firmware_info_v2_2( static enum bp_result get_firmware_info_v2_2(
struct bios_parser *bp, struct bios_parser *bp,
struct firmware_info *info); struct dc_firmware_info *info);
static enum bp_result bios_parser_get_firmware_info( static enum bp_result bios_parser_get_firmware_info(
struct dc_bios *dcb, struct dc_bios *dcb,
struct firmware_info *info) struct dc_firmware_info *info)
{ {
struct bios_parser *bp = BP_FROM_DCB(dcb); struct bios_parser *bp = BP_FROM_DCB(dcb);
enum bp_result result = BP_RESULT_BADBIOSTABLE; 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( static enum bp_result get_firmware_info_v1_4(
struct bios_parser *bp, struct bios_parser *bp,
struct firmware_info *info) struct dc_firmware_info *info)
{ {
ATOM_FIRMWARE_INFO_V1_4 *firmware_info = ATOM_FIRMWARE_INFO_V1_4 *firmware_info =
GET_IMAGE(ATOM_FIRMWARE_INFO_V1_4, 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( static enum bp_result get_firmware_info_v2_1(
struct bios_parser *bp, struct bios_parser *bp,
struct firmware_info *info) struct dc_firmware_info *info)
{ {
ATOM_FIRMWARE_INFO_V2_1 *firmwareInfo = ATOM_FIRMWARE_INFO_V2_1 *firmwareInfo =
GET_IMAGE(ATOM_FIRMWARE_INFO_V2_1, DATA_TABLES(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( static enum bp_result get_firmware_info_v2_2(
struct bios_parser *bp, struct bios_parser *bp,
struct firmware_info *info) struct dc_firmware_info *info)
{ {
ATOM_FIRMWARE_INFO_V2_2 *firmware_info; ATOM_FIRMWARE_INFO_V2_2 *firmware_info;
struct spread_spectrum_info internal_ss; struct spread_spectrum_info internal_ss;

8
drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c
View File

@ -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( static enum bp_result bios_parser_get_firmware_info(
struct dc_bios *dcb, struct dc_bios *dcb,
struct firmware_info *info); struct dc_firmware_info *info);
static enum bp_result bios_parser_get_encoder_cap_info( static enum bp_result bios_parser_get_encoder_cap_info(
struct dc_bios *dcb, 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( static enum bp_result get_firmware_info_v3_1(
struct bios_parser *bp, 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, static struct atom_hpd_int_record *get_hpd_record(struct bios_parser *bp,
struct atom_display_object_path_v2 *object); 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( static enum bp_result bios_parser_get_firmware_info(
struct dc_bios *dcb, struct dc_bios *dcb,
struct firmware_info *info) struct dc_firmware_info *info)
{ {
struct bios_parser *bp = BP_FROM_DCB(dcb); struct bios_parser *bp = BP_FROM_DCB(dcb);
enum bp_result result = BP_RESULT_BADBIOSTABLE; 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( static enum bp_result get_firmware_info_v3_1(
struct bios_parser *bp, struct bios_parser *bp,
struct firmware_info *info) struct dc_firmware_info *info)
{ {
struct atom_firmware_info_v3_1 *firmware_info; struct atom_firmware_info_v3_1 *firmware_info;
struct atom_display_controller_info_v4_1 *dce_info = NULL; struct atom_display_controller_info_v4_1 *dce_info = NULL;

2
drivers/gpu/drm/amd/display/dc/core/dc_resource.c
View File

@ -126,7 +126,7 @@ struct resource_pool *dc_create_resource_pool(
break; break;
} }
if (res_pool != NULL) { 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( if (dc->ctx->dc_bios->funcs->get_firmware_info(
dc->ctx->dc_bios, &fw_info) == BP_RESULT_OK) { dc->ctx->dc_bios, &fw_info) == BP_RESULT_OK) {

2
drivers/gpu/drm/amd/display/dc/dc_bios_types.h
View File

@ -84,7 +84,7 @@ struct dc_vbios_funcs {
struct connector_device_tag_info *info); struct connector_device_tag_info *info);
enum bp_result (*get_firmware_info)( enum bp_result (*get_firmware_info)(
struct dc_bios *bios, struct dc_bios *bios,
struct firmware_info *info); struct dc_firmware_info *info);
enum bp_result (*get_spread_spectrum_info)( enum bp_result (*get_spread_spectrum_info)(
struct dc_bios *bios, struct dc_bios *bios,
enum as_signal_type signal, enum as_signal_type signal,

4
drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
View File

@ -1103,7 +1103,7 @@ static bool calc_pll_max_vco_construct(
struct calc_pll_clock_source_init_data *init_data) struct calc_pll_clock_source_init_data *init_data)
{ {
uint32_t i; uint32_t i;
struct firmware_info fw_info = { { 0 } }; struct dc_firmware_info fw_info = { { 0 } };
if (calc_pll_cs == NULL || if (calc_pll_cs == NULL ||
init_data == NULL || init_data == NULL ||
init_data->bp == 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_shift *cs_shift,
const struct dce110_clk_src_mask *cs_mask) 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_hdmi;
struct calc_pll_clock_source_init_data calc_pll_cs_init_data; struct calc_pll_clock_source_init_data calc_pll_cs_init_data;

2
drivers/gpu/drm/amd/display/dc/dce/dce_clocks.c
View File

@ -424,7 +424,7 @@ static void dce_clock_read_integrated_info(struct dce_disp_clk *clk_dce)
struct dc_debug *debug = &clk_dce->base.ctx->dc->debug; struct dc_debug *debug = &clk_dce->base.ctx->dc->debug;
struct dc_bios *bp = clk_dce->base.ctx->dc_bios; struct dc_bios *bp = clk_dce->base.ctx->dc_bios;
struct integrated_info info = { { { 0 } } }; struct integrated_info info = { { { 0 } } };
struct firmware_info fw_info = { { 0 } }; struct dc_firmware_info fw_info = { { 0 } };
int i; int i;
if (bp->integrated_info) if (bp->integrated_info)

2
drivers/gpu/drm/amd/display/dc/dce100/dce100_resource.c
View File

@ -819,7 +819,7 @@ static bool construct(
{ {
unsigned int i; unsigned int i;
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0}; struct dm_pp_static_clock_info static_clk_info = {0};

2
drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
View File

@ -1190,7 +1190,7 @@ static bool construct(
{ {
unsigned int i; unsigned int i;
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0}; struct dm_pp_static_clock_info static_clk_info = {0};

2
drivers/gpu/drm/amd/display/dc/dce80/dce80_resource.c
View File

@ -833,7 +833,7 @@ static bool construct(
{ {
unsigned int i; unsigned int i;
struct dc_context *ctx = dc->ctx; struct dc_context *ctx = dc->ctx;
struct firmware_info info; struct dc_firmware_info info;
struct dc_bios *bp; struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0}; struct dm_pp_static_clock_info static_clk_info = {0};

2
drivers/gpu/drm/amd/display/dc/i2caux/i2caux.c
View File

@ -320,7 +320,7 @@ void dal_i2caux_destroy(
uint32_t dal_i2caux_get_reference_clock( uint32_t dal_i2caux_get_reference_clock(
struct dc_bios *bios) struct dc_bios *bios)
{ {
struct firmware_info info = { { 0 } }; struct dc_firmware_info info = { { 0 } };
if (bios->funcs->get_firmware_info(bios, &info) != BP_RESULT_OK) if (bios->funcs->get_firmware_info(bios, &info) != BP_RESULT_OK)
return 0; return 0;

2
drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
View File

@ -154,7 +154,7 @@ struct embedded_panel_info {
bool realtek_eDPToLVDS; bool realtek_eDPToLVDS;
}; };
struct firmware_info { struct dc_firmware_info {
struct pll_info { struct pll_info {
uint32_t crystal_frequency; /* in KHz */ uint32_t crystal_frequency; /* in KHz */
uint32_t min_input_pxl_clk_pll_frequency; /* in KHz */ uint32_t min_input_pxl_clk_pll_frequency; /* in KHz */