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

Commit 5d3d0995 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: add global macro for the default primary plane 



Define DEFAULT_WIN as zero to help set the primary plane on all CRTCs.
Some CRTCs were defining a variable to store the default window, but that
is not necessary as the default (primary) window is always the window zero.

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

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+2 −4
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct decon_context { 
	struct exynos_drm_plane		planes[WINDOWS_NR];

	void __iomem			*addr;

	struct clk			*clks[6];

	unsigned int			default_win;

	unsigned long			irq_flags;

	int				pipe;

	bool				suspended;
@@ -501,7 +500,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
	ctx->pipe = priv->pipe++;



	for (zpos = 0; zpos < WINDOWS_NR; zpos++) {

		type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY :

		type = (zpos == DEFAULT_WIN) ? DRM_PLANE_TYPE_PRIMARY :

							DRM_PLANE_TYPE_OVERLAY;

		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],

				1 << ctx->pipe, type, decon_formats,
@@ -510,7 +509,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
			return ret;

	}



	exynos_plane = &ctx->planes[ctx->default_win];

	exynos_plane = &ctx->planes[DEFAULT_WIN];

	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,

					ctx->pipe, EXYNOS_DISPLAY_TYPE_LCD,

					&decon_crtc_ops, ctx);
@@ -607,7 +606,6 @@ static int exynos5433_decon_probe(struct platform_device *pdev) 
	if (!ctx)

		return -ENOMEM;



	ctx->default_win = 0;

	ctx->suspended = true;

	ctx->dev = dev;

	if (of_get_child_by_name(dev->of_node, "i80-if-timings"))

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+2 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ struct decon_context { 
	struct clk			*eclk;

	struct clk			*vclk;

	void __iomem			*regs;

	unsigned int			default_win;

	unsigned long			irq_flags;

	bool				i80_if;

	bool				suspended;
@@ -690,7 +689,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
	}



	for (zpos = 0; zpos < WINDOWS_NR; zpos++) {

		type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY :

		type = (zpos == DEFAULT_WIN) ? DRM_PLANE_TYPE_PRIMARY :

						DRM_PLANE_TYPE_OVERLAY;

		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],

					1 << ctx->pipe, type, decon_formats,
@@ -699,7 +698,7 @@ static int decon_bind(struct device *dev, struct device *master, void *data) 
			return ret;

	}



	exynos_plane = &ctx->planes[ctx->default_win];

	exynos_plane = &ctx->planes[DEFAULT_WIN];

	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,

					   ctx->pipe, EXYNOS_DISPLAY_TYPE_LCD,

					   &decon_crtc_ops, ctx);

drivers/gpu/drm/exynos/exynos_drm_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#define MAX_PLANE	5

#define MAX_FB_BUFFER	4



#define DEFAULT_WIN	0



#define to_exynos_crtc(x)	container_of(x, struct exynos_drm_crtc, base)

#define to_exynos_plane(x)	container_of(x, struct exynos_drm_plane, base)

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+2 −3
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ struct fimd_context { 
	struct clk			*lcd_clk;

	void __iomem			*regs;

	struct regmap			*sysreg;

	unsigned int			default_win;

	unsigned long			irq_flags;

	u32				vidcon0;

	u32				vidcon1;
@@ -949,7 +948,7 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) 
	ctx->pipe = priv->pipe++;



	for (zpos = 0; zpos < WINDOWS_NR; zpos++) {

		type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY :

		type = (zpos == DEFAULT_WIN) ? DRM_PLANE_TYPE_PRIMARY :

						DRM_PLANE_TYPE_OVERLAY;

		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],

					1 << ctx->pipe, type, fimd_formats,
@@ -958,7 +957,7 @@ static int fimd_bind(struct device *dev, struct device *master, void *data) 
			return ret;

	}



	exynos_plane = &ctx->planes[ctx->default_win];

	exynos_plane = &ctx->planes[DEFAULT_WIN];

	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,

					   ctx->pipe, EXYNOS_DISPLAY_TYPE_LCD,

					   &fimd_crtc_ops, ctx);

drivers/gpu/drm/exynos/exynos_drm_vidi.c

+2 −4
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ struct vidi_context { 
	struct exynos_drm_plane		planes[WINDOWS_NR];

	struct edid			*raw_edid;

	unsigned int			clkdiv;

	unsigned int			default_win;

	unsigned long			irq_flags;

	unsigned int			connected;

	bool				vblank_on;
@@ -446,7 +445,7 @@ static int vidi_bind(struct device *dev, struct device *master, void *data) 
	vidi_ctx_initialize(ctx, drm_dev);



	for (zpos = 0; zpos < WINDOWS_NR; zpos++) {

		type = (zpos == ctx->default_win) ? DRM_PLANE_TYPE_PRIMARY :

		type = (zpos == DEFAULT_WIN) ? DRM_PLANE_TYPE_PRIMARY :

						DRM_PLANE_TYPE_OVERLAY;

		ret = exynos_plane_init(drm_dev, &ctx->planes[zpos],

					1 << ctx->pipe, type, formats,
@@ -455,7 +454,7 @@ static int vidi_bind(struct device *dev, struct device *master, void *data) 
			return ret;

	}



	exynos_plane = &ctx->planes[ctx->default_win];

	exynos_plane = &ctx->planes[DEFAULT_WIN];

	ctx->crtc = exynos_drm_crtc_create(drm_dev, &exynos_plane->base,

					   ctx->pipe, EXYNOS_DISPLAY_TYPE_VIDI,

					   &vidi_crtc_ops, ctx);
@@ -507,7 +506,6 @@ static int vidi_probe(struct platform_device *pdev) 
	if (!ctx)

		return -ENOMEM;



	ctx->default_win = 0;

	ctx->pdev = pdev;



	INIT_WORK(&ctx->work, vidi_fake_vblank_handler);