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

Commit 937cff84 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/sde: set VBIF Amem type during rotator hw config" into dev/msm-4.14-display

parents b5601201 d3d0440c

drivers/media/platform/msm/sde/rotator/sde_rotator_core.c

+0 −3
Original line number Diff line number Diff line
@@ -418,9 +418,6 @@ int sde_rotator_clk_ctrl(struct sde_rot_mgr *mgr, int enable) 
			if (ret)

				goto error_rot_sub;



			/* reinitialize static vbif setting */

			sde_mdp_init_vbif();



			/* Active+Sleep */

			msm_bus_scale_client_update_context(

				mgr->data_bus.bus_hdl, false,

drivers/media/platform/msm/sde/rotator/sde_rotator_r3.c

+3 −0
Original line number Diff line number Diff line
@@ -2795,6 +2795,9 @@ static int sde_hw_rotator_config(struct sde_rot_hw_resource *hw, 
			item->input.format, item->output.format,

			entry->perf->config.frame_rate);



	/* initialize static vbif setting */

	sde_mdp_init_vbif();



	if (!ctx->sbuf_mode && mdata->default_ot_rd_limit) {

		struct sde_mdp_set_ot_params ot_params;