Commit 53dac830 authored by Dave Airlie's avatar Dave Airlie

drm/mgag200: fix oops in cursor code.

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.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent c5416d66
...@@ -22,8 +22,10 @@ static void mga_hide_cursor(struct mga_device *mdev) ...@@ -22,8 +22,10 @@ static void mga_hide_cursor(struct mga_device *mdev)
{ {
WREG8(MGA_CURPOSXL, 0); WREG8(MGA_CURPOSXL, 0);
WREG8(MGA_CURPOSXH, 0); WREG8(MGA_CURPOSXH, 0);
mgag200_bo_unpin(mdev->cursor.pixels_1); if (mdev->cursor.pixels_1->pin_count)
mgag200_bo_unpin(mdev->cursor.pixels_2); 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, int mga_crtc_cursor_set(struct drm_crtc *crtc,
...@@ -32,7 +34,7 @@ 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 width,
uint32_t height) 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 mga_device *mdev = (struct mga_device *)dev->dev_private;
struct mgag200_bo *pixels_1 = mdev->cursor.pixels_1; struct mgag200_bo *pixels_1 = mdev->cursor.pixels_1;
struct mgag200_bo *pixels_2 = mdev->cursor.pixels_2; struct mgag200_bo *pixels_2 = mdev->cursor.pixels_2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment