drm/amdgpu: Make struct amdgpu_atif private to amdgpu_acpi.c

Currently, there is nothing in amdgpu that actually uses these structs
other than amdgpu_acpi.c. Additionally, since we're about to start
saving the correct ACPI handle to use for calling ATIF in this struct
this saves us from having to handle making sure that the acpi_handle
(and by proxy, the type definition for acpi_handle and all of the other
acpi headers) doesn't need to be included within the amdgpu_drv struct
itself. This follows the example set by amdgpu_atpx_handler.c.

Signed-off-by: Lyude Paul <lyude@redhat.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

1 files changed, 2 insertions, 38 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 86e4d8bd52a6..219fea72beeb 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -190,6 +190,7 @@ struct amdgpu_job;
 struct amdgpu_irq_src;
 struct amdgpu_fpriv;
 struct amdgpu_bo_va_mapping;
+struct amdgpu_atif;
 
 enum amdgpu_cp_irq {
         AMDGPU_CP_IRQ_GFX_EOP = 0,
@@ -1278,43 +1279,6 @@ struct amdgpu_vram_scratch {
 /*
  * ACPI
  */
-struct amdgpu_atif_notification_cfg {
-        bool enabled;
-        int command_code;
-};
-
-struct amdgpu_atif_notifications {
-        bool display_switch;
-        bool expansion_mode_change;
-        bool thermal_state;
-        bool forced_power_state;
-        bool system_power_state;
-        bool display_conf_change;
-        bool px_gfx_switch;
-        bool brightness_change;
-        bool dgpu_display_event;
-};
-
-struct amdgpu_atif_functions {
-        bool system_params;
-        bool sbios_requests;
-        bool select_active_disp;
-        bool lid_state;
-        bool get_tv_standard;
-        bool set_tv_standard;
-        bool get_panel_expansion_mode;
-        bool set_panel_expansion_mode;
-        bool temperature_change;
-        bool graphics_device_types;
-};
-
-struct amdgpu_atif {
-        struct amdgpu_atif_notifications notifications;
-        struct amdgpu_atif_functions functions;
-        struct amdgpu_atif_notification_cfg notification_cfg;
-        struct amdgpu_encoder *encoder_for_bl;
-};
-
 struct amdgpu_atcs_functions {
         bool get_ext_state;
         bool pcie_perf_req;
@@ -1475,7 +1439,7 @@ struct amdgpu_device {
 #if defined(CONFIG_DEBUG_FS)
         struct dentry                   *debugfs_regs[AMDGPU_DEBUGFS_MAX_COMPONENTS];
 #endif
-        struct amdgpu_atif              atif;
+        struct amdgpu_atif              *atif;
         struct amdgpu_atcs              atcs;
         struct mutex                    srbm_mutex;
         /* GRBM index mutex. Protects concurrent access to GRBM index */