UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

gma500: power can be touched in IRQ state 

So we need to use a spinlock here

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Cox 2011-07-05 15:45:13 +01:00 committed by Greg Kroah-Hartman
parent 398c442489
commit 9fdc5ff8b9
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/gma500/power.c
View File

@ -36,7 +36,7 @@
#include <linux/pm_runtime.h> #include <linux/pm_runtime.h>
static struct mutex power_mutex; /* Serialize power ops */ static struct mutex power_mutex; /* Serialize power ops */
static struct mutex power_ctrl_mutex; /* Serialize power claim */ static spinlock_t power_ctrl_lock; /* Serialize power claim */
/** /**
* gma_power_init - initialise power manager * gma_power_init - initialise power manager
@ -55,8 +55,8 @@ void gma_power_init(struct drm_device *dev)
dev_priv->display_power = true; /* We start active */ dev_priv->display_power = true; /* We start active */
dev_priv->display_count = 0; /* Currently no users */ dev_priv->display_count = 0; /* Currently no users */
dev_priv->suspended = false; /* And not suspended */ dev_priv->suspended = false; /* And not suspended */
spin_lock_init(&power_ctrl_lock);
mutex_init(&power_mutex); mutex_init(&power_mutex);
mutex_init(&power_ctrl_mutex);
dev_priv->ops->init_pm(dev); dev_priv->ops->init_pm(dev);
} }
@ -247,13 +247,14 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
{ {
struct drm_psb_private *dev_priv = dev->dev_private; struct drm_psb_private *dev_priv = dev->dev_private;
int ret; int ret;
unsigned long flags;
mutex_lock(&power_ctrl_mutex); spin_lock_irqsave(&power_ctrl_lock, flags);
/* Power already on ? */ /* Power already on ? */
if (dev_priv->display_power) { if (dev_priv->display_power) {
dev_priv->display_count++; dev_priv->display_count++;
pm_runtime_get(&dev->pdev->dev); pm_runtime_get(&dev->pdev->dev);
mutex_unlock(&power_ctrl_mutex); spin_unlock_irqrestore(&power_ctrl_lock, flags);
return true; return true;
} }
if (force_on == false) if (force_on == false)
@ -266,11 +267,11 @@ bool gma_power_begin(struct drm_device *dev, bool force_on)
psb_irq_postinstall(dev); psb_irq_postinstall(dev);
pm_runtime_get(&dev->pdev->dev); pm_runtime_get(&dev->pdev->dev);
dev_priv->display_count++; dev_priv->display_count++;
mutex_unlock(&power_ctrl_mutex); spin_unlock_irqrestore(&power_ctrl_lock, flags);
return true; return true;
} }
out_false: out_false:
mutex_unlock(&power_ctrl_mutex); spin_unlock_irqrestore(&power_ctrl_lock, flags);
return false; return false;
} }
@ -284,10 +285,11 @@ out_false:
void gma_power_end(struct drm_device *dev) void gma_power_end(struct drm_device *dev)
{ {
struct drm_psb_private *dev_priv = dev->dev_private; struct drm_psb_private *dev_priv = dev->dev_private;
mutex_lock(&power_ctrl_mutex); unsigned long flags;
spin_lock_irqsave(&power_ctrl_lock, flags);
dev_priv->display_count--; dev_priv->display_count--;
WARN_ON(dev_priv->display_count < 0); WARN_ON(dev_priv->display_count < 0);
mutex_unlock(&power_ctrl_mutex); spin_unlock_irqrestore(&power_ctrl_lock, flags);
pm_runtime_put(&dev->pdev->dev); pm_runtime_put(&dev->pdev->dev);
} }