Merge tag 'drm-etnaviv-next-2024-03-07' of https://git.pengutronix.de/git/lst/linux...

[linux-2.6-block.git] / drivers / gpu / drm / etnaviv / etnaviv_gpu.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index 18725ff5c79bbce1ce79c44bd093fef0dd004111..734412aae94dde5c08e6e575c405fd9805e98d8d 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1935,11 +1935,10 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int etnaviv_gpu_platform_remove(struct platform_device *pdev)
+static void etnaviv_gpu_platform_remove(struct platform_device *pdev)
 {
        component_del(&pdev->dev, &gpu_ops);
        pm_runtime_disable(&pdev->dev);
-       return 0;
 }
 
 static int etnaviv_gpu_rpm_suspend(struct device *dev)
@@ -1948,7 +1947,7 @@ static int etnaviv_gpu_rpm_suspend(struct device *dev)
        u32 idle, mask;
 
        /* If there are any jobs in the HW queue, we're not idle */
-       if (atomic_read(&gpu->sched.hw_rq_count))
+       if (atomic_read(&gpu->sched.credit_count))
                return -EBUSY;
 
        /* Check whether the hardware (except FE and MC) is idle */
@@ -2001,6 +2000,6 @@ struct platform_driver etnaviv_gpu_driver = {
                .of_match_table = etnaviv_gpu_match,
        },
        .probe = etnaviv_gpu_platform_probe,
-       .remove = etnaviv_gpu_platform_remove,
+       .remove_new = etnaviv_gpu_platform_remove,
        .id_table = gpu_ids,
 };