Commit 80d46fff authored by Huang Rui's avatar Huang Rui Committed by Alex Deucher

drm/amdgpu: add apu sequence in the imu v11

APU required to issue the enable GFX IMU message after IMU reset.
Signed-off-by: default avatarHuang Rui <ray.huang@amd.com>
Reviewed-by: default avatarTim Huang <Tim.Huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7101ab97
...@@ -6292,7 +6292,11 @@ static void gfx_v11_0_set_irq_funcs(struct amdgpu_device *adev) ...@@ -6292,7 +6292,11 @@ static void gfx_v11_0_set_irq_funcs(struct amdgpu_device *adev)
static void gfx_v11_0_set_imu_funcs(struct amdgpu_device *adev) static void gfx_v11_0_set_imu_funcs(struct amdgpu_device *adev)
{ {
adev->gfx.imu.mode = DEBUG_MODE; if (adev->flags & AMD_IS_APU)
adev->gfx.imu.mode = MISSION_MODE;
else
adev->gfx.imu.mode = DEBUG_MODE;
adev->gfx.imu.funcs = &gfx_v11_0_imu_funcs; adev->gfx.imu.funcs = &gfx_v11_0_imu_funcs;
} }
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include "amdgpu.h" #include "amdgpu.h"
#include "amdgpu_imu.h" #include "amdgpu_imu.h"
#include "amdgpu_dpm.h"
#include "gc/gc_11_0_0_offset.h" #include "gc/gc_11_0_0_offset.h"
#include "gc/gc_11_0_0_sh_mask.h" #include "gc/gc_11_0_0_sh_mask.h"
...@@ -165,10 +166,10 @@ static int imu_v11_0_start(struct amdgpu_device *adev) ...@@ -165,10 +166,10 @@ static int imu_v11_0_start(struct amdgpu_device *adev)
imu_reg_val &= 0xfffffffe; imu_reg_val &= 0xfffffffe;
WREG32_SOC15(GC, 0, regGFX_IMU_CORE_CTRL, imu_reg_val); WREG32_SOC15(GC, 0, regGFX_IMU_CORE_CTRL, imu_reg_val);
if (adev->gfx.imu.mode == DEBUG_MODE) if (adev->flags & AMD_IS_APU)
return imu_v11_0_wait_for_reset_status(adev); amdgpu_dpm_set_gfx_power_up_by_imu(adev);
return 0; return imu_v11_0_wait_for_reset_status(adev);
} }
static const struct imu_rlc_ram_golden imu_rlc_ram_golden_11[] = static const struct imu_rlc_ram_golden imu_rlc_ram_golden_11[] =
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment