Makussu/vendor-reset
1
0
Fork 0
mirror of https://github.com/gnif/vendor-reset.git synced 2026-03-28 05:02:44 +01:00
Code Issues Projects Releases Wiki Activity

Fix some logic errors that reversed the reset choice

Browse Source
This commit is contained in:
Adam Madsen
2020-11-22 14:28:53 -06:00
parent e82aa63e2b
commit cc2f3a83e6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/amd/navi10.c
View File

@@ -61,10 +61,10 @@ static int navi10_needs_reset(struct vendor_reset_dev *dev, enum navi10_reset_ty
smu_resp, sol, mp1_intr ? "yes" : "no", smu_resp, sol, mp1_intr ? "yes" : "no",
psp_bl_ready ? "yes" : "no"); psp_bl_ready ? "yes" : "no");
if (sol == 0x0 && !mp1_intr && psp_bl_ready) if (!sol && !mp1_intr && psp_bl_ready)
/* okay, if we're in this state, we're probably reset */ /* okay, if we're in this state, we're probably reset */
*type = NAVI10_RESET_NONE; *type = NAVI10_RESET_NONE;
else if (sol && sol != ~1L && mp1_intr && psp_bl_ready) else if (sol && sol != ~1L && smu_resp != 0 && mp1_intr && psp_bl_ready)
*type = NAVI10_RESET_BACO; *type = NAVI10_RESET_BACO;
else else
*type = NAVI10_RESET_MODE1; *type = NAVI10_RESET_MODE1;
@@ -233,7 +233,7 @@ static int amd_navi10_reset(struct vendor_reset_dev *dev)
if (!navi10_needs_reset(dev, &reset_type)) if (!navi10_needs_reset(dev, &reset_type))
goto free_adev; goto free_adev;
if (reset_type == NAVI10_RESET_MODE1) if (reset_type == NAVI10_RESET_BACO)
ret = navi10_baco_reset(dev); ret = navi10_baco_reset(dev);
else else
{ {