diff options
| -rw-r--r-- | drivers/video/fbdev/msm/mdss.h | 4 | ||||
| -rw-r--r-- | drivers/video/fbdev/msm/mdss_mdp.c | 22 |
2 files changed, 14 insertions, 12 deletions
diff --git a/drivers/video/fbdev/msm/mdss.h b/drivers/video/fbdev/msm/mdss.h index 64a685b6cf26..c6029273bbe0 100644 --- a/drivers/video/fbdev/msm/mdss.h +++ b/drivers/video/fbdev/msm/mdss.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2012, The Linux Foundation. All rights reserved. +/* Copyright (c) 2012-2013, 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 @@ -79,9 +79,7 @@ struct mdss_data_type { u8 clk_ena; u8 fs_ena; u8 vsync_ena; - u8 eintf_ena; - u32 prim_ptype; u32 res_init; u32 bus_hdl; diff --git a/drivers/video/fbdev/msm/mdss_mdp.c b/drivers/video/fbdev/msm/mdss_mdp.c index 759c4e2a62f6..689219f8e35c 100644 --- a/drivers/video/fbdev/msm/mdss_mdp.c +++ b/drivers/video/fbdev/msm/mdss_mdp.c @@ -812,6 +812,18 @@ static u32 mdss_mdp_res_init(struct mdss_data_type *mdata) { u32 rc = 0; + if (mdata->res_init) { + pr_err("mdss resources already initialized\n"); + return -EPERM; + } + + mdata->res_init = true; + mdata->timeout = HZ/20; + mdata->clk_ena = false; + mdata->irq_mask = MDSS_MDP_DEFAULT_INTR_MASK; + mdata->irq_ena = false; + mdata->suspend = false; + rc = mdss_mdp_irq_clk_setup(mdata); if (rc) return rc; @@ -833,14 +845,6 @@ static u32 mdss_mdp_res_init(struct mdss_data_type *mdata) pr_info("mdss_revision=%x\n", mdata->rev); pr_info("mdp_hw_revision=%x\n", mdata->mdp_rev); - mdata->res_init = true; - mdata->timeout = HZ/20; - mdata->clk_ena = false; - mdata->irq_mask = MDSS_MDP_DEFAULT_INTR_MASK; - mdata->suspend = false; - mdata->prim_ptype = NO_PANEL; - mdata->irq_ena = false; - mdata->iclient = msm_ion_client_create(-1, mdata->pdev->name); if (IS_ERR_OR_NULL(mdata->iclient)) { pr_err("msm_ion_client_create() return error (%p)\n", @@ -967,7 +971,7 @@ static void mdss_mdp_footswitch_ctrl(struct mdss_data_type *mdata, int on) int ret; mutex_lock(&mdp_suspend_mutex); - if (!mdata->suspend || mdata->eintf_ena || !mdata->fs) { + if (!mdata->suspend || !mdata->fs) { mutex_unlock(&mdp_suspend_mutex); return; } |