* [PATCH] drm/amdgpu/jpeg: fix race condition issue for jpeg start
@ 2020-06-10 16:36 James Zhu
2020-06-10 18:31 ` Nirmoy
2020-06-11 11:56 ` Leo Liu
0 siblings, 2 replies; 3+ messages in thread
From: James Zhu @ 2020-06-10 16:36 UTC (permalink / raw)
To: amd-gfx; +Cc: jamesz
Fix race condition issue when multiple jpeg starts are called.
Signed-off-by: James Zhu <James.Zhu@amd.com>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 16 ++++++++++++----
drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 ++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
index d31d65e..8996cb4e 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
@@ -37,6 +37,8 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work);
int amdgpu_jpeg_sw_init(struct amdgpu_device *adev)
{
INIT_DELAYED_WORK(&adev->jpeg.idle_work, amdgpu_jpeg_idle_work_handler);
+ mutex_init(&adev->jpeg.jpeg_pg_lock);
+ atomic_set(&adev->jpeg.total_submission_cnt, 0);
return 0;
}
@@ -54,6 +56,8 @@ int amdgpu_jpeg_sw_fini(struct amdgpu_device *adev)
amdgpu_ring_fini(&adev->jpeg.inst[i].ring_dec);
}
+ mutex_destroy(&adev->jpeg.jpeg_pg_lock);
+
return 0;
}
@@ -83,7 +87,7 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work)
fences += amdgpu_fence_count_emitted(&adev->jpeg.inst[i].ring_dec);
}
- if (fences == 0)
+ if (!fences && !atomic_read(&adev->jpeg.total_submission_cnt))
amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
AMD_PG_STATE_GATE);
else
@@ -93,15 +97,19 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work)
void amdgpu_jpeg_ring_begin_use(struct amdgpu_ring *ring)
{
struct amdgpu_device *adev = ring->adev;
- bool set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work);
- if (set_clocks)
- amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
+ atomic_inc(&adev->jpeg.total_submission_cnt);
+ cancel_delayed_work_sync(&adev->jpeg.idle_work);
+
+ mutex_lock(&adev->jpeg.jpeg_pg_lock);
+ amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
AMD_PG_STATE_UNGATE);
+ mutex_unlock(&adev->jpeg.jpeg_pg_lock);
}
void amdgpu_jpeg_ring_end_use(struct amdgpu_ring *ring)
{
+ atomic_dec(&ring->adev->jpeg.total_submission_cnt);
schedule_delayed_work(&ring->adev->jpeg.idle_work, JPEG_IDLE_TIMEOUT);
}
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
index 5131a0a..55fbff2 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
@@ -46,6 +46,8 @@ struct amdgpu_jpeg {
unsigned harvest_config;
struct delayed_work idle_work;
enum amd_powergating_state cur_state;
+ struct mutex jpeg_pg_lock;
+ atomic_t total_submission_cnt;
};
int amdgpu_jpeg_sw_init(struct amdgpu_device *adev);
--
2.7.4
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu/jpeg: fix race condition issue for jpeg start
2020-06-10 16:36 [PATCH] drm/amdgpu/jpeg: fix race condition issue for jpeg start James Zhu
@ 2020-06-10 18:31 ` Nirmoy
2020-06-11 11:56 ` Leo Liu
1 sibling, 0 replies; 3+ messages in thread
From: Nirmoy @ 2020-06-10 18:31 UTC (permalink / raw)
To: amd-gfx
Acked-by: Nirmoy Das <nirmoy.das@amd.com>
On 6/10/20 6:36 PM, James Zhu wrote:
> Fix race condition issue when multiple jpeg starts are called.
>
> Signed-off-by: James Zhu <James.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 16 ++++++++++++----
> drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 ++
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> index d31d65e..8996cb4e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> @@ -37,6 +37,8 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work);
> int amdgpu_jpeg_sw_init(struct amdgpu_device *adev)
> {
> INIT_DELAYED_WORK(&adev->jpeg.idle_work, amdgpu_jpeg_idle_work_handler);
> + mutex_init(&adev->jpeg.jpeg_pg_lock);
> + atomic_set(&adev->jpeg.total_submission_cnt, 0);
>
> return 0;
> }
> @@ -54,6 +56,8 @@ int amdgpu_jpeg_sw_fini(struct amdgpu_device *adev)
> amdgpu_ring_fini(&adev->jpeg.inst[i].ring_dec);
> }
>
> + mutex_destroy(&adev->jpeg.jpeg_pg_lock);
> +
> return 0;
> }
>
> @@ -83,7 +87,7 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work)
> fences += amdgpu_fence_count_emitted(&adev->jpeg.inst[i].ring_dec);
> }
>
> - if (fences == 0)
> + if (!fences && !atomic_read(&adev->jpeg.total_submission_cnt))
> amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
> AMD_PG_STATE_GATE);
> else
> @@ -93,15 +97,19 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work)
> void amdgpu_jpeg_ring_begin_use(struct amdgpu_ring *ring)
> {
> struct amdgpu_device *adev = ring->adev;
> - bool set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work);
>
> - if (set_clocks)
> - amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
> + atomic_inc(&adev->jpeg.total_submission_cnt);
> + cancel_delayed_work_sync(&adev->jpeg.idle_work);
> +
> + mutex_lock(&adev->jpeg.jpeg_pg_lock);
> + amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
> AMD_PG_STATE_UNGATE);
> + mutex_unlock(&adev->jpeg.jpeg_pg_lock);
> }
>
> void amdgpu_jpeg_ring_end_use(struct amdgpu_ring *ring)
> {
> + atomic_dec(&ring->adev->jpeg.total_submission_cnt);
> schedule_delayed_work(&ring->adev->jpeg.idle_work, JPEG_IDLE_TIMEOUT);
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
> index 5131a0a..55fbff2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
> @@ -46,6 +46,8 @@ struct amdgpu_jpeg {
> unsigned harvest_config;
> struct delayed_work idle_work;
> enum amd_powergating_state cur_state;
> + struct mutex jpeg_pg_lock;
> + atomic_t total_submission_cnt;
> };
>
> int amdgpu_jpeg_sw_init(struct amdgpu_device *adev);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/amdgpu/jpeg: fix race condition issue for jpeg start
2020-06-10 16:36 [PATCH] drm/amdgpu/jpeg: fix race condition issue for jpeg start James Zhu
2020-06-10 18:31 ` Nirmoy
@ 2020-06-11 11:56 ` Leo Liu
1 sibling, 0 replies; 3+ messages in thread
From: Leo Liu @ 2020-06-11 11:56 UTC (permalink / raw)
To: James Zhu, amd-gfx; +Cc: jamesz
Reviewed-by: Leo Liu <leo.liu@amd.com>
On 2020-06-10 12:36 p.m., James Zhu wrote:
> Fix race condition issue when multiple jpeg starts are called.
>
> Signed-off-by: James Zhu <James.Zhu@amd.com>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 16 ++++++++++++----
> drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 ++
> 2 files changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> index d31d65e..8996cb4e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c
> @@ -37,6 +37,8 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work);
> int amdgpu_jpeg_sw_init(struct amdgpu_device *adev)
> {
> INIT_DELAYED_WORK(&adev->jpeg.idle_work, amdgpu_jpeg_idle_work_handler);
> + mutex_init(&adev->jpeg.jpeg_pg_lock);
> + atomic_set(&adev->jpeg.total_submission_cnt, 0);
>
> return 0;
> }
> @@ -54,6 +56,8 @@ int amdgpu_jpeg_sw_fini(struct amdgpu_device *adev)
> amdgpu_ring_fini(&adev->jpeg.inst[i].ring_dec);
> }
>
> + mutex_destroy(&adev->jpeg.jpeg_pg_lock);
> +
> return 0;
> }
>
> @@ -83,7 +87,7 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work)
> fences += amdgpu_fence_count_emitted(&adev->jpeg.inst[i].ring_dec);
> }
>
> - if (fences == 0)
> + if (!fences && !atomic_read(&adev->jpeg.total_submission_cnt))
> amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
> AMD_PG_STATE_GATE);
> else
> @@ -93,15 +97,19 @@ static void amdgpu_jpeg_idle_work_handler(struct work_struct *work)
> void amdgpu_jpeg_ring_begin_use(struct amdgpu_ring *ring)
> {
> struct amdgpu_device *adev = ring->adev;
> - bool set_clocks = !cancel_delayed_work_sync(&adev->jpeg.idle_work);
>
> - if (set_clocks)
> - amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
> + atomic_inc(&adev->jpeg.total_submission_cnt);
> + cancel_delayed_work_sync(&adev->jpeg.idle_work);
> +
> + mutex_lock(&adev->jpeg.jpeg_pg_lock);
> + amdgpu_device_ip_set_powergating_state(adev, AMD_IP_BLOCK_TYPE_JPEG,
> AMD_PG_STATE_UNGATE);
> + mutex_unlock(&adev->jpeg.jpeg_pg_lock);
> }
>
> void amdgpu_jpeg_ring_end_use(struct amdgpu_ring *ring)
> {
> + atomic_dec(&ring->adev->jpeg.total_submission_cnt);
> schedule_delayed_work(&ring->adev->jpeg.idle_work, JPEG_IDLE_TIMEOUT);
> }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
> index 5131a0a..55fbff2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h
> @@ -46,6 +46,8 @@ struct amdgpu_jpeg {
> unsigned harvest_config;
> struct delayed_work idle_work;
> enum amd_powergating_state cur_state;
> + struct mutex jpeg_pg_lock;
> + atomic_t total_submission_cnt;
> };
>
> int amdgpu_jpeg_sw_init(struct amdgpu_device *adev);
_______________________________________________
amd-gfx mailing list
amd-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-11 11:56 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-10 16:36 [PATCH] drm/amdgpu/jpeg: fix race condition issue for jpeg start James Zhu
2020-06-10 18:31 ` Nirmoy
2020-06-11 11:56 ` Leo Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).