drm/amdgpu: add read_bios_from_rom callback for VI parts

BugLink: http://bugs.launchpad.net/bugs/1546572
Read the vbios image directly from the rom.

Reviewed-by: Jammy Zhou <Jammy.Zhou@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Monk Liu <monk.liu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 95addb2ae06f46cd13346ed87bbda3990438a69b)
Signed-off-by: Alberto Milone <alberto.milone@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c
index 7628eb44cce2f28596d5f149659592e76fe4704f..b176dab051c9ebd83b5ab38e8d77ff0e8b824c33 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/vi.c
+++ b/drivers/gpu/drm/amd/amdgpu/vi.c
@@ -377,6 +377,38 @@ static bool vi_read_disabled_bios(struct amdgpu_device *adev)
        WREG32_SMC(ixROM_CNTL, rom_cntl);
        return r;
 }
+
+static bool vi_read_bios_from_rom(struct amdgpu_device *adev,
+                                 u8 *bios, u32 length_bytes)
+{
+       u32 *dw_ptr;
+       unsigned long flags;
+       u32 i, length_dw;
+
+       if (bios == NULL)
+               return false;
+       if (length_bytes == 0)
+               return false;
+       /* APU vbios image is part of sbios image */
+       if (adev->flags & AMD_IS_APU)
+               return false;
+
+       dw_ptr = (u32 *)bios;
+       length_dw = ALIGN(length_bytes, 4) / 4;
+       /* take the smc lock since we are using the smc index */
+       spin_lock_irqsave(&adev->smc_idx_lock, flags);
+       /* set rom index to 0 */
+       WREG32(mmSMC_IND_INDEX_0, ixROM_INDEX);
+       WREG32(mmSMC_IND_DATA_0, 0);
+       /* set index to data for continous read */
+       WREG32(mmSMC_IND_INDEX_0, ixROM_DATA);
+       for (i = 0; i < length_dw; i++)
+               dw_ptr[i] = RREG32(mmSMC_IND_DATA_0);
+       spin_unlock_irqrestore(&adev->smc_idx_lock, flags);
+
+       return true;
+}
+
 static struct amdgpu_allowed_register_entry tonga_allowed_read_registers[] = {
        {mmGB_MACROTILE_MODE7, true},
 };
@@ -1369,6 +1401,7 @@ static uint32_t vi_get_rev_id(struct amdgpu_device *adev)
 static const struct amdgpu_asic_funcs vi_asic_funcs =
 {
        .read_disabled_bios = &vi_read_disabled_bios,
+       .read_bios_from_rom = &vi_read_bios_from_rom,
        .read_register = &vi_read_register,
        .reset = &vi_asic_reset,
        .set_vga_state = &vi_vga_set_state,