drm/amd/pm: enable baco reset for Hawaii
Subsystems (3)
PATCH 1/2 drm/amd/pm: enable baco reset for Hawaii
Which can be used for S4(hibernation) support.
--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/cik.c +3 -1
@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_BONAIRE : -case CHIP_HAWAII :/* disable baco reset until it works */ /* smu7_asic_get_baco_capability(adev, &baco_reset); */ baco_reset = false;break ; +case CHIP_HAWAII : + baco_reset =cik_asic_supports_baco (adev); +break ;default : baco_reset = false;break ;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +4 -3
@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_BCLK_OFF_MASK, BACO_CNTL__BACO_BCLK_OFF__SHIFT, 0, 0x00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_POWER_OFF_MASK, BACO_CNTL__BACO_POWER_OFF__SHIFT, 0, 0x00 }, { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x20 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x200 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ANA_ISO_DIS_MASK, BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0, 0x01 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x00 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x10 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x100 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_EN_MASK, BACO_CNTL__BACO_EN__SHIFT, 0, 0x00 }, { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MODE_MASK, 0, 0xffffffff, 0x00 } };
@@ -155,6 +155,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] =static const struct baco_cmd_entry clean_baco_tbl[] = { {CMD_WRITE , mmBIOS_SCRATCH_6,0 ,0 ,0 ,0 }, + {CMD_WRITE , mmBIOS_SCRATCH_7,0 ,0 ,0 ,0 }, {CMD_WRITE , mmCP_PFP_UCODE_ADDR,0 ,0 ,0 ,0 } };
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/pm: do not use ixFEATURE_STATUS for checking smc running
This reverts commit f87812284172a9809820d10143b573d833cd3f75 "drm/amdgpu:
Fix bug where DPM is not enabled after hibernate and resume". It was intended to fix Hawaii S4(hibernation) issue but break S3. As ixFEATURE_STATUS is filled with garbage data on resume which can be only cleared by reloading smc firmware(but that will involve many changes). So, we will revert this S4 fix and seek a new way.
--- drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +1 -4
@@ -2726,10 +2726,7 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)static bool ci_is_dpm_running (struct pp_hwmgr *hwmgr) { -return (1 ==PHM_READ_INDIRECT_FIELD (hwmgr->device, -CGS_IND_REG__SMC ,FEATURE_STATUS , -VOLTAGE_CONTROLLER_ON )) - ? true : false; +return ci_is_smc_ram_running (hwmgr); }static int ci_smu_init (struct pp_hwmgr *hwmgr)
Signature · 6 lines
2.29.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 74 lines · On Tue, 27 Oct, 2020, 08:10 Evan Quan, <[email protected]> wrote:
Which can be used for S4(hibernation) support.
Change-Id I6e4962c120a3baed14cea04ed1742ff11a273d34Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/cik.c +3
-1@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_BONAIRE : -case CHIP_HAWAII :/* disable baco reset until it works */ /* smu7_asic_get_baco_capability(adev, &baco_reset); */ baco_reset = false;break ; +case CHIP_HAWAII : + baco_reset =cik_asic_supports_baco (adev); +break ;default : baco_reset = false;break ;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +2
-2@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = {CMD_READMODIFYWRITE , mmBACO_CNTL,BACO_CNTL__BACO_BCLK_OFF_MASK ,BACO_CNTL__BACO_BCLK_OFF__SHIFT , 0, 0x00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL,BACO_CNTL__BACO_POWER_OFF_MASK ,BACO_CNTL__BACO_POWER_OFF__SHIFT , 0, 0x00 }, { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x20 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x200 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c00},
{CMD_READMODIFYWRITE,mmBACO_CNTL,BACO_CNTL__BACO_ANA_ISO_DIS_MASK,BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0,0x01},
{CMD_READMODIFYWRITE,mmBACO_CNTL,BACO_CNTL__BACO_RESET_EN_MASK,BACO_CNTL__BACO_RESET_EN__SHIFT, 0,0x00},
- {CMD_WAITFOR,mmBACO_CNTL,BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK,
0, 5,0x10},
+ {CMD_WAITFOR,mmBACO_CNTL,BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK,
0, 5,0x100},
{CMD_READMODIFYWRITE,mmBACO_CNTL,BACO_CNTL__BACO_EN_MASK,BACO_CNTL__BACO_EN__SHIFT, 0,0x00},
{CMD_WAITFOR,mmBACO_CNTL,BACO_CNTL__BACO_MODE_MASK, 0,0xffffffff,0x00}
};drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +1
-1@@ -155,6 +155,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] =static const struct baco_cmd_entry clean_baco_tbl[] = { {CMD_WRITE , mmBIOS_SCRATCH_6,0 ,0 ,0 ,0 }, + {CMD_WRITE , mmBIOS_SCRATCH_7,0 ,0 ,0 ,0 }, {CMD_WRITE , mmCP_PFP_UCODE_ADDR,0 ,0 ,0 ,0 } }; --
Quoted 2 lines
2.29.0
Not sure why I'm cc'd on this, I'm not a maintainer, nor does this patch seem related to any patches I've contributed.
- Sandeep
Quoted 1 line
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 84 lines · On Tue, 27 Oct, 2020, 17:01 Sandeep, <[email protected]> wrote:
Quoted 74 lines · On Tue, 27 Oct, 2020, 08:10 Evan Quan, <[email protected]> wrote:
Which can be used for S4(hibernation) support.
Change-Id I6e4962c120a3baed14cea04ed1742ff11a273d34Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/cik.c +3
-1@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_BONAIRE : -case CHIP_HAWAII :/* disable baco reset until it works */ /* smu7_asic_get_baco_capability(adev, &baco_reset); */ baco_reset = false;break ; +case CHIP_HAWAII : + baco_reset =cik_asic_supports_baco (adev); +break ;default : baco_reset = false;break ;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +2
-2@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = {CMD_READMODIFYWRITE , mmBACO_CNTL,BACO_CNTL__BACO_BCLK_OFF_MASK ,BACO_CNTL__BACO_BCLK_OFF__SHIFT , 0, 0x00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL,BACO_CNTL__BACO_POWER_OFF_MASK ,BACO_CNTL__BACO_POWER_OFF__SHIFT , 0, 0x00 }, { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x20 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x200 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c00},
{CMD_READMODIFYWRITE,mmBACO_CNTL,BACO_CNTL__BACO_ANA_ISO_DIS_MASK,BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0,0x01},
{CMD_READMODIFYWRITE,mmBACO_CNTL,BACO_CNTL__BACO_RESET_EN_MASK,BACO_CNTL__BACO_RESET_EN__SHIFT, 0,0x00},
- {CMD_WAITFOR,mmBACO_CNTL,BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK,
0, 5,0x10},
+ {CMD_WAITFOR,mmBACO_CNTL,BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK,
0, 5,0x100},
{CMD_READMODIFYWRITE,mmBACO_CNTL,BACO_CNTL__BACO_EN_MASK,BACO_CNTL__BACO_EN__SHIFT, 0,0x00},
{CMD_WAITFOR,mmBACO_CNTL,BACO_CNTL__BACO_MODE_MASK, 0,0xffffffff,0x00}
};drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +1
-1@@ -155,6 +155,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] =static const struct baco_cmd_entry clean_baco_tbl[] = { {CMD_WRITE , mmBIOS_SCRATCH_6,0 ,0 ,0 ,0 }, + {CMD_WRITE , mmBIOS_SCRATCH_7,0 ,0 ,0 ,0 }, {CMD_WRITE , mmCP_PFP_UCODE_ADDR,0 ,0 ,0 ,0 } }; --Quoted 2 lines
2.29.0
Not sure why I'm cc'd on this, I'm not a maintainer, nor does this patch seem related to any patches I've contributed.
Quoted 2 lines
- Sandeep
Ok, I just saw the other email. I'll try testing the patch and see if it fixes the hibernation bug.
- Sandeep
Quoted 1 line
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 71 lines · Sandeep
Quoted 67 lines · On Tue, 27 Oct, 2020, 17:01 Sandeep, <[email protected]> wrote:
Quoted 58 lines · On Tue, 27 Oct, 2020, 08:10 Evan Quan, <[email protected]> wrote:
Which can be used for S4(hibernation) support.
Change-Id I6e4962c120a3baed14cea04ed1742ff11a273d34Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/cik.c +3
-1@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_BONAIRE : -case CHIP_HAWAII :/* disable baco reset until it works */ /* smu7_asic_get_baco_capability(adev, &baco_reset); */ baco_reset = false;break ; +case CHIP_HAWAII : + baco_reset =cik_asic_supports_baco (adev); +break ;default : baco_reset = false;break ;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +4
-4@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_BCLK_OFF_MASK, BACO_CNTL__BACO_BCLK_OFF__SHIFT, 0, 0x00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_POWER_OFF_MASK, BACO_CNTL__BACO_POWER_OFF__SHIFT, 0, 0x00 }, { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x20 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x200 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ANA_ISO_DIS_MASK, BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0, 0x01 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x00 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x10 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x100 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_EN_MASK, BACO_CNTL__BACO_EN__SHIFT, 0, 0x00 }, { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MODE_MASK, 0, 0xffffffff, 0x00 } };@@ -155,6 +155,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] =static const struct baco_cmd_entry clean_baco_tbl[] = { {CMD_WRITE , mmBIOS_SCRATCH_6,0 ,0 ,0 ,0 }, + {CMD_WRITE , mmBIOS_SCRATCH_7,0 ,0 ,0 ,0 }, {CMD_WRITE , mmCP_PFP_UCODE_ADDR,0 ,0 ,0 ,0 } }; --Quoted 1 line
2.29.0
Not sure why I'm cc'd on this, I'm not a maintainer, nor does this patch seem related to any patches I've contributed.
Quoted 6 lines
Quoted 1 line
- Sandeep
Ok, I just saw the other email. I'll try testing the patch and see if it fixes the hibernation bug.
- Sandeep
I tested and while suspend works correctly, hibernation is completely broken. The system fails to resume from hibernation which is much worse than before.
- Sandeep
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Hi Sandeep,
Did you run the tests on Hawaii?
And can you help to confirm which method is used for gpu reset? "BACO reset" or " PCI CONFIG reset" (you can grep these keywords in dmesg)?
BR
Evan
-----Original Message-----
From: Sandeep <[email protected]>
Sent: Tuesday, October 27, 2020 10:33 PM
To: Quan, Evan <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: enable baco reset for Hawaii
Quoted 75 lines · Sandeep
Quoted 71 lines · On Tue, 27 Oct, 2020, 17:01 Sandeep, <[email protected]> wrote:
Quoted 56 lines · On Tue, 27 Oct, 2020, 08:10 Evan Quan, <[email protected]> wrote:
Which can be used for S4(hibernation) support.
Change-Id I6e4962c120a3baed14cea04ed1742ff11a273d34Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/cik.c +3
-1@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_BONAIRE : -case CHIP_HAWAII :/* disable baco reset until it works */ /* smu7_asic_get_baco_capability(adev, &baco_reset); */ baco_reset = false;break ; +case CHIP_HAWAII : + baco_reset =cik_asic_supports_baco (adev); +break ;default : baco_reset = false;break;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +6
-3@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_BCLK_OFF_MASK, BACO_CNTL__BACO_BCLK_OFF__SHIFT, 0, 0x00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_POWER_OFF_MASK, BACO_CNTL__BACO_POWER_OFF__SHIFT, 0, 0x00 }, { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x20 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, + 0xffffffff, 0x200 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, + 0x1c00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ANA_ISO_DIS_MASK, BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0, 0x01 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x00 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x10 }, + { CMD_WAITFOR, mmBACO_CNTL, + BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x100 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_EN_MASK, BACO_CNTL__BACO_EN__SHIFT, 0, 0x00 }, { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MODE_MASK, 0,
0xffffffff,0x00} }; @@ -155,6 +155,7 @@ static const structbaco_cmd_entryexit_baco_tbl[] = static const structbaco_cmd_entryQuoted 7 lines
clean_baco_tbl[] = { { CMD_WRITE, mmBIOS_SCRATCH_6, 0, 0, 0, 0 }, + { CMD_WRITE, mmBIOS_SCRATCH_7, 0, 0, 0, 0 }, { CMD_WRITE, mmCP_PFP_UCODE_ADDR, 0, 0, 0, 0 } };--
2.29.0Not sure why I'm cc'd on this, I'm not a maintainer, nor does this patch seem related to any patches I've contributed.
Quoted 6 lines
Quoted 1 line
- Sandeep
Ok, I just saw the other email. I'll try testing the patch and see if it fixes the hibernation bug.
- Sandeep
I tested and while suspend works correctly, hibernation is completely broken. The system fails to resume from hibernation which is much worse than before.
- Sandeep
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
If it turns out "PCI CONFIG reset" is used, please try the new patch series I just sent.
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055327.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055328.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055329.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055330.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055331.html
BR
Evan
-----Original Message-----
From: Quan, Evan
Sent: Wednesday, October 28, 2020 9:31 AM
To: Sandeep <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: RE: [PATCH 1/2] drm/amd/pm: enable baco reset for Hawaii
Hi Sandeep,
Did you run the tests on Hawaii?
And can you help to confirm which method is used for gpu reset? "BACO reset" or " PCI CONFIG reset" (you can grep these keywords in dmesg)?
BR
Evan
-----Original Message-----
From: Sandeep <[email protected]>
Sent: Tuesday, October 27, 2020 10:33 PM
To: Quan, Evan <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH 1/2] drm/amd/pm: enable baco reset for Hawaii
Quoted 75 lines · Sandeep
Quoted 71 lines · On Tue, 27 Oct, 2020, 17:01 Sandeep, <[email protected]> wrote:
Quoted 56 lines · On Tue, 27 Oct, 2020, 08:10 Evan Quan, <[email protected]> wrote:
Which can be used for S4(hibernation) support.
Change-Id I6e4962c120a3baed14cea04ed1742ff11a273d34Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/cik.c +3
-1@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_BONAIRE : -case CHIP_HAWAII :/* disable baco reset until it works */ /* smu7_asic_get_baco_capability(adev, &baco_reset); */ baco_reset = false;break ; +case CHIP_HAWAII : + baco_reset =cik_asic_supports_baco (adev); +break ;default : baco_reset = false;break;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +6
-3@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_BCLK_OFF_MASK, BACO_CNTL__BACO_BCLK_OFF__SHIFT, 0, 0x00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_POWER_OFF_MASK, BACO_CNTL__BACO_POWER_OFF__SHIFT, 0, 0x00 }, { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x20 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, + 0xffffffff, 0x200 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, + 0x1c00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ANA_ISO_DIS_MASK, BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0, 0x01 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x00 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x10 }, + { CMD_WAITFOR, mmBACO_CNTL, + BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x100 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_EN_MASK, BACO_CNTL__BACO_EN__SHIFT, 0, 0x00 }, { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MODE_MASK, 0,
0xffffffff,0x00} }; @@ -155,6 +155,7 @@ static const structbaco_cmd_entryexit_baco_tbl[] = static const structbaco_cmd_entryQuoted 7 lines
clean_baco_tbl[] = { { CMD_WRITE, mmBIOS_SCRATCH_6, 0, 0, 0, 0 }, + { CMD_WRITE, mmBIOS_SCRATCH_7, 0, 0, 0, 0 }, { CMD_WRITE, mmCP_PFP_UCODE_ADDR, 0, 0, 0, 0 } };--
2.29.0Not sure why I'm cc'd on this, I'm not a maintainer, nor does this patch seem related to any patches I've contributed.
Quoted 6 lines
Quoted 1 line
- Sandeep
Ok, I just saw the other email. I'll try testing the patch and see if it fixes the hibernation bug.
- Sandeep
I tested and while suspend works correctly, hibernation is completely broken. The system fails to resume from hibernation which is much worse than before.
- Sandeep
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 10 lines · Evan
[AMD Official Use Only - Internal Distribution Only]
If it turns out "PCI CONFIG reset" is used, please try the new patch series I just sent.
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055327.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055328.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055329.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055330.html
https://lists.freedesktop.org/archives/amd-gfx/2020-October/055331.html
Quoted 2 lines
BR
Evan
I tested out this patchset, and can confirm that both suspend and hibernate work as expected.
- Sandeep
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 10 lines · Evan
[AMD Official Use Only - Internal Distribution Only]
Hi Sandeep,
Did you run the tests on Hawaii?
And can you help to confirm which method is used for gpu reset? "BACO reset" or " PCI CONFIG reset" (you can grep these keywords in dmesg)?BR
Evan
Yes, I ran the tests on Hawaii. The reset method isn't printed out in dmesg. Is it only printed out during hibernate? When I run the kernel with the above patch, the computer hangs when I attempt to hibernate, and kernel logs don't get written to disk, so I'm unable to figure out which method it's using with your patches.
However, I did look at the reset method for earlier kernels, and I believe it's using the PCI config reset method. I will try your other patchset to see if it fixes the issue.
- Sandeep
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 50 lines · Evan Quan
Which can be used for S4(hibernation) support.
Change-Id I6e4962c120a3baed14cea04ed1742ff11a273d34Signed-off-by Evan Quan <[email protected]>--- drivers/gpu/drm/amd/amdgpu/cik.c | 4 +++- drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c | 7 ++++--- 2 files changed, 7 insertions(+), 4 deletions(-)drivers/gpu/drm/amd/amdgpu/cik.c +3
-1@@ -1336,11 +1336,13 @@ cik_asic_reset_method(struct amdgpu_device *adev)switch (adev->asic_type) {case CHIP_BONAIRE : -case CHIP_HAWAII :/* disable baco reset until it works */ /* smu7_asic_get_baco_capability(adev, &baco_reset); */ baco_reset = false;break ; +case CHIP_HAWAII : + baco_reset =cik_asic_supports_baco (adev); +break ;default : baco_reset = false;break ;drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +3
-3@@ -142,12 +142,12 @@ static const struct baco_cmd_entry exit_baco_tbl[] = { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_BCLK_OFF_MASK, BACO_CNTL__BACO_BCLK_OFF__SHIFT, 0, 0x00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_POWER_OFF_MASK, BACO_CNTL__BACO_POWER_OFF__SHIFT, 0, 0x00 }, { CMD_DELAY_MS, 0, 0, 0, 20, 0 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x20 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_BF_MASK, 0, 0xffffffff, 0x200 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ISO_DIS_MASK, BACO_CNTL__BACO_ISO_DIS__SHIFT, 0, 0x01 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__PWRGOOD_MASK, 0, 5, 0x1c00 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_ANA_ISO_DIS_MASK, BACO_CNTL__BACO_ANA_ISO_DIS__SHIFT, 0, 0x01 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_RESET_EN_MASK, BACO_CNTL__BACO_RESET_EN__SHIFT, 0, 0x00 }, - { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x10 }, + { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__RCU_BIF_CONFIG_DONE_MASK, 0, 5, 0x100 }, { CMD_READMODIFYWRITE, mmBACO_CNTL, BACO_CNTL__BACO_EN_MASK, BACO_CNTL__BACO_EN__SHIFT, 0, 0x00 }, { CMD_WAITFOR, mmBACO_CNTL, BACO_CNTL__BACO_MODE_MASK, 0, 0xffffffff, 0x00 } };
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c static const struct baco_cmd_entry exit_baco_tbl[] = · line 160
Quoted 6 lines
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +1
-0@@ -155,6 +155,7 @@ static const struct baco_cmd_entry exit_baco_tbl[] =static const struct baco_cmd_entry clean_baco_tbl[] = { {CMD_WRITE , mmBIOS_SCRATCH_6,0 ,0 ,0 ,0 }, + {CMD_WRITE , mmBIOS_SCRATCH_7,0 ,0 ,0 ,0 }, {CMD_WRITE , mmCP_PFP_UCODE_ADDR,0 ,0 ,0 ,0 } };
The changes to this file look like a bug fix. Can you break that out as a separate patch?
Alex
Quoted 8 lines
drivers/gpu/drm/amd/pm/powerplay/hwmgr/ci_baco.c +0
-1--2.29.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx