Merge tag 'arm-defconfig-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / gpu / drm / exynos / exynos_drm_g2d.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_g2d.c b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
index 1e0c5a7..cab4d2c 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_g2d.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_g2d.c
@@ -892,7 +892,14 @@ static void g2d_runqueue_worker(struct work_struct *work)
                g2d->runqueue_node = g2d_get_runqueue_node(g2d);
 
                if (g2d->runqueue_node) {
-                       pm_runtime_get_sync(g2d->dev);
+                       int ret;
+
+                       ret = pm_runtime_resume_and_get(g2d->dev);
+                       if (ret < 0) {
+                               dev_err(g2d->dev, "failed to enable G2D device.\n");
+                               return;
+                       }
+
                        g2d_dma_start(g2d, g2d->runqueue_node);
                }
        }