summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/exynos/exynos_mixer.c
diff options
context:
space:
mode:
authorSean Paul <seanpaul@chromium.org>2014-04-25 14:00:14 +0900
committerChanho Park <chanho61.park@samsung.com>2014-11-18 11:47:33 +0900
commit5d3f8b8700ff4eb769dd363d6ad5d7ecb61bbe6b (patch)
tree27cfb1d815adb3e3bd88b8590d71b1aee7821ddb /drivers/gpu/drm/exynos/exynos_mixer.c
parent56dd3761ca6517a4562ced288df8874bfb3e38c2 (diff)
downloadlinux-3.10-5d3f8b8700ff4eb769dd363d6ad5d7ecb61bbe6b.tar.gz
linux-3.10-5d3f8b8700ff4eb769dd363d6ad5d7ecb61bbe6b.tar.bz2
linux-3.10-5d3f8b8700ff4eb769dd363d6ad5d7ecb61bbe6b.zip
drm/exynos: Remove apply manager callback
This patch removes the apply() manager callback in favor of putting the relevant commits in the individual drivers. This will mitigate some of the difference between the suspend/resume path and the dpms path Signed-off-by: Sean Paul <seanpaul@chromium.org> Reviewed-by: Tomasz Figa <t.figa@samsung.com> Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_mixer.c')
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 54ac5fde48d..e07f7d01f1c 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -1041,6 +1041,8 @@ static void mixer_window_resume(struct mixer_context *ctx)
win_data = &ctx->win_data[i];
win_data->enabled = win_data->resume;
win_data->resume = false;
+ if (win_data->enabled)
+ mixer_win_commit(ctx, i);
}
}