diff options
| author | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:48 +0300 |
|---|---|---|
| committer | Cristian Ciocaltea <cristian.ciocaltea@collabora.com> | 2023-09-15 19:15:48 +0300 |
| commit | 0eb67c19c36cf2f517acea59dbb1bc38ccddf5eb (patch) | |
| tree | a362533dbc4e728cb182bec9a2fb9793cda20553 /drivers/gpu/drm/amd/amdgpu/amdgpu.h | |
| parent | ae4f9e9d596068d3b2137e55aaf17d2efc568c1c (diff) | |
| parent | b65228799e5ac96211b0e4c342d0a4478a1b6410 (diff) | |
| download | linux-0eb67c19c36cf2f517acea59dbb1bc38ccddf5eb.tar.gz | |
Merge branch 6.1/features/gpu-reset
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index c8dbc281072b..afe39421d10c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h @@ -59,6 +59,7 @@ #include <drm/amdgpu_drm.h> #include <drm/drm_gem.h> #include <drm/drm_ioctl.h> +#include <drm/drm_sysfs.h> #include <kgd_kfd_interface.h> #include "dm_pp_interface.h" @@ -1038,6 +1039,7 @@ struct amdgpu_device { int asic_reset_res; struct work_struct xgmi_reset_work; + struct work_struct gpu_reset_event_work; struct list_head reset_list; long gfx_timeout; @@ -1070,6 +1072,7 @@ struct amdgpu_device { pci_channel_state_t pci_channel_state; struct amdgpu_reset_control *reset_cntl; + struct drm_reset_event reset_event_info; uint32_t ip_versions[MAX_HWIP][HWIP_MAX_INSTANCE]; bool ram_is_direct_mapped; |