drm: ast,cirrus,mgag200: use drm_can_sleep
authorDave Airlie <airlied@redhat.com>
Thu, 23 Jan 2014 23:50:18 +0000 (09:50 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 29 Jan 2014 00:51:52 +0000 (10:51 +1000)
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>
drivers/gpu/drm/ast/ast_fb.c
drivers/gpu/drm/cirrus/cirrus_fbdev.c
drivers/gpu/drm/mgag200/mgag200_fb.c

index 7b33e14e44aa17a8026d4c1c33b8e2dbc529f93f..3f65dd6676b2c1354a4faef7d723f171ad840c67 100644 (file)
@@ -65,7 +65,7 @@ static void ast_dirty_update(struct ast_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 = ast_bo_reserve(bo, true);
        if (ret) {
                if (ret != -EBUSY)
index e63a7533f849b0511c60be45a4e75f3b0c1e373b..2fd4a92162cb8880b3c0834ee294184b57b7edf7 100644 (file)
@@ -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)
index 005b60aa2a004c45317002a2dcf509e567206622..f9adc27ef32a05fdee5b66a23e35b7e6df21fd3d 100644 (file)
@@ -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)