drm/i915: Remove one very outdated comment
diff mbox

Message ID 1441713168-28595-1-git-send-email-tvrtko.ursulin@linux.intel.com
State New
Headers show

Commit Message

Tvrtko Ursulin Sept. 8, 2015, 11:52 a.m. UTC
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Comment disagrees with the code which has changed a lot since
it was documented.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
 drivers/gpu/drm/i915/i915_gem.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Daniel Vetter Sept. 10, 2015, 4:28 p.m. UTC | #1
On Tue, Sep 08, 2015 at 12:52:48PM +0100, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> 
> Comment disagrees with the code which has changed a lot since
> it was documented.
> 
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Applied, with the commit citation added for the patch which made this
comment obsolete. I tried finding the curb-EIO commit too, but that one
might have stalled somewhere :(
-Daniel
> ---
>  drivers/gpu/drm/i915/i915_gem.c | 4 ----
>  1 file changed, 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
> index 41263cd4170c..760cfba22e71 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -3230,10 +3230,6 @@ int i915_vma_unbind(struct i915_vma *vma)
>  	ret = i915_gem_object_wait_rendering(obj, false);
>  	if (ret)
>  		return ret;
> -	/* Continue on if we fail due to EIO, the GPU is hung so we
> -	 * should be safe and we need to cleanup or else we might
> -	 * cause memory corruption through use-after-free.
> -	 */
>  
>  	if (i915_is_ggtt(vma->vm) &&
>  	    vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL) {
> -- 
> 2.5.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Patch
diff mbox

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 41263cd4170c..760cfba22e71 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3230,10 +3230,6 @@  int i915_vma_unbind(struct i915_vma *vma)
 	ret = i915_gem_object_wait_rendering(obj, false);
 	if (ret)
 		return ret;
-	/* Continue on if we fail due to EIO, the GPU is hung so we
-	 * should be safe and we need to cleanup or else we might
-	 * cause memory corruption through use-after-free.
-	 */
 
 	if (i915_is_ggtt(vma->vm) &&
 	    vma->ggtt_view.type == I915_GGTT_VIEW_NORMAL) {