Merge drm/drm-next into drm-misc-next

[sfrench/cifs-2.6.git] / drivers / accel / ivpu / ivpu_pm.c

diff --git a/drivers/accel/ivpu/ivpu_pm.c b/drivers/accel/ivpu/ivpu_pm.c
index 33d7c7731fe32659707cc845c48a6e57710818e9..d915f3c2991f48889f600e247041d0541e4437f1 100644 (file)
--- a/drivers/accel/ivpu/ivpu_pm.c
+++ b/drivers/accel/ivpu/ivpu_pm.c
@@ -284,7 +284,8 @@ void ivpu_pm_reset_prepare_cb(struct pci_dev *pdev)
        ivpu_dbg(vdev, PM, "Pre-reset..\n");
        atomic_inc(&vdev->pm->reset_counter);
        atomic_set(&vdev->pm->in_reset, 1);
-       ivpu_shutdown(vdev);
+       ivpu_prepare_for_reset(vdev);
+       ivpu_hw_reset(vdev);
        ivpu_pm_prepare_cold_boot(vdev);
        ivpu_jobs_abort_all(vdev);
        ivpu_dbg(vdev, PM, "Pre-reset done.\n");