* [PATCH] drm/i915: Suppress assertion for i915_ggtt_disable_guc
@ 2018-07-20 9:51 Chris Wilson
2018-07-20 10:29 ` ✓ Fi.CI.BAT: success for " Patchwork
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Chris Wilson @ 2018-07-20 9:51 UTC (permalink / raw)
To: intel-gfx
Another step in the drv_module_reload fault-injection saga, is that we
try to disable the guc twice. Probably. It's a little unclear exactly
what is going on in the unload sequence that catches us out, so for the
time being suppress the assertion to get the test re-enabled.
Testcase: igt/drv_module_reload/basic-reload-inject
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michał Winiarski <michal.winiarski@intel.com>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
---
drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index cff0e6430994..1b476423bfab 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -3654,6 +3654,10 @@ void i915_ggtt_enable_guc(struct drm_i915_private *i915)
void i915_ggtt_disable_guc(struct drm_i915_private *i915)
{
+ /* XXX Temporary pardon for error unload */
+ if (i915->ggtt.invalidate == gen6_ggtt_invalidate)
+ return;
+
/* We should only be called after i915_ggtt_enable_guc() */
GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
--
2.18.0
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 5+ messages in thread* ✓ Fi.CI.BAT: success for drm/i915: Suppress assertion for i915_ggtt_disable_guc
2018-07-20 9:51 [PATCH] drm/i915: Suppress assertion for i915_ggtt_disable_guc Chris Wilson
@ 2018-07-20 10:29 ` Patchwork
2018-07-20 14:25 ` ✓ Fi.CI.IGT: " Patchwork
2018-07-20 14:57 ` [PATCH] " Michał Winiarski
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-07-20 10:29 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Suppress assertion for i915_ggtt_disable_guc
URL : https://patchwork.freedesktop.org/series/46930/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4518 -> Patchwork_9728 =
== Summary - SUCCESS ==
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/46930/revisions/1/mbox/
== Known issues ==
Here are the changes found in Patchwork_9728 that come from known issues:
=== IGT changes ===
==== Possible fixes ====
igt@drv_selftest@live_hangcheck:
fi-skl-guc: DMESG-FAIL (fdo#107174) -> PASS
fdo#107174 https://bugs.freedesktop.org/show_bug.cgi?id=107174
== Participating hosts (47 -> 42) ==
Missing (5): fi-ctg-p8600 fi-ilk-m540 fi-byt-squawks fi-bsw-cyan fi-hsw-4200u
== Build changes ==
* Linux: CI_DRM_4518 -> Patchwork_9728
CI_DRM_4518: 85bdcb875339b30f7beecbc7cba6bc2041cdd28b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4569: bf70728a951cd3c08dd9bbc9310e16aaa252164f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9728: 22a6429a57b99e32a73517fe6715563369ab164e @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
22a6429a57b9 drm/i915: Suppress assertion for i915_ggtt_disable_guc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9728/issues.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* ✓ Fi.CI.IGT: success for drm/i915: Suppress assertion for i915_ggtt_disable_guc
2018-07-20 9:51 [PATCH] drm/i915: Suppress assertion for i915_ggtt_disable_guc Chris Wilson
2018-07-20 10:29 ` ✓ Fi.CI.BAT: success for " Patchwork
@ 2018-07-20 14:25 ` Patchwork
2018-07-20 14:57 ` [PATCH] " Michał Winiarski
2 siblings, 0 replies; 5+ messages in thread
From: Patchwork @ 2018-07-20 14:25 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: Suppress assertion for i915_ggtt_disable_guc
URL : https://patchwork.freedesktop.org/series/46930/
State : success
== Summary ==
= CI Bug Log - changes from CI_DRM_4518_full -> Patchwork_9728_full =
== Summary - WARNING ==
Minor unknown changes coming with Patchwork_9728_full need to be verified
manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_9728_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
== Possible new issues ==
Here are the unknown changes that may have been introduced in Patchwork_9728_full:
=== IGT changes ===
==== Warnings ====
igt@gem_exec_schedule@deep-blt:
shard-kbl: SKIP -> PASS +1
igt@gem_mocs_settings@mocs-rc6-blt:
shard-kbl: PASS -> SKIP
igt@kms_busy@extended-pageflip-modeset-hang-oldfb-render-b:
shard-snb: PASS -> SKIP +1
== Known issues ==
Here are the changes found in Patchwork_9728_full that come from known issues:
=== IGT changes ===
==== Issues hit ====
igt@kms_cursor_legacy@pipe-c-torture-bo:
shard-apl: PASS -> DMESG-WARN (fdo#107122)
igt@kms_flip@2x-flip-vs-expired-vblank-interruptible:
shard-glk: PASS -> FAIL (fdo#105363)
igt@kms_flip@2x-plain-flip-ts-check:
shard-glk: PASS -> FAIL (fdo#100368)
==== Possible fixes ====
igt@drv_suspend@shrink:
shard-kbl: FAIL (fdo#106886) -> PASS
igt@kms_flip@plain-flip-fb-recreate:
shard-glk: FAIL (fdo#100368) -> PASS +1
igt@kms_setmode@basic:
shard-apl: FAIL (fdo#99912) -> PASS
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#105363 https://bugs.freedesktop.org/show_bug.cgi?id=105363
fdo#106886 https://bugs.freedesktop.org/show_bug.cgi?id=106886
fdo#107122 https://bugs.freedesktop.org/show_bug.cgi?id=107122
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
== Participating hosts (5 -> 5) ==
No changes in participating hosts
== Build changes ==
* Linux: CI_DRM_4518 -> Patchwork_9728
CI_DRM_4518: 85bdcb875339b30f7beecbc7cba6bc2041cdd28b @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_4569: bf70728a951cd3c08dd9bbc9310e16aaa252164f @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_9728: 22a6429a57b99e32a73517fe6715563369ab164e @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_9728/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: Suppress assertion for i915_ggtt_disable_guc
2018-07-20 9:51 [PATCH] drm/i915: Suppress assertion for i915_ggtt_disable_guc Chris Wilson
2018-07-20 10:29 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-07-20 14:25 ` ✓ Fi.CI.IGT: " Patchwork
@ 2018-07-20 14:57 ` Michał Winiarski
2018-07-20 14:59 ` Chris Wilson
2 siblings, 1 reply; 5+ messages in thread
From: Michał Winiarski @ 2018-07-20 14:57 UTC (permalink / raw)
To: Chris Wilson; +Cc: intel-gfx
On Fri, Jul 20, 2018 at 10:51:44AM +0100, Chris Wilson wrote:
> Another step in the drv_module_reload fault-injection saga, is that we
> try to disable the guc twice. Probably. It's a little unclear exactly
> what is going on in the unload sequence that catches us out, so for the
> time being suppress the assertion to get the test re-enabled.
>
> Testcase: igt/drv_module_reload/basic-reload-inject
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Michał Winiarski <michal.winiarski@intel.com>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
-Michał
> ---
> drivers/gpu/drm/i915/i915_gem_gtt.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
> index cff0e6430994..1b476423bfab 100644
> --- a/drivers/gpu/drm/i915/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
> @@ -3654,6 +3654,10 @@ void i915_ggtt_enable_guc(struct drm_i915_private *i915)
>
> void i915_ggtt_disable_guc(struct drm_i915_private *i915)
> {
> + /* XXX Temporary pardon for error unload */
> + if (i915->ggtt.invalidate == gen6_ggtt_invalidate)
> + return;
> +
> /* We should only be called after i915_ggtt_enable_guc() */
> GEM_BUG_ON(i915->ggtt.invalidate != guc_ggtt_invalidate);
>
> --
> 2.18.0
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] drm/i915: Suppress assertion for i915_ggtt_disable_guc
2018-07-20 14:57 ` [PATCH] " Michał Winiarski
@ 2018-07-20 14:59 ` Chris Wilson
0 siblings, 0 replies; 5+ messages in thread
From: Chris Wilson @ 2018-07-20 14:59 UTC (permalink / raw)
To: Michał Winiarski; +Cc: intel-gfx
Quoting Michał Winiarski (2018-07-20 15:57:49)
> On Fri, Jul 20, 2018 at 10:51:44AM +0100, Chris Wilson wrote:
> > Another step in the drv_module_reload fault-injection saga, is that we
> > try to disable the guc twice. Probably. It's a little unclear exactly
> > what is going on in the unload sequence that catches us out, so for the
> > time being suppress the assertion to get the test re-enabled.
> >
> > Testcase: igt/drv_module_reload/basic-reload-inject
> > Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> > Cc: Michał Winiarski <michal.winiarski@intel.com>
> > Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
>
> Reviewed-by: Michał Winiarski <michal.winiarski@intel.com>
Out of respect, I'll say this was actually an Acked-by. :)
Hacks like this don't deserve r-b.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-07-20 14:59 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-20 9:51 [PATCH] drm/i915: Suppress assertion for i915_ggtt_disable_guc Chris Wilson
2018-07-20 10:29 ` ✓ Fi.CI.BAT: success for " Patchwork
2018-07-20 14:25 ` ✓ Fi.CI.IGT: " Patchwork
2018-07-20 14:57 ` [PATCH] " Michał Winiarski
2018-07-20 14:59 ` Chris Wilson
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).