diff options
| author | Dave Airlie <airlied@redhat.com> | 2024-12-13 09:42:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2024-12-13 09:43:20 +1000 |
| commit | d172ea67dbeec5c90f72752c91d202d5718e3754 (patch) | |
| tree | d0de104fa8da32cd5c11146e2b469abdc18f41a3 /drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | |
| parent | 4dba1fd3fe19a3227489779ba7f5b67c0fd041a8 (diff) | |
| parent | 438b39ac74e2a9dc0a5c9d653b7d8066877e86b1 (diff) | |
| download | linux-d172ea67dbeec5c90f72752c91d202d5718e3754.tar.gz linux-d172ea67dbeec5c90f72752c91d202d5718e3754.tar.bz2 linux-d172ea67dbeec5c90f72752c91d202d5718e3754.zip | |
Merge tag 'amd-drm-fixes-6.13-2024-12-11' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
amd-drm-fixes-6.13-2024-12-11:
amdgpu:
- ISP hw init fix
- SR-IOV fixes
- Fix contiguous VRAM mapping for UVD on older GPUs
- Fix some regressions due to drm scheduler changes
- Workload profile fixes
- Cleaner shader fix
amdkfd:
- Fix DMA map direction for migration
- Fix a potential null pointer dereference
- Cacheline size fixes
- Runtime PM fix
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexander.deucher@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241211215449.741848-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index 96316111300a..d272d95dd5b2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -145,7 +145,7 @@ const char *amdgpu_asic_name[] = { "LAST", }; -#define AMDGPU_IP_BLK_MASK_ALL GENMASK(AMDGPU_MAX_IP_NUM, 0) +#define AMDGPU_IP_BLK_MASK_ALL GENMASK(AMD_IP_BLOCK_TYPE_NUM - 1, 0) /* * Default init level where all blocks are expected to be initialized. This is * the level of initialization expected by default and also after a full reset |