drm/exynos: unify exynos_drm_plane names with drm core

Rename crtc_{widht,height} to crtc_{w,h} and src_{width,height} to
src_{w,h} to make it similar to the atomic state names.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Joonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
index 2489e7a..484e312 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c
@@ -237,8 +237,8 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
        val = COORDINATE_X(plane->crtc_x) | COORDINATE_Y(plane->crtc_y);
        writel(val, ctx->addr + DECON_VIDOSDxA(win));
 
-       val = COORDINATE_X(plane->crtc_x + plane->crtc_width - 1) |
-               COORDINATE_Y(plane->crtc_y + plane->crtc_height - 1);
+       val = COORDINATE_X(plane->crtc_x + plane->crtc_w - 1) |
+               COORDINATE_Y(plane->crtc_y + plane->crtc_h - 1);
        writel(val, ctx->addr + DECON_VIDOSDxB(win));
 
        val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |
@@ -251,11 +251,11 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
 
        writel(plane->dma_addr[0], ctx->addr + DECON_VIDW0xADD0B0(win));
 
-       val = plane->dma_addr[0] + pitch * plane->crtc_height;
+       val = plane->dma_addr[0] + pitch * plane->crtc_h;
        writel(val, ctx->addr + DECON_VIDW0xADD1B0(win));
 
-       val = OFFSIZE(pitch - plane->crtc_width * bpp)
-               | PAGEWIDTH(plane->crtc_width * bpp);
+       val = OFFSIZE(pitch - plane->crtc_w * bpp)
+               | PAGEWIDTH(plane->crtc_w * bpp);
        writel(val, ctx->addr + DECON_VIDW0xADD2(win));
 
        decon_win_set_pixfmt(ctx, win, state->fb);

diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
index 9c56d11..cfd0b5e 100644 (file)
--- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c
+++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -430,25 +430,25 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc,
        DRM_DEBUG_KMS("start addr = 0x%lx\n",
                        (unsigned long)val);
        DRM_DEBUG_KMS("ovl_width = %d, ovl_height = %d\n",
-                       plane->crtc_width, plane->crtc_height);
+                       plane->crtc_w, plane->crtc_h);
 
        /*
         * OSD position.
         * In case the window layout goes of LCD layout, DECON fails.
         */
-       if ((plane->crtc_x + plane->crtc_width) > mode->hdisplay)
-               plane->crtc_x = mode->hdisplay - plane->crtc_width;
-       if ((plane->crtc_y + plane->crtc_height) > mode->vdisplay)
-               plane->crtc_y = mode->vdisplay - plane->crtc_height;
+       if ((plane->crtc_x + plane->crtc_w) > mode->hdisplay)
+               plane->crtc_x = mode->hdisplay - plane->crtc_w;
+       if ((plane->crtc_y + plane->crtc_h) > mode->vdisplay)
+               plane->crtc_y = mode->vdisplay - plane->crtc_h;
 
        val = VIDOSDxA_TOPLEFT_X(plane->crtc_x) |
                VIDOSDxA_TOPLEFT_Y(plane->crtc_y);
        writel(val, ctx->regs + VIDOSD_A(win));
 
-       last_x = plane->crtc_x + plane->crtc_width;
+       last_x = plane->crtc_x + plane->crtc_w;
        if (last_x)
                last_x--;
-       last_y = plane->crtc_y + plane->crtc_height;
+       last_y = plane->crtc_y + plane->crtc_h;
        if (last_y)
                last_y--;
 

diff --cc drivers/gpu/drm/exynos/exynos_drm_drv.h
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_fimd.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_drm_plane.c
Simple merge

diff --cc drivers/gpu/drm/exynos/exynos_mixer.c
Simple merge