From: Lucas De Marchi Date: Mon, 9 Dec 2024 23:27:37 +0000 (-0800) Subject: drm/xe/reg_sr: Convert whitelist to gt logging X-Git-Tag: v6.14-rc1~174^2~17^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd022199ce967cd4bfdd6cea2385448d72be2a80;p=thirdparty%2Flinux.git drm/xe/reg_sr: Convert whitelist to gt logging Part of the whitelist printing was already using gt-logging - convert the rest. Reviewed-by: Matt Roper Link: https://patchwork.freedesktop.org/patch/msgid/20241209232739.147417-4-lucas.demarchi@intel.com Signed-off-by: Lucas De Marchi --- diff --git a/drivers/gpu/drm/xe/xe_reg_sr.c b/drivers/gpu/drm/xe/xe_reg_sr.c index c13123008e903..080229e0fc15a 100644 --- a/drivers/gpu/drm/xe/xe_reg_sr.c +++ b/drivers/gpu/drm/xe/xe_reg_sr.c @@ -196,7 +196,6 @@ void xe_reg_sr_apply_whitelist(struct xe_hw_engine *hwe) { struct xe_reg_sr *sr = &hwe->reg_whitelist; struct xe_gt *gt = hwe->gt; - struct xe_device *xe = gt_to_xe(gt); struct xe_reg_sr_entry *entry; struct drm_printer p; u32 mmio_base = hwe->mmio_base; @@ -207,13 +206,13 @@ void xe_reg_sr_apply_whitelist(struct xe_hw_engine *hwe) if (xa_empty(&sr->xa)) return; - drm_dbg(&xe->drm, "Whitelisting %s registers\n", sr->name); + xe_gt_dbg(gt, "Whitelisting %s registers\n", sr->name); fw_ref = xe_force_wake_get(gt_to_fw(gt), XE_FORCEWAKE_ALL); if (!xe_force_wake_ref_has_domain(fw_ref, XE_FORCEWAKE_ALL)) goto err_force_wake; - p = drm_dbg_printer(&xe->drm, DRM_UT_DRIVER, NULL); + p = xe_gt_dbg_printer(gt); xa_for_each(&sr->xa, reg, entry) { if (slot == RING_MAX_NONPRIV_SLOTS) { xe_gt_err(gt, @@ -241,7 +240,7 @@ void xe_reg_sr_apply_whitelist(struct xe_hw_engine *hwe) err_force_wake: xe_force_wake_put(gt_to_fw(gt), fw_ref); - drm_err(&xe->drm, "Failed to apply, err=-ETIMEDOUT\n"); + xe_gt_err(gt, "Failed to apply, err=-ETIMEDOUT\n"); } /**