drm/i915/uc: Sanitize uC
Subsystems (2)
v2 cover drm/i915/uc: Sanitize uC
Attempt to sanitize uC for better alignment with rest of GEM driver.
v2: cover reset path and sanitize uc before gem
Michal Wajdeczko (3):
drm/i915/uc: Sanitize uC options early
drm/i915/uc: Sanitize uC together with GEM
HAX: Enable GuC for CI
drivers/gpu/drm/i915/i915_drv.c | 2 -- drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_guc.h | 6 ++++++ drivers/gpu/drm/i915/intel_huc.h | 6 ++++++ drivers/gpu/drm/i915/intel_uc.c | 26 ++++++++++++++++++++++++-- drivers/gpu/drm/i915/intel_uc.h | 2 +- drivers/gpu/drm/i915/intel_uc_fw.h | 6 ++++++ 8 files changed, 46 insertions(+), 6 deletions(-)
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/3 drm/i915/uc: Sanitize uC options early
We are sanitizing uC related modparams together with other driver modparams in intel_sanitize_options called from i915_driver_init_hw, but this is too late for us as we will want to use USES_GUC/USES_HUC macros at earlier stage. Since our sanitizing does not require any MMIO access, we can do it in intel_uc_init_early right after we resolve firmware names.
--- drivers/gpu/drm/i915/i915_drv.c | 2 -- drivers/gpu/drm/i915/intel_uc.c | 6 ++++-- drivers/gpu/drm/i915/intel_uc.h | 1 - 3 files changed, 4 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +0 -2
@@ -1074,8 +1074,6 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) i915_modparams.enable_ppgtt);DRM_DEBUG_DRIVER ("ppgtt mode: %i\n" , i915_modparams.enable_ppgtt); -intel_uc_sanitize_options (dev_priv); -intel_gvt_sanitize_options (dev_priv); }
drivers/gpu/drm/i915/intel_uc.c +4 -2
@@ -83,7 +83,7 @@ static int __get_default_guc_log_level(struct drm_i915_private *dev_priv) }/** -* intel_uc_sanitize_options - sanitize uC related modparam options +* sanitize_options_early - sanitize uC related modparam options * @dev_priv: device private * * In case of "enable_guc" option this function will attempt to modify
@@ -99,7 +99,7 @@ static int __get_default_guc_log_level(struct drm_i915_private *dev_priv)* unless GuC is enabled on given platform and the driver is compiled with * debug config when this modparam will default to "enable(1..4)". */ -void intel_uc_sanitize_options (struct drm_i915_private *dev_priv) +static void sanitize_options_early (struct drm_i915_private *dev_priv) {struct intel_uc_fw *guc_fw = &dev_priv->guc.fw;struct intel_uc_fw *huc_fw = &dev_priv->huc.fw;
@@ -163,6 +163,8 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv) {intel_guc_init_early (&dev_priv->guc);intel_huc_init_early (&dev_priv->huc); + +sanitize_options_early (dev_priv); }void intel_uc_init_fw (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_uc.h +0 -1
@@ -28,7 +28,6 @@#include "intel_huc.h" #include "i915_params.h" -void intel_uc_sanitize_options (struct drm_i915_private *dev_priv);void intel_uc_init_early (struct drm_i915_private *dev_priv);void intel_uc_init_mmio (struct drm_i915_private *dev_priv);void intel_uc_init_fw (struct drm_i915_private *dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/3 drm/i915/uc: Sanitize uC together with GEM
In reply to Michal WajdeczkoInstead of dancing around uC on reset/suspend/resume scenarios, explicitly sanitize uC when we sanitize GEM to force uC reload and start from known beginning.
v2: don't forget about reset path (Daniele)
sanitize uc before gem initiated full reset (Daniele)
--- drivers/gpu/drm/i915/i915_gem.c | 2 ++ drivers/gpu/drm/i915/intel_guc.h | 6 ++++++ drivers/gpu/drm/i915/intel_huc.h | 6 ++++++ drivers/gpu/drm/i915/intel_uc.c | 18 ++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 1 + drivers/gpu/drm/i915/intel_uc_fw.h | 6 ++++++ 6 files changed, 39 insertions(+)
drivers/gpu/drm/i915/i915_gem.c +2 -0
@@ -2998,6 +2998,7 @@ int i915_gem_reset_prepare(struct drm_i915_private *dev_priv) }i915_gem_revoke_fences (dev_priv); +intel_uc_sanitize (dev_priv);return err; }
@@ -4978,6 +4979,7 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)* machines is a good idea, we don't - just in case it leaves the * machine in an unusable condition. */ +intel_uc_sanitize (dev_priv);i915_gem_sanitize (dev_priv);intel_runtime_pm_put (dev_priv);
drivers/gpu/drm/i915/intel_guc.h +6 -0
@@ -132,4 +132,10 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv); +static inline int intel_guc_sanitize (struct intel_guc *guc) +{ +intel_uc_fw_sanitize (&guc->fw); +return 0 ; +} +#endif
drivers/gpu/drm/i915/intel_huc.h +6 -0
@@ -38,4 +38,10 @@ struct intel_huc {void intel_huc_init_early (struct intel_huc *huc);int intel_huc_auth (struct intel_huc *huc); +static inline int intel_huc_sanitize (struct intel_huc *huc) +{ +intel_uc_fw_sanitize (&huc->fw); +return 0 ; +} +#endif
drivers/gpu/drm/i915/intel_uc.c +18 -0
@@ -327,6 +327,24 @@ void intel_uc_fini(struct drm_i915_private *dev_priv)intel_guc_fini (guc); } +void intel_uc_sanitize (struct drm_i915_private *i915) +{ +struct intel_guc *guc = &i915->guc; +struct intel_huc *huc = &i915->huc; + +if (!USES_GUC (i915)) +return ; + +GEM_BUG_ON (!HAS_GUC (i915)); + +guc_disable_communication (guc); + +intel_huc_sanitize (huc); +intel_guc_sanitize (guc); + +__intel_uc_reset_hw (i915); +} +int intel_uc_init_hw (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -34,6 +34,7 @@void intel_uc_fini_fw (struct drm_i915_private *dev_priv);int intel_uc_init_misc (struct drm_i915_private *dev_priv);void intel_uc_fini_misc (struct drm_i915_private *dev_priv); +void intel_uc_sanitize (struct drm_i915_private *dev_priv);int intel_uc_init_hw (struct drm_i915_private *dev_priv);void intel_uc_fini_hw (struct drm_i915_private *dev_priv);int intel_uc_init (struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/intel_uc_fw.h +6 -0
@@ -115,6 +115,12 @@ static inline bool intel_uc_fw_is_selected(struct intel_uc_fw *uc_fw)return uc_fw->path !=NULL ; } +static inline void intel_uc_fw_sanitize (struct intel_uc_fw *uc_fw) +{ +if (uc_fw->load_status ==INTEL_UC_FIRMWARE_SUCCESS ) + uc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; +} +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw); int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v2 2/3] drm/i915/uc: Sanitize uC together with GEM
Quoted 4 lines · Michal Wajdeczko
Instead of dancing around uC on reset/suspend/resume scenarios, explicitly sanitize uC when we sanitize GEM to force uC reload and start from known beginning.
Quoted 8 lines
v2: don't forget about reset path (Daniele)
sanitize uc before gem initiated full reset (Daniele)Signed-off-by Michal Wajdeczko <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Chris Wilson <[email protected]>Cc Michel Thierry <[email protected]>
a small comment below
<snip>
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc.c +1
-0@@ -327,6 +327,24 @@ void intel_uc_fini(struct drm_i915_private *dev_priv)intel_guc_fini (guc); } +void intel_uc_sanitize (struct drm_i915_private *i915)
drivers/gpu/drm/i915/intel_uc.c void intel_uc_fini(struct drm_i915_private *dev_priv) · line 340
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+{ +struct intel_guc *guc = &i915->guc; +struct intel_huc *huc = &i915->huc; + +if (!USES_GUC (i915)) +return ; + +GEM_BUG_ON (!HAS_GUC (i915)); + +guc_disable_communication (guc);
With this here, can we now drop the guc_disable_communication in intel_uc_init_hw?
Thanks,
Daniele
Quoted 30 lines
drivers/gpu/drm/i915/intel_uc.c +7
-0+ +intel_huc_sanitize (huc); +intel_guc_sanitize (guc); + +__intel_uc_reset_hw (i915); +} +int intel_uc_init_hw (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;drivers/gpu/drm/i915/intel_uc.h +1
-0@@ -34,6 +34,7 @@void intel_uc_fini_fw (struct drm_i915_private *dev_priv);int intel_uc_init_misc (struct drm_i915_private *dev_priv);void intel_uc_fini_misc (struct drm_i915_private *dev_priv); +void intel_uc_sanitize (struct drm_i915_private *dev_priv);int intel_uc_init_hw (struct drm_i915_private *dev_priv);void intel_uc_fini_hw (struct drm_i915_private *dev_priv);int intel_uc_init (struct drm_i915_private *dev_priv);drivers/gpu/drm/i915/intel_uc_fw.h +0
-0@@ -115,6 +115,12 @@ static inline bool intel_uc_fw_is_selected(struct intel_uc_fw *uc_fw)return uc_fw->path !=NULL ; }
drivers/gpu/drm/i915/intel_uc_fw.h static inline bool intel_uc_fw_is_selected(struct intel_uc_fw *uc_fw) · line 126
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc_fw.h +6
-0+static inline void intel_uc_fw_sanitize (struct intel_uc_fw *uc_fw) +{ +if (uc_fw->load_status ==INTEL_UC_FIRMWARE_SUCCESS ) + uc_fw->load_status =INTEL_UC_FIRMWARE_PENDING ; +} +void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw); int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/3 HAX: Enable GuC for CI
In reply to Michal Wajdeczkov2: except running with HYPERVISOR
--- drivers/gpu/drm/i915/i915_params.h | 2 +- drivers/gpu/drm/i915/intel_uc.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_params.h +1 -1
@@ -47,7 +47,7 @@ param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc, 0) \ + param(int, enable_guc, -1) \ param(int, guc_log_level, 0) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
drivers/gpu/drm/i915/intel_uc.c +2 -0
@@ -63,6 +63,8 @@ static int __get_platform_enable_guc(struct drm_i915_private *dev_priv) enable_guc |=ENABLE_GUC_LOAD_HUC ;/* Any platform specific fine-tuning can be done here */ +if (boot_cpu_has (X86_FEATURE_HYPERVISOR )) + enable_guc =0 ;return enable_guc; }
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/uc: Sanitize uC (rev2)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915/uc: Sanitize uC (rev2)
URL : https://patchwork.freedesktop.org/series/39634/
State : success
== Summary ==
Series 39634v2 drm/i915/uc: Sanitize uC
https://patchwork.freedesktop.org/api/1.0/series/39634/revisions/2/mbox/
---- Known issues:
Test debugfs_test:
Subgroup read_all_entries:
incomplete -> PASS (fi-snb-2520m) fdo#103713
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> FAIL (fi-skl-guc) fdo#103191fdo#103713 https://bugs.freedesktop.org/show_bug.cgi?id=103713
fdo#103191 https://bugs.freedesktop.org/show_bug.cgi?id=103191
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:428s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:425s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:371s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:498s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:279s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:494s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:495s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:480s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:467s fi-cfl-8700k total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:406s fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:585s fi-cnl-y3 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:580s fi-elk-e7500 total:288 pass:229 dwarn:0 dfail:0 fail:0 skip:59 time:417s fi-gdg-551 total:288 pass:179 dwarn:0 dfail:0 fail:1 skip:108 time:287s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:516s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:395s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:409s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:452s fi-ivb-3770 total:288 pass:255 dwarn:0 dfail:0 fail:0 skip:33 time:419s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:468s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:456s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:508s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:587s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:433s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:518s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:538s fi-skl-6700k2 total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:491s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:491s fi-skl-guc total:288 pass:259 dwarn:0 dfail:0 fail:1 skip:28 time:422s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:425s fi-snb-2520m total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:524s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:388s Blacklisted hosts: fi-cfl-u total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:511s fi-cnl-drrs total:288 pass:257 dwarn:3 dfail:0 fail:0 skip:19 time:524s
2e2ef5a5221a7469ecd72c68ed15dd8b94e2e0c6 drm-tip: 2018y-03m-09d-14h-28m-10s UTC integration manifest ae3a1d7d7e62 HAX: Enable GuC for CI11f207630fb0 drm/i915/uc: Sanitize uC together with GEM70549b8cf2c8 drm/i915/uc: Sanitize uC options early
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8293/issues.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.IGT: failure for drm/i915/uc: Sanitize uC (rev2)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915/uc: Sanitize uC (rev2)
URL : https://patchwork.freedesktop.org/series/39634/
State : failure
== Summary ==
---- Possible new issues:
Test drv_missed_irq:
pass -> SKIP (shard-apl)
Test drv_selftest:
Subgroup live_guc:
pass -> DMESG-WARN (shard-apl)
Test perf:
Subgroup gen8-unprivileged-single-ctx-counters:
pass -> FAIL (shard-apl)---- Known issues:
Test gem_eio:
Subgroup in-flight-contexts:
incomplete -> PASS (shard-apl) fdo#105341 +1
Test kms_cursor_crc:
Subgroup cursor-128x128-suspend:
skip -> PASS (shard-hsw) fdo#103540
Test kms_flip:
Subgroup dpms-vs-vblank-race:
pass -> FAIL (shard-hsw) fdo#103060
Subgroup plain-flip-ts-check:
pass -> FAIL (shard-hsw) fdo#100368 +2
Test perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252 +1fdo#105341 https://bugs.freedesktop.org/show_bug.cgi?id=105341
fdo#103540 https://bugs.freedesktop.org/show_bug.cgi?id=103540
fdo#103060 https://bugs.freedesktop.org/show_bug.cgi?id=103060
fdo#100368 https://bugs.freedesktop.org/show_bug.cgi?id=100368
fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
shard-apl total:3338 pass:1754 dwarn:2 dfail:0 fail:14 skip:1566 time:11690s shard-hsw total:3467 pass:1766 dwarn:1 dfail:0 fail:8 skip:1691 time:11581s shard-snb total:3467 pass:1365 dwarn:1 dfail:0 fail:1 skip:2100 time:6947s
Blacklisted hosts:
shard-kbl total:2994 pass:1678 dwarn:2 dfail:1 fail:13 skip:1293 time:7175s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_8293/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx