diff options
| author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2015-07-16 12:23:38 -0300 |
|---|---|---|
| committer | Inki Dae <inki.dae@samsung.com> | 2015-08-16 10:23:35 +0900 |
| commit | d88d2463fecb13c67d8eec78c4b61671900deb94 (patch) | |
| tree | b04e9d9a18817ffcd9947e82b9a84b7d83a5b5be /drivers/gpu/drm/exynos/exynos7_drm_decon.c | |
| parent | a1bcc9da90ab44d29c38fc6e4a8dba633e97f3f3 (diff) | |
| download | linux-stable-d88d2463fecb13c67d8eec78c4b61671900deb94.tar.gz linux-stable-d88d2463fecb13c67d8eec78c4b61671900deb94.tar.bz2 linux-stable-d88d2463fecb13c67d8eec78c4b61671900deb94.zip | |
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>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos7_drm_decon.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos7_drm_decon.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index 9c56d116311d..cfd0b5eeb498 100644 --- 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--; |