drm/exynos: Drop MAX_FB_BUFFER in favor of DRM_FORMAT_MAX_PLANES

MAX_FB_BUFFER refers to the maximum number of buffer planes for a
framebuffer. This is the same as DRM_FORMAT_MAX_PLANES, which denotes
the maximum number of planes.

Signed-off-by: Chen-Yu Tsai <wenst@chromium.org>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 1ab7195d09ae336bc0b42fb9e060438448bffac5..b126cd1299440d4b0b8ce85068a642833aeac940 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -19,7 +19,6 @@
 
 #define MAX_CRTC       3
 #define MAX_PLANE      5
-#define MAX_FB_BUFFER  4
 
 #define DEFAULT_WIN    0
 

diff --git a/drivers/gpu/drm/exynos/exynos_drm_fb.c b/drivers/gpu/drm/exynos/exynos_drm_fb.c
index 125b87adfdc4f25269113c629689c4f112fc7a3f..93f387b12126bd32c1fb765845830c892ec71681 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_fb.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fb.c
@@ -99,7 +99,7 @@ exynos_user_fb_create(struct drm_device *dev, struct drm_file *file_priv,
                      const struct drm_format_info *info,
                      const struct drm_mode_fb_cmd2 *mode_cmd)
 {
-       struct exynos_drm_gem *exynos_gem[MAX_FB_BUFFER];
+       struct exynos_drm_gem *exynos_gem[DRM_FORMAT_MAX_PLANES];
        struct drm_framebuffer *fb;
        int i;
        int ret;
@@ -145,7 +145,7 @@ dma_addr_t exynos_drm_fb_dma_addr(struct drm_framebuffer *fb, int index)
 {
        struct exynos_drm_gem *exynos_gem;
 
-       if (WARN_ON_ONCE(index >= MAX_FB_BUFFER))
+       if (WARN_ON_ONCE(index >= DRM_FORMAT_MAX_PLANES))
                return 0;
 
        exynos_gem = to_exynos_gem(fb->obj[index]);

diff --git a/drivers/gpu/drm/exynos/exynos_drm_ipp.h b/drivers/gpu/drm/exynos/exynos_drm_ipp.h
index 67a0805ee009461463c9d3e1252f6eefe5b63947..2842c8af0b7c17cbaa12a40beecb56949f8ee186 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos_drm_ipp.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_ipp.h
@@ -70,9 +70,9 @@ struct exynos_drm_ipp_buffer {
        struct drm_exynos_ipp_task_buffer buf;
        struct drm_exynos_ipp_task_rect rect;
 
-       struct exynos_drm_gem *exynos_gem[MAX_FB_BUFFER];
+       struct exynos_drm_gem *exynos_gem[DRM_FORMAT_MAX_PLANES];
        const struct drm_format_info *format;
-       dma_addr_t dma_addr[MAX_FB_BUFFER];
+       dma_addr_t dma_addr[DRM_FORMAT_MAX_PLANES];
 };
 
 /**