drm/msm: remove pm_runtime_put() calls

The drm msm driver isn't pm_runtime adapted yet. Since gdsc is now associated
with pm_runtime, we need to make sure we don't do a pm_runtime_put() when we
are using the hardware.

This can be removed after pm_runtime adaptation.

Signed-off-by: Archit Taneja <architt@codeaurora.org>
Conflicts:
	drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c

diff --git a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
index 1db525b8bc70e69ecb0125c6ee4c3dc0362e218a..d7b2836af4ebec50290f84f2bb84f8170a8d3318 100644 (file)
--- a/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/mdp/mdp5/mdp5_kms.c
@@ -65,7 +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(dev->dev);
+       //pm_runtime_put_sync(dev->dev);
 
        return 0;
 }

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 24d45fc7716c5b20bfa8621c21d9c35c481c8c5f..9b52d9a3b35af03c5f879bf51e09ba1fc0bdfa04 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -413,7 +413,7 @@ static int msm_load(struct drm_device *dev, unsigned long flags)
 
        pm_runtime_get_sync(dev->dev);
        ret = drm_irq_install(dev, platform_get_irq(dev->platformdev, 0));
-       pm_runtime_put_sync(dev->dev);
+       //pm_runtime_put_sync(dev->dev);
        if (ret < 0) {
                dev_err(dev->dev, "failed to install IRQ handler\n");
                goto fail;