drm/i915: implemented dynamic WOPCM partition.
Subsystems (2)
PATCH 1/2 drm/i915: implemented dynamic WOPCM partition.
Static WOPCM partitioning would lead to GuC loading failure if the GuC/HuC firmware size exceeded current static 512KB partition boundary.
This patch enabled the dynamical calculation of the WOPCM aperture used by GuC/HuC firmware. GuC WOPCM offset was set to HuC size + reserved WOPCM size. GuC WOPCM size was set to total WOPCM size - GuC WOPCM offset - RC6CTX size.
--- drivers/gpu/drm/i915/i915_drv.c | 15 ++++ drivers/gpu/drm/i915/i915_drv.h | 13 ++++ drivers/gpu/drm/i915/i915_gem_context.c | 4 +- drivers/gpu/drm/i915/i915_guc_reg.h | 18 ++++- drivers/gpu/drm/i915/intel_guc.c | 46 ++++++++++-- drivers/gpu/drm/i915/intel_guc.h | 18 +---- drivers/gpu/drm/i915/intel_huc.c | 3 +- drivers/gpu/drm/i915/intel_uc.c | 128 +++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc_fw.c | 12 ++- 9 files changed, 223 insertions(+), 34 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +15 -0
@@ -623,6 +623,15 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)WARN_ON (!list_empty (&dev_priv->contexts.list)); } +static void i915_wopcm_init (struct drm_i915_private *dev_priv) +{ +struct intel_wopcm_info *wopcm = &dev_priv->wopcm; + + wopcm->size =WOPCM_DEFAULT_SIZE ; + +DRM_DEBUG_DRIVER ("WOPCM size: %dKB\n" , wopcm->size >>10 ); +} +static int i915_load_modeset_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
@@ -670,6 +679,12 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; +/* +* Get the wopcm memory info. +* NOTE: this need to be called before init FW. +*/ +i915_wopcm_init (dev_priv); +intel_uc_init_fw (dev_priv); ret =i915_gem_init (dev_priv);
drivers/gpu/drm/i915/i915_drv.h +13 -0
@@ -2235,6 +2235,16 @@ struct intel_cdclk_state {u8 voltage_level; }; +struct intel_wopcm_info { +u32 size; +}; + +struct intel_wopcm_partition { +u32 guc_wopcm_offset; +u32 guc_wopcm_size; +u32 guc_wopcm_top; +}; +struct drm_i915_private {struct drm_device drm;
@@ -2258,6 +2268,9 @@ struct drm_i915_private {struct intel_huc huc;struct intel_guc guc; +struct intel_wopcm_info wopcm; +struct intel_wopcm_partition wopcm_partition; +struct intel_csr csr;struct intel_gmbus gmbus[GMBUS_NUM_PINS ];
drivers/gpu/drm/i915/i915_gem_context.c +2 -2
@@ -312,12 +312,12 @@ __create_hw_context(struct drm_i915_private *dev_priv, ctx->desc_template =default_desc_template (dev_priv, dev_priv->mm.aliasing_ppgtt); -/* GuC requires the ring to be placed above GUC_WOPCM_TOP. If GuC is not +/* GuC requires the ring to be placed above guc wopcm top. If GuC is not * present or not in use we still need a small bias as ring wraparound * at offset 0 sometimes hangs. No idea why. */ if (HAS_GUC (dev_priv) && i915_modparams.enable_guc_loading) - ctx->ggtt_offset_bias =GUC_WOPCM_TOP ; + ctx->ggtt_offset_bias =intel_guc_wopcm_top (dev_priv);else ctx->ggtt_offset_bias =I915_GTT_PAGE_SIZE ;
drivers/gpu/drm/i915/i915_guc_reg.h +14 -4
@@ -67,17 +67,27 @@#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340)#define HUC_LOADING_AGENT_VCR (0<<1)#define HUC_LOADING_AGENT_GUC (1<<1) -#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)#define HUC_STATUS2 _MMIO(0xD3B0)#define HUC_FW_VERIFIED (1<<7)/* Defines WOPCM space available to GuC firmware */ +/* default WOPCM size 1MB */ +#define WOPCM_DEFAULT_SIZE (0x1 << 20) +/* reserved WOPCM size 16KB */ +#define WOPCM_RESERVED_SIZE (0x4000) +/* GUC WOPCM Offset need to be 16KB aligned */ +#define WOPCM_OFFSET_ALIGNMENT (0x4000) +/* 8KB stack reserved for GuC FW*/ +#define GUC_WOPCM_STACK_RESERVED (0x2000) +/* 24KB WOPCM reserved for RC6 CTX on BXT */ +#define BXT_WOPCM_RC6_RESERVED (0x6000) + +#define GEN9_GUC_WOPCM_DELTA 4 +#define GEN9_GUC_WOPCM_OFFSET (0x24000) +#define GUC_WOPCM_SIZE _MMIO(0xc050) -/* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */ -#define GUC_WOPCM_TOP (0x80 << 12)/* 512KB */ -#define BXT_GUC_WOPCM_RC6_RESERVED (0x10 << 12)/* 64KB */ /* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */ #define GUC_GGTT_TOP 0xFEE00000
drivers/gpu/drm/i915/intel_guc.c +39 -7
64 lines not on this page · raw message
drivers/gpu/drm/i915/intel_guc.h +3 -15
@@ -100,21 +100,6 @@ static inline void intel_guc_notify(struct intel_guc *guc) guc->notify (guc); } -/* -* GuC does not allow any gfx GGTT address that falls into range [0, WOPCM_TOP), -* which is reserved for Boot ROM, SRAM and WOPCM. Currently this top address is -* 512K. In order to exclude 0-512K address space from GGTT, all gfx objects -* used by GuC is pinned with PIN_OFFSET_BIAS along with size of WOPCM. -*/ -static inline u32 guc_ggtt_offset (struct i915_vma *vma) -{ -u32 offset =i915_ggtt_offset (vma); - -GEM_BUG_ON (offset <GUC_WOPCM_TOP ); -GEM_BUG_ON (range_overflows_t (u64, offset, vma->size,GUC_GGTT_TOP )); - -return offset; -}void intel_guc_init_early (struct intel_guc *guc);void intel_guc_init_send_regs (struct intel_guc *guc);
@@ -127,5 +112,8 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv); +u32 intel_guc_wopcm_top (struct drm_i915_private *dev_priv); +u32 intel_guc_wopcm_offset (struct drm_i915_private *dev_priv); +u32 guc_ggtt_offset (struct i915_vma *vma);#endif
drivers/gpu/drm/i915/intel_huc.c +2 -1
@@ -202,7 +202,8 @@ void intel_huc_auth(struct intel_huc *huc)return ; vma =i915_gem_object_ggtt_pin (huc->fw.obj,NULL ,0 ,0 , -PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +PIN_OFFSET_BIAS | +intel_guc_wopcm_top (i915));if (IS_ERR (vma)) {DRM_ERROR ("failed to pin huc fw object %d\n" , (int )PTR_ERR (vma));
drivers/gpu/drm/i915/intel_uc.c +126 -2
152 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uc_fw.c +9 -3
@@ -95,9 +95,13 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, 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); -/* Header and uCode will be loaded to WOPCM */ +/* +* Header and uCode will be loaded to WOPCM +* Only check the size against the overall available WOPCM here. Will +* continue to check the size during WOPCM partition calculation. +*/ size = uc_fw->header_size + uc_fw->ucode_size; -if (size >intel_guc_wopcm_size (dev_priv)) { +if (size > dev_priv->wopcm.size) {DRM_WARN ("%s: Firmware is too large to fit in WOPCM\n" ,intel_uc_fw_type_repr (uc_fw->type)); err = -E2BIG ;
@@ -207,6 +211,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,int (*xfer)(struct intel_uc_fw *uc_fw, struct i915_vma *vma)) { +struct drm_i915_private *i915 =to_i915 (uc_fw->obj->base.dev);struct i915_vma *vma;int err;
@@ -230,7 +235,8 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, } vma =i915_gem_object_ggtt_pin (uc_fw->obj,NULL ,0 ,0 , -PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +PIN_OFFSET_BIAS | +intel_guc_wopcm_top (i915));if (IS_ERR (vma)) { err =PTR_ERR (vma); DRM_DEBUG_DRIVER("%s fw ggtt-pin err=%d\n",
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 HAX enable guc submission for CI
--- drivers/gpu/drm/i915/i915_gem_gtt.c | 8 ++------ drivers/gpu/drm/i915/i915_params.h | 4 ++-- 2 files changed, 4 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/i915_gem_gtt.c +2 -6
@@ -3562,17 +3562,13 @@ int i915_ggtt_enable_hw(struct drm_i915_private *dev_priv)void i915_ggtt_enable_guc (struct drm_i915_private *i915) { -GEM_BUG_ON (i915->ggtt.invalidate != gen6_ggtt_invalidate); - i915->ggtt.invalidate = guc_ggtt_invalidate; }void i915_ggtt_disable_guc (struct drm_i915_private *i915) { -/* We should only be called after i915_ggtt_enable_guc() */ -GEM_BUG_ON (i915->ggtt.invalidate != guc_ggtt_invalidate); - - i915->ggtt.invalidate = gen6_ggtt_invalidate; +if (i915->ggtt.invalidate == guc_ggtt_invalidate) + i915->ggtt.invalidate = gen6_ggtt_invalidate; }void i915_gem_restore_gtt_mappings (struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_params.h +2 -2
@@ -44,8 +44,8 @@ param(int, disable_power_well, -1) \ param(int, enable_ips, 1) \ param(int, invert_brightness, 0) \ - param(int, enable_guc_loading, 0) \ - param(int, enable_guc_submission, 0) \ + param(int, enable_guc_loading, 1) \ + param(int, enable_guc_submission, 1) \ param(int, guc_log_level, -1) \ param(char *, guc_firmware_path, NULL) \param (char *, huc_firmware_path, NULL) \
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 9 lines · Jackie Li
Static WOPCM partitioning would lead to GuC loading failure if the GuC/HuC firmware size exceeded current static 512KB partition boundary.
This patch enabled the dynamical calculation of the WOPCM aperture used by GuC/HuC firmware. GuC WOPCM offset was set to HuC size + reserved WOPCM size. GuC WOPCM size was set to total WOPCM size - GuC WOPCM offset - RC6CTX size.
Quoted 7 lines
Signed-off-by Jackie Li <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Sujaritha Sundaresan <[email protected]>Reviewed-by Daniele Ceraolo Spurio <[email protected]>Reviewed-by John Spotswood <[email protected]>Reviewed-by Oscar Mateo <[email protected]>
Sorry, these Reviewed-by should be Cc. I will resend the patch.
Quoted 440 lines
--- drivers/gpu/drm/i915/i915_drv.c | 15 ++++ drivers/gpu/drm/i915/i915_drv.h | 13 ++++ drivers/gpu/drm/i915/i915_gem_context.c | 4 +- drivers/gpu/drm/i915/i915_guc_reg.h | 18 ++++- drivers/gpu/drm/i915/intel_guc.c | 46 ++++++++++-- drivers/gpu/drm/i915/intel_guc.h | 18 +---- drivers/gpu/drm/i915/intel_huc.c | 3 +- drivers/gpu/drm/i915/intel_uc.c | 128 +++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc_fw.c | 12 ++- 9 files changed, 223 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_drv.c +15
-0@@ -623,6 +623,15 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)WARN_ON (!list_empty (&dev_priv->contexts.list)); } +static void i915_wopcm_init (struct drm_i915_private *dev_priv) +{ +struct intel_wopcm_info *wopcm = &dev_priv->wopcm; + + wopcm->size =WOPCM_DEFAULT_SIZE ; + +DRM_DEBUG_DRIVER ("WOPCM size: %dKB\n" , wopcm->size >>10 ); +} +static int i915_load_modeset_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);@@ -670,6 +679,12 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; +/* +* Get the wopcm memory info. +* NOTE: this need to be called before init FW. +*/ +i915_wopcm_init (dev_priv); +intel_uc_init_fw (dev_priv); ret =i915_gem_init (dev_priv);drivers/gpu/drm/i915/i915_drv.h +13
-0@@ -2235,6 +2235,16 @@ struct intel_cdclk_state {u8 voltage_level; }; +struct intel_wopcm_info { +u32 size; +}; + +struct intel_wopcm_partition { +u32 guc_wopcm_offset; +u32 guc_wopcm_size; +u32 guc_wopcm_top; +}; +struct drm_i915_private {struct drm_device drm;@@ -2258,6 +2268,9 @@ struct drm_i915_private {struct intel_huc huc;struct intel_guc guc; +struct intel_wopcm_info wopcm; +struct intel_wopcm_partition wopcm_partition; +struct intel_csr csr;struct intel_gmbus gmbus[GMBUS_NUM_PINS ];drivers/gpu/drm/i915/i915_gem_context.c +2
-2@@ -312,12 +312,12 @@ __create_hw_context(struct drm_i915_private *dev_priv, ctx->desc_template =default_desc_template (dev_priv, dev_priv->mm.aliasing_ppgtt); -/* GuC requires the ring to be placed above GUC_WOPCM_TOP. If GuC is not +/* GuC requires the ring to be placed above guc wopcm top. If GuC is not * present or not in use we still need a small bias as ring wraparound * at offset 0 sometimes hangs. No idea why. */ if (HAS_GUC (dev_priv) && i915_modparams.enable_guc_loading) - ctx->ggtt_offset_bias =GUC_WOPCM_TOP ; + ctx->ggtt_offset_bias =intel_guc_wopcm_top (dev_priv);else ctx->ggtt_offset_bias =I915_GTT_PAGE_SIZE ;drivers/gpu/drm/i915/i915_guc_reg.h +14
-4@@ -67,17 +67,27 @@#define DMA_GUC_WOPCM_OFFSET _MMIO(0xc340)#define HUC_LOADING_AGENT_VCR (0<<1)#define HUC_LOADING_AGENT_GUC (1<<1) -#define GUC_WOPCM_OFFSET_VALUE 0x80000/* 512KB */ #define GUC_MAX_IDLE_COUNT _MMIO(0xC3E4)#define HUC_STATUS2 _MMIO(0xD3B0)#define HUC_FW_VERIFIED (1<<7)/* Defines WOPCM space available to GuC firmware */ +/* default WOPCM size 1MB */ +#define WOPCM_DEFAULT_SIZE (0x1 << 20) +/* reserved WOPCM size 16KB */ +#define WOPCM_RESERVED_SIZE (0x4000) +/* GUC WOPCM Offset need to be 16KB aligned */ +#define WOPCM_OFFSET_ALIGNMENT (0x4000) +/* 8KB stack reserved for GuC FW*/ +#define GUC_WOPCM_STACK_RESERVED (0x2000) +/* 24KB WOPCM reserved for RC6 CTX on BXT */ +#define BXT_WOPCM_RC6_RESERVED (0x6000) + +#define GEN9_GUC_WOPCM_DELTA 4 +#define GEN9_GUC_WOPCM_OFFSET (0x24000) +#define GUC_WOPCM_SIZE _MMIO(0xc050) -/* GuC addresses below GUC_WOPCM_TOP don't map through the GTT */ -#define GUC_WOPCM_TOP (0x80 << 12)/* 512KB */ -#define BXT_GUC_WOPCM_RC6_RESERVED (0x10 << 12)/* 64KB */ /* GuC addresses above GUC_GGTT_TOP also don't map through the GTT */ #define GUC_GGTT_TOP 0xFEE00000drivers/gpu/drm/i915/intel_guc.c +39
-7@@ -337,7 +337,7 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)* This is a wrapper to create an object for use with the GuC. In order to * use it inside the GuC, an object needs to be pinned lifetime, so we allocate * both some backing storage and a range inside the Global GTT. We must pin -* it in the GGTT somewhere other than than [0, GUC_WOPCM_TOP) because that +* it in the GGTT somewhere other than than [0, guc wopcm_top) because that * range is reserved inside GuC. * * Return: A i915_vma if successful, otherwise an ERR_PTR. @@ -358,7 +358,8 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size) goto err; ret =i915_vma_pin (vma,0 ,PAGE_SIZE , -PIN_GLOBAL |PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +PIN_GLOBAL |PIN_OFFSET_BIAS | +intel_guc_wopcm_top (dev_priv));if (ret) { vma =ERR_PTR (ret); goto err;@@ -373,11 +374,42 @@ struct i915_vma *intel_guc_allocate_vma(struct intel_guc *guc, u32 size)u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv) { -u32 wopcm_size =GUC_WOPCM_TOP ; +struct intel_wopcm_partition *wp = &dev_priv->wopcm_partition; -/* On BXT, the top of WOPCM is reserved for RC6 context */ -if (IS_GEN9_LP (dev_priv)) - wopcm_size -=BXT_GUC_WOPCM_RC6_RESERVED ; +GEM_BUG_ON (!wp->guc_wopcm_size); -return wopcm_size; +return wp->guc_wopcm_size; +} + +u32 intel_guc_wopcm_top (struct drm_i915_private *dev_priv) +{ +struct intel_wopcm_partition *wp = &dev_priv->wopcm_partition; + +GEM_BUG_ON (!dev_priv->wopcm.size); + +return wp->guc_wopcm_top ? wp->guc_wopcm_top : dev_priv->wopcm.size; +} + +u32 intel_guc_wopcm_offset (struct drm_i915_private *dev_priv) +{ +struct intel_wopcm_partition *wp = &dev_priv->wopcm_partition; + +GEM_BUG_ON (!wp->guc_wopcm_size); + +return wp->guc_wopcm_offset; +} + +/* +* GuC does not allow any gfx GGTT address that falls into range [0, WOPCM_TOP), +* which is reserved for Boot ROM, SRAM and WOPCM. All gfx objects +* used by GuC is pinned with PIN_OFFSET_BIAS along with top of WOPCM. +*/ +u32 guc_ggtt_offset (struct i915_vma *vma) +{ +struct drm_i915_private *dev_priv = vma->vm->i915; +u32 offset =i915_ggtt_offset (vma); + +GEM_BUG_ON (offset <intel_guc_wopcm_top (dev_priv)); +GEM_BUG_ON (range_overflows_t (u64, offset, vma->size,GUC_GGTT_TOP )); +return offset; }drivers/gpu/drm/i915/intel_guc.h +3
-15@@ -100,21 +100,6 @@ static inline void intel_guc_notify(struct intel_guc *guc) guc->notify (guc); } -/* -* GuC does not allow any gfx GGTT address that falls into range [0, WOPCM_TOP), -* which is reserved for Boot ROM, SRAM and WOPCM. Currently this top address is -* 512K. In order to exclude 0-512K address space from GGTT, all gfx objects -* used by GuC is pinned with PIN_OFFSET_BIAS along with size of WOPCM. -*/ -static inline u32 guc_ggtt_offset (struct i915_vma *vma) -{ -u32 offset =i915_ggtt_offset (vma); - -GEM_BUG_ON (offset <GUC_WOPCM_TOP ); -GEM_BUG_ON (range_overflows_t (u64, offset, vma->size,GUC_GGTT_TOP )); - -return offset; -}void intel_guc_init_early (struct intel_guc *guc);void intel_guc_init_send_regs (struct intel_guc *guc);@@ -127,5 +112,8 @@ int intel_guc_suspend(struct drm_i915_private *dev_priv);int intel_guc_resume (struct drm_i915_private *dev_priv);struct i915_vma *intel_guc_allocate_vma (struct intel_guc *guc,u32 size);u32 intel_guc_wopcm_size (struct drm_i915_private *dev_priv); +u32 intel_guc_wopcm_top (struct drm_i915_private *dev_priv); +u32 intel_guc_wopcm_offset (struct drm_i915_private *dev_priv); +u32 guc_ggtt_offset (struct i915_vma *vma);#endif drivers/gpu/drm/i915/intel_huc.c +2
-1@@ -202,7 +202,8 @@ void intel_huc_auth(struct intel_huc *huc)return ; vma =i915_gem_object_ggtt_pin (huc->fw.obj,NULL ,0 ,0 , -PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +PIN_OFFSET_BIAS | +intel_guc_wopcm_top (i915));if (IS_ERR (vma)) {DRM_ERROR ("failed to pin huc fw object %d\n" , (int )PTR_ERR (vma));drivers/gpu/drm/i915/intel_uc.c +126
-2@@ -86,6 +86,125 @@ void intel_uc_init_early(struct drm_i915_private *dev_priv)intel_guc_init_early (&dev_priv->guc); } +static u32 rc6_context_size (struct drm_i915_private *dev_priv) +{ +/* On BXT, the top of WOPCM is reserved for RC6 context */ +if (IS_GEN9_LP (dev_priv)) +return BXT_WOPCM_RC6_RESERVED ; + +return 0 ; +} + +static int do_wopcm_partition (struct drm_i915_private *dev_priv, +u32 offset,u32 reserved_size) +{ +struct intel_wopcm_partition *wp = &dev_priv->wopcm_partition; +u32 aligned_offset =ALIGN (offset,WOPCM_OFFSET_ALIGNMENT ); + +if (offset >= dev_priv->wopcm.size) +return -E2BIG ; + +if (reserved_size >= dev_priv->wopcm.size) +return -E2BIG ; + +if ((aligned_offset + reserved_size) >= dev_priv->wopcm.size) +return -E2BIG ; + + wp->guc_wopcm_offset = aligned_offset; + wp->guc_wopcm_top = dev_priv->wopcm.size - wp->guc_wopcm_offset; + wp->guc_wopcm_size = wp->guc_wopcm_top - reserved_size; + +return 0 ; +} + +static int intel_uc_init_wopcm_partition (struct drm_i915_private *dev_priv) +{ +struct intel_wopcm_partition *wp = &dev_priv->wopcm_partition; +struct intel_uc_fw *guc_fw = &dev_priv->guc.fw; +struct intel_uc_fw *huc_fw = &dev_priv->huc.fw; +size_t huc_size, guc_size; +u32 offset; +u32 reserved; +u32 wopcm_base; +u32 delta; +int err; + +/*Return if WOPCM partition has been initialized*/ +if (wp->guc_wopcm_size) +return 0 ; + +GEM_BUG_ON (!dev_priv->wopcm.size); + +/*No need to do partition if failed to fetch both GuC and HuC FW*/ +if (guc_fw->fetch_status !=INTEL_UC_FIRMWARE_SUCCESS && + huc_fw->fetch_status !=INTEL_UC_FIRMWARE_SUCCESS ) +return -EIO ; + + huc_size =0 ; + guc_size =0 ; + offset =WOPCM_RESERVED_SIZE ; + reserved =rc6_context_size (dev_priv); + +if (huc_fw->fetch_status ==INTEL_UC_FIRMWARE_SUCCESS ) + huc_size = huc_fw->header_size + huc_fw->ucode_size; + + err =do_wopcm_partition (dev_priv, offset + huc_size, reserved); +if (err) { +if (!huc_size) + goto pt_done; + +/*partition failed with HuC FW, block HuC loading*/ + huc_size =0 ; + +/*partition without loading HuC FW*/ + err =do_wopcm_partition (dev_priv, offset, reserved); +if (err) + goto pt_done; + } + +/* +* Check hardware restriction on Gen9 +* GuC WOPCM size is at least 4 bytes larger than GuC WOPCM base due +* to hardware limitation on Gen9. +*/ +if (IS_GEN9 (dev_priv)) { + wopcm_base = wp->guc_wopcm_offset +GEN9_GUC_WOPCM_OFFSET ; +if (unlikely (wopcm_base > wp->guc_wopcm_size)) + goto pt_done; + + delta = wp->guc_wopcm_size - wopcm_base; +if (unlikely (delta <GEN9_GUC_WOPCM_DELTA )) + goto pt_done; + } + +if (guc_fw->fetch_status ==INTEL_UC_FIRMWARE_SUCCESS ) { + guc_size = guc_fw->header_size + guc_fw->ucode_size; +/*need 8K stack for GuC*/ + guc_size +=GUC_WOPCM_STACK_RESERVED ; + } + +if (guc_size > wp->guc_wopcm_size) + guc_size =0 ; + +pt_done: +if (!huc_size) { +DRM_ERROR ("HuC firmware is too large to fit in WOPCM\n" ); +intel_uc_fw_fini (huc_fw); + } + +if (!guc_size) { +DRM_ERROR ("GuC firmware is too large to fit in WOPCM\n" ); +intel_uc_fw_fini (guc_fw); + } + +DRM_DEBUG_DRIVER ("GuC WOPCM offset %dKB, size %dKB, top %dKB\n" , + wp->guc_wopcm_offset >>10 , + wp->guc_wopcm_size >>10 , + wp->guc_wopcm_top >>10 ); + +return err; +} +void intel_uc_init_fw (struct drm_i915_private *dev_priv) {intel_uc_fw_fetch (dev_priv, &dev_priv->huc.fw);@@ -157,6 +276,11 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)if (!i915_modparams.enable_guc_loading)return 0 ; +/*init WOPCM partition*/ + ret =intel_uc_init_wopcm_partition (dev_priv); +if (ret) + goto err_wopcm; +guc_disable_communication (guc);gen9_reset_guc_interrupts (dev_priv);@@ -176,7 +300,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)/* init WOPCM */ I915_WRITE (GUC_WOPCM_SIZE ,intel_guc_wopcm_size (dev_priv));I915_WRITE (DMA_GUC_WOPCM_OFFSET , -GUC_WOPCM_OFFSET_VALUE |HUC_LOADING_AGENT_GUC ); +intel_guc_wopcm_offset (dev_priv) |HUC_LOADING_AGENT_GUC );/* WaEnableuKernelHeaderValidFix:skl */ /* WaEnableGuCBootHashCheckNotSet:skl,bxt,kbl */ @@ -249,7 +373,7 @@ int intel_uc_init_hw(struct drm_i915_private *dev_priv)i915_guc_submission_fini (dev_priv); err_guc:i915_ggtt_disable_guc (dev_priv); - +err_wopcm:if (i915_modparams.enable_guc_loading >1 || i915_modparams.enable_guc_submission >1 ) {DRM_ERROR ("GuC init failed. Firmware loading disabled.\n" );drivers/gpu/drm/i915/intel_uc_fw.c +7
-2@@ -95,9 +95,13 @@ void intel_uc_fw_fetch(struct drm_i915_private *dev_priv, 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); -/* Header and uCode will be loaded to WOPCM */ +/* +* Header and uCode will be loaded to WOPCM +* Only check the size against the overall available WOPCM here. Will +* continue to check the size during WOPCM partition calculation. +*/ size = uc_fw->header_size + uc_fw->ucode_size; -if (size >intel_guc_wopcm_size (dev_priv)) { +if (size > dev_priv->wopcm.size) {DRM_WARN ("%s: Firmware is too large to fit in WOPCM\n" ,intel_uc_fw_type_repr (uc_fw->type)); err = -E2BIG ;@@ -207,6 +211,7 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw,int (*xfer)(struct intel_uc_fw *uc_fw, struct i915_vma *vma)) { +struct drm_i915_private *i915 =to_i915 (uc_fw->obj->base.dev);struct i915_vma *vma;int err;
drivers/gpu/drm/i915/intel_uc_fw.c int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, · line 242
Quoted 9 lines
drivers/gpu/drm/i915/intel_uc_fw.c +2
-1@@ -230,7 +235,8 @@ int intel_uc_fw_upload(struct intel_uc_fw *uc_fw, } vma =i915_gem_object_ggtt_pin (uc_fw->obj,NULL ,0 ,0 , -PIN_OFFSET_BIAS |GUC_WOPCM_TOP ); +PIN_OFFSET_BIAS | +intel_guc_wopcm_top (i915));if (IS_ERR (vma)) { err =PTR_ERR (vma); DRM_DEBUG_DRIVER("%s fw ggtt-pin err=%d\n",
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: implemented dynamic WOPCM partition.
In reply to Jackie Li== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: implemented dynamic WOPCM partition.
URL : https://patchwork.freedesktop.org/series/33165/
State : warning
== Summary ==
Series 33165v1 series starting with [1/2] drm/i915: implemented dynamic WOPCM partition.
https://patchwork.freedesktop.org/api/1.0/series/33165/revisions/1/mbox/
Test gem_basic:
Subgroup create-close:
dmesg-warn -> PASS (fi-cfl-s)
Subgroup create-fd-close:
dmesg-warn -> PASS (fi-cfl-s)
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-c:
dmesg-warn -> PASS (fi-bsw-n3050)
Subgroup suspend-read-crc-pipe-a:
pass -> SKIP (fi-hsw-4770r)
Test drv_module_reload:
Subgroup basic-reload:
pass -> DMESG-WARN (fi-cnl-y)
Subgroup basic-no-display:
pass -> DMESG-WARN (fi-bsw-n3050)
pass -> DMESG-WARN (fi-cnl-y)
Subgroup basic-reload-inject:
pass -> DMESG-WARN (fi-cnl-y)fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:440s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:456s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:386s fi-bsw-n3050 total:289 pass:242 dwarn:1 dfail:0 fail:0 skip:46 time:556s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:277s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:506s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:508s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:505s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:486s fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:556s fi-cnl-y total:289 pass:259 dwarn:3 dfail:0 fail:0 skip:27 time:612s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:423s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:595s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:433s fi-hsw-4770r total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:417s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:428s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:503s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:489s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:576s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:586s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:567s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:591s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:649s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:521s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:504s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:463s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:571s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:419s
8b0ae6b50a229dc661a02f4034252ee854cc9b83 drm-tip: 2017y-11m-03d-17h-15m-57s UTC integration manifest febf0ac24d41 HAX enable guc submission for CI5d9e2e09e6de drm/i915: implemented dynamic WOPCM partition.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6956/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 49 lines · Jackie Li
Static WOPCM partitioning would lead to GuC loading failure if the GuC/HuC firmware size exceeded current static 512KB partition boundary.
This patch enabled the dynamical calculation of the WOPCM aperture used by GuC/HuC firmware. GuC WOPCM offset was set to HuC size + reserved WOPCM size. GuC WOPCM size was set to total WOPCM size - GuC WOPCM offset - RC6CTX size.
Signed-off-by Jackie Li <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Sujaritha Sundaresan <[email protected]>Reviewed-by Daniele Ceraolo Spurio <[email protected]>Reviewed-by John Spotswood <[email protected]>Reviewed-by Oscar Mateo <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 15 ++++ drivers/gpu/drm/i915/i915_drv.h | 13 ++++ drivers/gpu/drm/i915/i915_gem_context.c | 4 +- drivers/gpu/drm/i915/i915_guc_reg.h | 18 ++++- drivers/gpu/drm/i915/intel_guc.c | 46 ++++++++++-- drivers/gpu/drm/i915/intel_guc.h | 18 +---- drivers/gpu/drm/i915/intel_huc.c | 3 +- drivers/gpu/drm/i915/intel_uc.c | 128 +++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc_fw.c | 12 ++- 9 files changed, 223 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_drv.c +9
-0@@ -623,6 +623,15 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)WARN_ON (!list_empty (&dev_priv->contexts.list)); } +static void i915_wopcm_init (struct drm_i915_private *dev_priv) +{ +struct intel_wopcm_info *wopcm = &dev_priv->wopcm; + + wopcm->size =WOPCM_DEFAULT_SIZE ; + +DRM_DEBUG_DRIVER ("WOPCM size: %dKB\n" , wopcm->size >>10 ); +} +static int i915_load_modeset_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);
drivers/gpu/drm/i915/i915_drv.c static int i915_load_modeset_init(struct drm_device *dev) · line 686
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.c +5
-0@@ -670,6 +679,12 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq; +/* +* Get the wopcm memory info. +* NOTE: this need to be called before init FW. +*/ +i915_wopcm_init (dev_priv);
Is this guc wopcm somehow related to the normal wopcm? And if so are you planning to use the wopcm information we extract from the hardware in stolen init? If this is just related to the guc then it would seem better to bury this in some guc code.
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0+intel_uc_init_fw (dev_priv); ret =i915_gem_init (dev_priv);
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 53 lines · Ville Syrjälä
Quoted 52 lines · Jackie Li
Static WOPCM partitioning would lead to GuC loading failure if the GuC/HuC firmware size exceeded current static 512KB partition boundary.
This patch enabled the dynamical calculation of the WOPCM aperture used by GuC/HuC firmware. GuC WOPCM offset was set to HuC size + reserved WOPCM size. GuC WOPCM size was set to total WOPCM size - GuC WOPCM offset - RC6CTX size.
Signed-off-by Jackie Li <[email protected]>Cc Michal Wajdeczko <[email protected]>Cc Sagar Arun Kamble <[email protected]>Cc Sujaritha Sundaresan <[email protected]>Reviewed-by Daniele Ceraolo Spurio <[email protected]>Reviewed-by John Spotswood <[email protected]>Reviewed-by Oscar Mateo <[email protected]>--- drivers/gpu/drm/i915/i915_drv.c | 15 ++++ drivers/gpu/drm/i915/i915_drv.h | 13 ++++ drivers/gpu/drm/i915/i915_gem_context.c | 4 +- drivers/gpu/drm/i915/i915_guc_reg.h | 18 ++++- drivers/gpu/drm/i915/intel_guc.c | 46 ++++++++++-- drivers/gpu/drm/i915/intel_guc.h | 18 +---- drivers/gpu/drm/i915/intel_huc.c | 3 +- drivers/gpu/drm/i915/intel_uc.c | 128 +++++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_uc_fw.c | 12 ++- 9 files changed, 223 insertions(+), 34 deletions(-)drivers/gpu/drm/i915/i915_drv.c +9
-0@@ -623,6 +623,15 @@ static void i915_gem_fini(struct drm_i915_private *dev_priv)WARN_ON (!list_empty (&dev_priv->contexts.list)); } +static void i915_wopcm_init (struct drm_i915_private *dev_priv) +{ +struct intel_wopcm_info *wopcm = &dev_priv->wopcm; + + wopcm->size =WOPCM_DEFAULT_SIZE ; + +DRM_DEBUG_DRIVER ("WOPCM size: %dKB\n" , wopcm->size >>10 ); +} +static int i915_load_modeset_init (struct drm_device *dev) {struct drm_i915_private *dev_priv =to_i915 (dev);@@ -670,6 +679,12 @@ static int i915_load_modeset_init(struct drm_device *dev)if (ret) goto cleanup_irq;
Quoted 9 lines
drivers/gpu/drm/i915/i915_drv.c static int i915_load_modeset_init(struct drm_device *dev) · line 686
Quoted 5 lines
drivers/gpu/drm/i915/i915_drv.c +5
-0+/* +* Get the wopcm memory info. +* NOTE: this need to be called before init FW. +*/ +i915_wopcm_init (dev_priv);Is this guc wopcm somehow related to the normal wopcm? And if so are you planning to use the wopcm information we extract from the hardware in stolen init? If this is just related to the guc then it would seem better to bury this in some guc code.
Thanks for the comments. Yes. I am planning to reuse these information from stolen init to create an description of overall wopcm info. the guc related use of wopcm was encapsulated in intel_wopcm_partition. The reason I put the initialization code here is that we are doing a size check against the wopcm size during intel_uc_fw_fetch (so that we won't waste time to create a gem object for a firmware object whose size is larger than wopcm size) and we also need to guarantee the wopcm info are available before the creation of the kernel gem context since we need place the gem context above wopcm when guc is active.
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c static int i915_load_modeset_init(struct drm_device *dev) · line 690
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +1
-0+intel_uc_init_fw (dev_priv); ret =i915_gem_init (dev_priv);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: implemented dynamic WOPCM partition.
In reply to Jackie Li== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: implemented dynamic WOPCM partition.
URL : https://patchwork.freedesktop.org/series/33165/
State : warning
== Summary ==
Series 33165v1 series starting with [1/2] drm/i915: implemented dynamic WOPCM partition.
https://patchwork.freedesktop.org/api/1.0/series/33165/revisions/1/mbox/
Test gem_basic:
Subgroup create-close:
dmesg-warn -> PASS (fi-cfl-s) fdo#103186 +1
Test kms_pipe_crc_basic:
Subgroup read-crc-pipe-c:
dmesg-warn -> PASS (fi-bsw-n3050) fdo#103479 +1
Subgroup suspend-read-crc-pipe-a:
pass -> SKIP (fi-hsw-4770r)fdo#103186 https://bugs.freedesktop.org/show_bug.cgi?id=103186
fdo#103479 https://bugs.freedesktop.org/show_bug.cgi?id=103479
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:440s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:456s fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:386s fi-bsw-n3050 total:289 pass:242 dwarn:1 dfail:0 fail:0 skip:46 time:556s fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:277s fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:506s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:508s fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:505s fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:486s fi-cfl-s total:289 pass:254 dwarn:3 dfail:0 fail:0 skip:32 time:556s fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:423s fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:263s fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:595s fi-hsw-4770 total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:433s fi-hsw-4770r total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:417s fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:428s fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:503s fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:465s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:489s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:576s fi-kbl-7567u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:476s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:586s fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:567s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-skl-6600u total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:591s fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:649s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:521s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:504s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:463s fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:571s fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:419s
Blacklisted hosts:
fi-cnl-y total:289 pass:259 dwarn:3 dfail:0 fail:0 skip:27 time:612s
8b0ae6b50a229dc661a02f4034252ee854cc9b83 drm-tip: 2017y-11m-03d-17h-15m-57s UTC integration manifest febf0ac24d41 HAX enable guc submission for CI5d9e2e09e6de drm/i915: implemented dynamic WOPCM partition.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_6956/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx