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_gsc.c

diff --git a/drivers/gpu/drm/exynos/exynos_drm_gsc.c b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
index b01f36e..90d7bf9 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_gsc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_gsc.c
@@ -1118,7 +1118,12 @@ static int gsc_commit(struct exynos_drm_ipp *ipp,
        struct gsc_context *ctx = container_of(ipp, struct gsc_context, ipp);
        int ret;
 
-       pm_runtime_get_sync(ctx->dev);
+       ret = pm_runtime_resume_and_get(ctx->dev);
+       if (ret < 0) {
+               dev_err(ctx->dev, "failed to enable GScaler device.\n");
+               return ret;
+       }
+
        ctx->task = task;
 
        ret = gsc_reset(ctx);