]> git.ipfire.org Git - thirdparty/kernel/linux.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)
committerJacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com>
Mon, 31 Mar 2025 12:18:10 +0000 (14:18 +0200)
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
drivers/accel/ivpu/ivpu_ipc.c

index 01ebf88fe6ef0a97bb027fa2d6e38f5142155fa1..5daaf07fc1a712e13d590c3fe1afcea62870f0e1 100644 (file)
@@ -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);