From: Le Ma Date: Thu, 6 Sep 2018 09:34:06 +0000 (+0800) Subject: drm/amdgpu: add VMC1 interrupt client id for Arcturus X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7d19b15f7013c9a9ebdcf253eb016ff37752ecc9;p=openwrt%2Fstaging%2Fblogic.git drm/amdgpu: add VMC1 interrupt client id for Arcturus New IH client id for VMC1. Signed-off-by: Le Ma Acked-by: Snow Zhang < Snow.Zhang@amd.com> Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c index 3ce10e8ebefa..ad387529446e 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c @@ -1032,6 +1032,13 @@ static int gmc_v9_0_sw_init(void *handle) if (r) return r; + if (adev->asic_type == CHIP_ARCTURUS) { + r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_VMC1, VMC_1_0__SRCID__VM_FAULT, + &adev->gmc.vm_fault); + if (r) + return r; + } + r = amdgpu_irq_add_id(adev, SOC15_IH_CLIENTID_UTCL2, UTCL2_1_0__SRCID__FAULT, &adev->gmc.vm_fault); diff --git a/drivers/gpu/drm/amd/include/soc15_ih_clientid.h b/drivers/gpu/drm/amd/include/soc15_ih_clientid.h index 5b40b9d1b788..0f386b2e1f4f 100644 --- a/drivers/gpu/drm/amd/include/soc15_ih_clientid.h +++ b/drivers/gpu/drm/amd/include/soc15_ih_clientid.h @@ -70,6 +70,7 @@ enum soc15_ih_clientid { SOC15_IH_CLIENTID_SDMA5 = SOC15_IH_CLIENTID_VCE0, SOC15_IH_CLIENTID_SDMA6 = SOC15_IH_CLIENTID_XDMA, SOC15_IH_CLIENTID_SDMA7 = SOC15_IH_CLIENTID_VCE1, + SOC15_IH_CLIENTID_VMC1 = SOC15_IH_CLIENTID_PCIE0, }; #endif