Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e4295adc84a342cf6f627128cbbd939f320cf687

Authored by Evan Quan
Committed by Alex Deucher
1 parent c42656f8fc

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 <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Showing 1 changed file with 0 additions and 14 deletions Side-by-side Diff

drivers/gpu/drm/amd/powerplay/smu_v11_0.c
Diff comments   View file @ e4295ad
... ... @@ -1700,11 +1700,9 @@
1700 1700  
1701 1701 int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)
1702 1702 {
1703   -
1704 1703 struct smu_baco_context *smu_baco = &smu->smu_baco;
1705 1704 struct amdgpu_device *adev = smu->adev;
1706 1705 struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
1707   - uint32_t bif_doorbell_intr_cntl;
1708 1706 uint32_t data;
1709 1707 int ret = 0;
1710 1708  
1711 1709  
... ... @@ -1713,14 +1711,7 @@
1713 1711  
1714 1712 mutex_lock(&smu_baco->mutex);
1715 1713  
1716   - bif_doorbell_intr_cntl = RREG32_SOC15(NBIO, 0, mmBIF_DOORBELL_INT_CNTL);
1717   -
1718 1714 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   -
1724 1715 if (!ras || !ras->supported) {
1725 1716 data = RREG32_SOC15(THM, 0, mmTHM_BACO_CNTL);
1726 1717 data |= 0x80000000;
... ... @@ -1734,11 +1725,6 @@
1734 1725 ret = smu_send_smc_msg(smu, SMU_MSG_ExitBaco, NULL);
1735 1726 if (ret)
1736 1727 goto out;
1737   -
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 1728  
1743 1729 /* clear vbios scratch 6 and 7 for coming asic reinit */
1744 1730 WREG32(adev->bios_scratch_reg_offset + 6, 0);