diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2015-12-16 13:21:42 +0100 |
|---|---|---|
| committer | Inki Dae <daeinki@gmail.com> | 2016-01-13 00:16:33 +0900 |
| commit | 40bdfb0a4c4cd3f3af19171d31a6a7e8ab0cc1e7 (patch) | |
| tree | 2bd5349a5ff05176c4db7de13a81e1f6c81be7d6 /drivers/gpu/drm/exynos/exynos5433_drm_decon.c | |
| parent | 8a0d560f3e651808ae0a3d9ab9fe476e59de132b (diff) | |
| download | talos-obmc-linux-40bdfb0a4c4cd3f3af19171d31a6a7e8ab0cc1e7.tar.gz talos-obmc-linux-40bdfb0a4c4cd3f3af19171d31a6a7e8ab0cc1e7.zip | |
drm/exynos: rename zpos to index
This patch renames zpos entry to index, because in most places it is
used as index for selecting hardware layer/window instead of
configurable layer position. This will later enable to make the zpos
property configurable.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Inki Dae <inki.dae@samsung.com>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos5433_drm_decon.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c index c7362b99ce28..77073d8faaa3 100644 --- a/drivers/gpu/drm/exynos/exynos5433_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos5433_drm_decon.c @@ -256,7 +256,7 @@ static void decon_atomic_begin(struct exynos_drm_crtc *crtc, if (test_bit(BIT_SUSPENDED, &ctx->flags)) return; - decon_shadow_protect_win(ctx, plane->zpos, true); + decon_shadow_protect_win(ctx, plane->index, true); } #define BIT_VAL(x, e, s) (((x) & ((1 << ((e) - (s) + 1)) - 1)) << (s)) @@ -270,7 +270,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, to_exynos_plane_state(plane->base.state); struct decon_context *ctx = crtc->ctx; struct drm_framebuffer *fb = state->base.fb; - unsigned int win = plane->zpos; + unsigned int win = plane->index; unsigned int bpp = fb->bits_per_pixel >> 3; unsigned int pitch = fb->pitches[0]; dma_addr_t dma_addr = exynos_drm_fb_dma_addr(fb, 0); @@ -320,7 +320,7 @@ static void decon_disable_plane(struct exynos_drm_crtc *crtc, struct exynos_drm_plane *plane) { struct decon_context *ctx = crtc->ctx; - unsigned int win = plane->zpos; + unsigned int win = plane->index; if (test_bit(BIT_SUSPENDED, &ctx->flags)) return; @@ -344,7 +344,7 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc, if (test_bit(BIT_SUSPENDED, &ctx->flags)) return; - decon_shadow_protect_win(ctx, plane->zpos, false); + decon_shadow_protect_win(ctx, plane->index, false); if (ctx->out_type == IFTYPE_I80) set_bit(BIT_WIN_UPDATED, &ctx->flags); @@ -502,7 +502,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) ctx->configs[win].zpos = win; ctx->configs[win].type = decon_win_types[tmp]; - ret = exynos_plane_init(drm_dev, &ctx->planes[win], + ret = exynos_plane_init(drm_dev, &ctx->planes[win], win, 1 << ctx->pipe, &ctx->configs[win]); if (ret) return ret; |
