drm/amdgpu: enable software ih ring for vega20 ih block
Subsystems (2)
PATCH 1/3 drm/amdgpu: enable software ih ring for vega20 ih block
software ih ring will be used as a workaround
in case hardware ih ring 1 and ring 2 don't work
--- drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/amd/amdgpu/vega20_ih.c +7 -0
@@ -357,6 +357,9 @@ static int vega20_ih_irq_init(struct amdgpu_device *adev)if (ret)return ret; +if (adev->irq.ih_soft.ring_size) + adev->irq.ih_soft.enabled = true; +return 0 ; }
@@ -554,6 +557,10 @@ static int vega20_ih_sw_init(void *handle)/* initialize ih control registers offset */ vega20_ih_init_register_offset (adev); + r =amdgpu_ih_ring_init (adev, &adev->irq.ih_soft,PAGE_SIZE , true); +if (r) +return r; + r =amdgpu_irq_init (adev);return r;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amdgpu: set ih soft ring enabled flag for vega and navi
software ih ring is enabled in vega10 and navi
ih block by default.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 3 +++ drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +3 -0
@@ -370,6 +370,9 @@ static int navi10_ih_irq_init(struct amdgpu_device *adev)/* enable wptr force update for self int */ force_update_wptr_for_self_int (adev,0 ,8 , true); +if (adev->irq.ih_soft.ring_size) + adev->irq.ih_soft.enabled = true; +return 0 ; }
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +3 -0
@@ -307,6 +307,9 @@ static int vega10_ih_irq_init(struct amdgpu_device *adev)if (ret)return ret; +if (adev->irq.ih_soft.ring_size) + adev->irq.ih_soft.enabled = true; +return 0 ; }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: de-initialize software ih ring
In reply to Hawking Zhangtear down software ih ring and its state.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 1 + 3 files changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +1 -0
@@ -584,6 +584,7 @@ static int navi10_ih_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;amdgpu_irq_fini (adev); +amdgpu_ih_ring_fini (adev, &adev->irq.ih_soft);amdgpu_ih_ring_fini (adev, &adev->irq.ih2);amdgpu_ih_ring_fini (adev, &adev->irq.ih1);amdgpu_ih_ring_fini (adev, &adev->irq.ih);
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +1 -0
@@ -524,6 +524,7 @@ static int vega10_ih_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;amdgpu_irq_fini (adev); +amdgpu_ih_ring_fini (adev, &adev->irq.ih_soft);amdgpu_ih_ring_fini (adev, &adev->irq.ih2);amdgpu_ih_ring_fini (adev, &adev->irq.ih1);amdgpu_ih_ring_fini (adev, &adev->irq.ih);
drivers/gpu/drm/amd/amdgpu/vega20_ih.c +1 -0
@@ -571,6 +571,7 @@ static int vega20_ih_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;amdgpu_irq_fini (adev); +amdgpu_ih_ring_fini (adev, &adev->irq.ih_soft);amdgpu_ih_ring_fini (adev, &adev->irq.ih2);amdgpu_ih_ring_fini (adev, &adev->irq.ih1);amdgpu_ih_ring_fini (adev, &adev->irq.ih);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 3/3] drm/amdgpu: de-initialize software ih ring
[AMD Official Use Only - Internal Distribution Only]
Series is
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: 2020年12月21日 下午 1:43
To: [email protected]; Xu, Feifei <[email protected]>; Koenig, Christian <[email protected]>
Cc: Zhang, Hawking <[email protected]>
Subject: [PATCH 3/3] drm/amdgpu: de-initialize software ih ring
tear down software ih ring and its state.
--- drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 1 + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 1 + 3 files changed, 3 insertions(+)
drivers/gpu/drm/amd/amdgpu/navi10_ih.c +1 -0
@@ -584,6 +584,7 @@ static int navi10_ih_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;amdgpu_irq_fini (adev); +amdgpu_ih_ring_fini (adev, &adev->irq.ih_soft);amdgpu_ih_ring_fini (adev, &adev->irq.ih2);amdgpu_ih_ring_fini (adev, &adev->irq.ih1); amdgpu_ih_ring_fini(adev, &adev->irq.ih); diff --git a/drivers/gpu/drm/amd/amdgpu/vega10_ih.c b/drivers/gpu/drm/amd/amdgpu/vega10_ih.c
index 1581113477cf..88626d83e07b 100644
drivers/gpu/drm/amd/amdgpu/vega10_ih.c +1 -0
@@ -524,6 +524,7 @@ static int vega10_ih_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;amdgpu_irq_fini (adev); +amdgpu_ih_ring_fini (adev, &adev->irq.ih_soft);amdgpu_ih_ring_fini (adev, &adev->irq.ih2);amdgpu_ih_ring_fini (adev, &adev->irq.ih1); amdgpu_ih_ring_fini(adev, &adev->irq.ih); diff --git a/drivers/gpu/drm/amd/amdgpu/vega20_ih.c b/drivers/gpu/drm/amd/amdgpu/vega20_ih.c
index a1d4d67d5ee1..5487262527aa 100644
drivers/gpu/drm/amd/amdgpu/vega20_ih.c +1 -0
@@ -571,6 +571,7 @@ static int vega20_ih_sw_fini(void *handle)struct amdgpu_device *adev = (struct amdgpu_device *)handle;amdgpu_irq_fini (adev); +amdgpu_ih_ring_fini (adev, &adev->irq.ih_soft);amdgpu_ih_ring_fini (adev, &adev->irq.ih2);amdgpu_ih_ring_fini (adev, &adev->irq.ih1);amdgpu_ih_ring_fini (adev, &adev->irq.ih);
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx