drm/msm/mdp5: Add missing mdp5_enable/disable calls

Since runtime PM isn't implemented yet, we need to call
mdp5_enable/disable in a few more places. These would later be
replaced by runtime PM get/put calls.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
index 1c3c9098a86b6b795dc13d655af136509620289b..d53e5510fd7cbcf03695e718ace36b1f661c9db6 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_irq.c
@@ -54,7 +54,9 @@ int mdp5_irq_postinstall(struct msm_kms *kms)
                        MDP5_IRQ_INTF2_UNDER_RUN |
                        MDP5_IRQ_INTF3_UNDER_RUN;
 
+       mdp5_enable(mdp5_kms);
        mdp_irq_register(mdp_kms, error_handler);
+       mdp5_disable(mdp5_kms);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 5d6d9e146aaa0d164f8d5b5b4edecc87b15e33cd..174d7e7969fd9b8bee09760796ea8b978803395a 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -33,6 +33,7 @@ static int mdp5_hw_init(struct msm_kms *kms)
        unsigned long flags;
 
        pm_runtime_get_sync(&pdev->dev);
+       mdp5_enable(mdp5_kms);
 
        /* Magic unknown register writes:
         *
@@ -64,6 +65,7 @@ static int mdp5_hw_init(struct msm_kms *kms)
 
        mdp5_ctlm_hw_reset(mdp5_kms->ctlm);
 
+       mdp5_disable(mdp5_kms);
        pm_runtime_put_sync(&pdev->dev);
 
        return 0;