[PATCH] drm/i915/guc: Clear enable_guc_loading in case of init failure

[PATCH] drm/i915/guc: Clear enable_guc_loading in case of init failure

[Michel Thierry]

And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
failed, and the second time during driver unload / intel_uc_fini_hw),
and hitting the GEM_BUG_ON.

Fixes: 04f7b24eccdf ("drm/i915/guc: Assert that we switch between known
ggtt->invalidate functions")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 3524ff07a0f2..c5ef4fa2b404 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -433,6 +433,11 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 		DRM_NOTE("Falling back from GuC submission to execlist mode\n");
 	}
 
+	if (i915.enable_guc_loading) {
+		i915.enable_guc_loading = 0;
+		DRM_NOTE("GuC firmware loading disabled\n");
+	}
+
 	return ret;
 }
 
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915/guc: Clear enable_guc_loading in case of init failure

[Patchwork]

== Series Details ==

Series: drm/i915/guc: Clear enable_guc_loading in case of init failure
URL   : https://patchwork.freedesktop.org/series/25228/
State : success

== Summary ==

Series 25228v1 drm/i915/guc: Clear enable_guc_loading in case of init failure
https://patchwork.freedesktop.org/api/1.0/series/25228/revisions/1/mbox/

Test kms_busy:
        Subgroup basic-flip-default-a:
                dmesg-warn -> PASS       (fi-skl-6700hq) fdo#101144 +3
Test kms_cursor_legacy:
        Subgroup basic-busy-flip-before-cursor-atomic:
                fail       -> PASS       (fi-skl-6700hq) fdo#101154 +7

fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144
fdo#101154 https://bugs.freedesktop.org/show_bug.cgi?id=101154

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:445s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:442s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:582s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:515s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:494s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:483s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:430s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:420s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:414s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:490s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:471s
fi-kbl-7500u     total:278  pass:255  dwarn:5   dfail:0   fail:0   skip:18  time:468s
fi-kbl-7560u     total:278  pass:263  dwarn:5   dfail:0   fail:0   skip:10  time:575s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:463s
fi-skl-6700hq    total:278  pass:239  dwarn:0   dfail:1   fail:17  skip:21  time:432s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:463s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:503s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:441s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:536s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:411s

d919ad0d077110d2d48a4b7503ddc02c3864667d drm-tip: 2017y-06m-02d-21h-49m-57s UTC integration manifest
0e06d6f drm/i915/guc: Clear enable_guc_loading in case of init failure

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4868/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/guc: Clear enable_guc_loading in case of init failure

[Chris Wilson]

Quoting Michel Thierry (2017-06-03 00:46:54)
> And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
> failed, and the second time during driver unload / intel_uc_fini_hw),
> and hitting the GEM_BUG_ON.
> 
> Fixes: 04f7b24eccdf ("drm/i915/guc: Assert that we switch between known
> ggtt->invalidate functions")

Go back to the earlier culprit; that is just the messenger.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/guc: Clear enable_guc_loading in case of init failure

[Michal Wajdeczko]

On Fri, Jun 02, 2017 at 04:46:54PM -0700, Michel Thierry wrote:
> And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
> failed, and the second time during driver unload / intel_uc_fini_hw),
> and hitting the GEM_BUG_ON.
> 
> Fixes: 04f7b24eccdf ("drm/i915/guc: Assert that we switch between known
> ggtt->invalidate functions")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_uc.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 3524ff07a0f2..c5ef4fa2b404 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -433,6 +433,11 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
>  		DRM_NOTE("Falling back from GuC submission to execlist mode\n");
>  	}
>  
> +	if (i915.enable_guc_loading) {

This check is redundant (see top of this function)

Michal

> +		i915.enable_guc_loading = 0;
> +		DRM_NOTE("GuC firmware loading disabled\n");
> +	}
> +
>  	return ret;
>  }
>  
> -- 
> 2.11.0
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/guc: Clear enable_guc_loading in case of init failure

[Daniele Ceraolo Spurio]

You'll also need to change the order of operations in intel_uc_fini_hw 
to make sure guc_free_load_err_log is called before the 
i915.enable_guc_loading check, because that log exists exactly when GuC 
loading failed.

Thanks,
Daniele

On 02/06/17 16:46, Michel Thierry wrote:
> And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
> failed, and the second time during driver unload / intel_uc_fini_hw),
> and hitting the GEM_BUG_ON.
>
> Fixes: 04f7b24eccdf ("drm/i915/guc: Assert that we switch between known
> ggtt->invalidate functions")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_uc.c | 5 +++++
>  1 file changed, 5 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
> index 3524ff07a0f2..c5ef4fa2b404 100644
> --- a/drivers/gpu/drm/i915/intel_uc.c
> +++ b/drivers/gpu/drm/i915/intel_uc.c
> @@ -433,6 +433,11 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
>  		DRM_NOTE("Falling back from GuC submission to execlist mode\n");
>  	}
>
> +	if (i915.enable_guc_loading) {
> +		i915.enable_guc_loading = 0;
> +		DRM_NOTE("GuC firmware loading disabled\n");
> +	}
> +
>  	return ret;
>  }
>
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

[PATCH v2] drm/i915/guc: Clear enable_guc_loading in case of init failure

[Michel Thierry]

And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
failed, and the second time during driver unload / intel_uc_fini_hw),
and hitting the GEM_BUG_ON.

v2: Clear enable_guc_loading unconditionally (Michal)
    Make sure guc_free_load_err_log is still called (Daniele)
    Don't shoot the messenger (Chris)

Fixes: 3950bf3dbff10 ("drm/i915/guc: Add onion teardown to the GuC
setup")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Michel Thierry <michel.thierry@intel.com>
---
 drivers/gpu/drm/i915/intel_uc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_uc.c b/drivers/gpu/drm/i915/intel_uc.c
index 3524ff07a0f2..a8930f2feacf 100644
--- a/drivers/gpu/drm/i915/intel_uc.c
+++ b/drivers/gpu/drm/i915/intel_uc.c
@@ -433,16 +433,19 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)
 		DRM_NOTE("Falling back from GuC submission to execlist mode\n");
 	}
 
+	i915.enable_guc_loading = 0;
+	DRM_NOTE("GuC firmware loading disabled\n");
+
 	return ret;
 }
 
 void intel_uc_fini_hw(struct drm_i915_private *dev_priv)
 {
+	guc_free_load_err_log(&dev_priv->guc);
+
 	if (!i915.enable_guc_loading)
 		return;
 
-	guc_free_load_err_log(&dev_priv->guc);
-
 	if (i915.enable_guc_submission)
 		i915_guc_submission_disable(dev_priv);
 
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH v2] drm/i915/guc: Clear enable_guc_loading in case of init failure

[Michal Wajdeczko]

On Mon, Jun 05, 2017 at 10:12:51AM -0700, Michel Thierry wrote:
> And prevent calling i915_ggtt_disable_guc twice (the first when GuC init
> failed, and the second time during driver unload / intel_uc_fini_hw),
> and hitting the GEM_BUG_ON.
> 
> v2: Clear enable_guc_loading unconditionally (Michal)
>     Make sure guc_free_load_err_log is still called (Daniele)
>     Don't shoot the messenger (Chris)
> 
> Fixes: 3950bf3dbff10 ("drm/i915/guc: Add onion teardown to the GuC
> setup")
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> Signed-off-by: Michel Thierry <michel.thierry@intel.com>
> ---

Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>

-Michal
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Fi.CI.BAT: success for drm/i915/guc: Clear enable_guc_loading in case of init failure (rev2)

[Patchwork]

== Series Details ==

Series: drm/i915/guc: Clear enable_guc_loading in case of init failure (rev2)
URL   : https://patchwork.freedesktop.org/series/25228/
State : success

== Summary ==

Series 25228v2 drm/i915/guc: Clear enable_guc_loading in case of init failure
https://patchwork.freedesktop.org/api/1.0/series/25228/revisions/2/mbox/

Test gem_exec_suspend:
        Subgroup basic-s4-devices:
                pass       -> DMESG-WARN (fi-kbl-7560u) fdo#101022
Test kms_busy:
        Subgroup basic-flip-default-a:
                pass       -> DMESG-WARN (fi-skl-6700hq) fdo#101144 +1

fdo#101022 https://bugs.freedesktop.org/show_bug.cgi?id=101022
fdo#101144 https://bugs.freedesktop.org/show_bug.cgi?id=101144

fi-bdw-5557u     total:278  pass:267  dwarn:0   dfail:0   fail:0   skip:11  time:448s
fi-bdw-gvtdvm    total:278  pass:256  dwarn:8   dfail:0   fail:0   skip:14  time:433s
fi-bsw-n3050     total:278  pass:242  dwarn:0   dfail:0   fail:0   skip:36  time:584s
fi-bxt-j4205     total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:506s
fi-byt-j1900     total:278  pass:254  dwarn:0   dfail:0   fail:0   skip:24  time:490s
fi-byt-n2820     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:484s
fi-glk-2a        total:278  pass:259  dwarn:0   dfail:0   fail:0   skip:19  time:588s
fi-hsw-4770      total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:427s
fi-hsw-4770r     total:278  pass:262  dwarn:0   dfail:0   fail:0   skip:16  time:413s
fi-ilk-650       total:278  pass:228  dwarn:0   dfail:0   fail:0   skip:50  time:417s
fi-ivb-3520m     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:486s
fi-ivb-3770      total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:461s
fi-kbl-7500u     total:278  pass:260  dwarn:0   dfail:0   fail:0   skip:18  time:470s
fi-kbl-7560u     total:278  pass:267  dwarn:1   dfail:0   fail:0   skip:10  time:576s
fi-skl-6260u     total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:466s
fi-skl-6700hq    total:278  pass:228  dwarn:1   dfail:0   fail:27  skip:22  time:405s
fi-skl-6700k     total:278  pass:256  dwarn:4   dfail:0   fail:0   skip:18  time:465s
fi-skl-6770hq    total:278  pass:268  dwarn:0   dfail:0   fail:0   skip:10  time:505s
fi-skl-gvtdvm    total:278  pass:265  dwarn:0   dfail:0   fail:0   skip:13  time:443s
fi-snb-2520m     total:278  pass:250  dwarn:0   dfail:0   fail:0   skip:28  time:534s
fi-snb-2600      total:278  pass:249  dwarn:0   dfail:0   fail:0   skip:29  time:402s

30d3326ecb407cad6c03ef6a6d3805c70ba9f0a9 drm-tip: 2017y-06m-05d-15h-21m-50s UTC integration manifest
efafe653 drm/i915/guc: Clear enable_guc_loading in case of init failure

== Logs ==

For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4878/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✓ Fi.CI.BAT: success for drm/i915/guc: Clear enable_guc_loading in case of init failure (rev2)

[Michel Thierry]

On 6/5/2017 10:32 AM, Patchwork wrote:
> == Series Details ==
> 
> Series: drm/i915/guc: Clear enable_guc_loading in case of init failure (rev2)
> URL   : https://patchwork.freedesktop.org/series/25228/
> State : success
> 
> == Summary ==
> 
> Series 25228v2 drm/i915/guc: Clear enable_guc_loading in case of init failure
> https://patchwork.freedesktop.org/api/1.0/series/25228/revisions/2/mbox/
> 
...
> 
> For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4878/
> 

Hello,

Michal also reviewed this patch already (thanks Michal), let me know if 
something else is needed.

-Michel
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: ✓ Fi.CI.BAT: success for drm/i915/guc: Clear enable_guc_loading in case of init failure (rev2)

[Joonas Lahtinen]

On ti, 2017-06-06 at 12:57 -0700, Michel Thierry wrote:
> On 6/5/2017 10:32 AM, Patchwork wrote:
> > 
> > == Series Details ==
> > 
> > Series: drm/i915/guc: Clear enable_guc_loading in case of init failure (rev2)
> > URL   : https://patchwork.freedesktop.org/series/25228/
> > State : success
> > 
> > == Summary ==
> > 
> > Series 25228v2 drm/i915/guc: Clear enable_guc_loading in case of init failure
> > https://patchwork.freedesktop.org/api/1.0/series/25228/revisions/2/mbox/
> > 
> ...
> > 
> > 
> > For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4878/
> > 
> 
> Hello,
> 
> Michal also reviewed this patch already (thanks Michal), let me know if 
> something else is needed.

Applied it. Thanks for the patch and review.

Regards, Joonas
-- 
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx