Commit 3967ae6d authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu/nv: enable init reset check

gpu reset is implemented for navi so we can enable this.
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 337b7244
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
#include "hdp/hdp_5_0_0_offset.h" #include "hdp/hdp_5_0_0_offset.h"
#include "hdp/hdp_5_0_0_sh_mask.h" #include "hdp/hdp_5_0_0_sh_mask.h"
#include "smuio/smuio_11_0_0_offset.h" #include "smuio/smuio_11_0_0_offset.h"
#include "mp/mp_11_0_offset.h"
#include "soc15.h" #include "soc15.h"
#include "soc15_common.h" #include "soc15_common.h"
...@@ -514,7 +515,6 @@ static bool nv_need_full_reset(struct amdgpu_device *adev) ...@@ -514,7 +515,6 @@ static bool nv_need_full_reset(struct amdgpu_device *adev)
static bool nv_need_reset_on_init(struct amdgpu_device *adev) static bool nv_need_reset_on_init(struct amdgpu_device *adev)
{ {
#if 0
u32 sol_reg; u32 sol_reg;
if (adev->flags & AMD_IS_APU) if (adev->flags & AMD_IS_APU)
...@@ -526,8 +526,7 @@ static bool nv_need_reset_on_init(struct amdgpu_device *adev) ...@@ -526,8 +526,7 @@ static bool nv_need_reset_on_init(struct amdgpu_device *adev)
sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81); sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);
if (sol_reg) if (sol_reg)
return true; return true;
#endif
/* TODO: re-enable it when mode1 reset is functional */
return false; return false;
} }
......
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