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

Commit b86526c8 authored by Rahul Sharma's avatar Rahul Sharma Committed by Gerrit - the friendly Code Review server
Browse files

drm/msm: check hpd_off flag only for pluggable displays 



This change will wrap the 'hpd_off' flag with pluggable displays.
In non-pluggable display case 'hpd_off' flag prevents disabling
of HPD clocks and hence display subsystem doesn't got into suspend
state.

Change-Id: I28ade8fb60a60a15f1d23009de63bbf9f10c7c77
Signed-off-by: default avatarRahul Sharma <rahsha@codeaurora.org>
Signed-off-by: default avatarSuprith Malligere Shankaregowda <supgow@codeaurora.org>
parent a56e768c

drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c

+6 −3
Original line number Diff line number Diff line
@@ -1339,6 +1339,7 @@ static int _sde_hdmi_hpd_enable(struct sde_hdmi *sde_hdmi) 
			HDMI_HPD_CTRL_ENABLE | hpd_ctrl);

	spin_unlock_irqrestore(&hdmi->reg_lock, flags);



	if (!sde_hdmi->non_pluggable)

		hdmi->hpd_off = false;

	SDE_DEBUG("enabled hdmi hpd\n");

	return 0;
@@ -1401,7 +1402,7 @@ static void _sde_hdmi_hpd_disable(struct sde_hdmi *sde_hdmi) 
	int i, ret = 0;

	unsigned long flags;



	if (hdmi->hpd_off) {

	if (!sde_hdmi->non_pluggable && hdmi->hpd_off) {

		pr_warn("hdmi display hpd was already disabled\n");

		return;

	}
@@ -1432,6 +1433,8 @@ static void _sde_hdmi_hpd_disable(struct sde_hdmi *sde_hdmi) 
			pr_warn("failed to disable hpd regulator: %s (%d)\n",

					config->hpd_reg_names[i], ret);

	}



	if (!sde_hdmi->non_pluggable)

		hdmi->hpd_off = true;

	SDE_DEBUG("disabled hdmi hpd\n");

}