diff options
| author | Mark Brown <broonie@kernel.org> | 2026-07-27 14:20:34 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-27 14:20:39 +0100 |
| commit | 1c7ef95a59c296796e47977c7843c9c070473dff (patch) | |
| tree | b680f0951334ddeb73d3d04eca25fefaa5ed911f /drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | |
| parent | 70e2adab987629374db98a81f9caa0e063d8d3fd (diff) | |
| parent | ea97ab2759506d9a818ffed1009bde01062b4091 (diff) | |
| download | linux-next-1c7ef95a59c296796e47977c7843c9c070473dff.tar.gz linux-next-1c7ef95a59c296796e47977c7843c9c070473dff.zip | |
Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h index 1d0df6d93957..70fc4e5db51f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h @@ -68,6 +68,7 @@ enum amd_hw_ip_block_type { ISP_HWIP, ATU_HWIP, AIGC_HWIP, + UMSCH_HWIP, MAX_HWIP }; @@ -84,6 +85,9 @@ enum amd_hw_ip_block_type { #define IP_VERSION_SUBREV(ver) ((ver) & 0xF) #define IP_VERSION_MAJ_MIN_REV(ver) ((ver) >> 8) +struct amdgpu_ring; +struct amdgpu_fence; + struct amdgpu_ip_map_info { /* Map of logical to actual dev instances/mask */ uint32_t dev_inst[MAX_HWIP][HWIP_MAX_INSTANCE]; @@ -146,9 +150,9 @@ void amdgpu_device_ip_get_clockgating_state(struct amdgpu_device *adev, u64 *flags); int amdgpu_device_ip_wait_for_idle(struct amdgpu_device *adev, enum amd_ip_block_type block_type); -bool amdgpu_device_ip_is_hw(struct amdgpu_device *adev, - enum amd_ip_block_type block_type); bool amdgpu_device_ip_is_valid(struct amdgpu_device *adev, enum amd_ip_block_type block_type); +int amdgpu_device_ip_soft_reset(struct amdgpu_ring *guilty_ring, + struct amdgpu_fence *guilty_fence); #endif /* __AMDGPU_IP_H__ */ |