Merge "drm/msm/sde: avoid connector state mode update in commit thread" into dev/msm-4.14-display (22bb102b) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/gpu/drm/msm/sde/sde_encoder.c

+0 −16

Original line number	Diff line number	Diff line
		@@ -2692,8 +2692,6 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc,
		struct sde_kms *sde_kms;
		struct list_head *connector_list;
		struct drm_connector conn = NULL, conn_iter;
		struct sde_connector_state *sde_conn_state = NULL;
		struct sde_connector *sde_conn = NULL;
		struct sde_rm_hw_iter dsc_iter, pp_iter, qdss_iter;
		struct sde_rm_hw_request request_hw;
		bool is_cmd_mode = false;
		@@ -2742,20 +2740,6 @@ static void sde_encoder_virt_mode_set(struct drm_encoder *drm_enc,
		return;
		}

		sde_conn = to_sde_connector(conn);
		sde_conn_state = to_sde_connector_state(conn->state);
		if (sde_conn && sde_conn_state) {
		ret = sde_conn->ops.get_mode_info(&sde_conn->base, adj_mode,
		&sde_conn_state->mode_info,
		sde_kms->catalog->max_mixer_width,
		sde_conn->display);
		if (ret) {
		SDE_ERROR_ENC(sde_enc,
		"failed to get mode info from the display\n");
		return;
		}
		}

		/* release resources before seamless mode change */
		if (msm_is_mode_seamless_dms(adj_mode) \|\|
		(msm_is_mode_seamless_dyn_clk(adj_mode) &&