Commit 2ddc6c3e authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu: add reset_method asic callback for navi

Navi uses either mode1 or baco depending on various
conditions.
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ee360c0b
...@@ -289,6 +289,18 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev) ...@@ -289,6 +289,18 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev)
return ret; return ret;
} }
static enum amd_reset_method
nv_asic_reset_method(struct amdgpu_device *adev)
{
struct smu_context *smu = &adev->smu;
if (smu_baco_is_support(smu))
return AMD_RESET_METHOD_BACO;
else
return AMD_RESET_METHOD_MODE1;
}
static int nv_asic_reset(struct amdgpu_device *adev) static int nv_asic_reset(struct amdgpu_device *adev)
{ {
...@@ -303,7 +315,7 @@ static int nv_asic_reset(struct amdgpu_device *adev) ...@@ -303,7 +315,7 @@ static int nv_asic_reset(struct amdgpu_device *adev)
int ret = 0; int ret = 0;
struct smu_context *smu = &adev->smu; struct smu_context *smu = &adev->smu;
if (smu_baco_is_support(smu)) if (nv_asic_reset_method(adev) == AMD_RESET_METHOD_BACO)
ret = smu_baco_reset(smu); ret = smu_baco_reset(smu);
else else
ret = nv_asic_mode1_reset(adev); ret = nv_asic_mode1_reset(adev);
...@@ -500,6 +512,7 @@ static const struct amdgpu_asic_funcs nv_asic_funcs = ...@@ -500,6 +512,7 @@ static const struct amdgpu_asic_funcs nv_asic_funcs =
.read_bios_from_rom = &nv_read_bios_from_rom, .read_bios_from_rom = &nv_read_bios_from_rom,
.read_register = &nv_read_register, .read_register = &nv_read_register,
.reset = &nv_asic_reset, .reset = &nv_asic_reset,
.reset_method = &nv_asic_reset_method,
.set_vga_state = &nv_vga_set_state, .set_vga_state = &nv_vga_set_state,
.get_xclk = &nv_get_xclk, .get_xclk = &nv_get_xclk,
.set_uvd_clocks = &nv_set_uvd_clocks, .set_uvd_clocks = &nv_set_uvd_clocks,
......
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