drm/amdgpu:no gpu scheduler for KIQ
Subsystems (2)
PATCH 1/1 drm/amdgpu:no gpu scheduler for KIQ
KIQ is used for interaction between driver and CP, and not exposed to outside client, as such it doesn't need to be handled by GPU scheduler.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +4 -0
@@ -382,6 +382,10 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring,if (!ring->fence_drv.fences)return -ENOMEM ; +/* Doesn't need gpu scheduler */ +if (!num_hw_submission) +return 0 ; + timeout =msecs_to_jiffies (amdgpu_lockup_timeout);if (timeout ==0 ) {/*
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +4 -2
@@ -168,6 +168,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, unsigned irq_type) {int r; +int entry_num = amdgpu_sched_hw_submission;if (ring->adev ==NULL ) {if (adev->num_rings >=AMDGPU_MAX_RINGS )
@@ -176,8 +177,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, ring->adev = adev; ring->idx = adev->num_rings++; adev->rings[ring->idx] = ring; - r =amdgpu_fence_driver_init_ring (ring, - amdgpu_sched_hw_submission); +if (ring->funcs->type ==AMDGPU_RING_TYPE_KIQ ) + entry_num =0 ; + r =amdgpu_fence_driver_init_ring (ring, entry_num);if (r)return r; }
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1477984900-10244-1-git-send-email-trigger.huang-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 26 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Trigger Huang
Sent: Tuesday, November 01, 2016 3:22 AM
To: [email protected]
Cc: Yu, Xiangliang; Liu, Monk; Huang, Trigger
Subject: [PATCH] drm/amdgpu:no gpu scheduler for KIQKIQ is used for interaction between driver and CP, and not exposed to outside client, as such it doesn't need to be handled by GPU scheduler.
Signed-off-by Monk Liu <[email protected]>Signed-off-by Xiangliang Yu <[email protected]>Signed-off-by Trigger Huang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c int amdgpu_fence_driver_init_ring(struct · line 389
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +4
-0@@ -382,6 +382,10 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, if (!ring->fence_drv.fences) return -ENOMEM; +/* Doesn't need gpu scheduler */ +if (!num_hw_submission) +return 0 ; +
Rather than returning early here, I'd suggest wrapping the scheduler setup conditionally. E.g.,
if (num_hw_submission) {
/* setup scheduler */
....
}
That way if we add anything else to that function, we don't accidently break KIQ.
With that fixed:
Alex
Quoted 33 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0
-0timeout =msecs_to_jiffies (amdgpu_lockup_timeout);if (timeout ==0 ) {drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0
-0/* drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-0@@ -168,6 +168,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev,struct amdgpu_ring *ring, unsigned irq_type) { int r; +int entry_num = amdgpu_sched_hw_submission;if (ring->adev ==NULL ) {drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +3
-2if (adev->num_rings >=AMDGPU_MAX_RINGS )@@ -176,8 +177,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev,struct amdgpu_ring *ring, ring->adev = adev; ring->idx = adev->num_rings++; adev->rings[ring->idx] = ring; - r =amdgpu_fence_driver_init_ring (ring, - amdgpu_sched_hw_submission); +if (ring->funcs->type ==AMDGPU_RING_TYPE_KIQ ) + entry_num =0 ; + r =amdgpu_fence_driver_init_ring (ring, entry_num);if (r)return r;}
--
2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): MWHPR12MB1694199CDBFE65B2668F2F52F7A10-Gy0DoCVfaSW4WA4dJ5YXGAdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Am 01.11.2016 um 16:27 schrieb Deucher, Alexander:
Quoted 48 lines
Quoted 26 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Trigger Huang
Sent: Tuesday, November 01, 2016 3:22 AM
To: [email protected]
Cc: Yu, Xiangliang; Liu, Monk; Huang, Trigger
Subject: [PATCH] drm/amdgpu:no gpu scheduler for KIQKIQ is used for interaction between driver and CP, and not exposed to outside client, as such it doesn't need to be handled by GPU scheduler.
Signed-off-by Monk Liu <[email protected]>Signed-off-by Xiangliang Yu <[email protected]>Signed-off-by Trigger Huang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 ++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0
-0drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c int amdgpu_fence_driver_init_ring(struct · line 389
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +4
-0@@ -382,6 +382,10 @@ int amdgpu_fence_driver_init_ring(struct amdgpu_ring *ring, if (!ring->fence_drv.fences) return -ENOMEM; +/* Doesn't need gpu scheduler */ +if (!num_hw_submission) +return 0 ; +Rather than returning early here, I'd suggest wrapping the scheduler setup conditionally. E.g.,
if (num_hw_submission) { /* setup scheduler */....
}That way if we add anything else to that function, we don't accidently break KIQ.
With that fixed:
Reviewed-by Alex Deucher <[email protected]>Alex
Quoted 14 lines
Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +0
-0timeout =msecs_to_jiffies (amdgpu_lockup_timeout);if (timeout ==0 ) {/*
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +0
-0drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c int amdgpu_ring_init(struct amdgpu_device *adev, · line 172
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-0@@ -168,6 +168,7 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, unsigned irq_type) {int r; +int entry_num = amdgpu_sched_hw_submission;
Additionally to Alex comment above please move the new local variable into the "if" where it is used.
With that fixed the patch is Reviewed-by: Christian König <[email protected]> as well.
Regards,
Christian.
Quoted 19 lines
Quoted 19 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +3
-2if (ring->adev ==NULL ) {if (adev->num_rings >=AMDGPU_MAX_RINGS )@@ -176,8 +177,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev,struct amdgpu_ring *ring, ring->adev = adev; ring->idx = adev->num_rings++; adev->rings[ring->idx] = ring; - r =amdgpu_fence_driver_init_ring (ring, - amdgpu_sched_hw_submission); +if (ring->funcs->type ==AMDGPU_RING_TYPE_KIQ ) + entry_num =0 ; + r =amdgpu_fence_driver_init_ring (ring, entry_num);if (r)return r;}
--
2.7.4
Quoted 8 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx