Merge tag 'mmc-v4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc

[cascardo/linux.git] / drivers / gpu / ipu-v3 / ipu-ic.c

diff --git a/drivers/gpu/ipu-v3/ipu-ic.c b/drivers/gpu/ipu-v3/ipu-ic.c
index 1dcb96c..321eb98 100644 (file)
--- a/drivers/gpu/ipu-v3/ipu-ic.c
+++ b/drivers/gpu/ipu-v3/ipu-ic.c
@@ -160,6 +160,7 @@ struct ipu_ic_priv {
        spinlock_t lock;
        struct ipu_soc *ipu;
        int use_count;
+       int irt_use_count;
        struct ipu_ic task[IC_NUM_TASKS];
 };
 
@@ -379,8 +380,6 @@ void ipu_ic_task_disable(struct ipu_ic *ic)
 
        ipu_ic_write(ic, ic_conf, IC_CONF);
 
-       ic->rotation = ic->graphics = false;
-
        spin_unlock_irqrestore(&priv->lock, flags);
 }
 EXPORT_SYMBOL_GPL(ipu_ic_task_disable);
@@ -620,7 +619,7 @@ int ipu_ic_task_idma_init(struct ipu_ic *ic, struct ipuv3_channel *channel,
        ipu_ic_write(ic, ic_idmac_2, IC_IDMAC_2);
        ipu_ic_write(ic, ic_idmac_3, IC_IDMAC_3);
 
-       if (rot >= IPU_ROTATE_90_RIGHT)
+       if (ipu_rot_mode_is_irt(rot))
                ic->rotation = true;
 
 unlock:
@@ -629,22 +628,41 @@ unlock:
 }
 EXPORT_SYMBOL_GPL(ipu_ic_task_idma_init);
 
+static void ipu_irt_enable(struct ipu_ic *ic)
+{
+       struct ipu_ic_priv *priv = ic->priv;
+
+       if (!priv->irt_use_count)
+               ipu_module_enable(priv->ipu, IPU_CONF_ROT_EN);
+
+       priv->irt_use_count++;
+}
+
+static void ipu_irt_disable(struct ipu_ic *ic)
+{
+       struct ipu_ic_priv *priv = ic->priv;
+
+       if (priv->irt_use_count) {
+               if (!--priv->irt_use_count)
+                       ipu_module_disable(priv->ipu, IPU_CONF_ROT_EN);
+       }
+}
+
 int ipu_ic_enable(struct ipu_ic *ic)
 {
        struct ipu_ic_priv *priv = ic->priv;
        unsigned long flags;
-       u32 module = IPU_CONF_IC_EN;
 
        spin_lock_irqsave(&priv->lock, flags);
 
-       if (ic->rotation)
-               module |= IPU_CONF_ROT_EN;
-
        if (!priv->use_count)
-               ipu_module_enable(priv->ipu, module);
+               ipu_module_enable(priv->ipu, IPU_CONF_IC_EN);
 
        priv->use_count++;
 
+       if (ic->rotation)
+               ipu_irt_enable(ic);
+
        spin_unlock_irqrestore(&priv->lock, flags);
 
        return 0;
@@ -655,18 +673,22 @@ int ipu_ic_disable(struct ipu_ic *ic)
 {
        struct ipu_ic_priv *priv = ic->priv;
        unsigned long flags;
-       u32 module = IPU_CONF_IC_EN | IPU_CONF_ROT_EN;
 
        spin_lock_irqsave(&priv->lock, flags);
 
        priv->use_count--;
 
        if (!priv->use_count)
-               ipu_module_disable(priv->ipu, module);
+               ipu_module_disable(priv->ipu, IPU_CONF_IC_EN);
 
        if (priv->use_count < 0)
                priv->use_count = 0;
 
+       if (ic->rotation)
+               ipu_irt_disable(ic);
+
+       ic->rotation = ic->graphics = false;
+
        spin_unlock_irqrestore(&priv->lock, flags);
 
        return 0;