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

Commit 114033ba authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/dsi-staging: synchronize DSI error recovery and power off"

parents df8ad555 a878a444

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

+2 −2
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ bool dsi_ctrl_validate_host_state(struct dsi_ctrl *dsi_ctrl) 
	}



	if (!state->host_initialized)

		return true;



		return false;



	return true;

}



static void dsi_ctrl_update_state(struct dsi_ctrl *dsi_ctrl,

drivers/gpu/drm/msm/dsi-staging/dsi_defs.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,9 @@ 
	})



#define DSI_DEBUG_NAME_LEN		32

#define display_for_each_ctrl(index, display) \

	for (index = 0; (index < (display)->ctrl_count) &&\

			(index < MAX_DSI_CTRLS_PER_DISPLAY); index++)

/**

 * enum dsi_pixel_format - DSI pixel formats

 * @DSI_PIXEL_FORMAT_RGB565:

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

+139 −89

File changed.

Preview size limit exceeded, changes collapsed.

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

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ int dsi_conn_post_kickoff(struct drm_connector *connector) 
		}



		/* Update the rest of the controllers */

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

		display_for_each_ctrl(i, display) {

			ctrl = &display->ctrl[i];

			if (!ctrl->ctrl || (ctrl == m_ctrl))

				continue;