diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index d0102cfc8efb..42f882c633ee 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -75,6 +75,7 @@ | |||
75 | #include "amdgpu_sdma.h" | 75 | #include "amdgpu_sdma.h" |
76 | #include "amdgpu_dm.h" | 76 | #include "amdgpu_dm.h" |
77 | #include "amdgpu_virt.h" | 77 | #include "amdgpu_virt.h" |
78 | #include "amdgpu_csa.h" | ||
78 | #include "amdgpu_gart.h" | 79 | #include "amdgpu_gart.h" |
79 | #include "amdgpu_debugfs.h" | 80 | #include "amdgpu_debugfs.h" |
80 | #include "amdgpu_job.h" | 81 | #include "amdgpu_job.h" |
@@ -151,6 +152,7 @@ extern int amdgpu_compute_multipipe; | |||
151 | extern int amdgpu_gpu_recovery; | 152 | extern int amdgpu_gpu_recovery; |
152 | extern int amdgpu_emu_mode; | 153 | extern int amdgpu_emu_mode; |
153 | extern uint amdgpu_smu_memory_pool_size; | 154 | extern uint amdgpu_smu_memory_pool_size; |
155 | extern uint amdgpu_dc_feature_mask; | ||
154 | extern struct amdgpu_mgpu_info mgpu_info; | 156 | extern struct amdgpu_mgpu_info mgpu_info; |
155 | 157 | ||
156 | #ifdef CONFIG_DRM_AMDGPU_SI | 158 | #ifdef CONFIG_DRM_AMDGPU_SI |
@@ -432,7 +434,7 @@ typedef enum _AMDGPU_DOORBELL64_ASSIGNMENT | |||
432 | * default non-graphics QWORD index is 0xe0 - 0xFF inclusive | 434 | * default non-graphics QWORD index is 0xe0 - 0xFF inclusive |
433 | */ | 435 | */ |
434 | 436 | ||
435 | /* sDMA engines reserved from 0xe0 -oxef */ | 437 | /* sDMA engines reserved from 0xe0 -0xef */ |
436 | AMDGPU_DOORBELL64_sDMA_ENGINE0 = 0xE0, | 438 | AMDGPU_DOORBELL64_sDMA_ENGINE0 = 0xE0, |
437 | AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 = 0xE1, | 439 | AMDGPU_DOORBELL64_sDMA_HI_PRI_ENGINE0 = 0xE1, |
438 | AMDGPU_DOORBELL64_sDMA_ENGINE1 = 0xE8, | 440 | AMDGPU_DOORBELL64_sDMA_ENGINE1 = 0xE8, |
@@ -830,7 +832,6 @@ struct amdgpu_device { | |||
830 | bool need_dma32; | 832 | bool need_dma32; |
831 | bool need_swiotlb; | 833 | bool need_swiotlb; |
832 | bool accel_working; | 834 | bool accel_working; |
833 | struct work_struct reset_work; | ||
834 | struct notifier_block acpi_nb; | 835 | struct notifier_block acpi_nb; |
835 | struct amdgpu_i2c_chan *i2c_bus[AMDGPU_MAX_I2C_BUS]; | 836 | struct amdgpu_i2c_chan *i2c_bus[AMDGPU_MAX_I2C_BUS]; |
836 | struct amdgpu_debugfs debugfs[AMDGPU_DEBUGFS_MAX_COMPONENTS]; | 837 | struct amdgpu_debugfs debugfs[AMDGPU_DEBUGFS_MAX_COMPONENTS]; |