evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "drm/msm: check hpd_off flag only for pluggable displays"

Browse source
This commit is contained in:
Linux Build Service Account 2018-03-28 15:28:06 -07:00 • committed by Gerrit - the friendly Code Review server
commit 2a5b9922bf
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/gpu/drm/msm/hdmi-staging/sde_hdmi.c
View file

@ -1339,7 +1339,8 @@ static int _sde_hdmi_hpd_enable(struct sde_hdmi *sde_hdmi)
HDMI_HPD_CTRL_ENABLE | hpd_ctrl);
spin_unlock_irqrestore(&hdmi->reg_lock, flags);
hdmi->hpd_off = false;
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,7 +1433,9 @@ 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);
}
hdmi->hpd_off = true;
if (!sde_hdmi->non_pluggable)
hdmi->hpd_off = true;
SDE_DEBUG("disabled hdmi hpd\n");
}