mdss: display: add mdp core clock to dsi clock control
Since mdss interrupts are generated in mdp core clock domain,
mdp clock need to be enabled to have dsi interrupt be delivered
during dsi dcs command send and receive. Request of bus bandwidth
also needed to allow dsi controller to fetch dcs commands over
AXI bus.
CRs-fixed: 516172
Change-Id: I6e10cc5a193c9eb06803637e0432ec72f069377b
Signed-off-by: Kuogee Hsieh <khsieh@codeaurora.org>
diff --git a/arch/arm/mach-msm/clock-8226.c b/arch/arm/mach-msm/clock-8226.c
index 993ce58..ab9fe2c 100644
--- a/arch/arm/mach-msm/clock-8226.c
+++ b/arch/arm/mach-msm/clock-8226.c
@@ -3371,6 +3371,7 @@
CLK_LOOKUP("pixel_clk", mdss_pclk0_clk.c, "fd922800.qcom,mdss_dsi"),
CLK_LOOKUP("iface_clk", mdss_ahb_clk.c, "fd922800.qcom,mdss_dsi"),
CLK_LOOKUP("bus_clk", mdss_axi_clk.c, "fd922800.qcom,mdss_dsi"),
+ CLK_LOOKUP("mdp_core_clk", mdss_mdp_clk.c, "fd922800.qcom,mdss_dsi"),
CLK_LOOKUP("core_clk", mdss_mdp_clk.c, "fd900000.qcom,mdss_mdp"),
CLK_LOOKUP("lut_clk", mdss_mdp_lut_clk.c, "fd900000.qcom,mdss_mdp"),
diff --git a/arch/arm/mach-msm/clock-8974.c b/arch/arm/mach-msm/clock-8974.c
index b0adfa0..1f91f44 100644
--- a/arch/arm/mach-msm/clock-8974.c
+++ b/arch/arm/mach-msm/clock-8974.c
@@ -5102,6 +5102,8 @@
CLK_LOOKUP("bus_clk", mdss_axi_clk.c, "fd922e00.qcom,mdss_dsi"),
CLK_LOOKUP("pixel_clk", mdss_pclk0_clk.c, "fd922800.qcom,mdss_dsi"),
CLK_LOOKUP("pixel_clk", mdss_pclk1_clk.c, "fd922e00.qcom,mdss_dsi"),
+ CLK_LOOKUP("mdp_core_clk", mdss_mdp_clk.c, "fd922800.qcom,mdss_dsi"),
+ CLK_LOOKUP("mdp_core_clk", mdss_mdp_clk.c, "fd922e00.qcom,mdss_dsi"),
CLK_LOOKUP("iface_clk", mdss_ahb_clk.c, "fd922100.qcom,hdmi_tx"),
CLK_LOOKUP("alt_iface_clk", mdss_hdmi_ahb_clk.c,
"fd922100.qcom,hdmi_tx"),
diff --git a/drivers/video/msm/mdss/mdss.h b/drivers/video/msm/mdss/mdss.h
index 5857606..60a1adb 100644
--- a/drivers/video/msm/mdss/mdss.h
+++ b/drivers/video/msm/mdss/mdss.h
@@ -160,6 +160,7 @@
void mdss_enable_irq(struct mdss_hw *hw);
void mdss_disable_irq(struct mdss_hw *hw);
void mdss_disable_irq_nosync(struct mdss_hw *hw);
+void mdss_bus_bandwidth_ctrl(int enable);
static inline struct ion_client *mdss_get_ionclient(void)
{
diff --git a/drivers/video/msm/mdss/mdss_dsi.h b/drivers/video/msm/mdss/mdss_dsi.h
index 6953d8b..f950f41 100644
--- a/drivers/video/msm/mdss/mdss_dsi.h
+++ b/drivers/video/msm/mdss/mdss_dsi.h
@@ -320,6 +320,7 @@
unsigned char *ctrl_base;
int reg_size;
u32 clk_cnt;
+ struct clk *mdp_core_clk;
struct clk *ahb_clk;
struct clk *axi_clk;
struct clk *byte_clk;
diff --git a/drivers/video/msm/mdss/mdss_dsi_host.c b/drivers/video/msm/mdss/mdss_dsi_host.c
index 845ef10..8711791 100644
--- a/drivers/video/msm/mdss/mdss_dsi_host.c
+++ b/drivers/video/msm/mdss/mdss_dsi_host.c
@@ -1764,6 +1764,14 @@
if (req == NULL)
goto need_lock;
+ /*
+ * mdss interrupt is generated in mdp core clock domain
+ * mdp clock need to be enabled to receive dsi interrupt
+ * also, axi bus bandwidth need since dsi controller will
+ * fetch dcs commands from axi bus
+ */
+ mdss_bus_bandwidth_ctrl(1);
+
pr_debug("%s: from_mdp=%d pid=%d\n", __func__, from_mdp, current->pid);
mdss_dsi_clk_ctrl(ctrl, 1);
@@ -1773,6 +1781,7 @@
mdss_dsi_cmdlist_tx(ctrl, req);
mdss_dsi_clk_ctrl(ctrl, 0);
+ mdss_bus_bandwidth_ctrl(0);
need_lock:
diff --git a/drivers/video/msm/mdss/mdss_mdp.c b/drivers/video/msm/mdss/mdss_mdp.c
index db8a098..0890795 100644
--- a/drivers/video/msm/mdss/mdss_mdp.c
+++ b/drivers/video/msm/mdss/mdss_mdp.c
@@ -79,6 +79,7 @@
static DEFINE_SPINLOCK(mdp_lock);
static DEFINE_MUTEX(mdp_clk_lock);
+static DEFINE_MUTEX(bus_bw_lock);
#define MDP_BUS_VECTOR_ENTRY(ab_val, ib_val) \
{ \
@@ -608,9 +609,58 @@
return clk_rate;
}
+/**
+ * mdss_bus_bandwidth_ctrl() -- place bus bandwidth request
+ * @enable: value of enable or disable
+ *
+ * Function place bus bandwidth request to allocate saved bandwidth
+ * if enabled or free bus bandwidth allocation if disabled.
+ * Bus bandwidth is required by mdp.For dsi, it only requires to send
+ * dcs coammnd.
+ */
+void mdss_bus_bandwidth_ctrl(int enable)
+{
+ struct mdss_data_type *mdata = mdss_mdp_get_mdata();
+ static int bus_bw_cnt;
+ int changed = 0;
+
+ mutex_lock(&bus_bw_lock);
+ if (enable) {
+ if (bus_bw_cnt == 0)
+ changed++;
+ bus_bw_cnt++;
+ } else {
+ if (bus_bw_cnt) {
+ bus_bw_cnt--;
+ if (bus_bw_cnt == 0)
+ changed++;
+ } else {
+ pr_err("Can not be turned off\n");
+ }
+ }
+
+ pr_debug("bw_cnt=%d changed=%d enable=%d\n",
+ bus_bw_cnt, changed, enable);
+
+ if (changed) {
+ if (!enable) {
+ msm_bus_scale_client_update_request(
+ mdata->bus_hdl, 0);
+ pm_runtime_put(&mdata->pdev->dev);
+ } else {
+ pm_runtime_get_sync(&mdata->pdev->dev);
+ msm_bus_scale_client_update_request(
+ mdata->bus_hdl, mdata->current_bus_idx);
+ }
+ }
+
+ mutex_unlock(&bus_bw_lock);
+}
+EXPORT_SYMBOL(mdss_bus_bandwidth_ctrl);
+
void mdss_mdp_clk_ctrl(int enable, int isr)
{
- struct mdss_data_type *mdata = mdss_res;
+ struct mdss_data_type *mdata = mdss_mdp_get_mdata();
static int mdp_clk_cnt;
int changed = 0;
@@ -620,9 +670,13 @@
changed++;
mdp_clk_cnt++;
} else {
- mdp_clk_cnt--;
- if (mdp_clk_cnt == 0)
- changed++;
+ if (mdp_clk_cnt) {
+ mdp_clk_cnt--;
+ if (mdp_clk_cnt == 0)
+ changed++;
+ } else {
+ pr_err("Can not be turned off\n");
+ }
}
pr_debug("%s: clk_cnt=%d changed=%d enable=%d\n",
@@ -640,14 +694,10 @@
if (mdata->vsync_ena)
mdss_mdp_clk_update(MDSS_CLK_MDP_VSYNC, enable);
- if (!enable) {
- msm_bus_scale_client_update_request(
- mdss_res->bus_hdl, 0);
+ mdss_bus_bandwidth_ctrl(enable);
+
+ if (!enable)
pm_runtime_put(&mdata->pdev->dev);
- } else {
- msm_bus_scale_client_update_request(
- mdss_res->bus_hdl, mdss_res->current_bus_idx);
- }
}
mutex_unlock(&mdp_clk_lock);
diff --git a/drivers/video/msm/mdss/msm_mdss_io_8974.c b/drivers/video/msm/mdss/msm_mdss_io_8974.c
index f7ea557..62704a9 100644
--- a/drivers/video/msm/mdss/msm_mdss_io_8974.c
+++ b/drivers/video/msm/mdss/msm_mdss_io_8974.c
@@ -40,6 +40,14 @@
}
dev = &pdev->dev;
+ ctrl_pdata->mdp_core_clk = clk_get(dev, "mdp_core_clk");
+ if (IS_ERR(ctrl_pdata->mdp_core_clk)) {
+ rc = PTR_ERR(ctrl_pdata->mdp_core_clk);
+ pr_err("%s: Unable to get mdp core clk. rc=%d\n",
+ __func__, rc);
+ goto mdss_dsi_clk_err;
+ }
+
ctrl_pdata->ahb_clk = clk_get(dev, "iface_clk");
if (IS_ERR(ctrl_pdata->ahb_clk)) {
rc = PTR_ERR(ctrl_pdata->ahb_clk);
@@ -101,6 +109,8 @@
clk_put(ctrl_pdata->axi_clk);
if (ctrl_pdata->ahb_clk)
clk_put(ctrl_pdata->ahb_clk);
+ if (ctrl_pdata->mdp_core_clk)
+ clk_put(ctrl_pdata->mdp_core_clk);
}
#define PREF_DIV_RATIO 27
@@ -241,9 +251,17 @@
{
int rc = 0;
+ rc = clk_prepare_enable(ctrl_pdata->mdp_core_clk);
+ if (rc) {
+ pr_err("%s: failed to enable mdp_core_clock. rc=%d\n",
+ __func__, rc);
+ goto error;
+ }
+
rc = clk_prepare_enable(ctrl_pdata->ahb_clk);
if (rc) {
pr_err("%s: failed to enable ahb clock. rc=%d\n", __func__, rc);
+ clk_disable_unprepare(ctrl_pdata->mdp_core_clk);
goto error;
}
@@ -251,6 +269,7 @@
if (rc) {
pr_err("%s: failed to enable ahb clock. rc=%d\n", __func__, rc);
clk_disable_unprepare(ctrl_pdata->ahb_clk);
+ clk_disable_unprepare(ctrl_pdata->mdp_core_clk);
goto error;
}
@@ -262,6 +281,7 @@
{
clk_disable_unprepare(ctrl_pdata->axi_clk);
clk_disable_unprepare(ctrl_pdata->ahb_clk);
+ clk_disable_unprepare(ctrl_pdata->mdp_core_clk);
}
static int mdss_dsi_clk_prepare(struct mdss_dsi_ctrl_pdata *ctrl_pdata)