From 94255fd39ae88cc8f6bd84a5492f85112d14e1a9 Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Date: Wed, 17 Jan 2018 19:40:03 +0200
Subject: drm: rcar-du: Remove zpos field from rcar_du_vsp_plane_state structure
References: bsc#1085539
Patch-mainline: v4.17-rc1
Git-commit: 94255fd39ae88cc8f6bd84a5492f85112d14e1a9

Since commit 2fc4d838aaf2 ("drm: rcar: use generic code for managing
zpos plane property") the rcar-du driver stores the plane zpos in the
drm_plane_state structure. The commit however forgot to remove the zpos
field from the rcar_du_vsp_plane_state structure. Remove it.

Changes during backport:

 * Refreshed patch to account for line-offset changes

Fixes: 2fc4d838aaf2 ("drm: rcar: use generic code for managing zpos plane property")
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
---
 drivers/gpu/drm/rcar-du/rcar_du_vsp.h |    2 --
 1 file changed, 2 deletions(-)

--- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
+++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.h
@@ -44,7 +44,6 @@ static inline struct rcar_du_vsp_plane *
  * @state: base DRM plane state
  * @format: information about the pixel format used by the plane
  * @alpha: value of the plane alpha property
- * @zpos: value of the plane zpos property
  */
 struct rcar_du_vsp_plane_state {
 	struct drm_plane_state state;
@@ -52,7 +51,6 @@ struct rcar_du_vsp_plane_state {
 	const struct rcar_du_format_info *format;

 	unsigned int alpha;
-	unsigned int zpos;
 };

 static inline struct rcar_du_vsp_plane_state *