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

[linux-2.6-microblaze.git] / drivers / accel / ivpu / ivpu_drv.c

diff --git a/drivers/accel/ivpu/ivpu_drv.c b/drivers/accel/ivpu/ivpu_drv.c
index 51fa60b..bc15b06 100644 (file)
--- a/drivers/accel/ivpu/ivpu_drv.c
+++ b/drivers/accel/ivpu/ivpu_drv.c
@@ -341,7 +341,7 @@ static int ivpu_wait_for_ready(struct ivpu_device *vdev)
        }
 
        if (!ret)
-               ivpu_info(vdev, "VPU ready message received successfully\n");
+               ivpu_dbg(vdev, PM, "VPU ready message received successfully\n");
        else
                ivpu_hw_diagnose_failure(vdev);
 
@@ -382,15 +382,20 @@ int ivpu_boot(struct ivpu_device *vdev)
        return 0;
 }
 
-int ivpu_shutdown(struct ivpu_device *vdev)
+void ivpu_prepare_for_reset(struct ivpu_device *vdev)
 {
-       int ret;
-
        ivpu_hw_irq_disable(vdev);
        disable_irq(vdev->irq);
        ivpu_ipc_disable(vdev);
        ivpu_mmu_disable(vdev);
        ivpu_job_done_thread_disable(vdev);
+}
+
+int ivpu_shutdown(struct ivpu_device *vdev)
+{
+       int ret;
+
+       ivpu_prepare_for_reset(vdev);
 
        ret = ivpu_hw_power_down(vdev);
        if (ret)
@@ -630,6 +635,7 @@ static void ivpu_dev_fini(struct ivpu_device *vdev)
 
 static struct pci_device_id ivpu_pci_ids[] = {
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_MTL) },
+       { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_ARL) },
        { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_LNL) },
        { }
 };