Skip to contentSkip to conversation

drm/i915: Remove wrong warning from i915_gem_context_clean

PATCH Applied Tvrtko Ursulin 4 participants 4 messages Oct 8, 2015 – Oct 9, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/i915: Remove wrong warning from i915_gem_context_clean

From: Tvrtko Ursulin <[email protected]>

commit e9f24d5fb7cf3628b195b18ff3ac4e37937ceeae

Author: Tvrtko Ursulin <[email protected]>
Date:   Mon Oct 5 13:26:36 2015 +0100

drm/i915: Clean up associated VMAs on context destruction

Introduced a wrong assumption that all contexts have a ppgtt instance. This is not true when full PPGTT is not active so remove the WARN_ON_ONCE from the context cleanup code.

---
 drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
index 680b4c9f6b73..8c688a5f1589 100644
@@ -138,7 +138,7 @@ static void i915_gem_context_clean(struct intel_context *ctx)
 	struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
 	struct i915_vma *vma, *next;
 
-	if (WARN_ON_ONCE(!ppgtt))
+	if (!ppgtt)
 		return;
 
 	WARN_ON(!list_empty(&ppgtt->base.active_list));
Signature · 6 lines
1.9.1

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

commit e9f24d5fb7cf3628b195b18ff3ac4e37937ceeae

Author: Tvrtko Ursulin <[email protected]>
Date:   Mon Oct 5 13:26:36 2015 +0100

drm/i915: Clean up associated VMAs on context destruction

Introduced a wrong assumption that all contexts have a ppgtt instance. This is not true when full PPGTT is not active so remove the WARN_ON_ONCE from the context cleanup code.

Aliasing ppgtt? (for the record, I tried with enable_ppgtt=1 while reviewing the patch and didn't see the warning... maybe I didn't try hard enough).

Quoted 13 lines
---
  drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_context.c +0 -0
index 680b4c9f6b73..8c688a5f1589 100644

drivers/gpu/drm/i915/i915_gem_context.c static void i915_gem_context_clean(struct intel_context *ctx) · line 144

Quoted 8 lines
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
@@ -138,7 +138,7 @@ static void i915_gem_context_clean(struct intel_context *ctx)
  	struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
  	struct i915_vma *vma, *next;
 
-	if (WARN_ON_ONCE(!ppgtt))
+	if (!ppgtt)
  		return;
 
  	WARN_ON(!list_empty(&ppgtt->base.active_list));

_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

#2 lore raw
Quoted 9 lines · Michel Thierry
Quoted 8 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

commit e9f24d5fb7cf3628b195b18ff3ac4e37937ceeae

Author: Tvrtko Ursulin <[email protected]>
Date:   Mon Oct 5 13:26:36 2015 +0100

drm/i915: Clean up associated VMAs on context destruction

Quoted 7 lines
Quoted 3 lines

Introduced a wrong assumption that all contexts have a ppgtt instance. This is not true when full PPGTT is not active so remove the WARN_ON_ONCE from the context cleanup code.

Aliasing ppgtt? (for the record, I tried with enable_ppgtt=1 while reviewing the patch and didn't see the warning... maybe I didn't try hard enough).

We create a context per-fd on all platforms, as in it we store user specific information (such as hangstats, process identifiers etc). Think of a context as a view of driver state not just GPU state. -Chris

Signature · 5 lines
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw
In reply to Michel Thierry
Quoted 7 lines · Michel Thierry
Quoted 6 lines · Tvrtko Ursulin

From: Tvrtko Ursulin <[email protected]>

commit e9f24d5fb7cf3628b195b18ff3ac4e37937ceeae

Author: Tvrtko Ursulin <[email protected]>
Date:   Mon Oct 5 13:26:36 2015 +0100
Quoted 8 lines
Quoted 5 lines

drm/i915: Clean up associated VMAs on context destruction

Introduced a wrong assumption that all contexts have a ppgtt instance. This is not true when full PPGTT is not active so remove the WARN_ON_ONCE from the context cleanup code.

Aliasing ppgtt? (for the record, I tried with enable_ppgtt=1 while reviewing the patch and didn't see the warning... maybe I didn't try hard enough).

Aliasing ppgtt isn't a real ppgtt attached to a context, but just a pile of pagetables attached to the global gtt in dev_priv->mm.aliasing_ppgtt.

Originally I had the idea that there would be another structure for the real per-process stuff like

struct i915_ppgtt {
	i915_address_space base;
	i915_hw_ppgtt ppgtt;
};

but that kinda never got anywhere with the original per-process infrastructure merge. So now I get to have a broken record about "aliasing ppgtt isnt' a real ppgtt and will never show up in ctx->ppgtt".

Quoted 16 lines
Quoted 16 lines
---
 drivers/gpu/drm/i915/i915_gem_context.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gem_context.c +0 -0
index 680b4c9f6b73..8c688a5f1589 100644
@@ -138,7 +138,7 @@ static void i915_gem_context_clean(struct intel_context *ctx)
 	struct i915_hw_ppgtt *ppgtt = ctx->ppgtt;
 	struct i915_vma *vma, *next;
 
Quoted 8 lines

drivers/gpu/drm/i915/i915_gem_context.c static void i915_gem_context_clean(struct intel_context *ctx) · line 144

Quoted 6 lines
drivers/gpu/drm/i915/i915_gem_context.c +1 -1
-	if (WARN_ON_ONCE(!ppgtt))
+	if (!ppgtt)
 		return;
 
 	WARN_ON(!list_empty(&ppgtt->base.active_list));

Queued for -next, thanks for the patch.
-Daniel

Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx