GuC Scrub vol. 1
Subsystems (2)
v7 cover GuC Scrub vol. 1
Reasoning
=========
General GuC/HuC cleanup simplifying logic and moving chunks around as the area got pretty rusty.
This is the first part of effort to clean it up.
A lot of logic were extracted from intel_guc_load() to other functions - it did not only handle the actual loading but had WA implementations and the code that enabled submission baked into it.
Param sanitization and firmware selection are also extracted and streamlined.
Naming:
=======
I try to adhere to subject_verb_object naming and parameters.
e.g. for intel_guc_init_fw:
* intel_guc is the subject, it determines the first argument taken
* init is the verb
* fw is the object
intel_guc_ functions take intel_guc struct pointer intel_huc_ functions take intel_guc struct pointer
There's no struct intel_uc, so this family of functions take dev_priv.
New structure looks like this:
==============================
1. sanitize params - module params + selecting firmware happens at this stage
* this is done mostly in patch 8, and 9
* some cleanups happen along th way (e.g. pushing check ups, and changeing prototypes)
* patch 10 introduces new modules params to overload used firmware
2. init_fw - requesting and initial parsing of firmware
* firmware is read and parsed, we also check for versions to match
3. init_hw - firmware is loaded into hardware and hardware is initalized
* uc_init_hw has now all logic when it comes to retires and resetting fw to vanilla state
* huc_init_hw and guc_init_hw no longer care about each other and submission
v2: rebase after HuC merge + feedback
v3: even more renaming that aims to make things more semantic
v4: some naming improvements, some bikeshedding
v5: coding style, some cleanup
module params for huc and guc firmware path, separate fw select step from actual prepare
v6: feedback + pushed a couple of patches with r-b down the stack
v7: reorder, rename, rebase
Arkadiusz Hiler (10):
drm/i915/uc: Drop superfluous externs in intel_uc.h drm/i915/huc: Add huc_to_i915
drm/i915/uc: Rename intel_?uc_{setup,load}() to _init_hw() drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c drm/i915/uc: Introduce intel_uc_init_fw() drm/i915/guc: Extract param logic form guc_init_fw() drm/i915/guc: Simplify intel_guc_init_hw() drm/i915/uc: Simplify firmware path handling drm/i915/uc: Separate firmware selection and preparation drm/i915/uc: Add params for specifying firmware
drivers/gpu/drm/i915/i915_drv.c | 5 +- drivers/gpu/drm/i915/i915_drv.h | 5 + drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 10 + drivers/gpu/drm/i915/i915_params.h | 2 + drivers/gpu/drm/i915/intel_guc_loader.c | 389 +++++--------------------------- drivers/gpu/drm/i915/intel_huc.c | 109 ++++----- drivers/gpu/drm/i915/intel_uc.c | 287 +++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 25 +- 9 files changed, 421 insertions(+), 413 deletions(-)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 1/10 drm/i915/uc: Drop superfluous externs in intel_uc.h
Externs are implicit and we generally try to avoid them.
--- drivers/gpu/drm/i915/intel_uc.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/intel_uc.h +6 -6
@@ -189,12 +189,12 @@ int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);/* intel_guc_loader.c */ -extern void intel_guc_init (struct drm_i915_private *dev_priv); -extern int intel_guc_setup (struct drm_i915_private *dev_priv); -extern void intel_guc_fini (struct drm_i915_private *dev_priv); -extern const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status); -extern int intel_guc_suspend (struct drm_i915_private *dev_priv); -extern int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_guc_init (struct drm_i915_private *dev_priv); +int intel_guc_setup (struct drm_i915_private *dev_priv); +void intel_guc_fini (struct drm_i915_private *dev_priv); +const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status); +int intel_guc_suspend (struct drm_i915_private *dev_priv); +int intel_guc_resume (struct drm_i915_private *dev_priv);void intel_uc_fw_fetch (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 2/10 drm/i915/huc: Add huc_to_i915
In reply to Arkadiusz HilerUsed to obtain "dev_priv" from huc struct pointer. We already have similar thing for guc.
--- drivers/gpu/drm/i915/i915_drv.h | 5 +++++ 1 file changed, 5 insertions(+)
drivers/gpu/drm/i915/i915_drv.h +5 -0
@@ -2546,6 +2546,11 @@ static inline struct drm_i915_private *guc_to_i915(struct intel_guc *guc) return container_of(guc, struct drm_i915_private, guc); } +static inline struct drm_i915_private *huc_to_i915 (struct intel_huc *huc) +{ + return container_of(huc, struct drm_i915_private, huc); +} +/* Simple iterator over all initialised engines */ #define for_each_engine (engine__, dev_priv__, id__) \ for ((id__) = 0; \
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 3/10 drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw()
In reply to Arkadiusz HilerGuC historically has two "startup" functions called _init() and _setup()
Then HuC came with it's _init() and _load().
This commit renames intel_guc_setup() and intel_huc_load() to *uc_init_hw() as they called from the i915_gem_init_hw().
The aim is to be consistent in that entry points called during particular driver init phases (e.g. init_hw) are all suffixed by that phase. When reading the leaf functions, it should be clear at what stage during the driver load it is called and therefore what operations are legal at that point.
Also, since the functions start with intel_guc and intel_huc they take appropiate structure.
v2: commit message update (Chris Wilson)
v3: change taken parameters to be more "semantic" (M. Wajdeczko)
--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 44 ++++++++++++++++----------------- drivers/gpu/drm/i915/intel_huc.c | 44 ++++++++++++++++----------------- drivers/gpu/drm/i915/intel_uc.h | 4 +-- 4 files changed, 47 insertions(+), 47 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -4454,7 +4454,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)intel_mocs_init_l3cc_table (dev_priv);/* We can't enable contexts until all firmware is loaded */ - ret =intel_guc_setup (dev_priv); + ret =intel_guc_init_hw (&dev_priv->guc);if (ret) goto out;
drivers/gpu/drm/i915/intel_guc_loader.c +22 -22
106 lines not on this page · raw message
drivers/gpu/drm/i915/intel_huc.c +22 -22
90 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -190,7 +190,7 @@ int intel_guc_sample_forcewake(struct intel_guc *guc);/* intel_guc_loader.c */ void intel_guc_init (struct drm_i915_private *dev_priv); -int intel_guc_setup (struct drm_i915_private *dev_priv); +int intel_guc_init_hw (struct intel_guc *guc);void intel_guc_fini (struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);
@@ -225,7 +225,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma)/* intel_huc.c */ void intel_huc_init (struct drm_i915_private *dev_priv);void intel_huc_fini (struct drm_i915_private *dev_priv); -int intel_huc_load (struct drm_i915_private *dev_priv); +int intel_huc_init_hw (struct intel_huc *huc);void intel_guc_auth_huc (struct drm_i915_private *dev_priv);#endif
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 4/10 drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
In reply to Arkadiusz HilerThe file fits better.
Additionally rename it to intel_uc_prepare_fw(), as the function does more than simple fetch.
obj cleanup in the function is also fixed (i.e. removed). In the fail scenario it was always 'put' but there's no possible flow that initializes the obj properly and then goes to the fail label.
v2: remove second declaration, reorder (M. Wajdeczko)
v3: non-trivial rebase
v4: remove obj cleanup in the fail scenario (C. Wilson)
--- drivers/gpu/drm/i915/intel_guc_loader.c | 137 +------------------------------- drivers/gpu/drm/i915/intel_huc.c | 2 +- drivers/gpu/drm/i915/intel_uc.c | 131 ++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 4 +- 4 files changed, 135 insertions(+), 139 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +1 -136
@@ -26,7 +26,6 @@* Dave Gordon <[email protected]> * Alex Dai <[email protected]> */ -#include <linux/firmware.h> #include "i915_drv.h" #include "intel_uc.h"
@@ -587,140 +586,6 @@ int intel_guc_init_hw(struct intel_guc *guc)return ret; } -void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, -struct intel_uc_fw *uc_fw) -{ -struct pci_dev *pdev = dev_priv->drm.pdev; -struct drm_i915_gem_object *obj; -const struct firmware *fw =NULL ; -struct uc_css_header *css; -size_t size; -int err; - -DRM_DEBUG_DRIVER ("before requesting firmware: uC fw fetch status %s\n" , -intel_uc_fw_status_repr (uc_fw->fetch_status)); - - err =request_firmware (&fw, uc_fw->path, &pdev->dev); -if (err) - goto fail; -if (!fw) - goto fail; - -DRM_DEBUG_DRIVER ("fetch uC fw from %s succeeded, fw %p\n" , - uc_fw->path, fw); - -/* Check the size of the blob before examining buffer contents */ -if (fw->size <sizeof (struct uc_css_header )) { -DRM_NOTE ("Firmware header is missing\n" ); - goto fail; - } - - css = (struct uc_css_header *)fw->data; - -/* Firmware bits always start from header */ - uc_fw->header_offset =0 ; - uc_fw->header_size = (css->header_size_dw - css->modulus_size_dw - - css->key_size_dw - css->exponent_size_dw) *sizeof (u32); - -if (uc_fw->header_size !=sizeof (struct uc_css_header )) { -DRM_NOTE ("CSS header definition mismatch\n" ); - goto fail; - } - -/* then, uCode */ - uc_fw->ucode_offset = uc_fw->header_offset + uc_fw->header_size; - uc_fw->ucode_size = (css->size_dw - css->header_size_dw) *sizeof (u32); - -/* now RSA */ -if (css->key_size_dw !=UOS_RSA_SCRATCH_MAX_COUNT ) { -DRM_NOTE ("RSA key size is bad\n" ); - goto fail; - } - uc_fw->rsa_offset = uc_fw->ucode_offset + uc_fw->ucode_size; - uc_fw->rsa_size = css->key_size_dw *sizeof (u32); - -/* At least, it should have header, uCode and RSA. Size of all three. */ - size = uc_fw->header_size + uc_fw->ucode_size + uc_fw->rsa_size; -if (fw->size < size) { -DRM_NOTE ("Missing firmware components\n" ); - goto fail; - } - -/* -* The GuC firmware image has the version number embedded at a well-known -* offset within the firmware blob; note that major / minor version are -* TWO bytes each (i.e. u16), although all pointers and offsets are defined -* in terms of bytes (u8). -*/ -switch (uc_fw->fw) { -case INTEL_UC_FW_TYPE_GUC : -/* Header and uCode will be loaded to WOPCM. Size of the two. */ - size = uc_fw->header_size + uc_fw->ucode_size; - -/* Top 32k of WOPCM is reserved (8K stack + 24k RC6 context). */ -if (size >intel_guc_wopcm_size (dev_priv)) { -DRM_ERROR ("Firmware is too large to fit in WOPCM\n" ); - goto fail; - } - uc_fw->major_ver_found = css->guc.sw_version >>16 ; - uc_fw->minor_ver_found = css->guc.sw_version &0xFFFF ; -break ; - -case INTEL_UC_FW_TYPE_HUC : - uc_fw->major_ver_found = css->huc.sw_version >>16 ; - uc_fw->minor_ver_found = css->huc.sw_version &0xFFFF ; -break ; - -default : -DRM_ERROR ("Unknown firmware type %d\n" , uc_fw->fw); - err = -ENOEXEC ; - goto fail; - } - -if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || - uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { -DRM_NOTE ("uC firmware version %d.%d, required %d.%d\n" , - uc_fw->major_ver_found, uc_fw->minor_ver_found, - uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); - err = -ENOEXEC ; - goto fail; - } - -DRM_DEBUG_DRIVER ("firmware version %d.%d OK (minimum %d.%d)\n" , - uc_fw->major_ver_found, uc_fw->minor_ver_found, - uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted); - -mutex_lock (&dev_priv->drm.struct_mutex); - obj =i915_gem_object_create_from_data (dev_priv, fw->data, fw->size); -mutex_unlock (&dev_priv->drm.struct_mutex); -if (IS_ERR_OR_NULL (obj)) { - err = obj ?PTR_ERR (obj) : -ENOMEM ; - goto fail; - } - - uc_fw->obj = obj; - uc_fw->size = fw->size; - -DRM_DEBUG_DRIVER ("uC fw fetch status SUCCESS, obj %p\n" , - uc_fw->obj); - -release_firmware (fw); - uc_fw->fetch_status =INTEL_UC_FIRMWARE_SUCCESS ; -return ; - -fail: -DRM_WARN ("Failed to fetch valid uC firmware from %s (error %d)\n" , - uc_fw->path, err); -DRM_DEBUG_DRIVER ("uC fw fetch status FAIL; err %d, fw %p, obj %p\n" , - err, fw, uc_fw->obj); - - obj =fetch_and_zero (&uc_fw->obj); -if (obj) -i915_gem_object_put (obj); - -release_firmware (fw);/* OK even if fw is NULL */ - uc_fw->fetch_status =INTEL_UC_FIRMWARE_FAIL ; -}/** * intel_guc_init() - define parameters and fetch firmware
@@ -779,7 +644,7 @@ void intel_guc_init(struct drm_i915_private *dev_priv) guc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -intel_uc_fw_fetch (dev_priv, guc_fw); +intel_uc_prepare_fw (dev_priv, guc_fw);/* status must now be FAIL or SUCCESS */ }
drivers/gpu/drm/i915/intel_huc.c +1 -1
@@ -189,7 +189,7 @@ void intel_huc_init(struct drm_i915_private *dev_priv)DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); -intel_uc_fw_fetch (dev_priv, huc_fw); +intel_uc_prepare_fw (dev_priv, huc_fw); }/**
drivers/gpu/drm/i915/intel_uc.c +131 -0
140 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -185,6 +185,8 @@ struct intel_huc {/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv); +void intel_uc_prepare_fw (struct drm_i915_private *dev_priv, +struct intel_uc_fw *uc_fw);int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);
@@ -195,8 +197,6 @@ void intel_guc_fini(struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv); -void intel_uc_fw_fetch (struct drm_i915_private *dev_priv, -struct intel_uc_fw *uc_fw);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 5/10 drm/i915/uc: Introduce intel_uc_init_fw()
In reply to Arkadiusz HilerInstead of calling intel_guc_init() and intel_huc_init() one by one this patch introduces intel_uc_init_fw() function that calls them both.
Called functions are renamed accordingly.
Trying to have subject_verb_object ordering and more descriptive names, the intel_huc_init() and intel_guc_init() functions are renamed.
For guc_init():
* intel_guc is the subject, so those functions now take intel_guc structure, instead of the dev_priv
* init is the verb
* fw is the object which better describes the function's role
huc_init() change follows the same reasoning.
v2: settle on intel_uc_fetch_fw name (M. Wajdeczko)
v3: yet another rename - intel_uc_init_fw (J. Lahtinen)
v4: non-trivial rebase
--- drivers/gpu/drm/i915/i915_drv.c | 3 +-- drivers/gpu/drm/i915/intel_guc_loader.c | 30 ++++++++++++------------- drivers/gpu/drm/i915/intel_huc.c | 39 +++++++++++++++++---------------- drivers/gpu/drm/i915/intel_uc.c | 6 +++++ drivers/gpu/drm/i915/intel_uc.h | 5 +++-- 5 files changed, 45 insertions(+), 38 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +1 -2
@@ -607,8 +607,7 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; -intel_huc_init (dev_priv); -intel_guc_init (dev_priv); +intel_uc_init_fw (dev_priv); ret =i915_gem_init (dev_priv);if (ret)
drivers/gpu/drm/i915/intel_guc_loader.c +15 -15
@@ -588,17 +588,17 @@ int intel_guc_init_hw(struct intel_guc *guc)/** -* intel_guc_init() - define parameters and fetch firmware -* @dev_priv: i915 device private +* intel_guc_init_fw() - select and prepare firmware for loading +* @guc: intel_guc struct * * Called early during driver load, but after GEM is initialised. * * The firmware will be transferred to the GuC's memory later, * when intel_guc_init_hw() is called. */ -void intel_guc_init (struct drm_i915_private *dev_priv) +void intel_guc_init_fw (struct intel_guc *guc) { -struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; +struct drm_i915_private *dev_priv =guc_to_i915 (guc);const char *fw_path;if (!HAS_GUC (dev_priv)) {
@@ -616,23 +616,23 @@ void intel_guc_init(struct drm_i915_private *dev_priv) fw_path =NULL ; }else if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_GUC_UCODE ; - guc_fw->major_ver_wanted =SKL_FW_MAJOR ; - guc_fw->minor_ver_wanted =SKL_FW_MINOR ; + guc->fw.major_ver_wanted =SKL_FW_MAJOR ; + guc->fw.minor_ver_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { fw_path =I915_BXT_GUC_UCODE ; - guc_fw->major_ver_wanted =BXT_FW_MAJOR ; - guc_fw->minor_ver_wanted =BXT_FW_MINOR ; + guc->fw.major_ver_wanted =BXT_FW_MAJOR ; + guc->fw.minor_ver_wanted =BXT_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { fw_path =I915_KBL_GUC_UCODE ; - guc_fw->major_ver_wanted =KBL_FW_MAJOR ; - guc_fw->minor_ver_wanted =KBL_FW_MINOR ; + guc->fw.major_ver_wanted =KBL_FW_MAJOR ; + guc->fw.minor_ver_wanted =KBL_FW_MINOR ; }else { fw_path ="" ;/* unknown device */ } - guc_fw->path = fw_path; - guc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; - guc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.path = fw_path; + guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ;/* Early (and silent) return if GuC loading is disabled */ if (!i915.enable_guc_loading)
@@ -642,9 +642,9 @@ void intel_guc_init(struct drm_i915_private *dev_priv)if (*fw_path =='\0' )return ; - guc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + guc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path); -intel_uc_prepare_fw (dev_priv, guc_fw); +intel_uc_prepare_fw (dev_priv, &guc->fw);/* status must now be FAIL or SUCCESS */ }
drivers/gpu/drm/i915/intel_huc.c +20 -19
@@ -141,8 +141,8 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv) }/** -* intel_huc_init() - initiate HuC firmware loading request -* @dev_priv: the drm_i915_private device +* intel_huc_init_fw() - select and prepare firmware for loading +* @huc: intel_huc struct * * Called early during driver load, but after GEM is initialised. The loading * will continue only when driver explicitly specify firmware name and version.
@@ -152,44 +152,45 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)* * The DMA-copying to HW is done later when intel_huc_init_hw() is called. */ -void intel_huc_init (struct drm_i915_private *dev_priv) +void intel_huc_init_fw (struct intel_huc *huc) { -struct intel_huc *huc = &dev_priv->huc; -struct intel_uc_fw *huc_fw = &huc->fw; +struct drm_i915_private *dev_priv =huc_to_i915 (huc);const char *fw_path =NULL ; - huc_fw->path =NULL ; - huc_fw->fetch_status =INTEL_UC_FIRMWARE_NONE ; - huc_fw->load_status =INTEL_UC_FIRMWARE_NONE ; - huc_fw->fw =INTEL_UC_FW_TYPE_HUC ; + huc->fw.path =NULL ; + huc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; + huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; + huc->fw.fw =INTEL_UC_FW_TYPE_HUC ;if (!HAS_HUC_UCODE (dev_priv))return ;if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_HUC_UCODE ; - huc_fw->major_ver_wanted =SKL_HUC_FW_MAJOR ; - huc_fw->minor_ver_wanted =SKL_HUC_FW_MINOR ; + huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =SKL_HUC_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { fw_path =I915_BXT_HUC_UCODE ; - huc_fw->major_ver_wanted =BXT_HUC_FW_MAJOR ; - huc_fw->minor_ver_wanted =BXT_HUC_FW_MINOR ; + huc->fw.major_ver_wanted =BXT_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =BXT_HUC_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { fw_path =I915_KBL_HUC_UCODE ; - huc_fw->major_ver_wanted =KBL_HUC_FW_MAJOR ; - huc_fw->minor_ver_wanted =KBL_HUC_FW_MINOR ; + huc->fw.major_ver_wanted =KBL_HUC_FW_MAJOR ; + huc->fw.minor_ver_wanted =KBL_HUC_FW_MINOR ; } - huc_fw->path = fw_path; + huc->fw.path = fw_path; -if (huc_fw->path ==NULL ) +if (fw_path ==NULL )return ; - huc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; + huc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ;DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); -intel_uc_prepare_fw (dev_priv, huc_fw); +WARN (huc->fw.path ==NULL ,"HuC present but no fw path\n" ); + +intel_uc_prepare_fw (dev_priv, &huc->fw); }/**
drivers/gpu/drm/i915/intel_uc.c +6 -0
@@ -31,6 +31,12 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)mutex_init (&dev_priv->guc.send_mutex); } +void intel_uc_init_fw (struct drm_i915_private *dev_priv) +{ +intel_huc_init_fw (&dev_priv->huc); +intel_guc_init_fw (&dev_priv->guc); +} +/* * Read GuC command/status register (SOFT_SCRATCH_0) * Return true if it contains a response rather than a command
drivers/gpu/drm/i915/intel_uc.h +3 -2
@@ -185,13 +185,14 @@ struct intel_huc {/* intel_uc.c */ void intel_uc_init_early (struct drm_i915_private *dev_priv); +void intel_uc_init_fw (struct drm_i915_private *dev_priv);void intel_uc_prepare_fw (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw);int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);/* intel_guc_loader.c */ -void intel_guc_init (struct drm_i915_private *dev_priv); +void intel_guc_init_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc);void intel_guc_fini (struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);
@@ -223,7 +224,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) }/* intel_huc.c */ -void intel_huc_init (struct drm_i915_private *dev_priv); +void intel_huc_init_fw (struct intel_huc *huc);void intel_huc_fini (struct drm_i915_private *dev_priv);int intel_huc_init_hw (struct intel_huc *huc);void intel_guc_auth_huc (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 6/10 drm/i915/guc: Extract param logic form guc_init_fw()
In reply to Arkadiusz HilerLet intel_guc_init_fw() focus on determining and fetching the correct firmware.
This patch introduces intel_uc_sanitize_options() that is called from intel_sanitize_options().
Then, if we have GuC, we can call intel_guc_init_fw() conditionally and we do not have to do the internal checks.
v2: fix comment, notify when nuking GuC explicitly enabled (M. Wajdeczko)
v3: fix comment again, change the nuke message (M. Wajdeczko)
v4: update title to reflect new function name + rebase
v5: text && remove 2 uneccessary checks (M. Wajdeczko)
--- drivers/gpu/drm/i915/i915_drv.c | 2 ++ drivers/gpu/drm/i915/intel_guc_loader.c | 18 +----------------- drivers/gpu/drm/i915/intel_huc.c | 3 --- drivers/gpu/drm/i915/intel_uc.c | 28 +++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc.h | 1 + 5 files changed, 31 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +2 -0
@@ -991,6 +991,8 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) i915.semaphores =intel_sanitize_semaphores (dev_priv, i915.semaphores);DRM_DEBUG_DRIVER ("use GPU semaphores? %s\n" ,yesno (i915.semaphores)); + +intel_uc_sanitize_options (dev_priv); }/**
drivers/gpu/drm/i915/intel_guc_loader.c +1 -17
@@ -601,20 +601,7 @@ void intel_guc_init_fw(struct intel_guc *guc)struct drm_i915_private *dev_priv =guc_to_i915 (guc);const char *fw_path; -if (!HAS_GUC (dev_priv)) { - i915.enable_guc_loading =0 ; - i915.enable_guc_submission =0 ; - }else { -/* A negative value means "use platform default" */ -if (i915.enable_guc_loading <0 ) - i915.enable_guc_loading =HAS_GUC_UCODE (dev_priv); -if (i915.enable_guc_submission <0 ) - i915.enable_guc_submission =HAS_GUC_SCHED (dev_priv); - } - -if (!HAS_GUC_UCODE (dev_priv)) { - fw_path =NULL ; - }else if (IS_SKYLAKE (dev_priv)) { +if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_GUC_UCODE ; guc->fw.major_ver_wanted =SKL_FW_MAJOR ; guc->fw.minor_ver_wanted =SKL_FW_MINOR ;
@@ -634,9 +621,6 @@ void intel_guc_init_fw(struct intel_guc *guc) guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; -/* Early (and silent) return if GuC loading is disabled */ -if (!i915.enable_guc_loading) -return ;if (fw_path ==NULL )return ;if (*fw_path =='\0' )
drivers/gpu/drm/i915/intel_huc.c +0 -3
@@ -162,9 +162,6 @@ void intel_huc_init_fw(struct intel_huc *huc) huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; huc->fw.fw =INTEL_UC_FW_TYPE_HUC ; -if (!HAS_HUC_UCODE (dev_priv)) -return ; -if (IS_SKYLAKE (dev_priv)) { fw_path =I915_SKL_HUC_UCODE ; huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ;
drivers/gpu/drm/i915/intel_uc.c +27 -1
@@ -26,6 +26,27 @@#include "intel_uc.h" #include <linux/firmware.h> +void intel_uc_sanitize_options (struct drm_i915_private *dev_priv) +{ +if (!HAS_GUC (dev_priv)) { +if (i915.enable_guc_loading >0 ) +DRM_INFO ("Ignoring GuC options, no hardware" ); + + i915.enable_guc_loading =0 ; + i915.enable_guc_submission =0 ; + }else { +/* A negative value means "use platform default" */ +if (i915.enable_guc_loading <0 ) + i915.enable_guc_loading =HAS_GUC_UCODE (dev_priv); +if (i915.enable_guc_submission <0 ) + i915.enable_guc_submission =HAS_GUC_SCHED (dev_priv); + +/* Can't enable guc submission without guc loaded */ +if (!i915.enable_guc_loading) + i915.enable_guc_submission =0 ; + } +} +void intel_uc_init_early (struct drm_i915_private *dev_priv) {mutex_init (&dev_priv->guc.send_mutex);
@@ -33,7 +54,12 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)void intel_uc_init_fw (struct drm_i915_private *dev_priv) { -intel_huc_init_fw (&dev_priv->huc); +if (!i915.enable_guc_loading) +return ; + +if (HAS_HUC_UCODE (dev_priv)) +intel_huc_init_fw (&dev_priv->huc); +intel_guc_init_fw (&dev_priv->guc); }
drivers/gpu/drm/i915/intel_uc.h +1 -0
@@ -184,6 +184,7 @@ struct intel_huc { };/* intel_uc.c */ +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_fw (struct drm_i915_private *dev_priv); void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 7/10 drm/i915/guc: Simplify intel_guc_init_hw()
In reply to Arkadiusz HilerCurrent version of intel_guc_init_hw() does a lot:
- cares about submission
- loads huc
- implement WA
This change offloads some of the logic to intel_uc_init_hw(), which now cares about the above.
v2: rename guc_hw_reset and fix typo in define name (M. Wajdeczko)
v3: rename once again
v4: remove spurious comments and add some style (J. Lahtinen)
v5: flow changes, got rid of dead checks (M. Wajdeczko)
--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 147 +++----------------------------- drivers/gpu/drm/i915/intel_uc.c | 114 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 3 + 4 files changed, 130 insertions(+), 136 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -4454,7 +4454,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)intel_mocs_init_l3cc_table (dev_priv);/* We can't enable contexts until all firmware is loaded */ - ret =intel_guc_init_hw (&dev_priv->guc); + ret =intel_uc_init_hw (dev_priv);if (ret) goto out;
drivers/gpu/drm/i915/intel_guc_loader.c +12 -135
203 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +114 -0
126 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +3 -0
@@ -187,6 +187,7 @@ struct intel_huc {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_fw (struct drm_i915_private *dev_priv); +int intel_uc_init_hw (struct drm_i915_private *dev_priv);void intel_uc_prepare_fw (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw);int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len);
@@ -199,6 +200,8 @@ void intel_guc_fini(struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_guc_release_interrupts (struct drm_i915_private *dev_priv); +void intel_guc_capture_interrupts (struct drm_i915_private *dev_priv);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v6 1/1 drm/i915/guc: Simplify intel_guc_init_hw()
Current version of intel_guc_init_hw() does a lot:
- cares about submission
- loads huc
- implement WA
This change offloads some of the logic to intel_uc_init_hw(), which now cares about the above.
v2: rename guc_hw_reset and fix typo in define name (M. Wajdeczko)
v3: rename once again
v4: remove spurious comments and add some style (J. Lahtinen)
v5: flow changes, got rid of dead checks (M. Wajdeczko)
v6: rebase
--- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/intel_guc_loader.c | 144 +++----------------------------- drivers/gpu/drm/i915/intel_uc.c | 113 +++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_uc.h | 2 + 4 files changed, 127 insertions(+), 134 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -4540,7 +4540,7 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv)intel_mocs_init_l3cc_table (dev_priv);/* We can't enable contexts until all firmware is loaded */ - ret =intel_guc_init_hw (&dev_priv->guc); + ret =intel_uc_init_hw (dev_priv);if (ret) goto out;
drivers/gpu/drm/i915/intel_guc_loader.c +11 -133
194 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.c +113 -0
125 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc.h +2 -0
@@ -187,6 +187,7 @@ struct intel_huc {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_fw (struct drm_i915_private *dev_priv); +int intel_uc_init_hw (struct drm_i915_private *dev_priv);void intel_uc_prepare_fw (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw);int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len);
@@ -199,6 +200,7 @@ void intel_guc_fini(struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_guc_release_interrupts (struct drm_i915_private *dev_priv);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6] drm/i915/guc: Simplify intel_guc_init_hw()
Quoted 21 lines · Arkadiusz Hiler
Current version of
intel_guc_init_hw()does a lot:
- cares about submission
- loads huc
- implement WAThis change offloads some of the logic to
intel_uc_init_hw(), which now cares about the above.v2: rename
guc_hw_resetand fix typo in define name (M. Wajdeczko)
v3: rename once again
v4: remove spurious comments and add some style (J. Lahtinen)
v5: flow changes, got rid of dead checks (M. Wajdeczko)
v6: rebaseCc Anusha Srivatsa <[email protected]>Cc Michal Winiarski <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>---
snip
Quoted 36 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-18@@ -397,42 +379,22 @@ int intel_guc_init_hw(struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);const char *fw_path = guc->fw.path; -int retries, ret, err; +int ret;DRM_DEBUG_DRIVER ("GuC fw status: path %s, fetch %s, load %s\n" , fw_path,intel_uc_fw_status_repr (guc->fw.fetch_status),intel_uc_fw_status_repr (guc->fw.load_status)); -/* Loading forbidden, or no firmware to load? */ -if (!i915.enable_guc_loading) { - err =0 ; - goto fail; - }else if (fw_path ==NULL ) { -/* Device is known to have no uCode (e.g. no GuC) */ - err = -ENXIO ; - goto fail; +if (!fw_path) { +return -ENXIO ; }else if (*fw_path =='\0' ) { -/* Device has a GuC but we don't know what f/w to load? */ WARN (1 ,"No GuC firmware known for this platform!\n" ); - err = -ENODEV ; - goto fail; +return -ENODEV ; } -/* Fetch failed, or already fetched but failed to load? */ -if (guc->fw.fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) { - err = -EIO ; - goto fail; - }else if (guc->fw.load_status ==INTEL_UC_FIRMWARE_FAIL ) { - err = -ENOEXEC ;
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_init_hw(struct intel_guc *guc) · line 397
Quoted 10 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-8- goto fail; - } - -guc_interrupts_release (dev_priv); -gen9_reset_guc_interrupts (dev_priv); - -/* We need to notify the guc whenever we change the GGTT */ -i915_ggtt_enable_guc (dev_priv); +if (guc->fw.fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) +return -EIO ;
Above fw_path checks seem to be redundant as we also look for fetch status here.
...
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_fw(struct drm_i915_private *dev_priv) · line 90
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.c +4
-0@@ -63,6 +84,98 @@ void intel_uc_init_fw(struct drm_i915_private *dev_priv)intel_guc_init_fw (&dev_priv->guc); } +int intel_uc_init_hw (struct drm_i915_private *dev_priv) +{ +int ret, attempts; +const int guc_wa_hash_check_not_set_attempts =3 ;
In all other places, we put const vars definitions as first statements. And maybe this const should be accompanied by the /* Wa */ comment that is shown below. Also changing prefix to "gen9" maybe helpful
-Michal
Quoted 114 lines
drivers/gpu/drm/i915/intel_uc.c +88
-0+ + +/* GuC not enabled, nothing to do */ +if (!i915.enable_guc_loading) +return 0 ; + +intel_guc_release_interrupts (dev_priv); +gen9_reset_guc_interrupts (dev_priv); + +/* We need to notify the guc whenever we change the GGTT */ +i915_ggtt_enable_guc (dev_priv); + +if (i915.enable_guc_submission) { + ret =i915_guc_submission_init (dev_priv); +if (ret) + goto fail; + } + +/* WaEnableuKernelHeaderValidFix:skl */ +/* WaEnableGuCBootHashCheckNotSet:skl,bxt,kbl */ +if (IS_GEN9 (dev_priv)) + attempts = guc_wa_hash_check_not_set_attempts; +else + attempts =1 ; + +while (attempts--) { +/* +* Always reset the GuC just before (re)loading, so +* that the state and timing are fairly predictable +*/ + ret =__intel_uc_reset_hw (dev_priv); +if (ret) + goto fail; + +intel_huc_init_hw (&dev_priv->huc); + ret =intel_guc_init_hw (&dev_priv->guc); +if (ret ==0 || ret != -EAGAIN ) +break ; + +DRM_INFO ("GuC fw load failed: %d; will reset and " +"retry %d more time(s)\n" , ret, attempts); + } + +/* Did we succeded or run out of retries? */ +if (ret) + goto fail; + +intel_guc_auth_huc (dev_priv); +if (i915.enable_guc_submission) { +if (i915.guc_log_level >=0 ) +gen9_enable_guc_interrupts (dev_priv); + + ret =i915_guc_submission_enable (dev_priv); +if (ret) + goto fail; + } + +return 0 ; + +fail: +/* +* We've failed to load the firmware :( +* +* Decide whether to disable GuC submission and fall back to +* execlist mode, and whether to hide the error by returning +* zero or to return -EIO, which the caller will treat as a +* nonfatal error (i.e. it doesn't prevent driver load, but +* marks the GPU as wedged until reset). +*/ +DRM_ERROR ("GuC init failed\n" ); +if (i915.enable_guc_loading >1 || i915.enable_guc_submission >1 ) + ret = -EIO ; +else + ret =0 ; + +if (i915.enable_guc_submission) { + i915.enable_guc_submission =0 ; +DRM_NOTE ("Falling back from GuC submission to execlist mode\n" ); + } + +i915_ggtt_disable_guc (dev_priv); +intel_guc_release_interrupts (dev_priv); +i915_guc_submission_disable (dev_priv); +i915_guc_submission_fini (dev_priv); + +return ret; +} +/* * Read GuC command/status register (SOFT_SCRATCH_0) * Return true if it contains a response rather than a command drivers/gpu/drm/i915/intel_uc.h +2
-0@@ -187,6 +187,7 @@ struct intel_huc {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_fw (struct drm_i915_private *dev_priv); +int intel_uc_init_hw (struct drm_i915_private *dev_priv);void intel_uc_prepare_fw (struct drm_i915_private *dev_priv,struct intel_uc_fw *uc_fw);int intel_guc_send (struct intel_guc *guc,const u32 *action,u32 len);@@ -199,6 +200,7 @@ void intel_guc_fini(struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);int intel_guc_suspend (struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv); +void intel_guc_release_interrupts (struct drm_i915_private *dev_priv);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv);/* i915_guc_submission.c */ Signature · 1 line
2.9.3
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v6] drm/i915/guc: Simplify intel_guc_init_hw()
Quoted 65 lines · Michal Wajdeczko
Quoted 21 lines · Arkadiusz Hiler
Current version of
intel_guc_init_hw()does a lot:
- cares about submission
- loads huc
- implement WAThis change offloads some of the logic to
intel_uc_init_hw(), which now cares about the above.v2: rename
guc_hw_resetand fix typo in define name (M. Wajdeczko)
v3: rename once again
v4: remove spurious comments and add some style (J. Lahtinen)
v5: flow changes, got rid of dead checks (M. Wajdeczko)
v6: rebaseCc Anusha Srivatsa <[email protected]>Cc Michal Winiarski <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>---
snip
Quoted 40 lines
drivers/gpu/drm/i915/intel_guc_loader.c +4
-22@@ -397,42 +379,22 @@ int intel_guc_init_hw(struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);const char *fw_path = guc->fw.path; -int retries, ret, err; +int ret;DRM_DEBUG_DRIVER ("GuC fw status: path %s, fetch %s, load %s\n" , fw_path,intel_uc_fw_status_repr (guc->fw.fetch_status),intel_uc_fw_status_repr (guc->fw.load_status)); -/* Loading forbidden, or no firmware to load? */ -if (!i915.enable_guc_loading) { - err =0 ; - goto fail; - }else if (fw_path ==NULL ) { -/* Device is known to have no uCode (e.g. no GuC) */ - err = -ENXIO ; - goto fail; +if (!fw_path) { +return -ENXIO ; }else if (*fw_path =='\0' ) { -/* Device has a GuC but we don't know what f/w to load? */ WARN (1 ,"No GuC firmware known for this platform!\n" ); - err = -ENODEV ; - goto fail; +return -ENODEV ; } -/* Fetch failed, or already fetched but failed to load? */ -if (guc->fw.fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) { - err = -EIO ; - goto fail; - }else if (guc->fw.load_status ==INTEL_UC_FIRMWARE_FAIL ) { - err = -ENOEXEC ; - goto fail; - } - -guc_interrupts_release (dev_priv);
Quoted 8 lines
drivers/gpu/drm/i915/intel_guc_loader.c int intel_guc_init_hw(struct intel_guc *guc) · line 397
Quoted 6 lines
drivers/gpu/drm/i915/intel_guc_loader.c +2
-4-gen9_reset_guc_interrupts (dev_priv); - -/* We need to notify the guc whenever we change the GGTT */ -i915_ggtt_enable_guc (dev_priv); +if (guc->fw.fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) +return -EIO ;Above
fw_pathchecks seem to be redundant as we also look for fetch status here.
Got rid of it in the path simplifying patch. Thanks.
Quoted 4 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +0
-0@@ -63,6 +84,98 @@ void intel_uc_init_fw(struct drm_i915_private *dev_priv)intel_guc_init_fw (&dev_priv->guc); }
Quoted 8 lines
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_fw(struct drm_i915_private *dev_priv) · line 90
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +4
-0+int intel_uc_init_hw (struct drm_i915_private *dev_priv) +{ +int ret, attempts; +const int guc_wa_hash_check_not_set_attempts =3 ;In all other places, we put const vars definitions as first statements. And maybe this const should be accompanied by the /* Wa */ comment that is shown below. Also changing prefix to "gen9" maybe helpful
Went with using it directly, as Joonas suggested. The current if-else statement makes meaning obvious enough without having the need to name it.
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH v6] drm/i915/guc: Simplify intel_guc_init_hw()
In reply to Arkadiusz HilerQuoted 20 lines · Arkadiusz Hiler
Current version of
intel_guc_init_hw()does a lot:
- cares about submission
- loads huc
- implement WAThis change offloads some of the logic to
intel_uc_init_hw(), which now cares about the above.v2: rename
guc_hw_resetand fix typo in define name (M. Wajdeczko)
v3: rename once again
v4: remove spurious comments and add some style (J. Lahtinen)
v5: flow changes, got rid of dead checks (M. Wajdeczko)
v6: rebaseCc Anusha Srivatsa <[email protected]>Cc Michal Winiarski <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Daniele Ceraolo Spurio <[email protected]>Cc Joonas Lahtinen <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>
<SNIP>
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_fw(struct drm_i915_private *dev_priv) · line 90
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +4
-0+int intel_uc_init_hw (struct drm_i915_private *dev_priv) +{ +int ret, attempts; +const int guc_wa_hash_check_not_set_attempts =3 ;
I wouldn't bother with this const, the Wa comment makes it pretty clear already.
Extra newline here, too.
<SNIP>
Quoted 11 lines
drivers/gpu/drm/i915/intel_uc.c +11
-0+fail: +/* +* We've failed to load the firmware :( +* +* Decide whether to disable GuC submission and fall back to +* execlist mode, and whether to hide the error by returning +* zero or to return -EIO, which the caller will treat as a +* nonfatal error (i.e. it doesn't prevent driver load, but +* marks the GPU as wedged until reset). +*/ +DRM_ERROR ("GuC init failed\n" );
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_fw(struct drm_i915_private *dev_priv) · line 170
Quoted 10 lines
drivers/gpu/drm/i915/intel_uc.c +10
-0+if (i915.enable_guc_loading >1 || i915.enable_guc_submission >1 ) + ret = -EIO ; +else + ret =0 ; + +if (i915.enable_guc_submission) { + i915.enable_guc_submission =0 ; +DRM_NOTE ("Falling back from GuC submission to execlist mode\n" ); + } +
I'd drop the above code to the bottom.
drivers/gpu/drm/i915/intel_uc.c void intel_uc_init_fw(struct drm_i915_private *dev_priv) · line 174
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +4
-0+i915_ggtt_disable_guc (dev_priv); +intel_guc_release_interrupts (dev_priv); +i915_guc_submission_disable (dev_priv); +i915_guc_submission_fini (dev_priv);
And make this teardown oniony with some more labels.
With those changes, looks good to me.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 8/10 drm/i915/uc: Simplify firmware path handling
In reply to Arkadiusz HilerCurrently fw->path values can represent one of three possible states:
1) NULL - device without the uC
2) '\0' - device with the uC but have no firmware
3) else - device with the uC and we have firmware
Second case is used only to WARN at a later stage.
We can WARN right away and merge cases 1 and 2.
Code can be even further simplified and common (HuC/GuC logic) happening right before the fetch can be offloaded to the common function.
v2: fewer temporary variables, more straightforward flow (M. Wajdeczko)
v3: DRM_ERROR instead of WARN (M. Wajdeczko)
v4: coding standard (J. Lahtinen)
v5: non-trivial rebase
--- drivers/gpu/drm/i915/intel_guc_loader.c | 35 +++++++++++---------------------- drivers/gpu/drm/i915/intel_huc.c | 21 ++++++-------------- drivers/gpu/drm/i915/intel_uc.c | 4 +++- 3 files changed, 21 insertions(+), 39 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +12 -23
@@ -432,12 +432,8 @@ int intel_guc_init_hw(struct intel_guc *guc)intel_uc_fw_status_repr (guc->fw.fetch_status), intel_uc_fw_status_repr(guc->fw.load_status)); -if (!fw_path) { +if (!fw_path)return -ENXIO ; - }else if (*fw_path =='\0' ) { -WARN (1 ,"No GuC firmware known for this platform!\n" ); -return -ENODEV ; - }if (guc->fw.fetch_status !=INTEL_UC_FIRMWARE_SUCCESS )return -EIO ;
@@ -463,7 +459,6 @@ int intel_guc_init_hw(struct intel_guc *guc)return 0 ; } -/** * intel_guc_init_fw() - select and prepare firmware for loading * @guc: intel_guc struct
@@ -476,37 +471,31 @@ int intel_guc_init_hw(struct intel_guc *guc)void intel_guc_init_fw (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -const char *fw_path; + + guc->fw.path =NULL ; + guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; + guc->fw.fw =INTEL_UC_FW_TYPE_GUC ;if (IS_SKYLAKE (dev_priv)) { - fw_path =I915_SKL_GUC_UCODE ; + guc->fw.path =I915_SKL_GUC_UCODE ; guc->fw.major_ver_wanted =SKL_FW_MAJOR ; guc->fw.minor_ver_wanted =SKL_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { - fw_path =I915_BXT_GUC_UCODE ; + guc->fw.path =I915_BXT_GUC_UCODE ; guc->fw.major_ver_wanted =BXT_FW_MAJOR ; guc->fw.minor_ver_wanted =BXT_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { - fw_path =I915_KBL_GUC_UCODE ; + guc->fw.path =I915_KBL_GUC_UCODE ; guc->fw.major_ver_wanted =KBL_FW_MAJOR ; guc->fw.minor_ver_wanted =KBL_FW_MINOR ; }else { - fw_path ="" ;/* unknown device */ +DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); + i915.enable_guc_loading =0 ; +return ; } - guc->fw.path = fw_path; - guc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ; - guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; - -if (fw_path ==NULL ) -return ; -if (*fw_path =='\0' ) -return ; - - guc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ; -DRM_DEBUG_DRIVER ("GuC firmware pending, path %s\n" , fw_path);intel_uc_prepare_fw (dev_priv, &guc->fw); -/* status must now be FAIL or SUCCESS */ }/**
drivers/gpu/drm/i915/intel_huc.c +6 -15
@@ -155,7 +155,6 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv)void intel_huc_init_fw (struct intel_huc *huc) {struct drm_i915_private *dev_priv =huc_to_i915 (huc); -const char *fw_path =NULL ; huc->fw.path =NULL ; huc->fw.fetch_status =INTEL_UC_FIRMWARE_NONE ;
@@ -163,29 +162,21 @@ void intel_huc_init_fw(struct intel_huc *huc) huc->fw.fw =INTEL_UC_FW_TYPE_HUC ;if (IS_SKYLAKE (dev_priv)) { - fw_path =I915_SKL_HUC_UCODE ; + huc->fw.path =I915_SKL_HUC_UCODE ; huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ; huc->fw.minor_ver_wanted =SKL_HUC_FW_MINOR ; }else if (IS_BROXTON (dev_priv)) { - fw_path =I915_BXT_HUC_UCODE ; + huc->fw.path =I915_BXT_HUC_UCODE ; huc->fw.major_ver_wanted =BXT_HUC_FW_MAJOR ; huc->fw.minor_ver_wanted =BXT_HUC_FW_MINOR ; }else if (IS_KABYLAKE (dev_priv)) { - fw_path =I915_KBL_HUC_UCODE ; + huc->fw.path =I915_KBL_HUC_UCODE ; huc->fw.major_ver_wanted =KBL_HUC_FW_MAJOR ; huc->fw.minor_ver_wanted =KBL_HUC_FW_MINOR ; - } - - huc->fw.path = fw_path; - -if (fw_path ==NULL ) + }else { +DRM_ERROR ("No HuC firmware known for platform with HuC!\n" );return ; - - huc->fw.fetch_status =INTEL_UC_FIRMWARE_PENDING ; - -DRM_DEBUG_DRIVER ("HuC firmware pending, path %s\n" , fw_path); - -WARN (huc->fw.path ==NULL ,"HuC present but no fw path\n" ); + }intel_uc_prepare_fw (dev_priv, &huc->fw); }
drivers/gpu/drm/i915/intel_uc.c +3 -1
@@ -271,8 +271,10 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv,size_t size;int err; + uc_fw->fetch_status =INTEL_UC_FIRMWARE_PENDING ; +DRM_DEBUG_DRIVER ("before requesting firmware: uC fw fetch status %s\n" , -intel_uc_fw_status_repr (uc_fw->fetch_status)); +intel_uc_fw_status_repr (uc_fw->fetch_status)); err =request_firmware (&fw, uc_fw->path, &pdev->dev);if (err)
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 9/10 drm/i915/uc: Separate firmware selection and preparation
In reply to Arkadiusz Hilerintel_{h,g}uc_init_fw selects correct firmware and then triggers it's preparation (fetch + initial parsing).
This change separates out select steps, so those can be called by the sanitize_options().
Then, during the init_fw(), we prepare the firmware if the firmware was selected.
--- drivers/gpu/drm/i915/intel_guc_loader.c | 14 +++++--------- drivers/gpu/drm/i915/intel_huc.c | 14 ++------------ drivers/gpu/drm/i915/intel_uc.c | 18 ++++++++++++------ drivers/gpu/drm/i915/intel_uc.h | 4 ++-- 4 files changed, 21 insertions(+), 29 deletions(-)
drivers/gpu/drm/i915/intel_guc_loader.c +5 -9
@@ -460,15 +460,12 @@ int intel_guc_init_hw(struct intel_guc *guc) }/** -* intel_guc_init_fw() - select and prepare firmware for loading +* intel_guc_select_fw() - selects GuC firmware for loading * @guc: intel_guc struct * -* Called early during driver load, but after GEM is initialised. -* -* The firmware will be transferred to the GuC's memory later, -* when intel_guc_init_hw() is called. +* Return: zero when we know firmware, non-zero in other case */ -void intel_guc_init_fw (struct intel_guc *guc) +int intel_guc_select_fw (struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc);
@@ -491,11 +488,10 @@ void intel_guc_init_fw(struct intel_guc *guc) guc->fw.minor_ver_wanted =KBL_FW_MINOR ; }else {DRM_ERROR ("No GuC firmware known for platform with GuC!\n" ); - i915.enable_guc_loading =0 ; -return ; +return -ENOENT ; } -intel_uc_prepare_fw (dev_priv, &guc->fw); +return 0 ; }/**
drivers/gpu/drm/i915/intel_huc.c +2 -12
@@ -141,18 +141,10 @@ static int huc_ucode_xfer(struct drm_i915_private *dev_priv) }/** -* intel_huc_init_fw() - select and prepare firmware for loading +* intel_huc_select_fw() - selects HuC firmware for loading * @huc: intel_huc struct -* -* Called early during driver load, but after GEM is initialised. The loading -* will continue only when driver explicitly specify firmware name and version. -* All other cases are considered as INTEL_UC_FIRMWARE_NONE either because HW -* is not capable or driver yet support it. And there will be no error message -* for INTEL_UC_FIRMWARE_NONE cases. -* -* The DMA-copying to HW is done later when intel_huc_init_hw() is called. */ -void intel_huc_init_fw (struct intel_huc *huc) +void intel_huc_select_fw (struct intel_huc *huc) {struct drm_i915_private *dev_priv =huc_to_i915 (huc);
@@ -177,8 +169,6 @@ void intel_huc_init_fw(struct intel_huc *huc)DRM_ERROR ("No HuC firmware known for platform with HuC!\n" );return ; } - -intel_uc_prepare_fw (dev_priv, &huc->fw); }/**
drivers/gpu/drm/i915/intel_uc.c +12 -6
@@ -66,6 +66,14 @@ void intel_uc_sanitize_options(struct drm_i915_private *dev_priv)if (!i915.enable_guc_loading) i915.enable_guc_submission =0 ; } + +if (i915.enable_guc_loading) { +if (HAS_HUC_UCODE (dev_priv)) +intel_huc_select_fw (&dev_priv->huc); + +if (intel_guc_select_fw (&dev_priv->guc)) + i915.enable_guc_loading =0 ; + } }void intel_uc_init_early (struct drm_i915_private *dev_priv)
@@ -75,13 +83,11 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)void intel_uc_init_fw (struct drm_i915_private *dev_priv) { -if (!i915.enable_guc_loading) -return ; +if (dev_priv->huc.fw.path) +intel_uc_prepare_fw (dev_priv, &dev_priv->huc.fw); -if (HAS_HUC_UCODE (dev_priv)) -intel_huc_init_fw (&dev_priv->huc); - -intel_guc_init_fw (&dev_priv->guc); +if (dev_priv->guc.fw.path) +intel_uc_prepare_fw (dev_priv, &dev_priv->guc.fw); }int intel_uc_init_hw (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/intel_uc.h +2 -2
@@ -194,7 +194,7 @@ int intel_guc_send(struct intel_guc *guc, const u32 *action, u32 len);int intel_guc_sample_forcewake (struct intel_guc *guc);/* intel_guc_loader.c */ -void intel_guc_init_fw (struct intel_guc *guc); +int intel_guc_select_fw (struct intel_guc *guc);int intel_guc_init_hw (struct intel_guc *guc);void intel_guc_fini (struct drm_i915_private *dev_priv);const char *intel_uc_fw_status_repr (enum intel_uc_fw_status status);
@@ -228,7 +228,7 @@ static inline u32 guc_ggtt_offset(struct i915_vma *vma) }/* intel_huc.c */ -void intel_huc_init_fw (struct intel_huc *huc); +void intel_huc_select_fw (struct intel_huc *huc);void intel_huc_fini (struct drm_i915_private *dev_priv);int intel_huc_init_hw (struct intel_huc *huc);void intel_guc_auth_huc (struct drm_i915_private *dev_priv);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v7 10/10 drm/i915/uc: Add params for specifying firmware
In reply to Arkadiusz Hilerguc_firmware_path and huc_firmware_path module parameters are added.
Using the parameter disables version checks and loads desired firmware instead of the default one.
v2: make params unsafe && notice about disabled fw check (J. Lahtinen)
--- drivers/gpu/drm/i915/i915_params.c | 10 ++++++++++ drivers/gpu/drm/i915/i915_params.h | 2 ++ drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++- drivers/gpu/drm/i915/intel_huc.c | 6 +++++- drivers/gpu/drm/i915/intel_uc.c | 6 ++++-- 5 files changed, 26 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_params.c +10 -0
@@ -59,6 +59,8 @@ struct i915_params i915 __read_mostly = { .enable_guc_loading = 0, .enable_guc_submission = 0, .guc_log_level = -1, + .guc_firmware_path = NULL, + .huc_firmware_path = NULL, .enable_dp_mst = true, .inject_load_failure = 0, .enable_dpcd_backlight = false,
@@ -230,6 +232,14 @@ 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)" ); +module_param_named_unsafe (guc_firmware_path, i915.guc_firmware_path, charp,0400 ); +MODULE_PARM_DESC (guc_firmware_path, +"GuC firmware path to use instead of the default one" ); + +module_param_named_unsafe (huc_firmware_path, i915.huc_firmware_path, charp,0400 ); +MODULE_PARM_DESC (huc_firmware_path, +"HuC firmware path to use instead of the default one" ); +module_param_named_unsafe (enable_dp_mst, i915.enable_dp_mst, bool,0600 );MODULE_PARM_DESC (enable_dp_mst,"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)" );
drivers/gpu/drm/i915/i915_params.h +2 -0
@@ -46,6 +46,8 @@func (int, enable_guc_loading); \func (int, enable_guc_submission); \func (int, guc_log_level); \ + func(char *, guc_firmware_path); \ + func(char *, huc_firmware_path); \func (int, use_mmio_flip); \func (int, mmio_debug); \func (int, edp_vswing); \
drivers/gpu/drm/i915/intel_guc_loader.c +5 -1
@@ -474,7 +474,11 @@ int intel_guc_select_fw(struct intel_guc *guc) guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; guc->fw.fw =INTEL_UC_FW_TYPE_GUC ; -if (IS_SKYLAKE (dev_priv)) { +if (i915.guc_firmware_path) { + guc->fw.path = i915.guc_firmware_path; + guc->fw.major_ver_wanted =0 ; + guc->fw.minor_ver_wanted =0 ; + }else if (IS_SKYLAKE (dev_priv)) { guc->fw.path =I915_SKL_GUC_UCODE ; guc->fw.major_ver_wanted =SKL_FW_MAJOR ; guc->fw.minor_ver_wanted =SKL_FW_MINOR ;
drivers/gpu/drm/i915/intel_huc.c +5 -1
@@ -153,7 +153,11 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; huc->fw.fw =INTEL_UC_FW_TYPE_HUC ; -if (IS_SKYLAKE (dev_priv)) { +if (i915.huc_firmware_path) { + huc->fw.path = i915.huc_firmware_path; + huc->fw.major_ver_wanted =0 ; + huc->fw.minor_ver_wanted =0 ; + }else if (IS_SKYLAKE (dev_priv)) { huc->fw.path =I915_SKL_HUC_UCODE ; huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ; huc->fw.minor_ver_wanted =SKL_HUC_FW_MINOR ;
drivers/gpu/drm/i915/intel_uc.c +4 -2
@@ -359,8 +359,10 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, goto fail; } -if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || - uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { +if (uc_fw->major_ver_wanted ==0 && uc_fw->minor_ver_wanted ==0 ) { +DRM_NOTE ("Skipping uC firmware version check\n" ); + }else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || + uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) {DRM_NOTE ("uC firmware version %d.%d, required %d.%d\n" , uc_fw->major_ver_found, uc_fw->minor_ver_found, uc_fw->major_ver_wanted, uc_fw->minor_ver_wanted);
Signature · 6 lines
2.9.3 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
Quoted 10 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Arkadiusz Hiler
Sent: Tuesday, March 7, 2017 7:25 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
Quoted 4 lines
guc_firmware_pathandhuc_firmware_pathmodule parameters are added.Using the parameter disables version checks and loads desired firmware instead of the default one.
I see that the effort of this patch makes us test with different firmware versions and not just the default one. But is it worth introducing two new params ? We already have 3 parameters that are guc and huc related.
Anusha
Quoted 110 lines
v2: make params unsafe && notice about disabled fw check (J. Lahtinen)
Cc Chris Wilson <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Michal Winiarski <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>---
drivers/gpu/drm/i915/i915_params.c | 10 ++++++++++ drivers/gpu/drm/i915/i915_params.h | 2 ++ drivers/gpu/drm/i915/intel_guc_loader.c | 6 +++++- drivers/gpu/drm/i915/intel_huc.c | 6 +++++- drivers/gpu/drm/i915/intel_uc.c | 6 ++++-- 5 files changed, 26 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/i915_params.c +10
-0@@ -59,6 +59,8 @@ struct i915_params i915 __read_mostly = { .enable_guc_loading = 0, .enable_guc_submission = 0, .guc_log_level = -1, + .guc_firmware_path = NULL, + .huc_firmware_path = NULL, .enable_dp_mst = true, .inject_load_failure = 0, .enable_dpcd_backlight = false,@@ -230,6 +232,14 @@ 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)" ); +module_param_named_unsafe (guc_firmware_path, i915.guc_firmware_path, +charp,0400 );MODULE_PARM_DESC (guc_firmware_path, +"GuC firmware path to use instead of the default one" ); + +module_param_named_unsafe (huc_firmware_path, i915.huc_firmware_path, +charp,0400 );MODULE_PARM_DESC (huc_firmware_path, +"HuC firmware path to use instead of the default one" ); +module_param_named_unsafe (enable_dp_mst, i915.enable_dp_mst, bool, 0600); MODULE_PARM_DESC(enable_dp_mst, "Enable multi-stream transport (MST) for new DisplayPort sinks. (default:true)"); diff --git
a/drivers/gpu/drm/i915/i915_params.hb/drivers/gpu/drm/i915/i915_params.h
index 55d47ee..34148cc 100644drivers/gpu/drm/i915/i915_params.h +2
-0@@ -46,6 +46,8 @@func (int, enable_guc_loading); \func (int, enable_guc_submission); \func (int, guc_log_level); \ + func(char *, guc_firmware_path); \ + func(char *, huc_firmware_path); \func (int, use_mmio_flip); \func (int, mmio_debug); \func (int, edp_vswing); \drivers/gpu/drm/i915/intel_guc_loader.c +5
-1@@ -474,7 +474,11 @@ int intel_guc_select_fw(struct intel_guc *guc) guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; guc->fw.fw =INTEL_UC_FW_TYPE_GUC ; -if (IS_SKYLAKE (dev_priv)) { +if (i915.guc_firmware_path) { + guc->fw.path = i915.guc_firmware_path; + guc->fw.major_ver_wanted =0 ; + guc->fw.minor_ver_wanted =0 ; + }else if (IS_SKYLAKE (dev_priv)) { guc->fw.path =I915_SKL_GUC_UCODE ; guc->fw.major_ver_wanted =SKL_FW_MAJOR ; guc->fw.minor_ver_wanted = SKL_FW_MINOR; diff --git
a/drivers/gpu/drm/i915/intel_huc.cb/drivers/gpu/drm/i915/intel_huc.cindex ea67abc..ab4ee08 100644drivers/gpu/drm/i915/intel_huc.c +5
-1@@ -153,7 +153,11 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; huc->fw.fw =INTEL_UC_FW_TYPE_HUC ; -if (IS_SKYLAKE (dev_priv)) { +if (i915.huc_firmware_path) { + huc->fw.path = i915.huc_firmware_path; + huc->fw.major_ver_wanted =0 ; + huc->fw.minor_ver_wanted =0 ; + }else if (IS_SKYLAKE (dev_priv)) { huc->fw.path =I915_SKL_HUC_UCODE ; huc->fw.major_ver_wanted =SKL_HUC_FW_MAJOR ; huc->fw.minor_ver_wanted = SKL_HUC_FW_MINOR; diff --git
a/drivers/gpu/drm/i915/intel_uc.cb/drivers/gpu/drm/i915/intel_uc.cindex 8875647..1cf4590 100644drivers/gpu/drm/i915/intel_uc.c +4
-2@@ -359,8 +359,10 @@ void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, goto fail; } -if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || - uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { +if (uc_fw->major_ver_wanted ==0 && uc_fw->minor_ver_wanted ==0 ) { +DRM_NOTE ("Skipping uC firmware version check\n" ); + }else if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || + uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { DRM_NOTE("uC firmware version %d.%d, required %d.%d\n", uc_fw->major_ver_found, uc_fw->minor_ver_found,uc_fw->major_ver_wanted, uc_fw-
Quoted 8 lines
Quoted 1 line
minor_ver_wanted);--
2.9.3_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Jani Nikula
maintainerRe: [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
Quoted 10 lines · Anusha
Quoted 10 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Arkadiusz Hiler
Sent: Tuesday, March 7, 2017 7:25 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
guc_firmware_pathandhuc_firmware_pathmodule parameters are added.
Quoted 7 lines
Quoted 2 lines
Using the parameter disables version checks and loads desired firmware instead of the default one.
I see that the effort of this patch makes us test with different firmware versions and not just the default one. But is it worth introducing two new params ? We already have 3 parameters that are guc and huc related.
Obviously I'd prefer there were fewer module parameters, but looks like they multiply like rabbits...
Back when we decided that we only accept one firmware version, there were complaints about it becoming hard to test various firmware versions or to bisect the kernel while keeping the firmware constant. This addresses those issues. If you decide those are non-issues and the patch is not needed, I'll point whoever complains about the issues to this discussion.
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, · line 363
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +2
-2-if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || - uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { +if (uc_fw->major_ver_wanted ==0 && uc_fw->minor_ver_wanted ==0 ) { +DRM_NOTE ("Skipping uC firmware version check\n" );
Log the version found in the firmware? Or does that happens somewhere else already?
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
Quoted 29 lines · Jani Nikula
Quoted 10 lines · Anusha
Quoted 10 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Arkadiusz Hiler
Sent: Tuesday, March 7, 2017 7:25 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
guc_firmware_pathandhuc_firmware_pathmodule parameters are added.Quoted 7 lines
Quoted 2 lines
Using the parameter disables version checks and loads desired firmware instead of the default one.
I see that the effort of this patch makes us test with different firmware versions and not just the default one. But is it worth introducing two new params ? We already have 3 parameters that are guc and huc related.
Obviously I'd prefer there were fewer module parameters, but looks like they multiply like rabbits...
Back when we decided that we only accept one firmware version, there were complaints about it becoming hard to test various firmware versions or to bisect the kernel while keeping the firmware constant. This addresses those issues. If you decide those are non-issues and the patch is not needed, I'll point whoever complains about the issues to this discussion.
Quoted 7 lines
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c void intel_uc_prepare_fw(struct drm_i915_private *dev_priv, · line 363
Quoted 4 lines
drivers/gpu/drm/i915/intel_uc.c +2
-2-if (uc_fw->major_ver_found != uc_fw->major_ver_wanted || - uc_fw->minor_ver_found < uc_fw->minor_ver_wanted) { +if (uc_fw->major_ver_wanted ==0 && uc_fw->minor_ver_wanted ==0 ) { +DRM_NOTE ("Skipping uC firmware version check\n" );Log the version found in the firmware? Or does that happens somewhere else already?
It's logging the version couple lines down using DRM_DEBUG_DRIVER(). The log in the "else if" is there because we are reporting error and then returning.
This function requires general cleanup, especially when it comes to the log messages. I'll do it after this series lands (it's starting to go out of hand already), along with other fixes, using targeted and independent patches.
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
In reply to Srivatsa, AnushaQuoted 15 lines · Anusha
Quoted 10 lines
-----Original Message-----
From: Intel-gfx [mailto:[email protected]] On Behalf Of Arkadiusz Hiler
Sent: Tuesday, March 7, 2017 7:25 AM
To: [email protected]
Subject: [Intel-gfx] [PATCH 10/10] drm/i915/uc: Add params for specifying firmwareQuoted 4 lines
guc_firmware_pathandhuc_firmware_pathmodule parameters are added.Using the parameter disables version checks and loads desired firmware instead of the default one.
Quoted 6 lines
I see that the effort of this patch makes us test with different firmware versions and not just the default one. But is it worth introducing two new params ? We already have 3 parameters that are guc and huc related.
Anusha
Hey,
Having a mean to easily point to any binary you want to try out helps with testing and verification, without the need to do in-kernel changes.
This param was suggested by Chris, and I've seen couple of similar patches by different people in their trees - I've used one myself. Since it seem so common, why not have it in the mainline?
It's _unsafe anyway.
Signature · 7 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: [PATCH 10/10] drm/i915/uc: Add params for specifying firmware
Quoted 7 lines · Arkadiusz Hiler
Having a mean to easily point to any binary you want to try out helps with testing and verification, without the need to do in-kernel changes.
This param was suggested by Chris, and I've seen couple of similar patches by different people in their trees - I've used one myself. Since it seem so common, why not have it in the mainline?
We definitely need this, there's no doubt at this point. We'll have to be able to provide test versions of the GuC firmware so we can triage problems during our own or customer debug sessions.
Regards, Joonas
Signature · 7 lines
Joonas Lahtinen Open Source Technology Center Intel Corporation _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for GuC Scrub vol. 1 (rev10)
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: GuC Scrub vol. 1 (rev10)
URL : https://patchwork.freedesktop.org/series/16856/
State : success
== Summary ==
Series 16856v10 GuC Scrub vol. 1
https://patchwork.freedesktop.org/api/1.0/series/16856/revisions/10/mbox/
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-a:
dmesg-warn -> PASS (fi-byt-n2820)fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 463s fi-bsw-n3050 total:278 pass:239 dwarn:0 dfail:0 fail:0 skip:39 time: 612s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 541s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 610s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 505s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 500s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 436s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 434s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 438s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 500s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 488s fi-kbl-7500u total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time: 483s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 505s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 595s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 497s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 551s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 554s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time: 418s
ba93250bd451d62c73db7ed39242a625730424f2 drm-tip: 2017y-03m-07d-13h-23m-43s UTC integration manifest ba44d8a drm/i915/uc: Add params for specifying firmware
15c67b4 drm/i915/uc: Separate firmware selection and preparation
edb4736 drm/i915/uc: Simplify firmware path handling
bafb3bf drm/i915/guc: Simplify intel_guc_init_hw()
d09d99c drm/i915/guc: Extract param logic form guc_init_fw()
71768d6 drm/i915/uc: Introduce intel_uc_init_fw()
b6386a1 drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
4601d8f drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw()
e2d1541 drm/i915/huc: Add huc_to_i915
5d99ff1 drm/i915/uc: Drop superfluous externs in intel_uc.h
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4085/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for GuC Scrub vol. 1 (rev11)
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: GuC Scrub vol. 1 (rev11)
URL : https://patchwork.freedesktop.org/series/16856/
State : warning
== Summary ==
Series 16856v11 GuC Scrub vol. 1
https://patchwork.freedesktop.org/api/1.0/series/16856/revisions/11/mbox/
Test gem_exec_flush:
Subgroup basic-batch-kernel-default-uc:
pass -> FAIL (fi-snb-2600) fdo#100007
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
pass -> DMESG-WARN (fi-bsw-n3050) fdo#100113
Test prime_busy:
Subgroup basic-wait-after-default:
pass -> DMESG-WARN (fi-bsw-n3050)fdo#100007 https://bugs.freedesktop.org/show_bug.cgi?id=100007
fdo#100113 https://bugs.freedesktop.org/show_bug.cgi?id=100113
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time: 458s fi-bsw-n3050 total:278 pass:237 dwarn:2 dfail:0 fail:0 skip:39 time: 604s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time: 531s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time: 599s fi-byt-j1900 total:278 pass:251 dwarn:0 dfail:0 fail:0 skip:27 time: 512s fi-byt-n2820 total:278 pass:247 dwarn:0 dfail:0 fail:0 skip:31 time: 503s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 434s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time: 434s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time: 455s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 507s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time: 487s fi-kbl-7500u total:278 pass:259 dwarn:1 dfail:0 fail:0 skip:18 time: 475s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 511s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time: 588s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time: 498s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time: 534s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time: 550s fi-snb-2600 total:278 pass:248 dwarn:0 dfail:0 fail:1 skip:29 time: 426s
1c9112727f47a42221c86b48420395b417191f19 drm-tip: 2017y-03m-10d-13h-03m-29s UTC integration manifest 9febad7 drm/i915/uc: Add params for specifying firmware
6cc9299 drm/i915/uc: Separate firmware selection and preparation
46dbbfa drm/i915/uc: Simplify firmware path handling
17e130c drm/i915/guc: Simplify intel_guc_init_hw()
f6a642e drm/i915/guc: Extract param logic form guc_init_fw()
62bc1e9 drm/i915/uc: Introduce intel_uc_init_fw()
e91ed5e drm/i915/uc: Move intel_uc_fw_fetch() to intel_uc.c
9241478 drm/i915/uc: Rename intel_?uc_{setup, load}() to _init_hw()
a7a8abc drm/i915/huc: Add huc_to_i915
8847364 drm/i915/uc: Drop superfluous externs in intel_uc.h
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4135/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx