Merge "drm/msm/dsi-staging: avoid out of bounds access of ctrl array" (1e9dad51) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/dsi-staging/dsi_display.c

+11 −17

Original line number	Diff line number	Diff line
		@@ -3792,7 +3792,7 @@ static int dsi_display_update_dsi_bitrate(struct dsi_display *display,

		display->config.bit_clk_rate_hz = bit_clk_rate;

		for (i = 0; i < display->ctrl_count; i++) {
		display_for_each_ctrl(i, display) {
		struct dsi_display_ctrl *dsi_disp_ctrl = &display->ctrl[i];
		struct dsi_ctrl *ctrl = dsi_disp_ctrl->ctrl;
		u32 num_of_lanes = 0, bpp;
		@@ -3920,8 +3920,7 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
		goto exit;
		}

		for (i = 0; (i < display->ctrl_count) &&
		(i < MAX_DSI_CTRLS_PER_DISPLAY); i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		if (!ctrl->ctrl)
		continue;
		@@ -3939,8 +3938,7 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
		}
		}

		for (i = 0; (i < display->ctrl_count) &&
		(i < MAX_DSI_CTRLS_PER_DISPLAY); i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		if (ctrl == m_ctrl)
		continue;
		@@ -3949,8 +3947,7 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
		dsi_phy_dynamic_refresh_trigger(m_ctrl->phy, true);

		/* wait for dynamic refresh done */
		for (i = 0; (i < display->ctrl_count) &&
		(i < MAX_DSI_CTRLS_PER_DISPLAY); i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		rc = dsi_ctrl_wait4dynamic_refresh_done(ctrl->ctrl);
		if (rc) {
		@@ -3962,8 +3959,7 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
		}
		}

		for (i = 0; (i < display->ctrl_count) &&
		(i < MAX_DSI_CTRLS_PER_DISPLAY); i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		dsi_phy_dynamic_refresh_clear(ctrl->phy);
		}
		@@ -3978,8 +3974,7 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
		return rc;

		recover_pix_clk:
		for (i = 0; (i < display->ctrl_count) &&
		(i < MAX_DSI_CTRLS_PER_DISPLAY); i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		if (!ctrl->ctrl)
		continue;
		@@ -3988,8 +3983,7 @@ static int _dsi_display_dyn_update_clks(struct dsi_display *display,
		}

		recover_byte_clk:
		for (i = 0; (i < display->ctrl_count) &&
		(i < MAX_DSI_CTRLS_PER_DISPLAY); i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		if (!ctrl->ctrl)
		continue;
		@@ -4023,7 +4017,7 @@ static int dsi_display_dynamic_clk_switch(struct dsi_display *display,
		dsi_display_mask_ctrl_error_interrupts(display, mask, true);

		/* update the phy timings based on new mode */
		for (i = 0; i < display->ctrl_count; i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		dsi_phy_update_phy_timings(ctrl->phy, &display->config);
		}
		@@ -4043,7 +4037,7 @@ static int dsi_display_dynamic_clk_switch(struct dsi_display *display,
		_dsi_display_calc_pipe_delay(display, &delay, mode);

		/* configure dynamic refresh ctrl registers */
		for (i = 0; i < display->ctrl_count; i++) {
		display_for_each_ctrl(i, display) {
		ctrl = &display->ctrl[i];
		if (!ctrl->phy)
		continue;
		@@ -5513,7 +5507,7 @@ static struct dsi_display_ext_bridge *dsi_display_ext_get_bridge(
		sde_conn = to_sde_connector(conn_iter);
		if (sde_conn->encoder == bridge->encoder) {
		display = sde_conn->display;
		for (i = 0; i < display->ctrl_count; i++) {
		display_for_each_ctrl(i, display) {
		if (display->ext_bridge[i].bridge == bridge)
		return &display->ext_bridge[i];
		}
		@@ -6961,7 +6955,7 @@ static int dsi_display_qsync(struct dsi_display *display, bool enable)

		mutex_lock(&display->display_lock);

		for (i = 0; i < display->ctrl_count; i++) {
		display_for_each_ctrl(i, display) {

		if (enable) {
		/* send the commands to enable qsync */