Commit 768859c2 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Linus Walleij
Browse files

drm/mcde: Provide vblank handling unconditionally 



At the moment, vblank handling is only enabled together with
TE synchronization. However, the vblank IRQ is also working with
on displays without TE synchronization (e.g. DSI video mode panels).
It seems like the vblank IRQ is actually generated by the
MCDE hardware for the channel.

Therefore, the vblank handling should be working correctly in
all the cases and we can enable it unconditionally.

Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Tested-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20191106165835.2863-2-stephan@gerhold.net
parent f4563f3c

drivers/gpu/drm/mcde/mcde_display.c

+5 −10
Original line number Diff line number Diff line
@@ -934,9 +934,9 @@ static void mcde_display_enable(struct drm_simple_display_pipe *pipe, 
		val = readl(mcde->regs + MCDE_CRC);

		val |= MCDE_CRC_SYCEN0;

		writel(val, mcde->regs + MCDE_CRC);

	}



	drm_crtc_vblank_on(crtc);

	}



	dev_info(drm->dev, "MCDE display is enabled\n");

}
@@ -947,7 +947,6 @@ static void mcde_display_disable(struct drm_simple_display_pipe *pipe) 
	struct drm_device *drm = crtc->dev;

	struct mcde *mcde = drm->dev_private;



	if (mcde->te_sync)

	drm_crtc_vblank_off(crtc);



	/* Disable FIFO A flow */
@@ -1097,6 +1096,8 @@ static struct drm_simple_display_pipe_funcs mcde_display_funcs = { 
	.enable = mcde_display_enable,

	.disable = mcde_display_disable,

	.update = mcde_display_update,

	.enable_vblank = mcde_display_enable_vblank,

	.disable_vblank = mcde_display_disable_vblank,

	.prepare_fb = drm_gem_fb_simple_display_pipe_prepare_fb,

};
@@ -1123,12 +1124,6 @@ int mcde_display_init(struct drm_device *drm) 
		DRM_FORMAT_YUV422,

	};



	/* Provide vblank only when we have TE enabled */

	if (mcde->te_sync) {

		mcde_display_funcs.enable_vblank = mcde_display_enable_vblank;

		mcde_display_funcs.disable_vblank = mcde_display_disable_vblank;

	}



	ret = drm_simple_display_pipe_init(drm, &mcde->pipe,

					   &mcde_display_funcs,

					   formats, ARRAY_SIZE(formats),

drivers/gpu/drm/mcde/mcde_drv.c

+4 −12
Original line number Diff line number Diff line
@@ -179,19 +179,11 @@ static int mcde_modeset_init(struct drm_device *drm) 
	mode_config->min_height = 1;

	mode_config->max_height = 1080;



	/*

	 * Currently we only support vblank handling on the DSI bridge, using

	 * TE synchronization. If TE sync is not set up, it is still possible

	 * to push out a single update on demand, but this is hard for DRM to

	 * exploit.

	 */

	if (mcde->te_sync) {

	ret = drm_vblank_init(drm, 1);

	if (ret) {

		dev_err(drm->dev, "failed to init vblank\n");

		goto out_config;

	}

	}



	ret = mcde_display_init(drm);

	if (ret) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE