Merge "msm: mdss: Detach mdss iommu on static screen" (5bb9df4e) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/mdss_mdp.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -637,6 +637,7 @@ void mdss_bus_bandwidth_ctrl(int enable)
		if (!enable) {
		msm_bus_scale_client_update_request(
		mdata->bus_hdl, 0);
		mdss_iommu_dettach(mdata);
		pm_runtime_put(&mdata->pdev->dev);
		} else {
		pm_runtime_get_sync(&mdata->pdev->dev);

+1 −0

Original line number	Diff line number	Diff line
		@@ -487,6 +487,7 @@ static inline u32 mdss_mdp_pingpong_read(struct mdss_mdp_mixer *mixer, u32 reg)

		irqreturn_t mdss_mdp_isr(int irq, void *ptr);
		int mdss_iommu_attach(struct mdss_data_type *mdata);
		int mdss_iommu_dettach(struct mdss_data_type *mdata);
		void mdss_mdp_irq_clear(struct mdss_data_type *mdata,
		u32 intr_type, u32 intf_num);
		int mdss_mdp_irq_enable(u32 intr_type, u32 intf_num);

+6 −0

Original line number	Diff line number	Diff line
		@@ -839,6 +839,9 @@ static int mdss_mdp_overlay_start(struct msm_fb_data_type *mfd)
		if (ctl->power_on) {
		if (!mdp5_data->mdata->batfet)
		mdss_mdp_batfet_ctrl(mdp5_data->mdata, true);
		if (!is_mdss_iommu_attached() &&
		!mfd->panel_info->cont_splash_enabled)
		mdss_iommu_attach(mdp5_data->mdata);
		return 0;
		}

		@@ -950,6 +953,9 @@ int mdss_mdp_overlay_kickoff(struct msm_fb_data_type *mfd,
		int ret = 0;
		int sd_in_pipe = 0;

		if (!is_mdss_iommu_attached() && !mfd->panel_info->cont_splash_enabled)
		mdss_iommu_attach(mdp5_data->mdata);

		if (ctl->shared_lock)
		mutex_lock(ctl->shared_lock);