Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_atomfirmware.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
index 1279053324f99e7e5f85cdaae69dbdfbb97592ea..306077884a6794e5709efcefea25dea0554b3a33 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c
@@ -70,7 +70,7 @@ int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev)
        struct atom_context *ctx = adev->mode_info.atom_context;
        int index = get_index_into_master_table(atom_master_list_of_data_tables_v2_1,
                                                vram_usagebyfirmware);
-       struct vram_usagebyfirmware_v2_1 *      firmware_usage;
+       struct vram_usagebyfirmware_v2_1 *firmware_usage;
        uint32_t start_addr, size;
        uint16_t data_offset;
        int usage_bytes = 0;
@@ -89,9 +89,9 @@ int amdgpu_atomfirmware_allocate_fb_scratch(struct amdgpu_device *adev)
                        (uint32_t)(ATOM_VRAM_BLOCK_SRIOV_MSG_SHARE_RESERVATION <<
                        ATOM_VRAM_OPERATION_FLAGS_SHIFT)) {
                        /* Firmware request VRAM reservation for SR-IOV */
-                       adev->fw_vram_usage.start_offset = (start_addr &
+                       adev->mman.fw_vram_usage_start_offset = (start_addr &
                                (~ATOM_VRAM_OPERATION_FLAGS_MASK)) << 10;
-                       adev->fw_vram_usage.size = size << 10;
+                       adev->mman.fw_vram_usage_size = size << 10;
                        /* Use the default scratch size */
                        usage_bytes = 0;
                } else {
@@ -149,6 +149,10 @@ static int convert_atom_mem_type_to_vram_type(struct amdgpu_device *adev,
                case LpDdr4MemType:
                        vram_type = AMDGPU_VRAM_TYPE_DDR4;
                        break;
+               case Ddr5MemType:
+               case LpDdr5MemType:
+                       vram_type = AMDGPU_VRAM_TYPE_DDR5;
+                       break;
                default:
                        vram_type = AMDGPU_VRAM_TYPE_UNKNOWN;
                        break;
@@ -543,6 +547,8 @@ int amdgpu_mem_train_support(struct amdgpu_device *adev)
                case HW_REV(11, 0, 0):
                case HW_REV(11, 0, 5):
                case HW_REV(11, 0, 7):
+               case HW_REV(11, 0, 11):
+               case HW_REV(11, 0, 12):
                        ret = 1;
                        break;
                default: