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 140/233] drm/mgag200: fix oops in cursor code.
    Date
    3.11.10.4 -stable review patch.  If anyone has any objections, please let me know.

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

    From: Dave Airlie <airlied@redhat.com>

    commit 53dac830537b51df555ba5e7ebb236705b7eaa7c upstream.

    In some cases we enter the cursor code with file_priv = NULL causing an oops,
    we also can try to unpin something that isn't pinned, and this is a good fix for it.

    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/gpu/drm/mgag200/mgag200_cursor.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c
    index 801731a..9f9780b 100644
    --- a/drivers/gpu/drm/mgag200/mgag200_cursor.c
    +++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c
    @@ -22,8 +22,10 @@ static void mga_hide_cursor(struct mga_device *mdev)
    {
    WREG8(MGA_CURPOSXL, 0);
    WREG8(MGA_CURPOSXH, 0);
    - mgag200_bo_unpin(mdev->cursor.pixels_1);
    - mgag200_bo_unpin(mdev->cursor.pixels_2);
    + if (mdev->cursor.pixels_1->pin_count)
    + mgag200_bo_unpin(mdev->cursor.pixels_1);
    + if (mdev->cursor.pixels_2->pin_count)
    + mgag200_bo_unpin(mdev->cursor.pixels_2);
    }

    int mga_crtc_cursor_set(struct drm_crtc *crtc,
    @@ -32,7 +34,7 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc,
    uint32_t width,
    uint32_t height)
    {
    - struct drm_device *dev = (struct drm_device *)file_priv->minor->dev;
    + struct drm_device *dev = crtc->dev;
    struct mga_device *mdev = (struct mga_device *)dev->dev_private;
    struct mgag200_bo *pixels_1 = mdev->cursor.pixels_1;
    struct mgag200_bo *pixels_2 = mdev->cursor.pixels_2;
    --
    1.8.3.2


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