Unverified Commit d8b599bf authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Robert Foss
Browse files

drm/bridge: ti-sn65dsi86: Use atomic variants of drm_bridge_funcs 



Move away from the deprecated enable/disable operations in
drm_bridge_funcs and enable atomic use.

v3:
 - Drop use of DRM_BRIDGE_STATE_OPS

v2:
 - fix build (kernel test robot <lkp@intel.com>)

Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Kieran Bingham <kieran.bingham@ideasonboard.com>
Cc: Douglas Anderson <dianders@chromium.org>
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@gmail.com>
Reviewed-by: default avatarRobert Foss <robert.foss@linaro.org>
Signed-off-by: default avatarRobert Foss <robert.foss@linaro.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20220703202724.9553-2-sam@ravnborg.org
parent 819da60d

drivers/gpu/drm/bridge/ti-sn65dsi86.c

+15 −8
Original line number Diff line number Diff line
@@ -752,7 +752,8 @@ ti_sn_bridge_mode_valid(struct drm_bridge *bridge, 
	return MODE_OK;

}



static void ti_sn_bridge_disable(struct drm_bridge *bridge)

static void ti_sn_bridge_atomic_disable(struct drm_bridge *bridge,

					struct drm_bridge_state *old_bridge_state)

{

	struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
@@ -1011,7 +1012,8 @@ static int ti_sn_link_training(struct ti_sn65dsi86 *pdata, int dp_rate_idx, 
	return ret;

}



static void ti_sn_bridge_enable(struct drm_bridge *bridge)

static void ti_sn_bridge_atomic_enable(struct drm_bridge *bridge,

				       struct drm_bridge_state *old_bridge_state)

{

	struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);

	const char *last_err_str = "No supported DP rate";
@@ -1080,7 +1082,8 @@ static void ti_sn_bridge_enable(struct drm_bridge *bridge) 
			   VSTREAM_ENABLE);

}



static void ti_sn_bridge_pre_enable(struct drm_bridge *bridge)

static void ti_sn_bridge_atomic_pre_enable(struct drm_bridge *bridge,

					   struct drm_bridge_state *old_bridge_state)

{

	struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
@@ -1093,7 +1096,8 @@ static void ti_sn_bridge_pre_enable(struct drm_bridge *bridge) 
	usleep_range(100, 110);

}



static void ti_sn_bridge_post_disable(struct drm_bridge *bridge)

static void ti_sn_bridge_atomic_post_disable(struct drm_bridge *bridge,

					     struct drm_bridge_state *old_bridge_state)

{

	struct ti_sn65dsi86 *pdata = bridge_to_ti_sn65dsi86(bridge);
@@ -1114,10 +1118,13 @@ static const struct drm_bridge_funcs ti_sn_bridge_funcs = { 
	.attach = ti_sn_bridge_attach,

	.detach = ti_sn_bridge_detach,

	.mode_valid = ti_sn_bridge_mode_valid,

	.pre_enable = ti_sn_bridge_pre_enable,

	.enable = ti_sn_bridge_enable,

	.disable = ti_sn_bridge_disable,

	.post_disable = ti_sn_bridge_post_disable,

	.atomic_pre_enable = ti_sn_bridge_atomic_pre_enable,

	.atomic_enable = ti_sn_bridge_atomic_enable,

	.atomic_disable = ti_sn_bridge_atomic_disable,

	.atomic_post_disable = ti_sn_bridge_atomic_post_disable,

	.atomic_reset = drm_atomic_helper_bridge_reset,

	.atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_bridge_destroy_state,

};



static void ti_sn_bridge_parse_lanes(struct ti_sn65dsi86 *pdata,