提交 5ee44638 编写于 作者: G Gustavo Padovan 提交者: Daniel Vetter

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: NVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: NGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: NVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: NDaniel Vetter <daniel.vetter@ffwll.ch>
上级 ccc759dc
...@@ -8455,13 +8455,6 @@ static bool cursor_size_ok(struct drm_device *dev, ...@@ -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, ...@@ -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, ...@@ -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;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册