Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40bdfb0a authored by Marek Szyprowski's avatar Marek Szyprowski Committed by Inki Dae
Browse files

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: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 8a0d560f

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static void decon_atomic_begin(struct exynos_drm_crtc *crtc, 
	if (ctx->suspended)

		return;



	decon_shadow_protect_win(ctx, plane->zpos, true);

	decon_shadow_protect_win(ctx, plane->index, true);

}



static void decon_update_plane(struct exynos_drm_crtc *crtc,
@@ -407,7 +407,7 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, 
	unsigned long val, alpha;

	unsigned int last_x;

	unsigned int last_y;

	unsigned int win = plane->zpos;

	unsigned int win = plane->index;

	unsigned int bpp = fb->bits_per_pixel >> 3;

	unsigned int pitch = fb->pitches[0];
@@ -498,7 +498,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;

	u32 val;



	if (ctx->suspended)
@@ -525,7 +525,7 @@ static void decon_atomic_flush(struct exynos_drm_crtc *crtc, 
	if (ctx->suspended)

		return;



	decon_shadow_protect_win(ctx, plane->zpos, false);

	decon_shadow_protect_win(ctx, plane->index, false);

}



static void decon_init(struct decon_context *ctx)
@@ -657,7 +657,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
		ctx->configs[i].zpos = i;

		ctx->configs[i].type = decon_win_types[i];



		ret = exynos_plane_init(drm_dev, &ctx->planes[i],

		ret = exynos_plane_init(drm_dev, &ctx->planes[i], i,

					1 << ctx->pipe, &ctx->configs[i]);

		if (ret)

			return ret;

drivers/gpu/drm/exynos/exynos_drm_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ to_exynos_plane_state(struct drm_plane_state *state) 
 * Exynos drm common overlay structure.

 *

 * @base: plane object

 * @zpos: order of overlay layer(z position).

 * @index: hardware index of the overlay layer

 *

 * this structure is common to exynos SoC and its contents would be copied

 * to hardware specific overlay info.
@@ -85,7 +85,7 @@ to_exynos_plane_state(struct drm_plane_state *state) 
struct exynos_drm_plane {

	struct drm_plane base;

	const struct exynos_drm_plane_config *config;

	unsigned int zpos;

	unsigned int index;

	struct drm_framebuffer *pending_fb;

};

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+5 −5
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ static void fimd_atomic_begin(struct exynos_drm_crtc *crtc, 
	if (ctx->suspended)

		return;



	fimd_shadow_protect_win(ctx, plane->zpos, true);

	fimd_shadow_protect_win(ctx, plane->index, true);

}



static void fimd_atomic_flush(struct exynos_drm_crtc *crtc,
@@ -641,7 +641,7 @@ static void fimd_atomic_flush(struct exynos_drm_crtc *crtc, 
	if (ctx->suspended)

		return;



	fimd_shadow_protect_win(ctx, plane->zpos, false);

	fimd_shadow_protect_win(ctx, plane->index, false);

}



static void fimd_update_plane(struct exynos_drm_crtc *crtc,
@@ -654,7 +654,7 @@ static void fimd_update_plane(struct exynos_drm_crtc *crtc, 
	dma_addr_t dma_addr;

	unsigned long val, size, offset;

	unsigned int last_x, last_y, buf_offsize, line_size;

	unsigned int win = plane->zpos;

	unsigned int win = plane->index;

	unsigned int bpp = fb->bits_per_pixel >> 3;

	unsigned int pitch = fb->pitches[0];
@@ -740,7 +740,7 @@ static void fimd_disable_plane(struct exynos_drm_crtc *crtc, 
			       struct exynos_drm_plane *plane)

{

	struct fimd_context *ctx = crtc->ctx;

	unsigned int win = plane->zpos;

	unsigned int win = plane->index;



	if (ctx->suspended)

		return;
@@ -944,7 +944,7 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) 
		ctx->configs[i].num_pixel_formats = ARRAY_SIZE(fimd_formats);

		ctx->configs[i].zpos = i;

		ctx->configs[i].type = fimd_win_types[i];

		ret = exynos_plane_init(drm_dev, &ctx->planes[i],

		ret = exynos_plane_init(drm_dev, &ctx->planes[i], i,

					1 << ctx->pipe, &ctx->configs[i]);

		if (ret)

			return ret;

drivers/gpu/drm/exynos/exynos_drm_plane.c

+2 −2
Original line number Diff line number Diff line
@@ -280,7 +280,7 @@ static void exynos_plane_attach_zpos_property(struct drm_plane *plane, 


int exynos_plane_init(struct drm_device *dev,

		      struct exynos_drm_plane *exynos_plane,

		      unsigned long possible_crtcs,

		      unsigned int index, unsigned long possible_crtcs,

		      const struct exynos_drm_plane_config *config)

{

	int err;
@@ -298,7 +298,7 @@ int exynos_plane_init(struct drm_device *dev, 


	drm_plane_helper_add(&exynos_plane->base, &plane_helper_funcs);



	exynos_plane->zpos = config->zpos;

	exynos_plane->index = index;

	exynos_plane->config = config;



	if (config->type == DRM_PLANE_TYPE_OVERLAY)