Commit 666832f7 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Dmitry Baryshkov
Browse files

drm/msm/hdmi: wire in hpd_enable/hpd_disable bridge ops 



The HDMI driver already has msm_hdmi_hpd_enable() and
msm_hdmi_hpd_disable() functions. Wire them into the
msm_hdmi_bridge_funcs, so that HPD  can be enabled and disabled
dynamically rather than always having HPD events generation enabled.

Reviewed-by: default avatarJessica Zhang <quic_jesszhan@quicinc.com>
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20250505-fd-hdmi-hpd-v5-13-48541f76318c@oss.qualcomm.com


Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
parent b93f19d8

drivers/gpu/drm/msm/hdmi/hdmi.c

+0 −9
Original line number Diff line number Diff line
@@ -200,12 +200,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, 
		goto fail;

	}



	ret = msm_hdmi_hpd_enable(hdmi->bridge);

	if (ret < 0) {

		DRM_DEV_ERROR(&hdmi->pdev->dev, "failed to enable HPD: %d\n", ret);

		goto fail;

	}



	return 0;



fail:
@@ -261,9 +255,6 @@ static void msm_hdmi_unbind(struct device *dev, struct device *master, 
	struct msm_drm_private *priv = dev_get_drvdata(master);



	if (priv->hdmi) {

		if (priv->hdmi->bridge)

			msm_hdmi_hpd_disable(priv->hdmi);



		msm_hdmi_destroy(priv->hdmi);

		priv->hdmi = NULL;

	}

drivers/gpu/drm/msm/hdmi/hdmi.h

+2 −2
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ int msm_hdmi_bridge_init(struct hdmi *hdmi); 
void msm_hdmi_hpd_irq(struct drm_bridge *bridge);

enum drm_connector_status msm_hdmi_bridge_detect(

		struct drm_bridge *bridge);

int msm_hdmi_hpd_enable(struct drm_bridge *bridge);

void msm_hdmi_hpd_disable(struct hdmi *hdmi);

void msm_hdmi_hpd_enable(struct drm_bridge *bridge);

void msm_hdmi_hpd_disable(struct drm_bridge *bridge);



/*

 * i2c adapter for ddc:

drivers/gpu/drm/msm/hdmi/hdmi_bridge.c

+2 −0
Original line number Diff line number Diff line
@@ -459,6 +459,8 @@ static const struct drm_bridge_funcs msm_hdmi_bridge_funcs = { 
	.atomic_post_disable = msm_hdmi_bridge_atomic_post_disable,

	.edid_read = msm_hdmi_bridge_edid_read,

	.detect = msm_hdmi_bridge_detect,

	.hpd_enable = msm_hdmi_hpd_enable,

	.hpd_disable = msm_hdmi_hpd_disable,

	.hdmi_tmds_char_rate_valid = msm_hdmi_bridge_tmds_char_rate_valid,

	.hdmi_clear_infoframe = msm_hdmi_bridge_clear_infoframe,

	.hdmi_write_infoframe = msm_hdmi_bridge_write_infoframe,

drivers/gpu/drm/msm/hdmi/hdmi_hpd.c

+6 −6
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ static void msm_hdmi_phy_reset(struct hdmi *hdmi) 
	}

}



int msm_hdmi_hpd_enable(struct drm_bridge *bridge)

void msm_hdmi_hpd_enable(struct drm_bridge *bridge)

{

	struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);

	struct hdmi *hdmi = hdmi_bridge->hdmi;
@@ -73,8 +73,8 @@ int msm_hdmi_hpd_enable(struct drm_bridge *bridge) 
		gpiod_set_value_cansleep(hdmi->hpd_gpiod, 1);



	ret = pm_runtime_resume_and_get(dev);

	if (ret)

		return ret;

	if (WARN_ON(ret))

		return;



	mutex_lock(&hdmi->state_mutex);

	msm_hdmi_set_mode(hdmi, false);
@@ -102,12 +102,12 @@ int msm_hdmi_hpd_enable(struct drm_bridge *bridge) 
	hdmi_write(hdmi, REG_HDMI_HPD_CTRL,

			HDMI_HPD_CTRL_ENABLE | hpd_ctrl);

	spin_unlock_irqrestore(&hdmi->reg_lock, flags);



	return 0;

}



void msm_hdmi_hpd_disable(struct hdmi *hdmi)

void msm_hdmi_hpd_disable(struct drm_bridge *bridge)

{

	struct hdmi_bridge *hdmi_bridge = to_hdmi_bridge(bridge);

	struct hdmi *hdmi = hdmi_bridge->hdmi;

	struct device *dev = &hdmi->pdev->dev;



	/* Disable HPD interrupt */