]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/exynos: remove extra call to exynos_dp_commit()
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>
Wed, 5 Aug 2015 23:24:18 +0000 (20:24 -0300)
committerInki Dae <inki.dae@samsung.com>
Sun, 16 Aug 2015 01:23:37 +0000 (10:23 +0900)
exynos_dp_commit() was getting called twice by exynos encoder core, once
inside the .enable() call and another time by .commit() itself.

The remove of the second call caused the wake of a bug, the operations
orders inside exynos_dp_commit was wrong and we had to move
exynos_dp_start_video() to be the last operation in there.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
drivers/gpu/drm/exynos/exynos_dp_core.c

index 2118737ab462d2c2242cf85fb98ea4ff08737446..6c84bfbcff9771473c37ccf962a9adc36c253889 100644 (file)
@@ -795,9 +795,6 @@ static int exynos_dp_config_video(struct exynos_dp_device *dp)
        /* Configure video slave mode */
        exynos_dp_enable_video_master(dp, 0);
 
-       /* Enable video */
-       exynos_dp_start_video(dp);
-
        timeout_loop = 0;
 
        for (;;) {
@@ -938,6 +935,9 @@ static void exynos_dp_commit(struct exynos_drm_encoder *encoder)
                if (drm_panel_enable(dp->panel))
                        DRM_ERROR("failed to enable the panel\n");
        }
+
+       /* Enable video */
+       exynos_dp_start_video(dp);
 }
 
 static enum drm_connector_status exynos_dp_detect(
@@ -1114,7 +1114,6 @@ static struct exynos_drm_encoder_ops exynos_dp_encoder_ops = {
        .create_connector = exynos_dp_create_connector,
        .enable = exynos_dp_enable,
        .disable = exynos_dp_disable,
-       .commit = exynos_dp_commit,
 };
 
 static struct video_info *exynos_dp_dt_parse_pdata(struct device *dev)