drm/i915: Separate GuC/HuC specific functionality from intel_uc
Subsystems (2)
PATCH 1/8 drm/i915: Separate GuC/HuC specific functionality from intel_uc
Removed unnecessary intel_uc.h includes as it is present in i915_drv.h. Created intel_guc.c and intel_guc.h for placing GuC specific code. Created intel_huc.h to refer to HuC specific functions.
v2: Prepared intel_uc_common.h. huc_auth code declaration adjusted. Moved enable/disable_communication to intel_uc.c (Michal)
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_guc_submission.c | 1 - drivers/gpu/drm/i915/intel_guc.c | 193 ++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 200 +++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc_loader.c | 1 - drivers/gpu/drm/i915/intel_huc.c | 50 +----- drivers/gpu/drm/i915/intel_huc.h | 38 +++++ drivers/gpu/drm/i915/intel_uc.c | 128 +-------------- drivers/gpu/drm/i915/intel_uc.h | 254 +---------------------------- drivers/gpu/drm/i915/intel_uc_common.h | 101 ++++++++++++ 11 files changed, 545 insertions(+), 423 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_guc.c create mode 100644 drivers/gpu/drm/i915/intel_guc.h create mode 100644 drivers/gpu/drm/i915/intel_huc.h create mode 100644 drivers/gpu/drm/i915/intel_uc_common.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -59,6 +59,7 @@ i915-y += i915_cmd_parser.o \ # general-purpose microcontroller (GuC) support i915-y += intel_uc.o \ + intel_guc.o \ intel_guc_ct.o \ intel_guc_log.o \ intel_guc_loader.o \
drivers/gpu/drm/i915/i915_drv.c +0 -1
@@ -50,7 +50,6 @@#include "i915_trace.h" #include "i915_vgpu.h" #include "intel_drv.h" -#include "intel_uc.h" static struct drm_driver driver;
drivers/gpu/drm/i915/i915_guc_submission.c +0 -1
@@ -23,7 +23,6 @@*/ #include <linux/circ_buf.h> #include "i915_drv.h" -#include "intel_uc.h" #include <trace/events/dma_fence.h>
drivers/gpu/drm/i915/intel_guc.c new file +193 -0
193 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h new file +200 -0
200 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc_loader.c +0 -1
@@ -27,7 +27,6 @@* Alex Dai <[email protected]> */ #include "i915_drv.h" -#include "intel_uc.h" /** * DOC: GuC-specific firmware loader
drivers/gpu/drm/i915/intel_huc.c +4 -46
67 lines not on this page · raw message
drivers/gpu/drm/i915/intel_huc.h new file +38 -0
@@ -0,0 +1,38 @@ +/* +* Copyright © 2017 Intel Corporation +* +* Permission is hereby granted, free of charge, to any person obtaining a +* copy of this software and associated documentation files (the "Software"), +* to deal in the Software without restriction, including without limitation +* the rights to use, copy, modify, merge, publish, distribute, sublicense, +* and/or sell copies of the Software, and to permit persons to whom the +* Software is furnished to do so, subject to the following conditions: +* +* The above copyright notice and this permission notice (including the next +* paragraph) shall be included in all copies or substantial portions of the +* Software. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS +* IN THE SOFTWARE. +* +*/ +#ifndef _INTEL_HUC_H_ +#define _INTEL_HUC_H_ + +struct intel_huc { +/* Generic uC firmware management */ +struct intel_uc_fw fw; + +/* HuC-specific additions */ +}; + +/* intel_huc.c */ +void intel_huc_select_fw (struct intel_huc *huc); +void intel_huc_init_hw (struct intel_huc *huc); +void intel_huc_auth (struct intel_huc *huc); +#endif
drivers/gpu/drm/i915/intel_uc.c +5 -123
181 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +3 -251
259 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc_common.h new file +101 -0
101 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/8 drm/i915/guc: Fix GuC interaction in reset/suspend scenarios
Tearing down of guc_ggtt_invalidate/guc_interrupts/guc_communication setup should happen towards end of reset/suspend as these are setup back again during recovery/resume.
Prepared helpers intel_guc_pause and intel_guc_unpause that will do teardown/bringup of this setup along with suspension/resumption of GuC if loaded. Moved intel_guc_suspend, intel_guc_resume to intel_guc.c.
--- drivers/gpu/drm/i915/i915_drv.c | 6 +- drivers/gpu/drm/i915/i915_gem.c | 6 +- drivers/gpu/drm/i915/i915_guc_submission.c | 52 ---------- drivers/gpu/drm/i915/intel_guc.c | 152 +++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.h | 9 +- drivers/gpu/drm/i915/intel_uc.c | 29 +----- 6 files changed, 169 insertions(+), 85 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -4
@@ -1690,8 +1690,6 @@ static int i915_drm_resume(struct drm_device *dev) }mutex_unlock (&dev->struct_mutex); -intel_guc_resume (dev_priv); -intel_modeset_init_hw (dev);spin_lock_irq (&dev_priv->irq_lock);
@@ -2486,7 +2484,7 @@ static int intel_runtime_suspend(struct device *kdev)*/ i915_gem_runtime_suspend (dev_priv); -intel_guc_suspend (dev_priv); +intel_guc_runtime_suspend (&dev_priv->guc);intel_runtime_pm_disable_interrupts (dev_priv);
@@ -2571,7 +2569,7 @@ static int intel_runtime_resume(struct device *kdev)if (intel_uncore_unclaimed_mmio (dev_priv))DRM_DEBUG_DRIVER ("Unclaimed access during suspend, bios?\n" ); -intel_guc_resume (dev_priv); +intel_guc_runtime_resume (&dev_priv->guc);if (IS_GEN9_LP (dev_priv)) {bxt_disable_dc9 (dev_priv);
drivers/gpu/drm/i915/i915_gem.c +4 -2
@@ -2842,6 +2842,8 @@ int i915_gem_reset_prepare(struct drm_i915_private *dev_priv)i915_gem_revoke_fences (dev_priv); +intel_guc_reset_prepare (&dev_priv->guc); +return err; }
@@ -4576,8 +4578,6 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)i915_gem_contexts_lost (dev_priv);mutex_unlock (&dev->struct_mutex); -intel_guc_suspend (dev_priv); -cancel_delayed_work_sync (&dev_priv->gpu_error.hangcheck_work);cancel_delayed_work_sync (&dev_priv->gt.retire_work);
@@ -4593,6 +4593,8 @@ int i915_gem_suspend(struct drm_i915_private *dev_priv)WARN_ON (dev_priv->gt.awake);WARN_ON (!intel_engines_are_idle (dev_priv)); +intel_guc_system_suspend (&dev_priv->guc); +/* * Neither the BIOS, ourselves or any other kernel * expects the system to be in execlists mode on startup,
drivers/gpu/drm/i915/i915_guc_submission.c +0 -52
55 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.c +152 -0
155 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h +7 -2
@@ -162,6 +162,13 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)int intel_guc_send_nop (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_send_mmio (struct intel_guc *guc,const u32 *action,u32 len);void intel_guc_auth_huc (struct intel_guc *guc,struct intel_uc_fw *huc_fw); +int intel_guc_enable_communication (struct intel_guc *guc); +void intel_guc_disable_communication (struct intel_guc *guc); +void intel_guc_reset_prepare (struct intel_guc *guc); +int intel_guc_runtime_suspend (struct intel_guc *guc); +int intel_guc_runtime_resume (struct intel_guc *guc); +int intel_guc_system_suspend (struct intel_guc *guc); +int intel_guc_system_resume (struct intel_guc *guc);static inline int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len)
@@ -177,8 +184,6 @@ static inline void intel_guc_notify(struct intel_guc *guc)/* intel_guc_loader.c */ int intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc); -int intel_guc_suspend (struct drm_i915_private *dev_priv); -int intel_guc_resume (struct drm_i915_private *dev_priv);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */
drivers/gpu/drm/i915/intel_uc.c +4 -25
@@ -265,27 +265,6 @@ static void guc_free_load_err_log(struct intel_guc *guc)i915_gem_object_put (guc->load_err_log); } -static int guc_enable_communication (struct intel_guc *guc) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); - -if (HAS_GUC_CT (dev_priv)) -return intel_guc_enable_ct (guc); - - guc->send = intel_guc_send_mmio; -return 0 ; -} - -static void guc_disable_communication (struct intel_guc *guc) -{ -struct drm_i915_private *dev_priv =guc_to_i915 (guc); - -if (HAS_GUC_CT (dev_priv)) -intel_guc_disable_ct (guc); - - guc->send = intel_guc_send_nop; -} -int intel_uc_init_hw (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc;
@@ -295,7 +274,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)if (!i915.enable_guc_loading)return 0 ; -guc_disable_communication (guc); +intel_guc_disable_communication (guc);gen9_reset_guc_interrupts (dev_priv);/* We need to notify the guc whenever we change the GGTT */
@@ -347,7 +326,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)intel_guc_init_send_regs (guc); - ret =guc_enable_communication (guc); + ret =intel_guc_enable_communication (guc);if (ret) goto err_log_capture;
@@ -373,7 +352,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)* marks the GPU as wedged until reset). */ err_interrupts: -guc_disable_communication (guc); +intel_guc_disable_communication (guc);gen9_disable_guc_interrupts (dev_priv); err_log_capture:guc_capture_load_err_log (guc);
@@ -410,7 +389,7 @@ void intel_uc_fini_hw(struct drm_i915_private *dev_priv)if (i915.enable_guc_submission)i915_guc_submission_disable (dev_priv); -guc_disable_communication (&dev_priv->guc); +intel_guc_disable_communication (&dev_priv->guc);if (i915.enable_guc_submission) {gen9_disable_guc_interrupts (dev_priv);
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 3/8 drm/i915/guc: Fix GuC HW/SW state cleanup in unload path
In reply to Sagar Arun KambleTeardown of GuC HW/SW state was not properly done in unload path. During unload, we can rely on intel_guc_reset_prepare being done as part of i915_gem_suspend for disabling GuC interfaces.
We will have to disable GuC submission prior to suspend as that involves communication with GuC to destroy doorbell. So intel_uc_fini_hw has to be called as part of i915_gem_suspend during unload as that really takes care of finishing the GuC operations. Created new parameter for i915_gem_suspend to handle unload/suspend path w.r.t gem and GuC suspend. GuC related allocations are cleaned up as part of intel_uc_cleanup_hw.
v2: Prepared i915_gem_unload. (Michal)
--- drivers/gpu/drm/i915/i915_drv.c | 6 +-- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/i915_gem.c | 79 ++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_guc.c | 13 ++++++ drivers/gpu/drm/i915/intel_guc.h | 1 + drivers/gpu/drm/i915/intel_uc.c | 14 +++--- drivers/gpu/drm/i915/intel_uc_common.h | 1 + 7 files changed, 103 insertions(+), 12 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +3 -3
@@ -601,7 +601,7 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)i915_gem_drain_workqueue (dev_priv);mutex_lock (&dev_priv->drm.struct_mutex); -intel_uc_fini_hw (dev_priv); +intel_uc_cleanup_hw (dev_priv);i915_gem_cleanup_engines (dev_priv);i915_gem_contexts_fini (dev_priv);i915_gem_cleanup_userptr (dev_priv);
@@ -682,7 +682,7 @@ static int i915_load_modeset_init(struct drm_device *dev)return 0 ; cleanup_gem: -if (i915_gem_suspend (dev_priv)) +if (i915_gem_unload (dev_priv))DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );i915_gem_fini (dev_priv); cleanup_uc:
@@ -1375,7 +1375,7 @@ void i915_driver_unload(struct drm_device *dev)i915_driver_unregister (dev_priv); -if (i915_gem_suspend (dev_priv)) +if (i915_gem_unload (dev_priv))DRM_ERROR ("failed to idle hardware; continuing to unload!\n" );intel_display_power_get (dev_priv,POWER_DOMAIN_INIT );
drivers/gpu/drm/i915/i915_drv.h +1 -0
@@ -3606,6 +3606,7 @@ void i915_gem_reset_engine(struct intel_engine_cs *engine,int i915_gem_wait_for_idle (struct drm_i915_private *dev_priv,unsigned int flags);int __must_check i915_gem_suspend (struct drm_i915_private *dev_priv); +int __must_check i915_gem_unload (struct drm_i915_private *dev_priv);void i915_gem_resume (struct drm_i915_private *dev_priv);int i915_gem_fault (struct vm_fault *vmf); int i915_gem_object_wait(struct drm_i915_gem_object *obj,
drivers/gpu/drm/i915/i915_gem.c +79 -0
85 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.c +13 -0
@@ -343,3 +343,16 @@ int intel_guc_system_resume(struct intel_guc *guc)*/ return ret; } + +void intel_guc_fini (struct intel_guc *guc) +{ +struct drm_i915_private *dev_priv =guc_to_i915 (guc); +struct drm_device *dev = &dev_priv->drm; + +if (i915.enable_guc_submission) { +mutex_lock (&dev->struct_mutex); +i915_guc_submission_disable (dev_priv); +mutex_unlock (&dev->struct_mutex); +intel_guc_reset_prepare (guc); + } +}
drivers/gpu/drm/i915/intel_guc.h +1 -0
@@ -169,6 +169,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)int intel_guc_runtime_resume (struct intel_guc *guc);int intel_guc_system_suspend (struct intel_guc *guc);int intel_guc_system_resume (struct intel_guc *guc); +void intel_guc_fini (struct intel_guc *guc);static inline int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len)
drivers/gpu/drm/i915/intel_uc.c +5 -9
@@ -381,20 +381,16 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)void intel_uc_fini_hw (struct drm_i915_private *dev_priv) { +intel_guc_fini (&dev_priv->guc); +} + +void intel_uc_cleanup_hw (struct drm_i915_private *dev_priv) +{guc_free_load_err_log (&dev_priv->guc);if (!i915.enable_guc_loading)return ;if (i915.enable_guc_submission) -i915_guc_submission_disable (dev_priv); - -intel_guc_disable_communication (&dev_priv->guc); - -if (i915.enable_guc_submission) { -gen9_disable_guc_interrupts (dev_priv);i915_guc_submission_fini (dev_priv); - } - -i915_ggtt_disable_guc (dev_priv); }
drivers/gpu/drm/i915/intel_uc_common.h +1 -0
@@ -97,5 +97,6 @@ struct intel_uc_fw {void intel_uc_fini_fw (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); +void intel_uc_cleanup_hw (struct drm_i915_private *dev_priv);#endif
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 4/8 drm/i915/guc: Disable critical logging in GuC by default from GuC v9
In reply to Sagar Arun Kamblecritical logging in GuC to enable capturing minimal important logs in production systems.
i915.guc_log_level controls the verbosity and logging in GuC for logs other than critical logs. By default, logging in GuC is disabled through i915.guc_log_level.
This patch introduces new kernel param i915.enable_guc_critical_logging. For Linux release builds, if needed critical GuC logs can be enabled separately through this parameter. GuC log snapshot captured in error state will have these minimal critical events logged.
Default value for this parameter is currently set to false. This patch updates the initialization parameter sent during GuC load to disable critical logging unless i915.guc_log_level is set to enable logging and ensures it is enabled/disabling while enabling/disabling through debugfs based on i915.enable_guc_critical_logging.
v2: Emulating GuC critical logging through i915.guc_log_level. Setting this to 0 will make GuC critical logging ON and setting it to 1-4 will communicate log level of 0-3 to GuC.
--- drivers/gpu/drm/i915/i915_params.c | 3 ++- drivers/gpu/drm/i915/intel_guc_fwif.h | 24 +++++++++++++++++++++--- drivers/gpu/drm/i915/intel_guc_loader.c | 31 +++++++++++++++++++++++++++---- drivers/gpu/drm/i915/intel_guc_log.c | 26 +++++++++++++++++++++++--- 4 files changed, 73 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -1
@@ -234,7 +234,8 @@ struct i915_params i915 __read_mostly = {module_param_named (guc_log_level, i915.guc_log_level, int,0400 );MODULE_PARM_DESC (guc_log_level, -"GuC firmware logging level (-1:disabled (default), 0-3:enabled)" ); +"GuC firmware logging level (-1:disabled (default), " +"0: Critical Logging enabled, 1-4:Normal Logging enabled)" );module_param_named_unsafe (guc_firmware_path, i915.guc_firmware_path, charp,0400 ); MODULE_PARM_DESC(guc_firmware_path,
drivers/gpu/drm/i915/intel_guc_fwif.h +21 -3
@@ -122,9 +122,15 @@#define GUC_LOG_VERBOSITY_MED (1 << GUC_LOG_VERBOSITY_SHIFT)#define GUC_LOG_VERBOSITY_HIGH (2 << GUC_LOG_VERBOSITY_SHIFT)#define GUC_LOG_VERBOSITY_ULTRA (3 << GUC_LOG_VERBOSITY_SHIFT) -/* Verbosity range-check limits, without the shift */ +/* +* Verbosity range-check limits, without the shift. +* GuC log verbosity supported by firmware are 0 to 3. +* However, in order to treat the critical GuC logging similar to +* other logging levels we have incresed GuC verbosity levels by 1 +* with Level 0 corresponding to critical GuC logging. +*/ #define GUC_LOG_VERBOSITY_MIN 0 -#define GUC_LOG_VERBOSITY_MAX 3 +#define GUC_LOG_VERBOSITY_MAX 4#define GUC_LOG_VERBOSITY_MASK 0x0000000f#define GUC_LOG_DESTINATION_MASK (3 << 4)#define GUC_LOG_DISABLED (1 << 6)
@@ -132,6 +138,7 @@#define GUC_WQ_TRACK_ENABLED (1 << 8)#define GUC_ADS_ENABLED (1 << 9)#define GUC_DEBUG_RESERVED (1 << 10) +#define GUC_V9_CRITICAL_LOGGING_DISABLED (1 << 10)#define GUC_ADS_ADDR_SHIFT 11#define GUC_ADS_ADDR_MASK 0xfffff800
@@ -139,6 +146,16 @@#define GUC_CTL_MAX_DWORDS (SOFT_SCRATCH_COUNT - 2)/* [1..14] */ +/* +* Critical logging in GuC is to be enabled always from GuC v9+. +* (for KBL - v9.39+) +*/ +#define NEEDS_GUC_CRITICAL_LOGGING (dev_priv, guc_fw) \ + (((IS_SKYLAKE(dev_priv) || IS_BROXTON(dev_priv)) && \ + guc_fw->major_ver_found >= 9) || \ + (IS_KABYLAKE(dev_priv) && guc_fw->major_ver_found >= 9 && \ + guc_fw->minor_ver_found >= 39)) +/** * DOC: GuC Firmware Layout *
@@ -539,7 +556,8 @@ struct guc_log_buffer_state { u32 logging_enabled:1; u32 reserved1:3; u32 verbosity:4; - u32 reserved2:24; + u32 critical_logging_enabled:1; + u32 reserved2:23; };u32 value; } __packed;
drivers/gpu/drm/i915/intel_guc_loader.c +27 -4
@@ -106,6 +106,8 @@ static u32 get_core_family(struct drm_i915_private *dev_priv)static void guc_params_init (struct drm_i915_private *dev_priv) {struct intel_guc *guc = &dev_priv->guc; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; +bool enable_critical_logging = false;u32 params[GUC_CTL_MAX_DWORDS ];int i;
@@ -130,11 +132,32 @@ static void guc_params_init(struct drm_i915_private *dev_priv) params[GUC_CTL_LOG_PARAMS ] = guc->log.flags; + params[GUC_CTL_DEBUG ] =GUC_LOG_DISABLED ; + +/* +* GuC has critical logging level which is currently not being enabled +* through other log level interfaces. We are emulating that by making +* i915.guc_log_level value 1 more than GuC's log level values to make +* value 0 correspond to GuC critical logging level. Once GuC fixes +* the implementation this needs to be updated. +*/ if (i915.guc_log_level >=0 ) { - params[GUC_CTL_DEBUG ] = - i915.guc_log_level <<GUC_LOG_VERBOSITY_SHIFT ; - }else - params[GUC_CTL_DEBUG ] =GUC_LOG_DISABLED ; +if (i915.guc_log_level >=1 ) { + params[GUC_CTL_DEBUG ] = (i915.guc_log_level-1 ) << +GUC_LOG_VERBOSITY_SHIFT ; + params[GUC_CTL_DEBUG ] &= ~GUC_LOG_DISABLED ; + } + enable_critical_logging = true; + } + +if (NEEDS_GUC_CRITICAL_LOGGING (dev_priv, guc_fw)) { +if (enable_critical_logging) + params[GUC_CTL_DEBUG ] &= + ~GUC_V9_CRITICAL_LOGGING_DISABLED ; +else + params[GUC_CTL_DEBUG ] |= +GUC_V9_CRITICAL_LOGGING_DISABLED ; + }/* If GuC submission is enabled, set up additional parameters here */ if (i915.enable_guc_submission) {
drivers/gpu/drm/i915/intel_guc_log.c +23 -3
@@ -589,8 +589,8 @@ void intel_guc_log_destroy(struct intel_guc *guc)int i915_guc_log_control (struct drm_i915_private *dev_priv,u64 control_val) {struct intel_guc *guc = &dev_priv->guc; - -union guc_log_control log_param; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; +union guc_log_control log_param, tmp;int ret; log_param.value = control_val;
@@ -603,14 +603,34 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)if (!log_param.logging_enabled && (i915.guc_log_level <0 ))return 0 ; +if (NEEDS_GUC_CRITICAL_LOGGING (dev_priv, guc_fw)) { + tmp.value = log_param.value; +if (log_param.logging_enabled) { + log_param.critical_logging_enabled =1 ; +if (log_param.verbosity ==GUC_LOG_VERBOSITY_MIN ) + log_param.logging_enabled =0 ; +else + log_param.verbosity -=1 ; + } + } + ret =guc_log_control (guc, log_param.value);if (ret <0 ) {DRM_DEBUG_DRIVER ("guc_logging_control action failed %d\n" , ret);return ret; } +if (NEEDS_GUC_CRITICAL_LOGGING (dev_priv, guc_fw)) + log_param.logging_enabled = tmp.logging_enabled; +if (log_param.logging_enabled) { - i915.guc_log_level = log_param.verbosity; +if (NEEDS_GUC_CRITICAL_LOGGING (dev_priv, guc_fw)) { +if (tmp.verbosity ==GUC_LOG_VERBOSITY_MIN ) + i915.guc_log_level =0 ; +else + i915.guc_log_level = log_param.verbosity +1 ; + }else + i915.guc_log_level = log_param.verbosity;/* If log_level was set as -1 at boot time, then the relay channel file * wouldn't have been created by now and interrupts also would not have
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 5/8 drm/i915/guc: Change default GuC FW for SKL to v9.33
In reply to Sagar Arun KambleThis patch makes v9.33 firmware as default firmware for SKL. This update includes (since v6.1):
- HuC RSA Keys updated.
- Adding per engine preemption support in GuC scheduler
- Minor bug fixes.
- Added support to log media reset count for host to read it
- Sub-feature level control for power management features.
- Minor clean-up for power management interface.
- Unified power management interface and scheduler interface into 1 file using same version.
- Bug Fix for multi context scheduler flag.
- DCC spec changes for BXT + DCT enabling
- SB based Pre-ETM/ETM flow enabling for debug signed GuC/HuC
- Moving GuC non_critical r/w data to lower SRAM 64KB
- Media engine Reset fix. Correctly marking context for resubmission in Media Reset case.
- ABT Disable bug fix. Disabled Evaluation mode on context change.
- Async FW in Engine Schedule feature (not enabled from KMD)
- GuC clean up to align developer build in line to production build.
- DCC consistency fix for SKL
- Disable ARAT interrupt before programming ARAT delta.
- Memory range check in Parse to avoid failure due to overflow.
- Enabled WA for MSGCH hang issue
- Clear forcewake in CSB when SQ is empty.
- Move UkGuckmdInterface.h file from 2016 folders to common 2016 folder.
- This is file location change.No functional change done as part of this check in.
- Enable decoupled freq for SKL GT4
- 3 tries of wake request needed from GuC2CSME for ME to wake up. Request has come from ME spec
- During reset one parameter was not getting accounted
- Enabling Guc Log changes for ultra low logging for OCA
- Enabling build failure check to catch critical section overflow.
- Disable build.bat redundant prints.
- Move few least used functions to non-critical section.
- Rearrange GuC documentation folder structure.
- Synchronize SLPC internal debug interface with other branches.
- Fixing Issue with Default Guc Log changes for OCA using special Control Bit
--- drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
@@ -51,8 +51,8 @@* */ -#define SKL_FW_MAJOR 6 -#define SKL_FW_MINOR 1 +#define SKL_FW_MAJOR 9 +#define SKL_FW_MINOR 33#define BXT_FW_MAJOR 8#define BXT_FW_MINOR 7
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 5/8] drm/i915/guc: Change default GuC FW for SKL to v9.33
Hi Sagar,
Quoted 2 lines · Sagar Arun Kamble
This patch makes v9.33 firmware as default firmware for SKL. This update includes (since v6.1):
https://01.org/linuxgraphics/downloads/firmware does not include v9.33, only 6.1.
Please do not push this patch until it has at least made it out for public release, and preferably into a linux-firmware tree as well.
Cheers,
Daniel
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 6/8 drm/i915/guc: Change default GuC FW for BXT to v9.29
In reply to Sagar Arun KambleThis patch makes v9.29 firmware as default firmware for BXT. This update includes (since v8.7):
- Added support to log media reset count for host to read it
- BXT WA for fixing MTP hangs. WaDisableDOPRenderClkGatingAtSubmit
- Sub-feature level control for power management features.
- Minor clean-up for power management interface.
- Unified power management interface and scheduler interface into 1 file using same version.
- Bug Fix for multi context scheduler flag.
- DCC spec changes for BXT + DCT enabling
- Springboard based Pre-ETM/ETM flow enabling for debug signed GuC/HuC
- Moving GuC non_critical r/w data to lower SRAM 64KB
- Enabled IBC for BXT
- Media engine Reset fix. Correctly marking context for resubmission in Media Reset case.
- SLPC Dynamic RPe fix to resolve issues where incorrect frequency was set.
- ABT Disable bug fix. Disabled Evaluation mode on context change.
- GuC clean up to align developer build in line to production build.
- Disable ARAT interrupt before programming ARAT delta.
- Memory range check in Parse to avoid failure due to overflow.
- Clear forcewake in CSB when SQ is empty.
- SLPC IBC 1.6 for APL to ensure multiplier does not cap IA below Pe.
- Move UkGuckmdInterface.h file from 2016 folders to common 2016 folder.
- This is file location change. No functional change done as part of this check in.
- 3 tries of wake request needed from GuC2CSME for ME to wake up. Request has come from ME spec
- During reset one parameter was not getting accounted
- Enabling Guc Log changes for ultra low logging for OCA
- Disable build.bat redundant prints.
- Move few least used functions to non-critical section.
- Rearrange GuC documentation folder structure.
- Fixing Issue with Default Guc Log changes for OCA using special Control Bit
--- drivers/gpu/drm/i915/intel_guc_loader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +2 -2
@@ -54,8 +54,8 @@#define SKL_FW_MAJOR 9#define SKL_FW_MINOR 33 -#define BXT_FW_MAJOR 8 -#define BXT_FW_MINOR 7 +#define BXT_FW_MAJOR 9 +#define BXT_FW_MINOR 29#define KBL_FW_MAJOR 9#define KBL_FW_MINOR 14
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 7/8 drm/i915/guc: Change default GuC FW for KBL to v9.39
In reply to Sagar Arun KambleThis patch makes v9.39 firmware as default firmware for KBL. This update includes (since v9.14):
- DCC spec changes for BXT + DCT enabling
- Bug Fix for power conservation feature SLPC_DCC
- Scheduler 1-element submission during DCC cycles.
- SB based Pre-ETM/ETM flow enabling for debug signed GuC/HuC
- Moving GuC non_critical r/w data to lower SRAM 64KB
- Media engine Reset fix. Correctly marking context for resubmission in Media Reset case.
- ABT Disable bug fix. Disabled Evaluation mode on context change.
- Async FW in Engine Schedule feature (not enabled from KMD)
- GuC clean up to align developer build in line to production build.
- Disable ARAT interrupt before programming ARAT delta.
- Memory range check in Parse to avoid failure due to overflow.
- GuC Msg Channel Hang WA - Stall GUC for mmio access when IDI is low during CPD flow.
- Fix for submit queue over flow issue
- Enabling IBC on KBL GT3 15W, GT4 45W
- Disabling wrong device ID WA in production signed kernel
- Enabling WA for MSGCH hang issue upto required KBL stepping
- Clear forcewake in CSB when SQ is empty.
- 3Tries of GuC2CSME wake request
- During reset one parameter was not getting accounted
- Disable DCC 1-elem mode submission
- Move UkGuckmdInterface.h file from 2016 folders to common 2016 folder.
- This is file location change.No functional change done as part of this check in.
- Enabling Guc Log changes for ultra low logging for OCA
- Enabling Dynamic Render Power Well Hysteresis Programming for Compute Worklaods
- Enabling build failure check to catch critical section overflow.
- Disable build.bat redundant prints.
- Move few least used functions to non-critical section.
- Rearrange GuC documentation folder structure.
- Synchronize SLPC internal debug interface with other branches.
- Fixing Issue with Default Guc Log changes for OCA using special Control Bit
- Aggressive DCC implementation for supported platforms.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -1
@@ -58,7 +58,7 @@#define BXT_FW_MINOR 29#define KBL_FW_MAJOR 9 -#define KBL_FW_MINOR 14 +#define KBL_FW_MINOR 39#define GLK_FW_MAJOR 10#define GLK_FW_MINOR 56
Signature · 6 lines
1.9.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 8/8 HAX enable guc submission for CI
In reply to Sagar Arun KambleFrom: Chris Wilson <[email protected]>
--- drivers/gpu/drm/i915/i915_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -2
@@ -56,8 +56,8 @@ struct i915_params i915 __read_mostly = { .verbose_state_checks = 1, .nuclear_pageflip = 0, .edp_vswing = 0, - .enable_guc_loading = 0, - .enable_guc_submission = 0, + .enable_guc_loading = 1, + .enable_guc_submission = 1, .guc_log_level = -1, .guc_firmware_path = NULL, .huc_firmware_path = NULL,
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: failure for series starting with [1/8] drm/i915: Separate GuC/HuC specific functionality from intel_uc
In reply to Sagar Arun Kamble== Series Details ==
== Series Details ==
Series: series starting with [1/8] drm/i915: Separate GuC/HuC specific functionality from intel_uc
URL : https://patchwork.freedesktop.org/series/29420/
State : failure
== Summary ==
Series 29420v1 series starting with [1/8] drm/i915: Separate GuC/HuC specific functionality from intel_uc
https://patchwork.freedesktop.org/api/1.0/series/29420/revisions/1/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test gem_sync:
Subgroup basic-store-each:
pass -> FAIL (fi-skl-6260u)
pass -> FAIL (fi-skl-6700k)
pass -> FAIL (fi-skl-6770hq)
pass -> FAIL (fi-skl-gvtdvm)
pass -> FAIL (fi-skl-x1585l)
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
fail -> PASS (fi-snb-2600) fdo#100215
Test drv_module_reload:
Subgroup basic-reload:
pass -> DMESG-WARN (fi-glk-2a)
Subgroup basic-no-display:
pass -> DMESG-WARN (fi-glk-2a)
Subgroup basic-reload-inject:
pass -> DMESG-WARN (fi-glk-2a)fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:456s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:360s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:563s fi-bwr-2160 total:279 pass:184 dwarn:0 dfail:0 fail:0 skip:95 time:253s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:506s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:519s fi-byt-n2820 total:279 pass:250 dwarn:1 dfail:0 fail:0 skip:28 time:514s fi-elk-e7500 total:279 pass:230 dwarn:0 dfail:0 fail:0 skip:49 time:435s fi-glk-2a total:279 pass:257 dwarn:3 dfail:0 fail:0 skip:19 time:615s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:449s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:424s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:426s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:494s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:470s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:463s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:580s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:584s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:520s fi-skl-6260u total:279 pass:268 dwarn:0 dfail:0 fail:1 skip:10 time:459s fi-skl-6700k total:279 pass:260 dwarn:0 dfail:0 fail:1 skip:18 time:470s fi-skl-6770hq total:279 pass:268 dwarn:0 dfail:0 fail:1 skip:10 time:489s fi-skl-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:1 skip:13 time:434s fi-skl-x1585l total:279 pass:267 dwarn:0 dfail:0 fail:1 skip:11 time:473s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:546s fi-snb-2600 total:279 pass:248 dwarn:0 dfail:0 fail:2 skip:29 time:402s
fi-bdw-gvtdvm failed to connect after reboot
c52f5322612a688655751c4dd44baa43e39d4dec drm-tip: 2017y-08m-26d-11h-41m-06s UTC integration manifest 3c3e0c1856da HAX enable guc submission for CIeea7658646db drm/i915/guc: Change default GuC FW for KBL to v9.39c333427db680 drm/i915/guc: Change default GuC FW for BXT to v9.29301e32c4fc6f drm/i915/guc: Change default GuC FW for SKL to v9.33f6bb0d1cb2c7 drm/i915/guc: Disable critical logging in GuC by default from GuC v9 a59f7ca55717 drm/i915/guc: Fix GuC HW/SW state cleanup in unload path9074d00deb1f drm/i915/guc: Fix GuC interaction in reset/suspend scenarios d4191b2e5cf2 drm/i915: Separate GuC/HuC specific functionality from intel_uc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5504/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx