[RESEND PATCH 04/28] drm/imx: Drop pipe field from struct imx_drm_crtc

[Boris Brezillon]

From: Thierry Reding <tred...@nvidia.com>

Use the drm_crtc_index() helper to determine the pipe number of the CRTC
instead.

Cc: Philipp Zabel <p.zabel at pengutronix.de>
Acked-by: Philipp Zabel <p.zabel at pengutronix.de>
Signed-off-by: Thierry Reding <treding at nvidia.com>
---
 drivers/gpu/drm/imx/imx-drm-core.c | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/imx/imx-drm-core.c 
b/drivers/gpu/drm/imx/imx-drm-core.c
index 9211473..303a673 100644
--- a/drivers/gpu/drm/imx/imx-drm-core.c
+++ b/drivers/gpu/drm/imx/imx-drm-core.c
@@ -45,7 +45,6 @@ struct imx_drm_device {

 struct imx_drm_crtc {
        struct drm_crtc                         *crtc;
-       unsigned int                            pipe;
        struct imx_drm_crtc_helper_funcs        imx_drm_helper_funcs;
 };

@@ -56,7 +55,7 @@ module_param(legacyfb_depth, int, 0444);

 unsigned int imx_drm_crtc_id(struct imx_drm_crtc *crtc)
 {
-       return crtc->pipe;
+       return drm_crtc_index(crtc->crtc);
 }
 EXPORT_SYMBOL_GPL(imx_drm_crtc_id);

@@ -124,19 +123,19 @@ EXPORT_SYMBOL_GPL(imx_drm_set_bus_format);

 int imx_drm_crtc_vblank_get(struct imx_drm_crtc *imx_drm_crtc)
 {
-       return drm_vblank_get(imx_drm_crtc->crtc->dev, imx_drm_crtc->pipe);
+       return drm_crtc_vblank_get(imx_drm_crtc->crtc);
 }
 EXPORT_SYMBOL_GPL(imx_drm_crtc_vblank_get);

 void imx_drm_crtc_vblank_put(struct imx_drm_crtc *imx_drm_crtc)
 {
-       drm_vblank_put(imx_drm_crtc->crtc->dev, imx_drm_crtc->pipe);
+       drm_crtc_vblank_put(imx_drm_crtc->crtc);
 }
 EXPORT_SYMBOL_GPL(imx_drm_crtc_vblank_put);

 void imx_drm_handle_vblank(struct imx_drm_crtc *imx_drm_crtc)
 {
-       drm_handle_vblank(imx_drm_crtc->crtc->dev, imx_drm_crtc->pipe);
+       drm_crtc_handle_vblank(imx_drm_crtc->crtc);
 }
 EXPORT_SYMBOL_GPL(imx_drm_handle_vblank);

@@ -356,12 +355,11 @@ int imx_drm_add_crtc(struct drm_device *drm, struct 
drm_crtc *crtc,
                return -ENOMEM;

        imx_drm_crtc->imx_drm_helper_funcs = *imx_drm_helper_funcs;
-       imx_drm_crtc->pipe = imxdrm->pipes++;
        imx_drm_crtc->crtc = crtc;

        crtc->port = port;

-       imxdrm->crtc[imx_drm_crtc->pipe] = imx_drm_crtc;
+       imxdrm->crtc[imxdrm->pipes++] = imx_drm_crtc;

        *new_crtc = imx_drm_crtc;

@@ -378,7 +376,7 @@ int imx_drm_add_crtc(struct drm_device *drm, struct 
drm_crtc *crtc,
        return 0;

 err_register:
-       imxdrm->crtc[imx_drm_crtc->pipe] = NULL;
+       imxdrm->crtc[--imxdrm->pipes] = NULL;
        kfree(imx_drm_crtc);
        return ret;
 }
@@ -390,10 +388,11 @@ EXPORT_SYMBOL_GPL(imx_drm_add_crtc);
 int imx_drm_remove_crtc(struct imx_drm_crtc *imx_drm_crtc)
 {
        struct imx_drm_device *imxdrm = imx_drm_crtc->crtc->dev->dev_private;
+       unsigned int pipe = drm_crtc_index(imx_drm_crtc->crtc);

        drm_crtc_cleanup(imx_drm_crtc->crtc);

-       imxdrm->crtc[imx_drm_crtc->pipe] = NULL;
+       imxdrm->crtc[pipe] = NULL;

        kfree(imx_drm_crtc);

-- 
2.1.4