5 files changed, 4 insertions, 6 deletions

diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
index 68aae38b2cf9..0fe981bc693b 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
@@ -436,7 +436,7 @@ int exynos_drm_crtc_get_pipe_from_type(struct drm_device *drm_dev,
 
                 exynos_crtc = to_exynos_crtc(crtc);
                 if (exynos_crtc->manager->type == out_type)
-                        return exynos_crtc->manager->pipe;
+                        return exynos_crtc->pipe;
         }
 
         return -EPERM;
diff --git a/drivers/gpu/drm/exynos/exynos_drm_drv.h b/drivers/gpu/drm/exynos/exynos_drm_drv.h
index 0a565f83be4d..1d024c0421a8 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_drv.h
+++ b/drivers/gpu/drm/exynos/exynos_drm_drv.h
@@ -207,7 +207,6 @@ struct exynos_drm_manager_ops {
  * @type: one of EXYNOS_DISPLAY_TYPE_LCD and HDMI.
  * @drm_dev: pointer to the drm device
  * @crtc: crtc object.
- * @pipe: the pipe number for this crtc/manager
  * @ops: pointer to callbacks for exynos drm specific functionality
  * @ctx: A pointer to the manager's implementation specific context
  */
@@ -216,7 +215,6 @@ struct exynos_drm_manager {
         enum exynos_drm_output_type type;
         struct drm_device *drm_dev;
         struct drm_crtc *crtc;
-        int pipe;
         struct exynos_drm_manager_ops *ops;
 };
 
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fimd.c b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
index f1f3b3498297..4df151ca74f3 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_fimd.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_fimd.c
@@ -299,7 +299,7 @@ static int fimd_mgr_initialize(struct exynos_drm_manager *mgr,
         priv = drm_dev->dev_private;
 
         mgr->drm_dev = ctx->drm_dev = drm_dev;
-        mgr->pipe = ctx->pipe = priv->pipe++;
+        ctx->pipe = priv->pipe++;
 
         /* attach this sub driver to iommu mapping if supported. */
         if (is_drm_iommu_supported(ctx->drm_dev)) {
diff --git a/drivers/gpu/drm/exynos/exynos_drm_vidi.c b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
index e78764f800de..785d2fe47fe0 100644
--- a/drivers/gpu/drm/exynos/exynos_drm_vidi.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_vidi.c
@@ -302,7 +302,7 @@ static int vidi_mgr_initialize(struct exynos_drm_manager *mgr,
         struct exynos_drm_private *priv = drm_dev->dev_private;
 
         mgr->drm_dev = ctx->drm_dev = drm_dev;
-        mgr->pipe = ctx->pipe = priv->pipe++;
+        ctx->pipe = priv->pipe++;
 
         return 0;
 }
diff --git a/drivers/gpu/drm/exynos/exynos_mixer.c b/drivers/gpu/drm/exynos/exynos_mixer.c
index 16197a627c47..57c4622f9d41 100644
--- a/drivers/gpu/drm/exynos/exynos_mixer.c
+++ b/drivers/gpu/drm/exynos/exynos_mixer.c
@@ -863,7 +863,7 @@ static int mixer_initialize(struct exynos_drm_manager *mgr,
         priv = drm_dev->dev_private;
 
         mgr->drm_dev = mixer_ctx->drm_dev = drm_dev;
-        mgr->pipe = mixer_ctx->pipe = priv->pipe++;
+        mixer_ctx->pipe = priv->pipe++;
 
         /* acquire resources: regs, irqs, clocks */
         ret = mixer_resources_init(mixer_ctx);