From: Tao Zhou Date: Fri, 2 Oct 2020 15:39:28 +0000 (-0400) Subject: drm/amdgpu: add ih ip block for dimgrey_cavefish X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=771cc67ed08f544ec16d5194e509c66694428e71;p=linux.git drm/amdgpu: add ih ip block for dimgrey_cavefish Enable ih block for dimgrey_cavefish, same as navy_flounder. Signed-off-by: Tao Zhou Reviewed-by: Hawking Zhang Reviewed-by: Jiansong Chen Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c index 53ea83c08e8e3..837769fcb35b7 100644 --- a/drivers/gpu/drm/amd/amdgpu/navi10_ih.c +++ b/drivers/gpu/drm/amd/amdgpu/navi10_ih.c @@ -315,6 +315,7 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev) case CHIP_SIENNA_CICHLID: case CHIP_NAVY_FLOUNDER: case CHIP_VANGOGH: + case CHIP_DIMGREY_CAVEFISH: ih_chicken = RREG32_SOC15(OSSSYS, 0, mmIH_CHICKEN_Sienna_Cichlid); ih_chicken = REG_SET_FIELD(ih_chicken, IH_CHICKEN, MC_SPACE_GPA_ENABLE, 1); diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index 6c06756a216a3..7b261dc447864 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c @@ -629,6 +629,7 @@ int nv_set_ip_blocks(struct amdgpu_device *adev) case CHIP_DIMGREY_CAVEFISH: amdgpu_device_ip_block_add(adev, &nv_common_ip_block); amdgpu_device_ip_block_add(adev, &gmc_v10_0_ip_block); + amdgpu_device_ip_block_add(adev, &navi10_ih_ip_block); break; default: return -EINVAL;