diff options
| author | Hawking Zhang <Hawking.Zhang@amd.com> | 2020-12-01 00:23:16 +0800 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-12-23 15:06:08 -0500 |
| commit | 95c0c2576432b27105e144359dfc2bb06e60b5e7 (patch) | |
| tree | 6ec85c7d1b2482d433f6e234337bac5bf61efe18 /drivers/gpu/drm/amd/amdgpu/vega10_ih.c | |
| parent | 05bd7e74ec3e572eb129019d7b606febd27daa77 (diff) | |
| download | linux-stable-95c0c2576432b27105e144359dfc2bb06e60b5e7.tar.gz linux-stable-95c0c2576432b27105e144359dfc2bb06e60b5e7.tar.bz2 linux-stable-95c0c2576432b27105e144359dfc2bb06e60b5e7.zip | |
drm/amdgpu: drop IH_CHICKEN programming from vega10 ih block
except for RENOIR, it is not correct to have
IH_CHICKEN programming in vega10 ih block.
Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Acked-by: Christian König <christian.koenig@amd.com>
Acked-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Dennis Li <Dennis.Li@amd.com>
Reviewed-by: Feifei Xu <Feifei.Xu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/vega10_ih.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c index 17c0a07c883b..44021efe8222 100644 --- a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c @@ -274,9 +274,7 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev) adev->nbio.funcs->ih_control(adev); - if ((adev->asic_type == CHIP_ARCTURUS && - adev->firmware.load_type == AMDGPU_FW_LOAD_DIRECT) || - adev->asic_type == CHIP_RENOIR) { + if (adev->asic_type == CHIP_RENOIR) { ih_chicken = RREG32_SOC15(OSSSYS, 0, mmIH_CHICKEN); if (adev->irq.ih.use_bus_addr) { ih_chicken = REG_SET_FIELD(ih_chicken, IH_CHICKEN, |