| Message ID | 20250325114219.3739951-1-maciej.falkowski@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal() | expand |
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); >
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);