diff options
author | Dave Airlie <airlied@redhat.com> | 2014-01-24 09:50:18 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2014-01-29 10:51:52 +1000 |
commit | f4b4718b61d1d5a7442a4fd6863ea80c3a10e508 (patch) | |
tree | 315751b7a57c6b2e953b1013a58c1104fb2e6ca2 /drivers/gpu/drm/mgag200 | |
parent | 821b4db3b62139d51cf14090dfab07fb09cb3a6b (diff) | |
download | op-kernel-dev-f4b4718b61d1d5a7442a4fd6863ea80c3a10e508.zip op-kernel-dev-f4b4718b61d1d5a7442a4fd6863ea80c3a10e508.tar.gz |
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/mgag200')
-rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_fb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c index 005b60a..f9adc27 100644 --- a/drivers/gpu/drm/mgag200/mgag200_fb.c +++ b/drivers/gpu/drm/mgag200/mgag200_fb.c @@ -41,7 +41,7 @@ static void mga_dirty_update(struct mga_fbdev *mfbdev, * then the BO is being moved and we should * store up the damage until later. */ - if (!in_interrupt()) + if (!drm_can_sleep()) ret = mgag200_bo_reserve(bo, true); if (ret) { if (ret != -EBUSY) |