drm/amdgpu: take runtime pm reference when we attach a buffer
Subsystems (2)
PATCH 1/1 drm/amdgpu: take runtime pm reference when we attach a buffer
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +14 -2
@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation
@@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ; + r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; + r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers
@@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out; bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return r; }/**
@@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }/**
Signature · 6 lines
2.25.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 6 lines · Alex Deucher
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
Signed-off-by Alex Deucher <[email protected]>
Ping? Any thoughts on this? We really only need this for p2p since device memory in involved, but I'm not sure of the best way to handle that.
Alex
Quoted 59 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +14
-3@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation @@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ; + r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; + r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers @@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out; bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); +return r; }/** @@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }/** --
Quoted 2 lines
2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 34 lines · Alex Deucher
Quoted 5 lines · Alex Deucher
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
Signed-off-by Alex Deucher <[email protected]>Ping? Any thoughts on this? We really only need this for p2p since device memory in involved, but I'm not sure of the best way to handle that.
Alex
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +1
-0@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation @@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ;
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 194
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+ r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; +
I am a bit skeptical if we should fail the BO reserve if we don't get the sync ? I was hoping to continue with it, with a warning maybe, so that it doesn't block the existing functionality ?
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +2
-2r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers @@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out;
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +3
-0bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);
Why not just pm_runtime_put_sync ? Why autosuspend ?
- Shashank
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+return r; }/** @@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +0
-1/** -- 2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7Cd5fccf427c34414ff4e708d89c682898%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637431318483043257%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=NpCTY%2FVKd%2FBDi1wsFC79qSUTmNHx3nBp0HUj3m0cFeM%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Am 10.12.20 um 05:49 schrieb Shashank Sharma:
Quoted 34 lines · Alex Deucher
Quoted 33 lines · Alex Deucher
Quoted 5 lines
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
Signed-off-by Alex Deucher <[email protected]>Ping? Any thoughts on this? We really only need this for p2p since device memory in involved, but I'm not sure of the best way to handle that.
Alex
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +1
-0@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation @@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ;
Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 194
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+ r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; +I am a bit skeptical if we should fail the BO reserve if we don't get the sync ? I was hoping to continue with it, with a warning maybe, so that it doesn't block the existing functionality ?
I'm not sure why pm_runtime_get_sync() could fail, but not attaching the DMA-buf is certainly the best we could do here in that moment.
Otherwise we could end up in accessing the PCIe BAR with power disabled and that's indeed kind of bad.
Christian.
Quoted 45 lines
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +2
-2r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers @@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out;Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +3
-0bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);Why not just
pm_runtime_put_sync? Why autosuspend ?- Shashank
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+return r; }/** @@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +0
-1/** -- 2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7Cd5fccf427c34414ff4e708d89c682898%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637431318483043257%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=NpCTY%2FVKd%2FBDi1wsFC79qSUTmNHx3nBp0HUj3m0cFeM%3D&reserved=0
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
Quoted 35 lines · Christian König
Am 10.12.20 um 05:49 schrieb Shashank Sharma:
Quoted 34 lines · Alex Deucher
Quoted 33 lines · Alex Deucher
Quoted 5 lines
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
Signed-off-by Alex Deucher <[email protected]>Ping? Any thoughts on this? We really only need this for p2p since device memory in involved, but I'm not sure of the best way to handle that.
Alex
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +1
-0@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation @@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ;
Quoted 7 lines
Quoted 5 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 194
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+ r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; +I am a bit skeptical if we should fail the BO reserve if we don't get the sync ? I was hoping to continue with it, with a warning maybe, so that it doesn't block the existing functionality ?
I'm not sure why
pm_runtime_get_sync()could fail, but not attaching the DMA-buf is certainly the best we could do here in that moment.
Ah, I see. Just curious about, before this patch, when we tried to reserve the BO, without the PM sync, how was that doing OK ?
- Shashank
Quoted 54 lines
Otherwise we could end up in accessing the PCIe BAR with power disabled and that's indeed kind of bad.
Christian.
Quoted 49 lines
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +2
-2r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers @@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out;Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +3
-0bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);Why not just
pm_runtime_put_sync? Why autosuspend ?- Shashank
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+return r; }/** @@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +0
-1/** -- 2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7C9957c5b838fc49ae225e08d89cf649a1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C1%7C637431928895902617%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=AMtWNSZRyFZDRHhE7hsIdBWxTHVLGYVOHZOSeRSR07s%3D&reserved=0_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7C9957c5b838fc49ae225e08d89cf649a1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C1%7C637431928895902617%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=AMtWNSZRyFZDRHhE7hsIdBWxTHVLGYVOHZOSeRSR07s%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 43 lines · Shashank Sharma
Quoted 40 lines · Christian König
Am 10.12.20 um 05:49 schrieb Shashank Sharma:
Quoted 39 lines · Alex Deucher
Quoted 33 lines · Alex Deucher
Quoted 5 lines
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
Signed-off-by Alex Deucher <[email protected]>Ping? Any thoughts on this? We really only need this for p2p since device memory in involved, but I'm not sure of the best way to handle that.
Alex
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +1
-0@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation @@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ;Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 194
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+ r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; +I am a bit skeptical if we should fail the BO reserve if we don't get the sync ? I was hoping to continue with it, with a warning maybe, so that it doesn't block the existing functionality ?
Quoted 4 lines
Quoted 2 lines
I'm not sure why
pm_runtime_get_sync()could fail, but not attaching the DMA-buf is certainly the best we could do here in that moment.Ah, I see. Just curious about, before this patch, when we tried to reserve the BO, without the PM sync, how was that doing OK ?
p2p is not widely used at this point, so we never really hit is except for specific testing of the functionality.
Alex
Quoted 53 lines
- Shashank
Quoted 50 lines
Otherwise we could end up in accessing the PCIe BAR with power disabled and that's indeed kind of bad.
Christian.
Quoted 45 lines
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +2
-2r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers @@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out;Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +3
-0bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);Why not just
pm_runtime_put_sync? Why autosuspend ?- Shashank
Quoted 21 lines
Quoted 15 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-1+return r; }/** @@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }/** -- Quoted 2 lines
2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7C9957c5b838fc49ae225e08d89cf649a1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C1%7C637431928895902617%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=AMtWNSZRyFZDRHhE7hsIdBWxTHVLGYVOHZOSeRSR07s%3D&reserved=0
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7C9957c5b838fc49ae225e08d89cf649a1%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C1%7C637431928895902617%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=AMtWNSZRyFZDRHhE7hsIdBWxTHVLGYVOHZOSeRSR07s%3D&reserved=0_______________________________________________
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
Shashank Sharma
Acked-byQuoted 41 lines · Alex Deucher
Quoted 40 lines · Shashank Sharma
Quoted 38 lines · Christian König
Am 10.12.20 um 05:49 schrieb Shashank Sharma:
Quoted 37 lines · Alex Deucher
Quoted 31 lines · Alex Deucher
Quoted 5 lines
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
Signed-off-by Alex Deucher <[email protected]>Ping? Any thoughts on this? We really only need this for p2p since device memory in involved, but I'm not sure of the best way to handle that.
Alex
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +1
-0@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation @@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ;Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 194
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+ r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; +I am a bit skeptical if we should fail the BO reserve if we don't get the sync ? I was hoping to continue with it, with a warning maybe, so that it doesn't block the existing functionality ?
Quoted 7 lines
Quoted 3 lines
Quoted 2 lines
I'm not sure why
pm_runtime_get_sync()could fail, but not attaching the DMA-buf is certainly the best we could do here in that moment.Ah, I see. Just curious about, before this patch, when we tried to reserve the BO, without the PM sync, how was that doing OK ?
p2p is not widely used at this point, so we never really hit is except for specific testing of the functionality.
Alex
Got it. Apart from this, looks fine by me.
Quoted 53 lines
Quoted 53 lines
- Shashank
Quoted 50 lines
Otherwise we could end up in accessing the PCIe BAR with power disabled and that's indeed kind of bad.
Christian.
Quoted 45 lines
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +2
-2r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers @@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out;Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +3
-0bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);Why not just
pm_runtime_put_sync? Why autosuspend ?- Shashank
Quoted 21 lines
Quoted 15 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-1+return r; }/** @@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }/** -- Quoted 2 lines
2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7C222e41b3837c4d7f3ec908d89d23ca8b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637432124337679194%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=bgSvn4XqmoKffyCF1v1ldVptiKMZXfEfkzFnJj3Ca0Y%3D&reserved=0
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7C222e41b3837c4d7f3ec908d89d23ca8b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637432124337679194%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=bgSvn4XqmoKffyCF1v1ldVptiKMZXfEfkzFnJj3Ca0Y%3D&reserved=0_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7C222e41b3837c4d7f3ec908d89d23ca8b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637432124337679194%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000&sdata=bgSvn4XqmoKffyCF1v1ldVptiKMZXfEfkzFnJj3Ca0Y%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 56 lines · Shashank Sharma
Quoted 34 lines · Alex Deucher
Quoted 5 lines · Alex Deucher
And drop it when we detach. If the shared buffer is in vram, we need to make sure we don't put the device into runtime suspend.
Signed-off-by Alex Deucher <[email protected]>Ping? Any thoughts on this? We really only need this for p2p since device memory in involved, but I'm not sure of the best way to handle that.
Alex
Quoted 20 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +1
-0@@ -40,6 +40,7 @@#include <linux/dma-buf.h> #include <linux/dma-fence-array.h> #include <linux/pci-p2pdma.h> +#include <linux/pm_runtime.h> /** * amdgpu_gem_prime_vmap - &dma_buf_ops.vmap implementation @@ -187,9 +188,13 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,if (attach->dev->driver == adev->dev->driver)return 0 ;Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 194
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+ r =pm_runtime_get_sync (adev_to_drm (adev)->dev); +if (r <0 ) + goto out; +I am a bit skeptical if we should fail the BO reserve if we don't get the sync ? I was hoping to continue with it, with a warning maybe, so that it doesn't block the existing functionality ?
Quoted 14 lines
Quoted 14 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +2
-2r =amdgpu_bo_reserve (bo, false);if (unlikely (r !=0 )) -return r; + goto out;/* * We only create shared fences for internal use, but importers @@ -201,11 +206,15 @@ static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf,*/ r =__dma_resv_make_exclusive (bo->tbo.base.resv);if (r) -return r; + goto out;
Quoted 8 lines
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c static int amdgpu_dma_buf_attach(struct dma_buf *dmabuf, · line 216
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +3
-0bo->prime_shared_count++;amdgpu_bo_unreserve (bo);return 0 ; + +out: +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev);Why not just
pm_runtime_put_sync? Why autosuspend ?
Not sure. I'm just copying what we do in other cases which happens to work. I'm not really a runtime pm expert.
Alex
Quoted 24 lines
- Shashank
Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +4
-0+return r; }/** @@ -225,6 +234,9 @@ static void amdgpu_dma_buf_detach(struct dma_buf *dmabuf,if (attach->dev->driver != adev->dev->driver && bo->prime_shared_count) bo->prime_shared_count--; + +pm_runtime_mark_last_busy (adev_to_drm (adev)->dev); +pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); }Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +0
-1/** -- 2.25.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Cshashank.sharma%40amd.com%7Cd5fccf427c34414ff4e708d89c682898%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637431318483043257%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=NpCTY%2FVKd%2FBDi1wsFC79qSUTmNHx3nBp0HUj3m0cFeM%3D&reserved=0
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