Merge "msm: mdss: ignore buffer mapping if it's solid fill layer" (d74d01d5) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/video/msm/mdss/mdss_mdp_layer.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1297,6 +1297,10 @@ int mdss_mdp_layer_pre_commit(struct msm_fb_data_type *mfd,

		mutex_lock(&mdp5_data->list_lock);
		list_for_each_entry_safe(pipe, tmp, &mdp5_data->pipes_used, list) {
		if (pipe->flags & MDP_SOLID_FILL) {
		src_data[i] = NULL;
		continue;
		}
		src_data[i] = __map_layer_buffer(mfd, pipe, layer_list,
		layer_count);
		if (IS_ERR_OR_NULL(src_data[i++])) {
		@@ -1320,6 +1324,7 @@ map_err:
		if (ret) {
		mutex_lock(&mdp5_data->list_lock);
		for (i--; i >= 0; i--)
		if (src_data[i])
		mdss_mdp_overlay_buf_free(mfd, src_data[i]);
		mutex_unlock(&mdp5_data->list_lock);
		}