diff options
author | Harry Wentland <harry.wentland@amd.com> | 2017-07-26 19:31:53 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 18:15:51 -0400 |
commit | 1515a47b44c8667987d070fdc494691f91b44b46 (patch) | |
tree | 4a7bc56e4468fe79b1c7190916735d3875252617 /drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | |
parent | 1c3fb02d2567ae348a3495c93bea991e9d028780 (diff) |
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>
Diffstat (limited to 'drivers/gpu/drm/amd/display/dc/bios/bios_parser.c')
-rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c index 47a467688073..2c683d468bb8 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser.c @@ -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; |