summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/amd/display/include
diff options
context:
space:
mode:
authorHarry Wentland <harry.wentland@amd.com>2017-07-26 19:31:53 -0400
committerAlex Deucher <alexander.deucher@amd.com>2017-09-26 18:15:51 -0400
commit1515a47b44c8667987d070fdc494691f91b44b46 (patch)
tree4a7bc56e4468fe79b1c7190916735d3875252617 /drivers/gpu/drm/amd/display/include
parent1c3fb02d2567ae348a3495c93bea991e9d028780 (diff)
downloadlinux-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/include')
-rw-r--r--drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h b/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
index 9c0bf6521dd9..6cdbf84f34e6 100644
--- a/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
+++ b/drivers/gpu/drm/amd/display/include/grph_object_ctrl_defs.h
@@ -154,7 +154,7 @@ struct embedded_panel_info {
bool realtek_eDPToLVDS;
};
-struct firmware_info {
+struct dc_firmware_info {
struct pll_info {
uint32_t crystal_frequency; /* in KHz */
uint32_t min_input_pxl_clk_pll_frequency; /* in KHz */