diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-25 10:56:40 -0800 |
| commit | 970259bff472579204108c6f27036ec4d1206ae1 (patch) | |
| tree | 869bdcda9aac4c67712d93e6141056fdf3f41bd8 /drivers/gpu/drm/mgag200/mgag200_cursor.c | |
| parent | 9b1b61cd8e31d9beba871333d7a798b3adb89288 (diff) | |
| parent | 29f5b34ca1a191c2cf4f6c8c12f4dec56e8d3bc1 (diff) | |
Merge branch '81xx' into omap-for-v4.4/fixes
Diffstat (limited to 'drivers/gpu/drm/mgag200/mgag200_cursor.c')
| -rw-r--r-- | drivers/gpu/drm/mgag200/mgag200_cursor.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/gpu/drm/mgag200/mgag200_cursor.c b/drivers/gpu/drm/mgag200/mgag200_cursor.c index 4f2068fe5d88..a7bf6a90eae5 100644 --- a/drivers/gpu/drm/mgag200/mgag200_cursor.c +++ b/drivers/gpu/drm/mgag200/mgag200_cursor.c @@ -70,6 +70,11 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, BUG_ON(pixels_2 != pixels_current && pixels_2 != pixels_prev); BUG_ON(pixels_current == pixels_prev); + if (!handle || !file_priv) { + mga_hide_cursor(mdev); + return 0; + } + obj = drm_gem_object_lookup(dev, file_priv, handle); if (!obj) return -ENOENT; @@ -88,12 +93,6 @@ int mga_crtc_cursor_set(struct drm_crtc *crtc, goto out_unreserve1; } - if (!handle) { - mga_hide_cursor(mdev); - ret = 0; - goto out1; - } - /* Move cursor buffers into VRAM if they aren't already */ if (!pixels_1->pin_count) { ret = mgag200_bo_pin(pixels_1, TTM_PL_FLAG_VRAM, |