drm/i915/guc: More debug print updates - GuC SLPC

Update a bunch more debug prints to use the new GT based scheme.

v2: Also change prints to use %pe for error values (MichalW).

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230207050717.1833718-6-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
index b585509..fcf5161 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_rc.c
@@ -6,6 +6,7 @@
 #include <linux/string_helpers.h>
 
 #include "intel_guc_rc.h"
+#include "intel_guc_print.h"
 #include "gt/intel_gt.h"
 #include "i915_drv.h"
 
@@ -70,13 +71,12 @@ static int __guc_rc_control(struct intel_guc *guc, bool enable)
 
        ret = guc_action_control_gucrc(guc, enable);
        if (ret) {
-               i915_probe_error(guc_to_gt(guc)->i915, "Failed to %s GuC RC (%pe)\n",
-                                str_enable_disable(enable), ERR_PTR(ret));
+               guc_probe_error(guc, "Failed to %s RC (%pe)\n",
+                               str_enable_disable(enable), ERR_PTR(ret));
                return ret;
        }
 
-       drm_info(&gt->i915->drm, "GuC RC: %s\n",
-                str_enabled_disabled(enable));
+       guc_info(guc, "RC %s\n", str_enabled_disabled(enable));
 
        return 0;
 }

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 6346493..026d738 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c
@@ -9,6 +9,7 @@
 #include "i915_drv.h"
 #include "i915_reg.h"
 #include "intel_guc_slpc.h"
+#include "intel_guc_print.h"
 #include "intel_mchbar_regs.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_regs.h"
@@ -171,14 +172,12 @@ static int guc_action_slpc_query(struct intel_guc *guc, u32 offset)
 static int slpc_query_task_state(struct intel_guc_slpc *slpc)
 {
        struct intel_guc *guc = slpc_to_guc(slpc);
-       struct drm_i915_private *i915 = slpc_to_i915(slpc);
        u32 offset = intel_guc_ggtt_offset(guc, slpc->vma);
        int ret;
 
        ret = guc_action_slpc_query(guc, offset);
        if (unlikely(ret))
-               i915_probe_error(i915, "Failed to query task state (%pe)\n",
-                                ERR_PTR(ret));
+               guc_probe_error(guc, "Failed to query task state: %pe\n", ERR_PTR(ret));
 
        drm_clflush_virt_range(slpc->vaddr, SLPC_PAGE_SIZE_BYTES);
 
@@ -188,15 +187,14 @@ static int slpc_query_task_state(struct intel_guc_slpc *slpc)
 static int slpc_set_param(struct intel_guc_slpc *slpc, u8 id, u32 value)
 {
        struct intel_guc *guc = slpc_to_guc(slpc);
-       struct drm_i915_private *i915 = slpc_to_i915(slpc);
        int ret;
 
        GEM_BUG_ON(id >= SLPC_MAX_PARAM);
 
        ret = guc_action_slpc_set_param(guc, id, value);
        if (ret)
-               i915_probe_error(i915, "Failed to set param %d to %u (%pe)\n",
-                                id, value, ERR_PTR(ret));
+               guc_probe_error(guc, "Failed to set param %d to %u: %pe\n",
+                               id, value, ERR_PTR(ret));
 
        return ret;
 }
@@ -212,8 +210,8 @@ static int slpc_unset_param(struct intel_guc_slpc *slpc, u8 id)
 
 static int slpc_force_min_freq(struct intel_guc_slpc *slpc, u32 freq)
 {
-       struct drm_i915_private *i915 = slpc_to_i915(slpc);
        struct intel_guc *guc = slpc_to_guc(slpc);
+       struct drm_i915_private *i915 = slpc_to_i915(slpc);
        intel_wakeref_t wakeref;
        int ret = 0;
 
@@ -236,9 +234,8 @@ static int slpc_force_min_freq(struct intel_guc_slpc *slpc, u32 freq)
                                        SLPC_PARAM_GLOBAL_MIN_GT_UNSLICE_FREQ_MHZ,
                                        freq);
                if (ret)
-                       drm_notice(&i915->drm,
-                                  "Failed to send set_param for min freq(%d): (%d)\n",
-                                  freq, ret);
+                       guc_notice(guc, "Failed to send set_param for min freq(%d): %pe\n",
+                                  freq, ERR_PTR(ret));
        }
 
        return ret;
@@ -267,7 +264,6 @@ static void slpc_boost_work(struct work_struct *work)
 int intel_guc_slpc_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;
 
@@ -275,9 +271,7 @@ int intel_guc_slpc_init(struct intel_guc_slpc *slpc)
 
        err = intel_guc_allocate_and_map_vma(guc, size, &slpc->vma, (void **)&slpc->vaddr);
        if (unlikely(err)) {
-               i915_probe_error(i915,
-                                "Failed to allocate SLPC struct (err=%pe)\n",
-                                ERR_PTR(err));
+               guc_probe_error(guc, "Failed to allocate SLPC struct: %pe\n", ERR_PTR(err));
                return err;
        }
 
@@ -338,7 +332,6 @@ static int guc_action_slpc_reset(struct intel_guc *guc, u32 offset)
 
 static int slpc_reset(struct intel_guc_slpc *slpc)
 {
-       struct drm_i915_private *i915 = slpc_to_i915(slpc);
        struct intel_guc *guc = slpc_to_guc(slpc);
        u32 offset = intel_guc_ggtt_offset(guc, slpc->vma);
        int ret;
@@ -346,15 +339,14 @@ static int slpc_reset(struct intel_guc_slpc *slpc)
        ret = guc_action_slpc_reset(guc, offset);
 
        if (unlikely(ret < 0)) {
-               i915_probe_error(i915, "SLPC reset action failed (%pe)\n",
-                                ERR_PTR(ret));
+               guc_probe_error(guc, "SLPC reset action failed: %pe\n", ERR_PTR(ret));
                return ret;
        }
 
        if (!ret) {
                if (wait_for(slpc_is_running(slpc), SLPC_RESET_TIMEOUT_MS)) {
-                       i915_probe_error(i915, "SLPC not enabled! State = %s\n",
-                                        slpc_get_state_string(slpc));
+                       guc_probe_error(guc, "SLPC not enabled! State = %s\n",
+                                       slpc_get_state_string(slpc));
                        return -EIO;
                }
        }
@@ -495,8 +487,8 @@ int intel_guc_slpc_set_min_freq(struct intel_guc_slpc *slpc, u32 val)
                             SLPC_PARAM_IGNORE_EFFICIENT_FREQUENCY,
                             val < slpc->rp1_freq);
        if (ret) {
-               i915_probe_error(i915, "Failed to toggle efficient freq (%pe)\n",
-                                ERR_PTR(ret));
+               guc_probe_error(slpc_to_guc(slpc), "Failed to toggle efficient freq: %pe\n",
+                               ERR_PTR(ret));
                goto out;
        }
 
@@ -611,15 +603,12 @@ static int slpc_set_softlimits(struct intel_guc_slpc *slpc)
 
 static bool is_slpc_min_freq_rpmax(struct intel_guc_slpc *slpc)
 {
-       struct drm_i915_private *i915 = slpc_to_i915(slpc);
        int slpc_min_freq;
        int ret;
 
        ret = intel_guc_slpc_get_min_freq(slpc, &slpc_min_freq);
        if (ret) {
-               drm_err(&i915->drm,
-                       "Failed to get min freq: (%d)\n",
-                       ret);
+               guc_err(slpc_to_guc(slpc), "Failed to get min freq: %pe\n", ERR_PTR(ret));
                return false;
        }
 
@@ -685,9 +674,8 @@ int intel_guc_slpc_override_gucrc_mode(struct intel_guc_slpc *slpc, u32 mode)
        with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
                ret = slpc_set_param(slpc, SLPC_PARAM_PWRGATE_RC_MODE, mode);
                if (ret)
-                       drm_err(&i915->drm,
-                               "Override gucrc mode %d failed %d\n",
-                               mode, ret);
+                       guc_err(slpc_to_guc(slpc), "Override RC mode %d failed: %pe\n",
+                               mode, ERR_PTR(ret));
        }
 
        return ret;
@@ -702,9 +690,7 @@ int intel_guc_slpc_unset_gucrc_mode(struct intel_guc_slpc *slpc)
        with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
                ret = slpc_unset_param(slpc, SLPC_PARAM_PWRGATE_RC_MODE);
                if (ret)
-                       drm_err(&i915->drm,
-                               "Unsetting gucrc mode failed %d\n",
-                               ret);
+                       guc_err(slpc_to_guc(slpc), "Unsetting RC mode failed: %pe\n", ERR_PTR(ret));
        }
 
        return ret;
@@ -725,7 +711,7 @@ int intel_guc_slpc_unset_gucrc_mode(struct intel_guc_slpc *slpc)
  */
 int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)
 {
-       struct drm_i915_private *i915 = slpc_to_i915(slpc);
+       struct intel_guc *guc = slpc_to_guc(slpc);
        int ret;
 
        GEM_BUG_ON(!slpc->vma);
@@ -734,8 +720,7 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)
 
        ret = slpc_reset(slpc);
        if (unlikely(ret < 0)) {
-               i915_probe_error(i915, "SLPC Reset event returned (%pe)\n",
-                                ERR_PTR(ret));
+               guc_probe_error(guc, "SLPC Reset event returned: %pe\n", ERR_PTR(ret));
                return ret;
        }
 
@@ -743,7 +728,7 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)
        if (unlikely(ret < 0))
                return ret;
 
-       intel_guc_pm_intrmsk_enable(to_gt(i915));
+       intel_guc_pm_intrmsk_enable(slpc_to_gt(slpc));
 
        slpc_get_rp_values(slpc);
 
@@ -753,16 +738,14 @@ int intel_guc_slpc_enable(struct intel_guc_slpc *slpc)
        /* Set SLPC max limit to RP0 */
        ret = slpc_use_fused_rp0(slpc);
        if (unlikely(ret)) {
-               i915_probe_error(i915, "Failed to set SLPC max to RP0 (%pe)\n",
-                                ERR_PTR(ret));
+               guc_probe_error(guc, "Failed to set SLPC max to RP0: %pe\n", ERR_PTR(ret));
                return ret;
        }
 
        /* Revert SLPC min/max to softlimits if necessary */
        ret = slpc_set_softlimits(slpc);
        if (unlikely(ret)) {
-               i915_probe_error(i915, "Failed to set SLPC softlimits (%pe)\n",
-                                ERR_PTR(ret));
+               guc_probe_error(guc, "Failed to set SLPC softlimits: %pe\n", ERR_PTR(ret));
                return ret;
        }