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

Commit b5f4843c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-fixes' of... 

Merge branch 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-fixes

   This pull-request fixes hdmi power-off order issue, mixer issues
   related to power on/off, and includes trivial fixups.

* 'exynos-drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: enable vsync interrupt while waiting for vblank
  drm/exynos: soft reset mixer before reconfigure after power-on
  drm/exynos: allow multiple layer updates per vsync for mixer
  drm/exynos: stop mixer before gating clocks during poweroff
  drm/exynos: set power state variable after enabling clocks and power
  drm/exynos: disable unused windows on apply
  drm/exynos: Fix de-registration ordering
  drm/exynos: change zero to NULL for sparse
  drm/exynos: dpi: Fix NULL pointer dereference with legacy bindings
  drm/exynos: hdmi: fix power order issue
parents b0a2c151 5d39b9ee

drivers/gpu/drm/exynos/exynos_drm_dpi.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ exynos_dpi_detect(struct drm_connector *connector, bool force) 
{

	struct exynos_dpi *ctx = connector_to_dpi(connector);



	if (!ctx->panel->connector)

	if (ctx->panel && !ctx->panel->connector)

		drm_panel_attach(ctx->panel, &ctx->connector);



	return connector_status_connected;

drivers/gpu/drm/exynos/exynos_drm_drv.c

+4 −4
Original line number Diff line number Diff line
@@ -765,24 +765,24 @@ static int exynos_drm_init(void) 


	return 0;



err_unregister_pd:

	platform_device_unregister(exynos_drm_pdev);



err_remove_vidi:

#ifdef CONFIG_DRM_EXYNOS_VIDI

	exynos_drm_remove_vidi();



err_unregister_pd:

#endif

	platform_device_unregister(exynos_drm_pdev);



	return ret;

}



static void exynos_drm_exit(void)

{

	platform_driver_unregister(&exynos_drm_platform_driver);

#ifdef CONFIG_DRM_EXYNOS_VIDI

	exynos_drm_remove_vidi();

#endif

	platform_device_unregister(exynos_drm_pdev);

	platform_driver_unregister(&exynos_drm_platform_driver);

}



module_init(exynos_drm_init);

drivers/gpu/drm/exynos/exynos_drm_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ struct exynos_drm_display * exynos_dpi_probe(struct device *dev); 
int exynos_dpi_remove(struct device *dev);

#else

static inline struct exynos_drm_display *

exynos_dpi_probe(struct device *dev) { return 0; }

exynos_dpi_probe(struct device *dev) { return NULL; }

static inline int exynos_dpi_remove(struct device *dev) { return 0; }

#endif

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+2 −0
Original line number Diff line number Diff line
@@ -741,6 +741,8 @@ static void fimd_apply(struct exynos_drm_manager *mgr) 
		win_data = &ctx->win_data[i];

		if (win_data->enabled)

			fimd_win_commit(mgr, i);

		else

			fimd_win_disable(mgr, i);

	}



	fimd_commit(mgr);

drivers/gpu/drm/exynos/exynos_hdmi.c

+19 −0
Original line number Diff line number Diff line
@@ -2090,6 +2090,11 @@ out: 


static void hdmi_dpms(struct exynos_drm_display *display, int mode)

{

	struct hdmi_context *hdata = display->ctx;

	struct drm_encoder *encoder = hdata->encoder;

	struct drm_crtc *crtc = encoder->crtc;

	struct drm_crtc_helper_funcs *funcs = NULL;



	DRM_DEBUG_KMS("mode %d\n", mode);



	switch (mode) {
@@ -2099,6 +2104,20 @@ static void hdmi_dpms(struct exynos_drm_display *display, int mode) 
	case DRM_MODE_DPMS_STANDBY:

	case DRM_MODE_DPMS_SUSPEND:

	case DRM_MODE_DPMS_OFF:

		/*

		 * The SFRs of VP and Mixer are updated by Vertical Sync of

		 * Timing generator which is a part of HDMI so the sequence

		 * to disable TV Subsystem should be as following,

		 *	VP -> Mixer -> HDMI

		 *

		 * Below codes will try to disable Mixer and VP(if used)

		 * prior to disabling HDMI.

		 */

		if (crtc)

			funcs = crtc->helper_private;

		if (funcs && funcs->dpms)

			(*funcs->dpms)(crtc, mode);



		hdmi_poweroff(display);

		break;

	default: