From b54b3d7783de977fee86ff27b40fa62a289f2ead Mon Sep 17 00:00:00 2001 From: Joonyoung Shim Date: Thu, 5 Apr 2012 20:49:25 +0900 Subject: [PATCH] --- yaml --- r: 299007 b: refs/heads/master c: a2ee151b6b6863d108552de82e02b77166ca23a8 h: refs/heads/master i: 299005: 39bd61685e288a17c8a31871c246c765027d0231 299003: 10a7e81a4acc1cc80e79c270dbcd8304a35581ec 298999: 048eb1adb3e03333631b6e2c3171735662aca879 298991: 1356346d942dccdab46ab0a3d50f39af84b4ffad 298975: 3e489e245622cf863716d09a8b565014b0b1b985 298943: 169198fa63eb6dc45466018fd347bb01e08aabf2 298879: 9da4e05cb182941a9d90e8ef31b226a8fe1f8c96 298751: fab771cf0ab18e0e2ea39c451dfc49b93c2898e5 298495: 68b29a18d9dfc1388252fefb15ebcb6b59487ce4 297983: d5e8fd9d018f67f73074084493d68fdac49916ae 296959: 615aba3617f3ca78937aac37009de45ee6319e42 294911: 35f6dac3f64b3fad7bff5dbe7847545534ed4009 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/exynos/exynos_mixer.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a894939ac458..4fbd6f447226 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a634dd54c05636a89a272e27e59118374065975e +refs/heads/master: a2ee151b6b6863d108552de82e02b77166ca23a8 diff --git a/trunk/drivers/gpu/drm/exynos/exynos_mixer.c b/trunk/drivers/gpu/drm/exynos/exynos_mixer.c index 9c99514eefbf..563092e23882 100644 --- a/trunk/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/trunk/drivers/gpu/drm/exynos/exynos_mixer.c @@ -38,6 +38,7 @@ #include "exynos_drm_hdmi.h" #define MIXER_WIN_NR 3 +#define MIXER_DEFAULT_WIN 0 #define get_mixer_context(dev) platform_get_drvdata(to_platform_device(dev)) @@ -75,7 +76,6 @@ struct mixer_resources { }; struct mixer_context { - unsigned int default_win; unsigned int irq; int pipe; bool interlace; @@ -640,7 +640,7 @@ static void mixer_win_mode_set(void *ctx, win = overlay->zpos; if (win == DEFAULT_ZPOS) - win = mixer_ctx->default_win; + win = MIXER_DEFAULT_WIN; if (win < 0 || win > MIXER_WIN_NR) { DRM_ERROR("overlay plane[%d] is wrong\n", win); @@ -680,7 +680,7 @@ static void mixer_win_commit(void *ctx, int zpos) DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win); if (win == DEFAULT_ZPOS) - win = mixer_ctx->default_win; + win = MIXER_DEFAULT_WIN; if (win < 0 || win > MIXER_WIN_NR) { DRM_ERROR("overlay plane[%d] is wrong\n", win); @@ -703,7 +703,7 @@ static void mixer_win_disable(void *ctx, int zpos) DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win); if (win == DEFAULT_ZPOS) - win = mixer_ctx->default_win; + win = MIXER_DEFAULT_WIN; if (win < 0 || win > MIXER_WIN_NR) { DRM_ERROR("overlay plane[%d] is wrong\n", win);