* [PATCH] accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal()
@ 2025-03-25 11:42 Maciej Falkowski
2025-03-27 17:34 ` Lizhi Hou
2025-03-31 12:23 ` Jacek Lawrynowicz
0 siblings, 2 replies; 3+ messages in thread
From: Maciej Falkowski @ 2025-03-25 11:42 UTC (permalink / raw)
To: dri-devel
Cc: oded.gabbay, quic_jhugo, jacek.lawrynowicz, lizhi.hou, stable,
Maciej Falkowski
From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Warn if device is suspended only when runtime PM is enabled.
Runtime PM is disabled during reset/recovery and it is not an error
to use ivpu_ipc_send_receive_internal() in such cases.
Fixes: 5eaa49741119 ("accel/ivpu: Prevent recovery invocation during probe and resume")
Cc: <stable@vger.kernel.org> # v6.13+
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Signed-off-by: Maciej Falkowski <maciej.falkowski@linux.intel.com>
---
drivers/accel/ivpu/ivpu_ipc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/accel/ivpu/ivpu_ipc.c b/drivers/accel/ivpu/ivpu_ipc.c
index 0e096fd9b95d..39f83225c181 100644
--- a/drivers/accel/ivpu/ivpu_ipc.c
+++ b/drivers/accel/ivpu/ivpu_ipc.c
@@ -302,7 +302,8 @@ ivpu_ipc_send_receive_internal(struct ivpu_device *vdev, struct vpu_jsm_msg *req
struct ivpu_ipc_consumer cons;
int ret;
- drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev));
+ drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev) &&
+ pm_runtime_enabled(vdev->drm.dev));
ivpu_ipc_consumer_add(vdev, &cons, channel, NULL);
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal()
2025-03-25 11:42 [PATCH] accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal() Maciej Falkowski
@ 2025-03-27 17:34 ` Lizhi Hou
2025-03-31 12:23 ` Jacek Lawrynowicz
1 sibling, 0 replies; 3+ messages in thread
From: Lizhi Hou @ 2025-03-27 17:34 UTC (permalink / raw)
To: Maciej Falkowski, dri-devel
Cc: oded.gabbay, quic_jhugo, jacek.lawrynowicz, stable
On 3/25/25 04:42, Maciej Falkowski wrote:
> From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>
> Warn if device is suspended only when runtime PM is enabled.
> Runtime PM is disabled during reset/recovery and it is not an error
> to use ivpu_ipc_send_receive_internal() in such cases.
>
> Fixes: 5eaa49741119 ("accel/ivpu: Prevent recovery invocation during probe and resume")
> Cc: <stable@vger.kernel.org> # v6.13+
> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Signed-off-by: Maciej Falkowski <maciej.falkowski@linux.intel.com>
> ---
> drivers/accel/ivpu/ivpu_ipc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_ipc.c b/drivers/accel/ivpu/ivpu_ipc.c
> index 0e096fd9b95d..39f83225c181 100644
> --- a/drivers/accel/ivpu/ivpu_ipc.c
> +++ b/drivers/accel/ivpu/ivpu_ipc.c
> @@ -302,7 +302,8 @@ ivpu_ipc_send_receive_internal(struct ivpu_device *vdev, struct vpu_jsm_msg *req
> struct ivpu_ipc_consumer cons;
> int ret;
>
> - drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev));
> + drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev) &&
> + pm_runtime_enabled(vdev->drm.dev));
Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
>
> ivpu_ipc_consumer_add(vdev, &cons, channel, NULL);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal()
2025-03-25 11:42 [PATCH] accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal() Maciej Falkowski
2025-03-27 17:34 ` Lizhi Hou
@ 2025-03-31 12:23 ` Jacek Lawrynowicz
1 sibling, 0 replies; 3+ messages in thread
From: Jacek Lawrynowicz @ 2025-03-31 12:23 UTC (permalink / raw)
To: Maciej Falkowski, dri-devel; +Cc: oded.gabbay, quic_jhugo, lizhi.hou, stable
Applied to drm-misc-fixes
On 3/25/2025 12:42 PM, Maciej Falkowski wrote:
> From: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
>
> Warn if device is suspended only when runtime PM is enabled.
> Runtime PM is disabled during reset/recovery and it is not an error
> to use ivpu_ipc_send_receive_internal() in such cases.
>
> Fixes: 5eaa49741119 ("accel/ivpu: Prevent recovery invocation during probe and resume")
> Cc: <stable@vger.kernel.org> # v6.13+
> Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
> Signed-off-by: Maciej Falkowski <maciej.falkowski@linux.intel.com>
> ---
> drivers/accel/ivpu/ivpu_ipc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/accel/ivpu/ivpu_ipc.c b/drivers/accel/ivpu/ivpu_ipc.c
> index 0e096fd9b95d..39f83225c181 100644
> --- a/drivers/accel/ivpu/ivpu_ipc.c
> +++ b/drivers/accel/ivpu/ivpu_ipc.c
> @@ -302,7 +302,8 @@ ivpu_ipc_send_receive_internal(struct ivpu_device *vdev, struct vpu_jsm_msg *req
> struct ivpu_ipc_consumer cons;
> int ret;
>
> - drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev));
> + drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev) &&
> + pm_runtime_enabled(vdev->drm.dev));
>
> ivpu_ipc_consumer_add(vdev, &cons, channel, NULL);
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-03-31 12:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-25 11:42 [PATCH] accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal() Maciej Falkowski
2025-03-27 17:34 ` Lizhi Hou
2025-03-31 12:23 ` Jacek Lawrynowicz
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.