drm/i915: More use of GT specific print helpers

Update a bunch of GT related print messages in non-GT files to use the
GT specific helpers.

Signed-off-by: John Harrison <John.C.Harrison@Intel.com>
Reviewed-by: Andi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231009183802.673882-3-John.C.Harrison@Intel.com

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
index 0d3b22a7436595eb4886024d8616697548ac5d3d..453d855dd1de7918c21217ec067b16e1b5f69246 100644 (file)
--- a/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c
@@ -68,8 +68,7 @@ static void gsc_work(struct work_struct *work)
                                 * A proxy failure right after firmware load means the proxy-init
                                 * step has failed so mark GSC as not usable after this
                                 */
-                               drm_err(&gt->i915->drm,
-                                       "GSC proxy handler failed to init\n");
+                               gt_err(gt, "GSC proxy handler failed to init\n");
                                intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
                        }
                        goto out_put;
@@ -83,11 +82,10 @@ static void gsc_work(struct work_struct *work)
                         * status register to check if the proxy init was actually successful
                         */
                        if (intel_gsc_uc_fw_proxy_init_done(gsc, false)) {
-                               drm_dbg(&gt->i915->drm, "GSC Proxy initialized\n");
+                               gt_dbg(gt, "GSC Proxy initialized\n");
                                intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_RUNNING);
                        } else {
-                               drm_err(&gt->i915->drm,
-                                       "GSC status reports proxy init not complete\n");
+                               gt_err(gt, "GSC status reports proxy init not complete\n");
                                intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
                        }
                }

diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 93fe2e54f1c47e212fef96cc25be491c5f8ff927..39703a578a2471d1603e24c9864b9639c34d3384 100644 (file)
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -71,6 +71,7 @@
 #include "gem/i915_gem_pm.h"
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_pm.h"
+#include "gt/intel_gt_print.h"
 #include "gt/intel_rc6.h"
 
 #include "pxp/intel_pxp.h"
@@ -425,7 +426,7 @@ static int i915_pcode_init(struct drm_i915_private *i915)
        for_each_gt(gt, i915, id) {
                ret = intel_pcode_init(gt->uncore);
                if (ret) {
-                       drm_err(&gt->i915->drm, "gt%d: intel_pcode_init failed %d\n", id, ret);
+                       gt_err(gt, "intel_pcode_init failed %d\n", ret);
                        return ret;
                }
        }

diff --git a/drivers/gpu/drm/i915/i915_perf.c b/drivers/gpu/drm/i915/i915_perf.c
index 1347e4ec9dd5a657edfa7af55aee0acad5207787..8f7ab64feec0dcc6eb88a593c6aa351c80069c52 100644 (file)
--- a/drivers/gpu/drm/i915/i915_perf.c
+++ b/drivers/gpu/drm/i915/i915_perf.c
@@ -206,6 +206,7 @@
 #include "gt/intel_gt.h"
 #include "gt/intel_gt_clock_utils.h"
 #include "gt/intel_gt_mcr.h"
+#include "gt/intel_gt_print.h"
 #include "gt/intel_gt_regs.h"
 #include "gt/intel_lrc.h"
 #include "gt/intel_lrc_reg.h"
@@ -1659,9 +1660,8 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream)
        free_noa_wait(stream);
 
        if (perf->spurious_report_rs.missed) {
-               drm_notice(&gt->i915->drm,
-                          "%d spurious OA report notices suppressed due to ratelimiting\n",
-                          perf->spurious_report_rs.missed);
+               gt_notice(gt, "%d spurious OA report notices suppressed due to ratelimiting\n",
+                         perf->spurious_report_rs.missed);
        }
 }
 
@@ -1852,7 +1852,7 @@ static int alloc_oa_buffer(struct i915_perf_stream *stream)
         */
        ret = i915_vma_pin(vma, 0, SZ_16M, PIN_GLOBAL | PIN_HIGH);
        if (ret) {
-               drm_err(&gt->i915->drm, "Failed to pin OA buffer %d\n", ret);
+               gt_err(gt, "Failed to pin OA buffer %d\n", ret);
                goto err_unref;
        }