drm/i915/guc/slpc: Allocate, initialize and release SLPC

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)
v4: Rebase
v5: Move allocation of shared data into slpc_init() (Michal W)

Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Signed-off-by: Vinay Belgaumkar <vinay.belgaumkar@intel.com>
Signed-off-by: Sundaresan Sujaritha <sujaritha.sundaresan@intel.com>
Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210730202119.23810-5-vinay.belgaumkar@intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc.c
index 5b0f8c5..13d1623 100644 (file)
--- 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 40950f1..377e091 100644 (file)
--- 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 */
@@ -37,9 +47,28 @@ void intel_guc_slpc_init_early(struct intel_guc_slpc *slpc)
 
 int intel_guc_slpc_init(struct intel_guc_slpc *slpc)
 {
-       return 0;
+       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;
+
+       GEM_BUG_ON(slpc->vma);
+
+       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;
 }
 
 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 769c162..8bd7531 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc_types.h
@@ -9,6 +9,8 @@
 #include <linux/types.h>
 
 struct intel_guc_slpc {
+       struct i915_vma *vma;
+       struct slpc_shared_data *vaddr;
        bool supported;
        bool selected;
 };