On 26.07.2021 21:07, Vinay Belgaumkar wrote:
Allocate data structures for SLPC and functions for initializing on host side.
v2: Address review comments (Michal W) v3: Remove unnecessary header includes (Michal W)
Signed-off-by: Vinay Belgaumkar vinay.belgaumkar@intel.com Signed-off-by: Sundaresan Sujaritha sujaritha.sundaresan@intel.com
drivers/gpu/drm/i915/gt/uc/intel_guc.c | 11 ++++++ drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 36 ++++++++++++++++++- .../gpu/drm/i915/gt/uc/intel_guc_slpc_types.h | 2 ++ 3 files changed, 48 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c index 5b0f8c541b69..13d162353b1a 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc.c @@ -336,6 +336,12 @@ int intel_guc_init(struct intel_guc *guc) goto err_ct; }
- if (intel_guc_slpc_is_used(guc)) {
ret = intel_guc_slpc_init(&guc->slpc);
if (ret)
goto err_submission;
- }
- /* now that everything is perma-pinned, initialize the parameters */ guc_init_params(guc);
@@ -346,6 +352,8 @@ int intel_guc_init(struct intel_guc *guc)
return 0;
+err_submission:
- intel_guc_submission_fini(guc);
err_ct: intel_guc_ct_fini(&guc->ct); err_ads: @@ -368,6 +376,9 @@ void intel_guc_fini(struct intel_guc *guc)
i915_ggtt_disable_guc(gt->ggtt);
- if (intel_guc_slpc_is_used(guc))
intel_guc_slpc_fini(&guc->slpc);
- if (intel_guc_submission_is_used(guc)) intel_guc_submission_fini(guc);
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c index 7275100ef8f8..bae4e33db0f8 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c @@ -12,6 +12,16 @@ static inline struct intel_guc *slpc_to_guc(struct intel_guc_slpc *slpc) return container_of(slpc, struct intel_guc, slpc); }
+static inline struct intel_gt *slpc_to_gt(struct intel_guc_slpc *slpc) +{
- return guc_to_gt(slpc_to_guc(slpc));
+}
+static inline struct drm_i915_private *slpc_to_i915(struct intel_guc_slpc *slpc) +{
- return slpc_to_gt(slpc)->i915;
+}
static bool __detect_slpc_supported(struct intel_guc *guc) { /* GuC SLPC is unavailable for pre-Gen12 */ @@ -35,11 +45,35 @@ void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc) guc->slpc_selected = __guc_slpc_selected(guc); }
+static int slpc_shared_data_init(struct intel_guc_slpc *slpc) +{
- struct intel_guc *guc = slpc_to_guc(slpc);
- struct drm_i915_private *i915 = slpc_to_i915(slpc);
- u32 size = PAGE_ALIGN(sizeof(struct slpc_shared_data));
- int err;
- err = intel_guc_allocate_and_map_vma(guc, size, &slpc->vma, (void **)&slpc->vaddr);
- if (unlikely(err)) {
drm_err(&i915->drm,
"Failed to allocate SLPC struct (err=%pe)\n",
ERR_PTR(err));
return err;
- }
- return err;
+}
int intel_guc_slpc_init(struct intel_guc_slpc *slpc) {
- return 0;
- GEM_BUG_ON(slpc->vma);
- return slpc_shared_data_init(slpc);
}
void intel_guc_slpc_fini(struct intel_guc_slpc *slpc) {
- if (!slpc->vma)
return;
- i915_vma_unpin_and_release(&slpc->vma, I915_VMA_RELEASE_MAP);
} diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h index bfe4a7f9ce15..edcf4c05bd9f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h @@ -7,6 +7,8 @@ #define _INTEL_GUC_SLPC_TYPES_H_
struct intel_guc_slpc {
- struct i915_vma *vma;
- struct slpc_shared_data *vaddr;
};
#endif
Reviewed-by: Michal Wajdeczko michal.wajdeczko@intel.com