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

Commit 6c90c886 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm : fix hdmi controller register programming"

parents 0899f88b d9bdeba0

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

+0 −2
Original line number Diff line number Diff line
@@ -328,7 +328,6 @@ static int _sde_hdmi_bridge_setup_scrambler(struct hdmi *hdmi, 
		}



		reg_val = hdmi_read(hdmi, REG_HDMI_CTRL);

		reg_val |= BIT(31); /* Enable Update DATAPATH_MODE */

		reg_val |= BIT(28); /* Set SCRAMBLER_EN bit */



		hdmi_write(hdmi, REG_HDMI_CTRL, reg_val);
@@ -360,7 +359,6 @@ static int _sde_hdmi_bridge_setup_scrambler(struct hdmi *hdmi, 
	} else {

		sde_hdmi_scdc_write(hdmi, HDMI_TX_SCDC_SCRAMBLING_ENABLE, 0x0);

		reg_val = hdmi_read(hdmi, REG_HDMI_CTRL);

		reg_val &= ~BIT(31); /* Disable Update DATAPATH_MODE */

		reg_val &= ~BIT(28); /* Unset SCRAMBLER_EN bit */

		hdmi_write(hdmi, REG_HDMI_CTRL, reg_val);

	}