]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
accel/ivpu: Fix warning in ivpu_ipc_send_receive_internal()
authorJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Tue, 25 Mar 2025 11:42:19 +0000 (12:42 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 20 Apr 2025 08:15:42 +0000 (10:15 +0200)
commit 6b4568b675b14cf890c0c21779773c3e08e80ce5 upstream.

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: Maciej Falkowski <maciej.falkowski@linux.intel.com>
Reviewed-by: Lizhi Hou <lizhi.hou@amd.com>
Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Link: https://lore.kernel.org/r/20250325114219.3739951-1-maciej.falkowski@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/accel/ivpu/ivpu_ipc.c

index 13c8a12162e89ecd440d16d98f23751845e6ea1f..f0402dc847582a68c522c3918bee6dd4e9247cb5 100644 (file)
@@ -299,7 +299,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);