Commit 3afb2a28 authored by Liu Ying's avatar Liu Ying Committed by Neil Armstrong
Browse files

drm/bridge: nwl-dsi: Force a full modeset when crtc_state->active is changed to be true 



This patch replaces ->mode_fixup() with ->atomic_check() so that
a full modeset can be requested from there when crtc_state->active
is changed to be true(which implies only connector's DPMS is brought
out of "Off" status, though not necessarily).  Bridge functions are
added or changed to accommodate the ->atomic_check() callback.  That
full modeset is needed by the up-coming patch which gets MIPI DSI
controller and PHY ready in ->mode_set(), because it makes sure
->mode_set() and ->atomic_disable() are called in pairs.

Cc: Andrzej Hajda <a.hajda@samsung.com>
Cc: Neil Armstrong <narmstrong@baylibre.com>
Cc: Robert Foss <robert.foss@linaro.org>
Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com>
Cc: Jonas Karlman <jonas@kwiboo.se>
Cc: Jernej Skrabec <jernej.skrabec@siol.net>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Guido Günther <agx@sigxcpu.org>
Cc: Robert Chiras <robert.chiras@nxp.com>
Cc: NXP Linux Team <linux-imx@nxp.com>
Signed-off-by: default avatarLiu Ying <victor.liu@nxp.com>
Reviewed-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Signed-off-by: default avatarNeil Armstrong <narmstrong@baylibre.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1619170003-4817-2-git-send-email-victor.liu@nxp.com
parent 6c525b72

drivers/gpu/drm/bridge/nwl-dsi.c

+39 −22
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/sys_soc.h>

#include <linux/time64.h>



#include <drm/drm_atomic_state_helper.h>

#include <drm/drm_bridge.h>

#include <drm/drm_mipi_dsi.h>

#include <drm/drm_of.h>
@@ -742,7 +743,9 @@ static int nwl_dsi_disable(struct nwl_dsi *dsi) 
	return 0;

}



static void nwl_dsi_bridge_disable(struct drm_bridge *bridge)

static void

nwl_dsi_bridge_atomic_disable(struct drm_bridge *bridge,

			      struct drm_bridge_state *old_bridge_state)

{

	struct nwl_dsi *dsi = bridge_to_dsi(bridge);

	int ret;
@@ -803,17 +806,6 @@ static int nwl_dsi_get_dphy_params(struct nwl_dsi *dsi, 
	return 0;

}



static bool nwl_dsi_bridge_mode_fixup(struct drm_bridge *bridge,

				      const struct drm_display_mode *mode,

				      struct drm_display_mode *adjusted_mode)

{

	/* At least LCDIF + NWL needs active high sync */

	adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);

	adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC);



	return true;

}



static enum drm_mode_status

nwl_dsi_bridge_mode_valid(struct drm_bridge *bridge,

			  const struct drm_display_info *info,
@@ -831,6 +823,24 @@ nwl_dsi_bridge_mode_valid(struct drm_bridge *bridge, 
	return MODE_OK;

}



static int nwl_dsi_bridge_atomic_check(struct drm_bridge *bridge,

				       struct drm_bridge_state *bridge_state,

				       struct drm_crtc_state *crtc_state,

				       struct drm_connector_state *conn_state)

{

	struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode;



	/* At least LCDIF + NWL needs active high sync */

	adjusted_mode->flags |= (DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC);

	adjusted_mode->flags &= ~(DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC);



	/* Do a full modeset if crtc_state->active is changed to be true. */

	if (crtc_state->active_changed && crtc_state->active)

		crtc_state->mode_changed = true;



	return 0;

}



static void

nwl_dsi_bridge_mode_set(struct drm_bridge *bridge,

			const struct drm_display_mode *mode,
@@ -862,7 +872,9 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, 
	drm_mode_debug_printmodeline(adjusted_mode);

}



static void nwl_dsi_bridge_pre_enable(struct drm_bridge *bridge)

static void

nwl_dsi_bridge_atomic_pre_enable(struct drm_bridge *bridge,

				 struct drm_bridge_state *old_bridge_state)

{

	struct nwl_dsi *dsi = bridge_to_dsi(bridge);

	int ret;
@@ -897,7 +909,9 @@ static void nwl_dsi_bridge_pre_enable(struct drm_bridge *bridge) 
	}

}



static void nwl_dsi_bridge_enable(struct drm_bridge *bridge)

static void

nwl_dsi_bridge_atomic_enable(struct drm_bridge *bridge,

			     struct drm_bridge_state *old_bridge_state)

{

	struct nwl_dsi *dsi = bridge_to_dsi(bridge);

	int ret;
@@ -942,10 +956,13 @@ static void nwl_dsi_bridge_detach(struct drm_bridge *bridge) 
}



static const struct drm_bridge_funcs nwl_dsi_bridge_funcs = {

	.pre_enable = nwl_dsi_bridge_pre_enable,

	.enable     = nwl_dsi_bridge_enable,

	.disable    = nwl_dsi_bridge_disable,

	.mode_fixup = nwl_dsi_bridge_mode_fixup,

	.atomic_duplicate_state	= drm_atomic_helper_bridge_duplicate_state,

	.atomic_destroy_state	= drm_atomic_helper_bridge_destroy_state,

	.atomic_reset		= drm_atomic_helper_bridge_reset,

	.atomic_check		= nwl_dsi_bridge_atomic_check,

	.atomic_pre_enable	= nwl_dsi_bridge_atomic_pre_enable,

	.atomic_enable		= nwl_dsi_bridge_atomic_enable,

	.atomic_disable		= nwl_dsi_bridge_atomic_disable,

	.mode_set		= nwl_dsi_bridge_mode_set,

	.mode_valid		= nwl_dsi_bridge_mode_valid,

	.attach			= nwl_dsi_bridge_attach,