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

Commit 1e6d486b authored by Philipp Zabel's avatar Philipp Zabel Committed by Russell King
Browse files

imx-drm: ipu-dc: disable DC module when not in use 



Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent c115edb8

drivers/staging/imx-drm/ipu-v3/imx-ipu-v3.h

+2 −0
Original line number Diff line number Diff line
@@ -115,8 +115,10 @@ struct ipu_dc *ipu_dc_get(struct ipu_soc *ipu, int channel); 
void ipu_dc_put(struct ipu_dc *dc);

int ipu_dc_init_sync(struct ipu_dc *dc, struct ipu_di *di, bool interlaced,

		u32 pixel_fmt, u32 width);

void ipu_dc_enable(struct ipu_soc *ipu);

void ipu_dc_enable_channel(struct ipu_dc *dc);

void ipu_dc_disable_channel(struct ipu_dc *dc);

void ipu_dc_disable(struct ipu_soc *ipu);



/*

 * IPU Display Interface (di) functions

drivers/staging/imx-drm/ipu-v3/ipu-dc.c

+12 −2
Original line number Diff line number Diff line
@@ -224,12 +224,16 @@ int ipu_dc_init_sync(struct ipu_dc *dc, struct ipu_di *di, bool interlaced, 
	writel(0x0, dc->base + DC_WR_CH_ADDR);

	writel(width, priv->dc_reg + DC_DISP_CONF2(dc->di));



	ipu_module_enable(priv->ipu, IPU_CONF_DC_EN);



	return 0;

}

EXPORT_SYMBOL_GPL(ipu_dc_init_sync);



void ipu_dc_enable(struct ipu_soc *ipu)

{

	ipu_module_enable(ipu, IPU_CONF_DC_EN);

}

EXPORT_SYMBOL_GPL(ipu_dc_enable);



void ipu_dc_enable_channel(struct ipu_dc *dc)

{

	int di;
@@ -286,6 +290,12 @@ void ipu_dc_disable_channel(struct ipu_dc *dc) 
}

EXPORT_SYMBOL_GPL(ipu_dc_disable_channel);



void ipu_dc_disable(struct ipu_soc *ipu)

{

	ipu_module_disable(ipu, IPU_CONF_DC_EN);

}

EXPORT_SYMBOL_GPL(ipu_dc_disable);



static void ipu_dc_map_config(struct ipu_dc_priv *priv, enum ipu_dc_map map,

		int byte_num, int offset, int mask)

{

drivers/staging/imx-drm/ipuv3-crtc.c

+6 −2
Original line number Diff line number Diff line
@@ -60,10 +60,12 @@ struct ipu_crtc { 


static void ipu_fb_enable(struct ipu_crtc *ipu_crtc)

{

	struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);



	if (ipu_crtc->enabled)

		return;



	/* TODO: Enable DC module here, right now it is never disabled */

	ipu_dc_enable(ipu);

	ipu_plane_enable(ipu_crtc->plane[0]);

	/* Start DC channel and DI after IDMAC */

	ipu_dc_enable_channel(ipu_crtc->dc);
@@ -74,6 +76,8 @@ static void ipu_fb_enable(struct ipu_crtc *ipu_crtc) 


static void ipu_fb_disable(struct ipu_crtc *ipu_crtc)

{

	struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);



	if (!ipu_crtc->enabled)

		return;
@@ -81,7 +85,7 @@ static void ipu_fb_disable(struct ipu_crtc *ipu_crtc) 
	ipu_dc_disable_channel(ipu_crtc->dc);

	ipu_di_disable(ipu_crtc->di);

	ipu_plane_disable(ipu_crtc->plane[0]);

	/* TODO: Disable DC module here */

	ipu_dc_disable(ipu);



	ipu_crtc->enabled = 0;

}