| Message ID | 20231106130827.1600948-1-jacek.lawrynowicz@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | accel/ivpu: Fix compilation with CONFIG_PM=n | expand |
On 11/6/2023 6:08 AM, Jacek Lawrynowicz wrote: > Use pm_runtime_status_suspended() instead of dev->power.runtime_status > field that is not available without PM. > > Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> > --- Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
Applied to drm-misc-next On 06.11.2023 14:08, Jacek Lawrynowicz wrote: > Use pm_runtime_status_suspended() instead of dev->power.runtime_status > field that is not available without PM. > > Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> > --- > drivers/accel/ivpu/ivpu_ipc.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/accel/ivpu/ivpu_ipc.c b/drivers/accel/ivpu/ivpu_ipc.c > index a5fb2e5e824b7..88453762c9d53 100644 > --- a/drivers/accel/ivpu/ivpu_ipc.c > +++ b/drivers/accel/ivpu/ivpu_ipc.c > @@ -6,6 +6,7 @@ > #include <linux/genalloc.h> > #include <linux/highmem.h> > #include <linux/kthread.h> > +#include <linux/pm_runtime.h> > #include <linux/wait.h> > > #include "ivpu_drv.h" > @@ -315,8 +316,7 @@ int ivpu_ipc_send_receive_active(struct ivpu_device *vdev, struct vpu_jsm_msg *r > struct vpu_jsm_msg hb_resp; > int ret, hb_ret; > > - drm_WARN_ON(&vdev->drm, > - vdev->drm.dev->power.runtime_status == RPM_SUSPENDED); > + drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev)); > > ret = ivpu_ipc_send_receive_internal(vdev, req, expected_resp, resp, channel, timeout_ms); > if (ret != -ETIMEDOUT)
diff --git a/drivers/accel/ivpu/ivpu_ipc.c b/drivers/accel/ivpu/ivpu_ipc.c index a5fb2e5e824b7..88453762c9d53 100644 --- a/drivers/accel/ivpu/ivpu_ipc.c +++ b/drivers/accel/ivpu/ivpu_ipc.c @@ -6,6 +6,7 @@ #include <linux/genalloc.h> #include <linux/highmem.h> #include <linux/kthread.h> +#include <linux/pm_runtime.h> #include <linux/wait.h> #include "ivpu_drv.h" @@ -315,8 +316,7 @@ int ivpu_ipc_send_receive_active(struct ivpu_device *vdev, struct vpu_jsm_msg *r struct vpu_jsm_msg hb_resp; int ret, hb_ret; - drm_WARN_ON(&vdev->drm, - vdev->drm.dev->power.runtime_status == RPM_SUSPENDED); + drm_WARN_ON(&vdev->drm, pm_runtime_status_suspended(vdev->drm.dev)); ret = ivpu_ipc_send_receive_internal(vdev, req, expected_resp, resp, channel, timeout_ms); if (ret != -ETIMEDOUT)
Use pm_runtime_status_suspended() instead of dev->power.runtime_status field that is not available without PM. Signed-off-by: Jacek Lawrynowicz <jacek.lawrynowicz@linux.intel.com> --- drivers/accel/ivpu/ivpu_ipc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)