Merge "msm: mdss: update mdss_mdp_clk ctrl for obsolete input parameter" (a50bb1bd) · Commits · e / devices / android_kernel_sony_msm8994

drivers/video/msm/mdss/dsi_status_6g.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -95,9 +95,9 @@ void mdss_check_dsi_ctrl_status(struct work_struct *work, uint32_t interval)

		pr_debug("%s: DSI ctrl wait for ping pong done\n", __func__);

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		ret = ctrl_pdata->check_status(ctrl_pdata);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);

		mutex_unlock(&mdp5_data->ov_lock);
		if (ctl->shared_lock)

drivers/video/msm/mdss/mdss_debug.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -595,7 +595,7 @@ void mdss_dump_reg(char __iomem *base, int len)
		len += 16;
		len /= 16;

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		for (i = 0; i < len; i++) {
		x0 = readl_relaxed(addr+0x0);
		x4 = readl_relaxed(addr+0x4);
		@@ -604,7 +604,7 @@ void mdss_dump_reg(char __iomem *base, int len)
		pr_info("%p : %08x %08x %08x %08x\n", addr, x0, x4, x8, xc);
		addr += 16;
		}
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		}

		int vsync_count;
		@@ -767,7 +767,7 @@ int mdss_misr_set(struct mdss_data_type *mdata,
		return -EINVAL;
		}

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		if (req->block_id == DISPLAY_MISR_MDP) {
		mixer = mdss_mdp_mixer_get(ctl, MDSS_MDP_MIXER_MUX_DEFAULT);
		mixer_num = mixer->num;
		@@ -829,7 +829,7 @@ int mdss_misr_set(struct mdss_data_type *mdata,
		pr_debug("MISR_CTRL = 0x%x",
		readl_relaxed(mdata->mdp_base + map->ctrl_reg));
		}
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		return 0;
		}

		@@ -851,7 +851,7 @@ int mdss_misr_get(struct mdss_data_type *mdata,
		}
		mixer = mdss_mdp_mixer_get(ctl, MDSS_MDP_MIXER_MUX_DEFAULT);

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		switch (map->crc_op_mode) {
		case MISR_OP_SFM:
		case MISR_OP_MFM:
		@@ -904,7 +904,7 @@ int mdss_misr_get(struct mdss_data_type *mdata,
		break;
		}

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		return ret;
		}

drivers/video/msm/mdss/mdss_mdp.c

+11 −11

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ int mdss_mdp_vbif_axi_halt(struct mdss_data_type *mdata)
		if (mdata->axi_port_cnt == 2)
		idle_mask \|= BIT(5);

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		reg_val = readl_relaxed(mdata->vbif_base + MMSS_VBIF_AXI_HALT_CTRL1);

		is_idle = (reg_val & idle_mask) ? true : false;
		@@ -206,7 +206,7 @@ int mdss_mdp_vbif_axi_halt(struct mdss_data_type *mdata)

		writel_relaxed(0, mdata->vbif_base + MMSS_VBIF_AXI_HALT_CTRL0);
		}
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);

		return rc;
		}
		@@ -819,7 +819,7 @@ void mdss_bus_bandwidth_ctrl(int enable)
		}
		EXPORT_SYMBOL(mdss_bus_bandwidth_ctrl);

		void mdss_mdp_clk_ctrl(int enable, int isr)
		void mdss_mdp_clk_ctrl(int enable)
		{
		struct mdss_data_type *mdata = mdss_mdp_get_mdata();
		static int mdp_clk_cnt;
		@@ -1112,9 +1112,9 @@ static int mdss_debug_dump_stats(void data, char buf, int len)
		static void mdss_debug_enable_clock(int on)
		{
		if (on)
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		else
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		}

		static int mdss_mdp_debug_init(struct mdss_data_type *mdata)
		@@ -1137,10 +1137,10 @@ static void mdss_hw_rev_init(struct mdss_data_type *mdata)
		{
		if (mdata->mdp_rev)
		return;
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		mdata->mdp_rev = readl_relaxed(mdata->mdss_base + MDSS_REG_HW_VERSION);
		pr_info_once("MDP Rev=%x\n", mdata->mdp_rev);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		}

		int mdss_hw_init(struct mdss_data_type *mdata)
		@@ -1149,7 +1149,7 @@ int mdss_hw_init(struct mdss_data_type *mdata)
		char *offset;
		struct mdss_mdp_pipe *vig;

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		mdss_hw_rev_init(mdata);

		/* disable hw underrun recovery */
		@@ -1191,7 +1191,7 @@ int mdss_hw_init(struct mdss_data_type *mdata)
		for (i = 0; i < mdata->nvig_pipes; i++)
		mdss_mdp_hscl_init(&vig[i]);

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		pr_debug("MDP hw init done\n");

		return 0;
		@@ -1252,11 +1252,11 @@ void mdss_mdp_footswitch_ctrl_splash(int on)
		if (ret)
		pr_err("Footswitch failed to enable\n");

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		mdss_hw_init(mdata);
		} else {
		pr_debug("Disable MDP FS for splash.\n");
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		regulator_disable(mdata->fs);
		mdata->handoff_pending = false;
		}

drivers/video/msm/mdss/mdss_mdp.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -595,7 +595,7 @@ int mdss_mdp_bus_scale_set_quota(u64 ab_quota, u64 ib_quota);
		void mdss_mdp_set_clk_rate(unsigned long min_clk_rate);
		unsigned long mdss_mdp_get_clk_rate(u32 clk_idx);
		int mdss_mdp_vsync_clk_enable(int enable);
		void mdss_mdp_clk_ctrl(int enable, int isr);
		void mdss_mdp_clk_ctrl(int enable);
		struct mdss_data_type *mdss_mdp_get_mdata(void);

		int mdss_mdp_overlay_init(struct msm_fb_data_type *mfd);

drivers/video/msm/mdss/mdss_mdp_ctl.c

+10 −10

Original line number	Diff line number	Diff line
		@@ -1948,13 +1948,13 @@ void mdss_mdp_ctl_restore(struct mdss_mdp_ctl *ctl)
		struct mdss_mdp_ctl *sctl;

		sctl = mdss_mdp_get_split_ctl(ctl);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		mdss_mdp_ctl_restore_sub(ctl);
		if (sctl) {
		mdss_mdp_ctl_restore_sub(sctl);
		mdss_mdp_ctl_split_display_enable(1, ctl, sctl);
		}
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		}

		static int mdss_mdp_ctl_start_sub(struct mdss_mdp_ctl *ctl, bool handoff)
		@@ -2041,7 +2041,7 @@ int mdss_mdp_ctl_start(struct mdss_mdp_ctl *ctl, bool handoff)

		memset(&ctl->cur_perf, 0, sizeof(ctl->cur_perf));

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);

		ret = mdss_mdp_ctl_intf_event(ctl, MDSS_EVENT_RESET, NULL);
		if (ret) {
		@@ -2068,7 +2068,7 @@ int mdss_mdp_ctl_start(struct mdss_mdp_ctl *ctl, bool handoff)
		}
		mdss_mdp_hist_intr_setup(&mdata->hist_intr, MDSS_IRQ_RESUME);

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		error:
		mutex_unlock(&ctl->lock);

		@@ -2093,7 +2093,7 @@ int mdss_mdp_ctl_stop(struct mdss_mdp_ctl *ctl)

		mutex_lock(&ctl->lock);

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);

		mdss_mdp_hist_intr_setup(&mdata->hist_intr, MDSS_IRQ_SUSPEND);

		@@ -2130,7 +2130,7 @@ int mdss_mdp_ctl_stop(struct mdss_mdp_ctl *ctl)
		mdss_mdp_ctl_perf_update(ctl, 0);
		}

		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);

		mutex_unlock(&ctl->lock);

		@@ -2840,7 +2840,7 @@ int mdss_mdp_display_wait4comp(struct mdss_mdp_ctl *ctl)
		mdss_mdp_ctl_perf_update(ctl, 0);

		if (IS_MDSS_MAJOR_MINOR_SAME(mdata->mdp_rev, MDSS_MDP_HW_REV_103)) {
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);
		reg_data = mdss_mdp_ctl_read(ctl, MDSS_MDP_REG_CTL_FLUSH);
		flush_data = readl_relaxed(mdata->mdp_base + AHB_CLK_OFFSET);
		if ((flush_data & BIT(28)) &&
		@@ -2851,7 +2851,7 @@ int mdss_mdp_display_wait4comp(struct mdss_mdp_ctl *ctl)
		mdata->mdp_base + AHB_CLK_OFFSET);
		ctl->flush_reg_data = 0;
		}
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);
		}

		mutex_unlock(&ctl->lock);
		@@ -2900,7 +2900,7 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl ctl, void arg)
		}

		sctl = mdss_mdp_get_split_ctl(ctl);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_ON);

		/*
		* We could have released the bandwidth if there were no transactions
		@@ -3041,7 +3041,7 @@ int mdss_mdp_display_commit(struct mdss_mdp_ctl ctl, void arg)
		ATRACE_END("flush_kickoff");

		done:
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF, false);
		mdss_mdp_clk_ctrl(MDP_BLOCK_POWER_OFF);

		mutex_unlock(&ctl->lock);