[5/6] drm: rcar-du: Let core take care of normalizing the zpos

Commit Message

Peter Ujfalusi Jan. 12, 2018, 9:38 a.m. UTC

Set the drm_device->normalize_zpos and call drm_atomic_helper_check() from
rcar_du_atomic_check() instead of re implementing the function locally.

Signed-off-by: Peter Ujfalusi <[e-mail]>
CC: Laurent Pinchart <[e-mail]>
---
 drivers/gpu/drm/rcar-du/rcar_du_drv.c |  1 +
 drivers/gpu/drm/rcar-du/rcar_du_kms.c | 10 +---------
 2 files changed, 2 insertions(+), 9 deletions(-)

Patch

diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
index 6e02c762a557..61dc773b9df0 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c
@@ -405,6 +405,7 @@  static int rcar_du_probe(struct platform_device *pdev)
 	}
 
 	ddev->irq_enabled = 1;
+	ddev->normalize_zpos = true;
 
 	/*
 	 * Register the DRM device with the core and the connectors with
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
index 566d1a948c8f..fa82adfe0982 100644
--- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c
+++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c
@@ -234,15 +234,7 @@  static int rcar_du_atomic_check(struct drm_device *dev,
 	struct rcar_du_device *rcdu = dev->dev_private;
 	int ret;
 
-	ret = drm_atomic_helper_check_modeset(dev, state);
-	if (ret)
-		return ret;
-
-	ret = drm_atomic_normalize_zpos(dev, state);
-	if (ret)
-		return ret;
-
-	ret = drm_atomic_helper_check_planes(dev, state);
+	ret = drm_atomic_helper_check(dev, state);
 	if (ret)
 		return ret;