Skip to content

Commit e4295ad

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amd/powerplay: drop redundant BIF doorbell interrupt operations
This is already done in soc15.c. And this is really ASIC specific and should not be placed here. Signed-off-by: Evan Quan <[email protected]> Reviewed-by: Alex Deucher <[email protected]> Signed-off-by: Alex Deucher <[email protected]>
1 parent c42656f commit e4295ad

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

drivers/gpu/drm/amd/powerplay/smu_v11_0.c

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1700,11 +1700,9 @@ enum smu_baco_state smu_v11_0_baco_get_state(struct smu_context *smu)
17001700

17011701
int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)
17021702
{
1703-
17041703
struct smu_baco_context *smu_baco = &smu->smu_baco;
17051704
struct amdgpu_device *adev = smu->adev;
17061705
struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
1707-
uint32_t bif_doorbell_intr_cntl;
17081706
uint32_t data;
17091707
int ret = 0;
17101708

@@ -1713,14 +1711,7 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)
17131711

17141712
mutex_lock(&smu_baco->mutex);
17151713

1716-
bif_doorbell_intr_cntl = RREG32_SOC15(NBIO, 0, mmBIF_DOORBELL_INT_CNTL);
1717-
17181714
if (state == SMU_BACO_STATE_ENTER) {
1719-
bif_doorbell_intr_cntl = REG_SET_FIELD(bif_doorbell_intr_cntl,
1720-
BIF_DOORBELL_INT_CNTL,
1721-
DOORBELL_INTERRUPT_DISABLE, 1);
1722-
WREG32_SOC15(NBIO, 0, mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl);
1723-
17241715
if (!ras || !ras->supported) {
17251716
data = RREG32_SOC15(THM, 0, mmTHM_BACO_CNTL);
17261717
data |= 0x80000000;
@@ -1735,11 +1726,6 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)
17351726
if (ret)
17361727
goto out;
17371728

1738-
bif_doorbell_intr_cntl = REG_SET_FIELD(bif_doorbell_intr_cntl,
1739-
BIF_DOORBELL_INT_CNTL,
1740-
DOORBELL_INTERRUPT_DISABLE, 0);
1741-
WREG32_SOC15(NBIO, 0, mmBIF_DOORBELL_INT_CNTL, bif_doorbell_intr_cntl);
1742-
17431729
/* clear vbios scratch 6 and 7 for coming asic reinit */
17441730
WREG32(adev->bios_scratch_reg_offset + 6, 0);
17451731
WREG32(adev->bios_scratch_reg_offset + 7, 0);

0 commit comments

Comments
 (0)