lkml.org 
[lkml]   [2014]   [Feb]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.13 101/120] drm: ast,cirrus,mgag200: use drm_can_sleep
    Date
    3.13-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Dave Airlie <airlied@redhat.com>

    commit f4b4718b61d1d5a7442a4fd6863ea80c3a10e508 upstream.

    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.

    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpu/drm/ast/ast_fb.c | 2 +-
    drivers/gpu/drm/cirrus/cirrus_fbdev.c | 2 +-
    drivers/gpu/drm/mgag200/mgag200_fb.c | 2 +-
    3 files changed, 3 insertions(+), 3 deletions(-)

    --- a/drivers/gpu/drm/ast/ast_fb.c
    +++ b/drivers/gpu/drm/ast/ast_fb.c
    @@ -65,7 +65,7 @@ static void ast_dirty_update(struct ast_
    * 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)
    --- 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 c
    * 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)
    --- 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_
    * 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)



    \
     
     \ /
      Last update: 2014-02-14 05:41    [W:4.229 / U:0.184 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site