From: Tom O'Rourke <Tom.O'Rourke@xxxxxxxxx> Send host2guc SLPC reset event to GuC post GuC load. Post this, i915 can ascertain if SLPC has started running successfully through shared data. This check is done during intel_init_gt_powersave. This allows to get initial configuration setup by SLPC and if needed move to Host RPS if SLPC runs into issues. v1: Extract host2guc_slpc to handle slpc status code coding style changes (Paulo) Removed WARN_ON for checking msb of gtt address of shared gem obj. (ChrisW) host2guc_action to i915_guc_action change.(Sagar) Updating SLPC enabled status. (Sagar) v2: Commit message update. (David) v3: Rebase. v4: Added DRM_INFO message when SLPC is enabled. v5: Updated patch as host2guc_slpc is moved to earlier patch. SLPC activation status message put after checking the state from shared data during intel_init_gt_powersave. Signed-off-by: Tom O'Rourke <Tom.O'Rourke@xxxxxxxxx> Signed-off-by: Sagar Arun Kamble <sagar.a.kamble@xxxxxxxxx> --- drivers/gpu/drm/i915/intel_pm.c | 8 +++ drivers/gpu/drm/i915/intel_slpc.c | 103 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_slpc.h | 4 ++ 3 files changed, 115 insertions(+) diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index b905638..80a8432 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -6667,6 +6667,14 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv) intel_runtime_pm_get(dev_priv); } + if (i915.enable_slpc) { + dev_priv->guc.slpc.active = intel_slpc_get_status(dev_priv); + if (!dev_priv->guc.slpc.active) { + i915.enable_slpc = 0; + intel_sanitize_gt_powersave(dev_priv); + } + } + mutex_lock(&dev_priv->drm.struct_mutex); mutex_lock(&dev_priv->rps.hw_lock); diff --git a/drivers/gpu/drm/i915/intel_slpc.c b/drivers/gpu/drm/i915/intel_slpc.c index 57d0d03..9dd4d6e 100644 --- a/drivers/gpu/drm/i915/intel_slpc.c +++ b/drivers/gpu/drm/i915/intel_slpc.c @@ -154,6 +154,109 @@ void intel_slpc_disable(struct drm_i915_private *dev_priv) { } +static void host2guc_slpc_reset(struct drm_i915_private *dev_priv) +{ + struct slpc_event_input data = {0}; + u32 shared_data_gtt_offset = i915_ggtt_offset(dev_priv->guc.slpc.vma); + + data.header.value = SLPC_EVENT(SLPC_EVENT_RESET, 2); + data.args[0] = shared_data_gtt_offset; + data.args[1] = 0; + + host2guc_slpc(dev_priv, &data, 4); +} + void intel_slpc_enable(struct drm_i915_private *dev_priv) { + host2guc_slpc_reset(dev_priv); + dev_priv->guc.slpc.active = true; +} + +static void host2guc_slpc_query_task_state(struct drm_i915_private *dev_priv) +{ + struct slpc_event_input data = {0}; + u32 shared_data_gtt_offset = i915_ggtt_offset(dev_priv->guc.slpc.vma); + + data.header.value = SLPC_EVENT(SLPC_EVENT_QUERY_TASK_STATE, 2); + data.args[0] = shared_data_gtt_offset; + data.args[1] = 0; + + host2guc_slpc(dev_priv, &data, 4); +} + +void intel_slpc_query_task_state(struct drm_i915_private *dev_priv) +{ + if (dev_priv->guc.slpc.active) + host2guc_slpc_query_task_state(dev_priv); +} + +/* + * This function will reads the state updates from GuC SLPC into shared data + * by invoking H2G action. Returns current state of GuC SLPC. + */ +void intel_slpc_read_shared_data(struct drm_i915_private *dev_priv, + struct slpc_shared_data *data) +{ + struct page *page; + void *pv = NULL; + + intel_slpc_query_task_state(dev_priv); + + page = i915_vma_first_page(dev_priv->guc.slpc.vma); + pv = kmap_atomic(page); + + drm_clflush_virt_range(pv, PAGE_SIZE); + memcpy(data, pv, sizeof(struct slpc_shared_data)); + + kunmap_atomic(pv); +} + +const char *intel_slpc_get_state_str(enum slpc_global_state state) +{ + if (state == SLPC_GLOBAL_STATE_NOT_RUNNING) + return "not running"; + else if (state == SLPC_GLOBAL_STATE_INITIALIZING) + return "initializing"; + else if (state == SLPC_GLOBAL_STATE_RESETTING) + return "resetting"; + else if (state == SLPC_GLOBAL_STATE_RUNNING) + return "running"; + else if (state == SLPC_GLOBAL_STATE_SHUTTING_DOWN) + return "shutting down"; + else if (state == SLPC_GLOBAL_STATE_ERROR) + return "error"; + else + return "unknown"; +} +bool intel_slpc_get_status(struct drm_i915_private *dev_priv) +{ + struct slpc_shared_data data; + bool ret = false; + + intel_slpc_read_shared_data(dev_priv, &data); + DRM_INFO("SLPC state: %s\n", + intel_slpc_get_state_str(data.global_state)); + + switch (data.global_state) { + case SLPC_GLOBAL_STATE_RUNNING: + /* Capture required state from SLPC here */ + ret = true; + break; + case SLPC_GLOBAL_STATE_ERROR: + DRM_ERROR("SLPC in error state.\n"); + break; + case SLPC_GLOBAL_STATE_RESETTING: + /* + * SLPC enabling in GuC should be completing fast. + * If SLPC is taking time to initialize (unlikely as we are + * sending reset event during GuC load itself). + * TODO: Need to wait till state changes to RUNNING. + */ + ret = true; + DRM_ERROR("SLPC not running yet.!!!"); + break; + default: + break; + } + return ret; } diff --git a/drivers/gpu/drm/i915/intel_slpc.h b/drivers/gpu/drm/i915/intel_slpc.h index 4378265..a777b57 100644 --- a/drivers/gpu/drm/i915/intel_slpc.h +++ b/drivers/gpu/drm/i915/intel_slpc.h @@ -200,5 +200,9 @@ enum slpc_status { void intel_slpc_suspend(struct drm_i915_private *dev_priv); void intel_slpc_disable(struct drm_i915_private *dev_priv); void intel_slpc_enable(struct drm_i915_private *dev_priv); +void intel_slpc_read_shared_data(struct drm_i915_private *dev_priv, + struct slpc_shared_data *data); +const char *intel_slpc_get_state_str(enum slpc_global_state state); +bool intel_slpc_get_status(struct drm_i915_private *dev_priv); #endif -- 1.9.1 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx