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_parser2.c | |
| parent | 1c3fb02d2567ae348a3495c93bea991e9d028780 (diff) | |
| download | linux-1515a47b44c8667987d070fdc494691f91b44b46.tar.gz linux-1515a47b44c8667987d070fdc494691f91b44b46.tar.bz2 linux-1515a47b44c8667987d070fdc494691f91b44b46.zip | |
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_parser2.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c index 3a69f9c5d20a..86fce5ae5856 100644 --- a/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +++ b/drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c @@ -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; |