On 7/10/2021 7:27 AM, Michal Wajdeczko wrote:
Hi Vinay,
On 10.07.2021 03:20, Vinay Belgaumkar wrote:
Add macros to check for slpc support. This feature is currently supported for gen12+ and enabled whenever guc submission is enabled/selected.
please try to use consistent names across all patches:
s/slpc/SLPC s/gen12/Gen12 s/guc/GuC
Signed-off-by: Vinay Belgaumkar vinay.belgaumkar@intel.com Signed-off-by: Sundaresan Sujaritha sujaritha.sundaresan@intel.com Signed-off-by: Daniele Ceraolo Spurio daniele.ceraolospurio@intel.com
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 1 + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 ++ .../gpu/drm/i915/gt/uc/intel_guc_submission.c | 21 +++++++++++++++++++ .../gpu/drm/i915/gt/uc/intel_guc_submission.h | 16 ++++++++++++++ drivers/gpu/drm/i915/gt/uc/intel_uc.c | 6 ++++-- drivers/gpu/drm/i915/gt/uc/intel_uc.h | 1 + 6 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c index 979128e28372..b9a809f2d221 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -157,6 +157,7 @@ void intel_guc_init_early(struct intel_guc *guc) intel_guc_ct_init_early(&guc->ct); intel_guc_log_init_early(&guc->log); intel_guc_submission_init_early(guc);
intel_guc_slpc_init_early(guc);
mutex_init(&guc->send_mutex); spin_lock_init(&guc->irq_lock);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.h b/drivers/gpu/drm/i915/gt/uc/intel_guc.h index 5d94cf482516..e5a456918b88 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.h @@ -57,6 +57,8 @@ struct intel_guc {
bool submission_supported; bool submission_selected;
bool slpc_supported;
bool slpc_selected;
struct i915_vma *ads_vma; struct __guc_ads_blob *ads_blob;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c index 9c102bf0c8e3..e2644a05f298 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c @@ -2351,6 +2351,27 @@ void intel_guc_submission_init_early(struct intel_guc *guc) guc->submission_selected = __guc_submission_selected(guc); }
+static bool __guc_slpc_supported(struct intel_guc *guc)
hmm, easy to confuse with intel_guc_slpc_is_supported, so maybe:
__detect_slpc_supported()
ok.
(yes, I know you were following code above)
+{
- /* GuC slpc is unavailable for pre-Gen12 */
s/slpc/SLPC
- return guc->submission_supported &&
GRAPHICS_VER(guc_to_gt(guc)->i915) >= 12;+}
+static bool __guc_slpc_selected(struct intel_guc *guc) +{
- if (!intel_guc_slpc_is_supported(guc))
return false;- return guc->submission_selected;
+}
+void intel_guc_slpc_init_early(struct intel_guc *guc) +{
- guc->slpc_supported = __guc_slpc_supported(guc);
- guc->slpc_selected = __guc_slpc_selected(guc);
+}
in patch 4/16 you are introducing intel_guc_slpc.c|h so to have proper encapsulation better to define this function as
void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc) { }
the uc_state_checkers force the use of struct intel_guc *guc as the param. don't think I can change that to refer to slpc instead.
static inline bool intel_guc_slpc_is_supported(struct intel_guc *guc) { return guc->slpc_supported; }
slpc_supported needs to be inside the guc struct.
and move it to intel_guc_slpc.c
- static inline struct intel_context * g2h_context_lookup(struct intel_guc *guc, u32 desc_idx) {
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h index be767eb6ff71..7ae5fd052faf 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.h @@ -13,6 +13,7 @@ struct drm_printer; struct intel_engine_cs;
+void intel_guc_slpc_init_early(struct intel_guc *guc);
it really does not belong to this .h
void intel_guc_submission_init_early(struct intel_guc *guc); int intel_guc_submission_init(struct intel_guc *guc); void intel_guc_submission_enable(struct intel_guc *guc); @@ -50,4 +51,19 @@ static inline bool intel_guc_submission_is_used(struct intel_guc *guc) return intel_guc_is_used(guc) && intel_guc_submission_is_wanted(guc); }
+static inline bool intel_guc_slpc_is_supported(struct intel_guc *guc) +{
- return guc->slpc_supported;
+}
+static inline bool intel_guc_slpc_is_wanted(struct intel_guc *guc) +{
- return guc->slpc_selected;
+}
+static inline bool intel_guc_slpc_is_used(struct intel_guc *guc) +{
- return intel_guc_submission_is_used(guc) && intel_guc_slpc_is_wanted(guc);
+}
did you try to define them in intel_guc_slpc.h ?
note that to avoid circular dependencies you can define slpc struct in intel_guc_slpc_types.h and then
in intel_guc.h: #include "intel_guc_slpc_types.h" instead of intel_guc_slpc.h
in intel_guc_slpc.h: #include "intel_guc.h" #include "intel_guc_slpc_types.h" #include "intel_guc_submission.h"
Sure, will give that a try.
- #endif
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_uc.c index 61be0aa81492..dca5f6d0641b 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.c @@ -76,16 +76,18 @@ static void __confirm_options(struct intel_uc *uc) struct drm_i915_private *i915 = uc_to_gt(uc)->i915;
drm_dbg(&i915->drm,
"enable_guc=%d (guc:%s submission:%s huc:%s)\n",
"enable_guc=%d (guc:%s submission:%s huc:%s slpc:%s)\n",
yesno(intel_uc_wants_huc(uc)));
yesno(intel_uc_wants_huc(uc)),yesno(intel_uc_wants_guc_slpc(uc)));if (i915->params.enable_guc == 0) { GEM_BUG_ON(intel_uc_wants_guc(uc)); GEM_BUG_ON(intel_uc_wants_guc_submission(uc)); GEM_BUG_ON(intel_uc_wants_huc(uc));
GEM_BUG_ON(intel_uc_wants_guc_slpc(uc));return; }
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc.h b/drivers/gpu/drm/i915/gt/uc/intel_uc.h index e2da2b6e76e1..38e465fd8a0c 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc.h @@ -83,6 +83,7 @@ __uc_state_checker(x, func, uses, used) uc_state_checkers(guc, guc); uc_state_checkers(huc, huc); uc_state_checkers(guc, guc_submission); +uc_state_checkers(guc, guc_slpc);
#undef uc_state_checkers #undef __uc_state_checker