p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

drm/i915: remove leftover from pre-universal planes days 

Now that universal planes are in place we don't need this plane unref on
failures.

Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Gustavo Padovan 2014-09-24 14:20:23 -03:00 committed by Daniel Vetter
parent ccc759dc2a
commit 5ee4463839
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/i915/intel_display.c
View File

@ -8455,13 +8455,6 @@ static bool cursor_size_ok(struct drm_device *dev,
return true; return true;
} }
/*
* intel_crtc_cursor_set_obj - Set cursor to specified GEM object
*
* Note that the object's reference will be consumed if the update fails. If
* the update succeeds, the reference of the old object (if any) will be
* consumed.
*/
static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc, static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
struct drm_i915_gem_object *obj, struct drm_i915_gem_object *obj,
uint32_t width, uint32_t height) uint32_t width, uint32_t height)
@ -8491,8 +8484,7 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
stride = roundup_pow_of_two(width) * 4; stride = roundup_pow_of_two(width) * 4;
if (obj->base.size < stride * height) { if (obj->base.size < stride * height) {
DRM_DEBUG_KMS("buffer is too small\n"); DRM_DEBUG_KMS("buffer is too small\n");
ret = -ENOMEM; return -ENOMEM;
goto fail;
} }
/* we only need to pin inside GTT if cursor is non-phy */ /* we only need to pin inside GTT if cursor is non-phy */
@ -8581,8 +8573,6 @@ static int intel_crtc_cursor_set_obj(struct drm_crtc *crtc,
i915_gem_object_unpin_from_display_plane(obj); i915_gem_object_unpin_from_display_plane(obj);
fail_locked: fail_locked:
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
fail:
drm_gem_object_unreference_unlocked(&obj->base);
return ret; return ret;
} }