Merge "drm/msm/sde: Set VBIF Amem type during rotator hw config." (146254ef) · Commits · e / devices / android_kernel_fairphone_FP3

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

+2 −4

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -417,9 +417,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,
		@@ -3329,6 +3326,7 @@ int sde_rotator_pm_resume(struct device *dev)
		*/
		pm_runtime_disable(dev);
		pm_runtime_set_suspended(dev);
		pm_runtime_set_active(dev);
		pm_runtime_enable(dev);

		sde_rot_mgr_lock(mgr);

+4 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -2714,6 +2714,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;