Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a326edd authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: remove pipe member of struct exynos_drm_manager 



It is not longer used. This is part of the process of removing
struct exynos_drm_manager entirely.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent e09f2b0d

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/exynos/exynos_drm_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

};

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+1 −1
Original line number Diff line number Diff line
@@ -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)) {

drivers/gpu/drm/exynos/exynos_drm_vidi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/exynos/exynos_mixer.c

+1 −1
Original line number Diff line number Diff line
@@ -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);