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

Merge "drm/msm: reset TMDS clock ratio bit when disabling scrambler"

Browse source
This commit is contained in:
Linux Build Service Account 2017-08-08 09:02:08 -07:00 • committed by Gerrit - the friendly Code Review server
commit a42bc74491
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -351,6 +351,7 @@ static int _sde_hdmi_bridge_setup_scrambler(struct hdmi *hdmi,
scrambler_on = true;
tmds_clock_ratio = 1;
} else {
tmds_clock_ratio = 0;
scrambler_on = connector->supports_scramble;
}
@ -396,6 +397,14 @@ static int _sde_hdmi_bridge_setup_scrambler(struct hdmi *hdmi,
rc = _sde_hdmi_bridge_setup_ddc_timers(hdmi,
HDMI_TX_DDC_TIMER_SCRAMBLER_STATUS, timeout_hsync);
} else {
/* reset tmds clock ratio */
rc = sde_hdmi_scdc_write(hdmi,
HDMI_TX_SCDC_TMDS_BIT_CLOCK_RATIO_UPDATE,
tmds_clock_ratio);
/* scdc write can fail if sink doesn't support SCDC */
if (rc && connector->scdc_present)
SDE_ERROR("SCDC present, TMDS clk ratio err\n");
sde_hdmi_scdc_write(hdmi, HDMI_TX_SCDC_SCRAMBLING_ENABLE, 0x0);
reg_val = hdmi_read(hdmi, REG_HDMI_CTRL);
reg_val &= ~BIT(28); /* Unset SCRAMBLER_EN bit */