summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
diff options
context:
space:
mode:
authorHarry Wentland2017-07-27 01:31:53 +0200
committerAlex Deucher2017-09-27 00:15:51 +0200
commit1515a47b44c8667987d070fdc494691f91b44b46 (patch)
tree4a7bc56e4468fe79b1c7190916735d3875252617 /drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
parentdrm/amd/display: update clocks we report to PPlib (diff)
downloadkernel-qcow2-linux-1515a47b44c8667987d070fdc494691f91b44b46.tar.gz
kernel-qcow2-linux-1515a47b44c8667987d070fdc494691f91b44b46.tar.xz
kernel-qcow2-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/dce110/dce110_resource.c')
-rw-r--r--drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
index cc25c4b6c06f..5c1790b61290 100644
--- a/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
+++ b/drivers/gpu/drm/amd/display/dc/dce110/dce110_resource.c
@@ -1190,7 +1190,7 @@ static bool construct(
{
unsigned int i;
struct dc_context *ctx = dc->ctx;
- struct firmware_info info;
+ struct dc_firmware_info info;
struct dc_bios *bp;
struct dm_pp_static_clock_info static_clk_info = {0};