aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/exynos/exynos_mixer.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 9c99514eefbf..563092e23882 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -38,6 +38,7 @@
38#include "exynos_drm_hdmi.h" 38#include "exynos_drm_hdmi.h"
39 39
40#define MIXER_WIN_NR 3 40#define MIXER_WIN_NR 3
41#define MIXER_DEFAULT_WIN 0
41 42
42#define get_mixer_context(dev) platform_get_drvdata(to_platform_device(dev)) 43#define get_mixer_context(dev) platform_get_drvdata(to_platform_device(dev))
43 44
@@ -75,7 +76,6 @@ struct mixer_resources {
75}; 76};
76 77
77struct mixer_context { 78struct mixer_context {
78 unsigned int default_win;
79 unsigned int irq; 79 unsigned int irq;
80 int pipe; 80 int pipe;
81 bool interlace; 81 bool interlace;
@@ -640,7 +640,7 @@ static void mixer_win_mode_set(void *ctx,
640 640
641 win = overlay->zpos; 641 win = overlay->zpos;
642 if (win == DEFAULT_ZPOS) 642 if (win == DEFAULT_ZPOS)
643 win = mixer_ctx->default_win; 643 win = MIXER_DEFAULT_WIN;
644 644
645 if (win < 0 || win > MIXER_WIN_NR) { 645 if (win < 0 || win > MIXER_WIN_NR) {
646 DRM_ERROR("overlay plane[%d] is wrong\n", win); 646 DRM_ERROR("overlay plane[%d] is wrong\n", win);
@@ -680,7 +680,7 @@ static void mixer_win_commit(void *ctx, int zpos)
680 DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win); 680 DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win);
681 681
682 if (win == DEFAULT_ZPOS) 682 if (win == DEFAULT_ZPOS)
683 win = mixer_ctx->default_win; 683 win = MIXER_DEFAULT_WIN;
684 684
685 if (win < 0 || win > MIXER_WIN_NR) { 685 if (win < 0 || win > MIXER_WIN_NR) {
686 DRM_ERROR("overlay plane[%d] is wrong\n", win); 686 DRM_ERROR("overlay plane[%d] is wrong\n", win);
@@ -703,7 +703,7 @@ static void mixer_win_disable(void *ctx, int zpos)
703 DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win); 703 DRM_DEBUG_KMS("[%d] %s, win: %d\n", __LINE__, __func__, win);
704 704
705 if (win == DEFAULT_ZPOS) 705 if (win == DEFAULT_ZPOS)
706 win = mixer_ctx->default_win; 706 win = MIXER_DEFAULT_WIN;
707 707
708 if (win < 0 || win > MIXER_WIN_NR) { 708 if (win < 0 || win > MIXER_WIN_NR) {
709 DRM_ERROR("overlay plane[%d] is wrong\n", win); 709 DRM_ERROR("overlay plane[%d] is wrong\n", win);