lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 186/233] drm: ast,cirrus,mgag200: use drm_can_sleep
    Date
    3.11.10.4 -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: Luis Henriques <luis.henriques@canonical.com>
    ---
    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(-)

    diff --git a/drivers/gpu/drm/ast/ast_fb.c b/drivers/gpu/drm/ast/ast_fb.c
    index 7b33e14..3f65dd6 100644
    --- 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_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)
    diff --git a/drivers/gpu/drm/cirrus/cirrus_fbdev.c b/drivers/gpu/drm/cirrus/cirrus_fbdev.c
    index b27e956..6c16de3 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)
    diff --git a/drivers/gpu/drm/mgag200/mgag200_fb.c b/drivers/gpu/drm/mgag200/mgag200_fb.c
    index 964f58c..17cea9f 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)
    --
    1.8.3.2


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