* [Intel-gfx] [PATCH] drm/i915/gt: Remove errant assertion in __intel_context_do_pin
@ 2020-05-20 7:30 Chris Wilson
2020-05-20 8:04 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
2020-05-20 10:51 ` [Intel-gfx] [PATCH] " Joonas Lahtinen
0 siblings, 2 replies; 3+ messages in thread
From: Chris Wilson @ 2020-05-20 7:30 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson
This assertion was removed in b412c63f1cba ("drm/i915/gt: Report
context-is-closed prior to pinning"), but accidentally restored by a
cherry-pick into drm-next and now has percolated back to
drm-intel-next-queued.
Fixes: 2e46a2a0b014 ("drm/i915: Use explicit flag to mark unreachable intel_context")
Fixes: 2b703bbda271 ("Merge drm/drm-next into drm-intel-next-queued")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
---
drivers/gpu/drm/i915/gt/intel_context.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
index 74ddb49b2941..e4aece20bc80 100644
--- a/drivers/gpu/drm/i915/gt/intel_context.c
+++ b/drivers/gpu/drm/i915/gt/intel_context.c
@@ -97,8 +97,6 @@ int __intel_context_do_pin(struct intel_context *ce)
{
int err;
- GEM_BUG_ON(intel_context_is_closed(ce));
-
if (unlikely(!test_bit(CONTEXT_ALLOC_BIT, &ce->flags))) {
err = intel_context_alloc_state(ce);
if (err)
--
2.27.0.rc0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915/gt: Remove errant assertion in __intel_context_do_pin
2020-05-20 7:30 [Intel-gfx] [PATCH] drm/i915/gt: Remove errant assertion in __intel_context_do_pin Chris Wilson
@ 2020-05-20 8:04 ` Patchwork
2020-05-20 10:51 ` [Intel-gfx] [PATCH] " Joonas Lahtinen
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2020-05-20 8:04 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/gt: Remove errant assertion in __intel_context_do_pin
URL : https://patchwork.freedesktop.org/series/77448/
State : failure
== Summary ==
Applying: drm/i915/gt: Remove errant assertion in __intel_context_do_pin
Using index info to reconstruct a base tree...
M drivers/gpu/drm/i915/gt/intel_context.c
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/gt: Remove errant assertion in __intel_context_do_pin
2020-05-20 7:30 [Intel-gfx] [PATCH] drm/i915/gt: Remove errant assertion in __intel_context_do_pin Chris Wilson
2020-05-20 8:04 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
@ 2020-05-20 10:51 ` Joonas Lahtinen
1 sibling, 0 replies; 3+ messages in thread
From: Joonas Lahtinen @ 2020-05-20 10:51 UTC (permalink / raw)
To: Chris Wilson, intel-gfx; +Cc: Chris Wilson
Quoting Chris Wilson (2020-05-20 10:30:48)
> This assertion was removed in b412c63f1cba ("drm/i915/gt: Report
> context-is-closed prior to pinning"), but accidentally restored by a
> cherry-pick into drm-next and now has percolated back to
> drm-intel-next-queued.
>
> Fixes: 2e46a2a0b014 ("drm/i915: Use explicit flag to mark unreachable intel_context")
> Fixes: 2b703bbda271 ("Merge drm/drm-next into drm-intel-next-queued")
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Regards, Joonas
> ---
> drivers/gpu/drm/i915/gt/intel_context.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gt/intel_context.c b/drivers/gpu/drm/i915/gt/intel_context.c
> index 74ddb49b2941..e4aece20bc80 100644
> --- a/drivers/gpu/drm/i915/gt/intel_context.c
> +++ b/drivers/gpu/drm/i915/gt/intel_context.c
> @@ -97,8 +97,6 @@ int __intel_context_do_pin(struct intel_context *ce)
> {
> int err;
>
> - GEM_BUG_ON(intel_context_is_closed(ce));
> -
> if (unlikely(!test_bit(CONTEXT_ALLOC_BIT, &ce->flags))) {
> err = intel_context_alloc_state(ce);
> if (err)
> --
> 2.27.0.rc0
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-05-20 10:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-20 7:30 [Intel-gfx] [PATCH] drm/i915/gt: Remove errant assertion in __intel_context_do_pin Chris Wilson
2020-05-20 8:04 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
2020-05-20 10:51 ` [Intel-gfx] [PATCH] " Joonas Lahtinen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).