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

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

imx-drm: ipuv3-crtc: change display enable/disable order 



Now that ipu_dc_disable_channel correctly waits for the channel to finish,
we can reorder the enable/disable order to first stop the DC and DI and
only then disable the IDMAC. Enabling is done the other way around: IDMAC
first, then DC, then DI.

This avoids an issue where sometimes the channel would not correctly start,
leading to non-working LVDS displays.

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

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

+7 −3
Original line number Diff line number Diff line
@@ -63,9 +63,11 @@ static void ipu_fb_enable(struct ipu_crtc *ipu_crtc) 
	if (ipu_crtc->enabled)

		return;



	ipu_di_enable(ipu_crtc->di);

	ipu_dc_enable_channel(ipu_crtc->dc);

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

	ipu_plane_enable(ipu_crtc->plane[0]);

	/* Start DC channel and DI after IDMAC */

	ipu_dc_enable_channel(ipu_crtc->dc);

	ipu_di_enable(ipu_crtc->di);



	ipu_crtc->enabled = 1;

}
@@ -75,9 +77,11 @@ static void ipu_fb_disable(struct ipu_crtc *ipu_crtc) 
	if (!ipu_crtc->enabled)

		return;



	ipu_plane_disable(ipu_crtc->plane[0]);

	/* Stop DC channel and DI before IDMAC */

	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_crtc->enabled = 0;

}