summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/cirrus
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2014-01-24 00:50:18 +0100
committerDave Airlie <airlied@redhat.com>2014-01-29 01:51:52 +0100
commitf4b4718b61d1d5a7442a4fd6863ea80c3a10e508 (patch)
tree315751b7a57c6b2e953b1013a58c1104fb2e6ca2 /drivers/gpu/drm/cirrus
parentMerge tag 'drm-intel-fixes-2014-01-28' of git://people.freedesktop.org/~danve... (diff)
downloadlinux-f4b4718b61d1d5a7442a4fd6863ea80c3a10e508.tar.xz
linux-f4b4718b61d1d5a7442a4fd6863ea80c3a10e508.zip
drm: ast,cirrus,mgag200: use drm_can_sleep
these 3 were checking in_interrupt but we have situations where calling vunmap under this could cause a BUG to be hit in smp_call_function_many. Use the drm_can_sleep macro instead, which should stop this path from been taken in this case. Cc: stable@vger.kernel.org Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/cirrus')
-rw-r--r--drivers/gpu/drm/cirrus/cirrus_fbdev.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
index e63a7533f849..2fd4a92162cb 100644
--- a/drivers/gpu/drm/cirrus/cirrus_fbdev.c
+++ b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
@@ -39,7 +39,7 @@ static void cirrus_dirty_update(struct cirrus_fbdev *afbdev,
* then the BO is being moved and we should
* store up the damage until later.
*/
- if (!in_interrupt())
+ if (!drm_can_sleep())
ret = cirrus_bo_reserve(bo, true);
if (ret) {
if (ret != -EBUSY)