Commit 039adf39 authored by John Harrison's avatar John Harrison

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: default avatarJohn Harrison <John.C.Harrison@Intel.com>
Reviewed-by: default avatarAndi Shyti <andi.shyti@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231009183802.673882-3-John.C.Harrison@Intel.com
parent e96aef07
...@@ -68,8 +68,7 @@ static void gsc_work(struct work_struct *work) ...@@ -68,8 +68,7 @@ static void gsc_work(struct work_struct *work)
* A proxy failure right after firmware load means the proxy-init * A proxy failure right after firmware load means the proxy-init
* step has failed so mark GSC as not usable after this * step has failed so mark GSC as not usable after this
*/ */
drm_err(&gt->i915->drm, gt_err(gt, "GSC proxy handler failed to init\n");
"GSC proxy handler failed to init\n");
intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL); intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
} }
goto out_put; goto out_put;
...@@ -83,11 +82,10 @@ static void gsc_work(struct work_struct *work) ...@@ -83,11 +82,10 @@ static void gsc_work(struct work_struct *work)
* status register to check if the proxy init was actually successful * status register to check if the proxy init was actually successful
*/ */
if (intel_gsc_uc_fw_proxy_init_done(gsc, false)) { 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); intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_RUNNING);
} else { } else {
drm_err(&gt->i915->drm, gt_err(gt, "GSC status reports proxy init not complete\n");
"GSC status reports proxy init not complete\n");
intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL); intel_uc_fw_change_status(&gsc->fw, INTEL_UC_FIRMWARE_LOAD_FAIL);
} }
} }
......
...@@ -71,6 +71,7 @@ ...@@ -71,6 +71,7 @@
#include "gem/i915_gem_pm.h" #include "gem/i915_gem_pm.h"
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
#include "gt/intel_gt_pm.h" #include "gt/intel_gt_pm.h"
#include "gt/intel_gt_print.h"
#include "gt/intel_rc6.h" #include "gt/intel_rc6.h"
#include "pxp/intel_pxp.h" #include "pxp/intel_pxp.h"
...@@ -425,7 +426,7 @@ static int i915_pcode_init(struct drm_i915_private *i915) ...@@ -425,7 +426,7 @@ static int i915_pcode_init(struct drm_i915_private *i915)
for_each_gt(gt, i915, id) { for_each_gt(gt, i915, id) {
ret = intel_pcode_init(gt->uncore); ret = intel_pcode_init(gt->uncore);
if (ret) { 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; return ret;
} }
} }
......
...@@ -206,6 +206,7 @@ ...@@ -206,6 +206,7 @@
#include "gt/intel_gt.h" #include "gt/intel_gt.h"
#include "gt/intel_gt_clock_utils.h" #include "gt/intel_gt_clock_utils.h"
#include "gt/intel_gt_mcr.h" #include "gt/intel_gt_mcr.h"
#include "gt/intel_gt_print.h"
#include "gt/intel_gt_regs.h" #include "gt/intel_gt_regs.h"
#include "gt/intel_lrc.h" #include "gt/intel_lrc.h"
#include "gt/intel_lrc_reg.h" #include "gt/intel_lrc_reg.h"
...@@ -1659,9 +1660,8 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream) ...@@ -1659,9 +1660,8 @@ static void i915_oa_stream_destroy(struct i915_perf_stream *stream)
free_noa_wait(stream); free_noa_wait(stream);
if (perf->spurious_report_rs.missed) { if (perf->spurious_report_rs.missed) {
drm_notice(&gt->i915->drm, gt_notice(gt, "%d spurious OA report notices suppressed due to ratelimiting\n",
"%d spurious OA report notices suppressed due to ratelimiting\n", perf->spurious_report_rs.missed);
perf->spurious_report_rs.missed);
} }
} }
...@@ -1852,7 +1852,7 @@ static int alloc_oa_buffer(struct i915_perf_stream *stream) ...@@ -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); ret = i915_vma_pin(vma, 0, SZ_16M, PIN_GLOBAL | PIN_HIGH);
if (ret) { 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; goto err_unref;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment