diff options
author | Joonyoung Shim <jy0922.shim@samsung.com> | 2012-04-05 07:49:24 -0400 |
---|---|---|
committer | Inki Dae <inki.dae@samsung.com> | 2012-04-12 01:51:21 -0400 |
commit | a634dd54c05636a89a272e27e59118374065975e (patch) | |
tree | efae3c63bb5dfb3530dbac391e76e14f1cb675f9 /drivers | |
parent | 46da222be7873bd1c79fa110d6988a2b826f7dee (diff) |
drm/exynos: rename s/HDMI_OVERLAY_NUMBER/MIXER_WIN_NR
HDMI_OVERLAY_NUMBER is specific of mixer driver and be used "windows
layer" term in exynos user manaual, so rename it.
Signed-off-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/exynos/exynos_mixer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c index baad0dde1ac5..9c99514eefbf 100644 --- a/drivers/gpu/drm/exynos/exynos_mixer.c +++ b/drivers/gpu/drm/exynos/exynos_mixer.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include "exynos_drm_drv.h" | 37 | #include "exynos_drm_drv.h" |
38 | #include "exynos_drm_hdmi.h" | 38 | #include "exynos_drm_hdmi.h" |
39 | 39 | ||
40 | #define HDMI_OVERLAY_NUMBER 3 | 40 | #define MIXER_WIN_NR 3 |
41 | 41 | ||
42 | #define get_mixer_context(dev) platform_get_drvdata(to_platform_device(dev)) | 42 | #define get_mixer_context(dev) platform_get_drvdata(to_platform_device(dev)) |
43 | 43 | ||
@@ -81,7 +81,7 @@ struct mixer_context { | |||
81 | bool interlace; | 81 | bool interlace; |
82 | 82 | ||
83 | struct mixer_resources mixer_res; | 83 | struct mixer_resources mixer_res; |
84 | struct hdmi_win_data win_data[HDMI_OVERLAY_NUMBER]; | 84 | struct hdmi_win_data win_data[MIXER_WIN_NR]; |
85 | }; | 85 | }; |
86 | 86 | ||
87 | static const u8 filter_y_horiz_tap8[] = { | 87 | static const u8 filter_y_horiz_tap8[] = { |
@@ -642,7 +642,7 @@ static void mixer_win_mode_set(void *ctx, | |||
642 | if (win == DEFAULT_ZPOS) | 642 | if (win == DEFAULT_ZPOS) |
643 | win = mixer_ctx->default_win; | 643 | win = mixer_ctx->default_win; |
644 | 644 | ||
645 | if (win < 0 || win > HDMI_OVERLAY_NUMBER) { | 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); |
647 | return; | 647 | return; |
648 | } | 648 | } |
@@ -682,7 +682,7 @@ static void mixer_win_commit(void *ctx, int zpos) | |||
682 | if (win == DEFAULT_ZPOS) | 682 | if (win == DEFAULT_ZPOS) |
683 | win = mixer_ctx->default_win; | 683 | win = mixer_ctx->default_win; |
684 | 684 | ||
685 | if (win < 0 || win > HDMI_OVERLAY_NUMBER) { | 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); |
687 | return; | 687 | return; |
688 | } | 688 | } |
@@ -705,7 +705,7 @@ static void mixer_win_disable(void *ctx, int zpos) | |||
705 | if (win == DEFAULT_ZPOS) | 705 | if (win == DEFAULT_ZPOS) |
706 | win = mixer_ctx->default_win; | 706 | win = mixer_ctx->default_win; |
707 | 707 | ||
708 | if (win < 0 || win > HDMI_OVERLAY_NUMBER) { | 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); |
710 | return; | 710 | return; |
711 | } | 711 | } |