Commit 053d231f authored by Dafna Hirschfeld's avatar Dafna Hirschfeld Committed by Chun-Kuang Hu
Browse files

drm/mediatek: Switch the hdmi bridge ops to the atomic versions 



The bridge operation '.enable' and the audio cb '.get_eld'
access hdmi->conn. In the future we will want to support
the flag DRM_BRIDGE_ATTACH_NO_CONNECTOR and then we will
not have direct access to the connector.
The atomic version '.atomic_enable' allows accessing the
current connector from the state.
This patch switches the bridge to the atomic version to
prepare access to the connector in later patches.

Signed-off-by: default avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent fdcbe17c

drivers/gpu/drm/mediatek/mtk_hdmi.c

+15 −8
Original line number Diff line number Diff line
@@ -1357,7 +1357,8 @@ static bool mtk_hdmi_bridge_mode_fixup(struct drm_bridge *bridge, 
	return true;

}



static void mtk_hdmi_bridge_disable(struct drm_bridge *bridge)

static void mtk_hdmi_bridge_atomic_disable(struct drm_bridge *bridge,

					   struct drm_bridge_state *old_bridge_state)

{

	struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
@@ -1371,7 +1372,8 @@ static void mtk_hdmi_bridge_disable(struct drm_bridge *bridge) 
	hdmi->enabled = false;

}



static void mtk_hdmi_bridge_post_disable(struct drm_bridge *bridge)

static void mtk_hdmi_bridge_atomic_post_disable(struct drm_bridge *bridge,

						struct drm_bridge_state *old_state)

{

	struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
@@ -1406,7 +1408,8 @@ static void mtk_hdmi_bridge_mode_set(struct drm_bridge *bridge, 
	drm_mode_copy(&hdmi->mode, adjusted_mode);

}



static void mtk_hdmi_bridge_pre_enable(struct drm_bridge *bridge)

static void mtk_hdmi_bridge_atomic_pre_enable(struct drm_bridge *bridge,

					      struct drm_bridge_state *old_state)

{

	struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
@@ -1426,7 +1429,8 @@ static void mtk_hdmi_send_infoframe(struct mtk_hdmi *hdmi, 
		mtk_hdmi_setup_vendor_specific_infoframe(hdmi, mode);

}



static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge)

static void mtk_hdmi_bridge_atomic_enable(struct drm_bridge *bridge,

					  struct drm_bridge_state *old_state)

{

	struct mtk_hdmi *hdmi = hdmi_ctx_from_bridge(bridge);
@@ -1440,13 +1444,16 @@ static void mtk_hdmi_bridge_enable(struct drm_bridge *bridge) 
}



static const struct drm_bridge_funcs mtk_hdmi_bridge_funcs = {

	.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,

	.attach = mtk_hdmi_bridge_attach,

	.mode_fixup = mtk_hdmi_bridge_mode_fixup,

	.disable = mtk_hdmi_bridge_disable,

	.post_disable = mtk_hdmi_bridge_post_disable,

	.atomic_disable = mtk_hdmi_bridge_atomic_disable,

	.atomic_post_disable = mtk_hdmi_bridge_atomic_post_disable,

	.mode_set = mtk_hdmi_bridge_mode_set,

	.pre_enable = mtk_hdmi_bridge_pre_enable,

	.enable = mtk_hdmi_bridge_enable,

	.atomic_pre_enable = mtk_hdmi_bridge_atomic_pre_enable,

	.atomic_enable = mtk_hdmi_bridge_atomic_enable,

};



static int mtk_hdmi_dt_parse_pdata(struct mtk_hdmi *hdmi,