Commit f412af18 authored by Yannick Fertré's avatar Yannick Fertré Committed by Benjamin Gaignard
Browse files

drm/stm: ltdc: move pinctrl to encoder mode set 



The pin control must be set to default as soon as possible to
establish a good video link between tv & bridge hdmi
(encoder mode set is call before encoder enable).

Signed-off-by: default avatarYannick Fertre <yannick.fertre@st.com>
Acked-by: default avatarPhilippe Cornu <philippe.cornu@st.com>
Signed-off-by: default avatarBenjamin Gaignard <benjamin.gaignard@st.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1574850218-13257-1-git-send-email-yannick.fertre@st.com
parent 93ccfa9a

drivers/gpu/drm/stm/ltdc.c

+18 −6
Original line number Diff line number Diff line
@@ -437,9 +437,6 @@ static void ltdc_crtc_atomic_enable(struct drm_crtc *crtc, 
	/* Commit shadow registers = update planes at next vblank */

	reg_set(ldev->regs, LTDC_SRCR, SRCR_VBR);



	/* Enable LTDC */

	reg_set(ldev->regs, LTDC_GCR, GCR_LTDCEN);



	drm_crtc_vblank_on(crtc);

}
@@ -453,9 +450,6 @@ static void ltdc_crtc_atomic_disable(struct drm_crtc *crtc, 


	drm_crtc_vblank_off(crtc);



	/* disable LTDC */

	reg_clear(ldev->regs, LTDC_GCR, GCR_LTDCEN);



	/* disable IRQ */

	reg_clear(ldev->regs, LTDC_IER, IER_RRIE | IER_FUIE | IER_TERRIE);
@@ -1044,14 +1038,31 @@ static const struct drm_encoder_funcs ltdc_encoder_funcs = { 
static void ltdc_encoder_disable(struct drm_encoder *encoder)

{

	struct drm_device *ddev = encoder->dev;

	struct ltdc_device *ldev = ddev->dev_private;



	DRM_DEBUG_DRIVER("\n");



	/* Disable LTDC */

	reg_clear(ldev->regs, LTDC_GCR, GCR_LTDCEN);



	/* Set to sleep state the pinctrl whatever type of encoder */

	pinctrl_pm_select_sleep_state(ddev->dev);

}



static void ltdc_encoder_enable(struct drm_encoder *encoder)

{

	struct drm_device *ddev = encoder->dev;

	struct ltdc_device *ldev = ddev->dev_private;



	DRM_DEBUG_DRIVER("\n");



	/* Enable LTDC */

	reg_set(ldev->regs, LTDC_GCR, GCR_LTDCEN);

}



static void ltdc_encoder_mode_set(struct drm_encoder *encoder,

				  struct drm_display_mode *mode,

				  struct drm_display_mode *adjusted_mode)

{

	struct drm_device *ddev = encoder->dev;
@@ -1069,6 +1080,7 @@ static void ltdc_encoder_enable(struct drm_encoder *encoder) 
static const struct drm_encoder_helper_funcs ltdc_encoder_helper_funcs = {

	.disable = ltdc_encoder_disable,

	.enable = ltdc_encoder_enable,

	.mode_set = ltdc_encoder_mode_set,

};



static int ltdc_encoder_init(struct drm_device *ddev, struct drm_bridge *bridge)

CRA Git | Maintained and supported by SUSTech CRA and CCSE