From 36b32f56c7e4546615d3806aa0923991b36da823 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 5 Jul 2011 15:45:13 +0100 Subject: [PATCH] --- yaml --- r: 259703 b: refs/heads/master c: 9fdc5ff8b9082150a12d11c3a0ea429429bb8456 h: refs/heads/master i: 259701: cec116154480169abe4ca1a5dd5a0f8b2d8bd83f 259699: 168c9bc0a8e24401e5fb938c574d161a219e5455 259695: 5732581042a9365073d1f0c2432ea212578bab3d v: v3 --- [refs] | 2 +- trunk/drivers/staging/gma500/power.c | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 6c928b699036..dd1de1852d4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 398c44248984a18876059724519f87c79b859deb +refs/heads/master: 9fdc5ff8b9082150a12d11c3a0ea429429bb8456 diff --git a/trunk/drivers/staging/gma500/power.c b/trunk/drivers/staging/gma500/power.c index 79eb6703a51b..5cd502306637 100644 --- a/trunk/drivers/staging/gma500/power.c +++ b/trunk/drivers/staging/gma500/power.c @@ -36,7 +36,7 @@ #include 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 @@ -55,8 +55,8 @@ void gma_power_init(struct drm_device *dev) dev_priv->display_power = true; /* We start active */ dev_priv->display_count = 0; /* Currently no users */ dev_priv->suspended = false; /* And not suspended */ + spin_lock_init(&power_ctrl_lock); mutex_init(&power_mutex); - mutex_init(&power_ctrl_mutex); 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; int ret; + unsigned long flags; - mutex_lock(&power_ctrl_mutex); + spin_lock_irqsave(&power_ctrl_lock, flags); /* Power already on ? */ if (dev_priv->display_power) { dev_priv->display_count++; pm_runtime_get(&dev->pdev->dev); - mutex_unlock(&power_ctrl_mutex); + spin_unlock_irqrestore(&power_ctrl_lock, flags); return true; } if (force_on == false) @@ -266,11 +267,11 @@ bool gma_power_begin(struct drm_device *dev, bool force_on) psb_irq_postinstall(dev); pm_runtime_get(&dev->pdev->dev); dev_priv->display_count++; - mutex_unlock(&power_ctrl_mutex); + spin_unlock_irqrestore(&power_ctrl_lock, flags); return true; } out_false: - mutex_unlock(&power_ctrl_mutex); + spin_unlock_irqrestore(&power_ctrl_lock, flags); return false; } @@ -284,10 +285,11 @@ bool gma_power_begin(struct drm_device *dev, bool force_on) void gma_power_end(struct drm_device *dev) { 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--; 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); }