Merge "msm: mdss: hdmi: fix 4 block EDID read failure" (bd9885ab) · Commits · e / devices / android_kernel_sony_msm8998

drivers/video/fbdev/msm/mdss_hdmi_util.c

+6 −4

Original line number	Diff line number	Diff line
		/* 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
		* 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) {
		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, (ddc_data->dev_addr << 8));
		} else {
		/* 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 */
		DSS_REG_W_ND(io, HDMI_DDC_DATA, ddc_data->offset << 8);