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/dce/dce_clock_source.c | |
| parent | 1c3fb02d2567ae348a3495c93bea991e9d028780 (diff) | |
| download | linux-1515a47b44c8667987d070fdc494691f91b44b46.tar.bz2 | |
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/dce/dce_clock_source.c')
| -rw-r--r-- | drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c index 2205491c83e9..dd7e1dd62636 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c @@ -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; |