CNL has its specific reserved GuC WOPCM size for RC6 and other hardware contexts. This patch updates the code to return CNL specific reserved GuC WOPCM size for RC6 and other hardware contexts so that the GuC WOPCM size can be calculated correctly for CNL. v9: - Created a new patch for these changes originally made in v8 4/6 patch of this series (Sagar/Michal) v10: - Used if-else ladder to the returning of context sizes (Joonas) Cc: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx> Cc: Michal Wajdeczko <michal.wajdeczko@xxxxxxxxx> Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx> Cc: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> Reviewed-by: Joonas Lahtinen <joonas.lahtinen@xxxxxxxxxxxxxxx> (v9) Signed-off-by: Jackie Li <yaodong.li@xxxxxxxxx> --- drivers/gpu/drm/i915/intel_guc_wopcm.c | 6 ++++-- drivers/gpu/drm/i915/intel_guc_wopcm.h | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_guc_wopcm.c b/drivers/gpu/drm/i915/intel_guc_wopcm.c index cf832b9..9a276fe 100644 --- a/drivers/gpu/drm/i915/intel_guc_wopcm.c +++ b/drivers/gpu/drm/i915/intel_guc_wopcm.c @@ -13,8 +13,10 @@ static inline u32 context_reserved_size(struct intel_guc *guc) if (IS_GEN9_LP(i915)) return BXT_GUC_WOPCM_RC6_CTX_RESERVED; - - return 0; + else if (INTEL_GEN(i915) >= 10) + return CNL_GUC_WOPCM_HW_CTX_RESERVED; + else + return 0; } static inline int gen9_check_dword_gap(struct intel_guc_wopcm *guc_wopcm) diff --git a/drivers/gpu/drm/i915/intel_guc_wopcm.h b/drivers/gpu/drm/i915/intel_guc_wopcm.h index a632caa..13fcab6 100644 --- a/drivers/gpu/drm/i915/intel_guc_wopcm.h +++ b/drivers/gpu/drm/i915/intel_guc_wopcm.h @@ -52,6 +52,8 @@ struct intel_guc; #define GUC_WOPCM_STACK_RESERVED (8 << 10) /* 24KB at the end of GuC WOPCM is reserved for RC6 CTX on BXT. */ #define BXT_GUC_WOPCM_RC6_CTX_RESERVED (24 << 10) +/* 36KB WOPCM reserved at the end of GuC WOPCM on CNL. */ +#define CNL_GUC_WOPCM_HW_CTX_RESERVED (36 << 10) /* * GuC WOPCM starts at 144KB (GUC_WOPCM_RESERVED + 128KB reserved for GuC -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
