diff options
| author | Maxime Ripard <mripard@kernel.org> | 2025-06-03 15:07:39 +0200 |
|---|---|---|
| committer | Maxime Ripard <mripard@kernel.org> | 2025-06-03 15:07:39 +0200 |
| commit | 7b1166dee847d5018c1f3cc781218e806078f752 (patch) | |
| tree | 84a2e30eade0212b89cc05063fb8e9a5793e9d7a /drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | |
| parent | drm/udl: use DRM_GEM_SHMEM_DRIVER_OPS_NO_MAP_SGT (diff) | |
| parent | drm/nouveau/tegra: Fix error pointer vs NULL return in nvkm_device_tegra_reso... (diff) | |
| download | linux-7b1166dee847d5018c1f3cc781218e806078f752.tar.gz linux-7b1166dee847d5018c1f3cc781218e806078f752.zip | |
Merge drm-next-2025-05-28 into drm-misc-next
Christian needs a recent drm-next branch to merge fence patches.
Signed-off-by: Maxime Ripard <mripard@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c index eb015bdda8a7..c7d32fb216e4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c @@ -281,6 +281,9 @@ static int convert_atom_mem_type_to_vram_type(struct amdgpu_device *adev, case ATOM_DGPU_VRAM_TYPE_GDDR6: vram_type = AMDGPU_VRAM_TYPE_GDDR6; break; + case ATOM_DGPU_VRAM_TYPE_HBM3E: + vram_type = AMDGPU_VRAM_TYPE_HBM3E; + break; default: vram_type = AMDGPU_VRAM_TYPE_UNKNOWN; break; |