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

Merge "msm: mdss: hdmi: fix 4 block EDID read failure"

Browse source
This commit is contained in:
Linux Build Service Account 2019-06-09 08:03:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit bb646b5795
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/video/fbdev/msm/mdss_hdmi_util.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved. /* Copyright (c) 2010-2017, 2019, The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -790,10 +790,12 @@ static void hdmi_ddc_trigger(struct hdmi_tx_ddc_ctrl *ddc_ctrl,
if (mode == TRIGGER_READ && seg) { if (mode == TRIGGER_READ && seg) {
DSS_REG_W_ND(io, HDMI_DDC_DATA, BIT(31) | (seg_addr << 8)); DSS_REG_W_ND(io, HDMI_DDC_DATA, BIT(31) | (seg_addr << 8));
DSS_REG_W_ND(io, HDMI_DDC_DATA, seg_num << 8); DSS_REG_W_ND(io, HDMI_DDC_DATA, seg_num << 8);
} DSS_REG_W_ND(io, HDMI_DDC_DATA, (ddc_data->dev_addr << 8));
} else {
/* handle portion #1 */ /* handle portion #1 */
DSS_REG_W_ND(io, HDMI_DDC_DATA, BIT(31) | (ddc_data->dev_addr << 8)); DSS_REG_W_ND(io, HDMI_DDC_DATA,
BIT(31) | (ddc_data->dev_addr << 8));
}
/* handle portion #2 */ /* handle portion #2 */
DSS_REG_W_ND(io, HDMI_DDC_DATA, ddc_data->offset << 8); DSS_REG_W_ND(io, HDMI_DDC_DATA, ddc_data->offset << 8);