| From a474ac81df0757cdf2bfbcc326989f085ccdb384 Mon Sep 17 00:00:00 2001 |
| From: Peter Ujfalusi <peter.ujfalusi@ti.com> |
| Date: Wed, 21 Mar 2018 12:20:28 +0200 |
| Subject: [PATCH 1325/1795] drm: rcar-du: Let core take care of normalizing the |
| zpos |
| |
| Set the drm_mode_config->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 <peter.ujfalusi@ti.com> |
| CC: Laurent Pinchart <laurent.pinchart@ideasonboard.com> |
| Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20180321102029.15248-6-peter.ujfalusi@ti.com |
| (cherry picked from commit 75def7785f4901b65a89dc99ea9506b1395242fa) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> |
| --- |
| drivers/gpu/drm/rcar-du/rcar_du_kms.c | 11 ++--------- |
| 1 file changed, 2 insertions(+), 9 deletions(-) |
| |
| diff --git a/drivers/gpu/drm/rcar-du/rcar_du_kms.c b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| index 0329b354bfa0..ab59d2061e06 100644 |
| --- a/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| +++ b/drivers/gpu/drm/rcar-du/rcar_du_kms.c |
| @@ -233,15 +233,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; |
| |
| @@ -529,6 +521,7 @@ int rcar_du_modeset_init(struct rcar_du_device *rcdu) |
| dev->mode_config.min_height = 0; |
| dev->mode_config.max_width = 4095; |
| dev->mode_config.max_height = 2047; |
| + dev->mode_config.normalize_zpos = true; |
| dev->mode_config.funcs = &rcar_du_mode_config_funcs; |
| dev->mode_config.helper_private = &rcar_du_mode_config_helper; |
| |
| -- |
| 2.19.0 |
| |
