Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 4A073C7EE23 for ; Thu, 1 Jun 2023 19:26:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14AD810E5A2; Thu, 1 Jun 2023 19:26:10 +0000 (UTC) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by gabe.freedesktop.org (Postfix) with ESMTPS id 795BB10E5A2 for ; Thu, 1 Jun 2023 19:26:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685647568; x=1717183568; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=ANVtdTZZ9kbs9hE/ygo09UWGZCY0nO/g7aCJxSRggxw=; b=SnxqW++ofmWVHFZmlbqsrOIqbLoSPmEkfY7+stJgUR20RUqRHjhWzqrK dwwKi35EYk3qFKIEIW/3s3Z22iifkIGbd50Pt/PdnGo86sa/SfD3pJvpz PDcvZm84JguTV1rPCJ2iJRWweAEJTHtQEcdJ3RVwMzo8xH2nJSHu94vSp xbULrPJRGtPw+N+SrTzRXKVYYliCNM4v6zBaYBLWAvw+vM2ofGwYBtaYc /UkQaCX1y9EGnTclD5i3eudrrJYIkY65QpGDgyGcbT7E7B+qCELhHGWUj nbVoK08doc0a5fX1Apa9rBosB3cn0w3jha+ljPmRN8MLd5kKIP0X4Ev7q g==; X-IronPort-AV: E=McAfee;i="6600,9927,10728"; a="340280819" X-IronPort-AV: E=Sophos;i="6.00,210,1681196400"; d="scan'208";a="340280819" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2023 12:26:07 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10728"; a="797288310" X-IronPort-AV: E=Sophos;i="6.00,210,1681196400"; d="scan'208";a="797288310" Received: from fabdulmu-mobl1.gar.corp.intel.com (HELO gjsousa-mobl2.intel.com) ([10.255.35.121]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Jun 2023 12:26:05 -0700 From: Gustavo Sousa To: intel-xe@lists.freedesktop.org Date: Thu, 1 Jun 2023 16:25:55 -0300 Message-Id: <20230601192555.1155097-1-gustavo.sousa@intel.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Intel-xe] [PATCH] drm/xe: Replace deprecated DRM_ERROR() X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , Matt Roper , Lucas De Marchi Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" DRM_ERROR() has been deprecated in favor of pr_err(). However, we should prefer to use xe_gt_err() or drm_err() whenever possible so we get gt- or device-specific output with the error message. v2: - Prefer drm_err() over pr_err(). (Matt, Jani) v3: - Prefer xe_gt_err() over drm_err() when possible. (Matt) Cc: Matt Roper Cc: Jani Nikula Cc: Lucas De Marchi Cc: Haridhar Kalvala Signed-off-by: Gustavo Sousa --- drivers/gpu/drm/xe/xe_reg_sr.c | 7 +++++-- drivers/gpu/drm/xe/xe_reg_sr.h | 3 ++- drivers/gpu/drm/xe/xe_rtp.c | 2 +- drivers/gpu/drm/xe/xe_vm.c | 3 ++- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_reg_sr.c b/drivers/gpu/drm/xe/xe_reg_sr.c index 434133444d74..8580ff38b82c 100644 --- a/drivers/gpu/drm/xe/xe_reg_sr.c +++ b/drivers/gpu/drm/xe/xe_reg_sr.c @@ -19,6 +19,7 @@ #include "xe_force_wake.h" #include "xe_gt.h" #include "xe_gt_mcr.h" +#include "xe_gt_printk.h" #include "xe_macros.h" #include "xe_mmio.h" #include "xe_reg_whitelist.h" @@ -89,7 +90,8 @@ static void reg_sr_inc_error(struct xe_reg_sr *sr) } int xe_reg_sr_add(struct xe_reg_sr *sr, - const struct xe_reg_sr_entry *e) + const struct xe_reg_sr_entry *e, + struct xe_gt *gt) { unsigned long idx = e->reg.addr; struct xe_reg_sr_entry *pentry = xa_load(&sr->xa, idx); @@ -122,7 +124,8 @@ int xe_reg_sr_add(struct xe_reg_sr *sr, return 0; fail: - DRM_ERROR("Discarding save-restore reg %04lx (clear: %08x, set: %08x, masked: %s, mcr: %s): ret=%d\n", + xe_gt_err(gt, + "discarding save-restore reg %04lx (clear: %08x, set: %08x, masked: %s, mcr: %s): ret=%d\n", idx, e->clr_bits, e->set_bits, str_yes_no(e->reg.masked), str_yes_no(e->reg.mcr), diff --git a/drivers/gpu/drm/xe/xe_reg_sr.h b/drivers/gpu/drm/xe/xe_reg_sr.h index 0bfe66ea29bf..c3001798d9e8 100644 --- a/drivers/gpu/drm/xe/xe_reg_sr.h +++ b/drivers/gpu/drm/xe/xe_reg_sr.h @@ -19,7 +19,8 @@ struct drm_printer; int xe_reg_sr_init(struct xe_reg_sr *sr, const char *name, struct xe_device *xe); void xe_reg_sr_dump(struct xe_reg_sr *sr, struct drm_printer *p); -int xe_reg_sr_add(struct xe_reg_sr *sr, const struct xe_reg_sr_entry *e); +int xe_reg_sr_add(struct xe_reg_sr *sr, const struct xe_reg_sr_entry *e, + struct xe_gt *gt); void xe_reg_sr_apply_mmio(struct xe_reg_sr *sr, struct xe_gt *gt); void xe_reg_sr_apply_whitelist(struct xe_reg_sr *sr, u32 mmio_base, struct xe_gt *gt); diff --git a/drivers/gpu/drm/xe/xe_rtp.c b/drivers/gpu/drm/xe/xe_rtp.c index 43a86358efb6..956bd39fe1a0 100644 --- a/drivers/gpu/drm/xe/xe_rtp.c +++ b/drivers/gpu/drm/xe/xe_rtp.c @@ -122,7 +122,7 @@ static void rtp_add_sr_entry(const struct xe_rtp_action *action, }; sr_entry.reg.addr += mmio_base; - xe_reg_sr_add(sr, &sr_entry); + xe_reg_sr_add(sr, &sr_entry, gt); } static bool rtp_process_one_sr(const struct xe_rtp_entry_sr *entry, diff --git a/drivers/gpu/drm/xe/xe_vm.c b/drivers/gpu/drm/xe/xe_vm.c index 5aa2aeb14beb..f31bfc738247 100644 --- a/drivers/gpu/drm/xe/xe_vm.c +++ b/drivers/gpu/drm/xe/xe_vm.c @@ -7,6 +7,7 @@ #include +#include #include #include #include @@ -3056,7 +3057,7 @@ int xe_vm_bind_ioctl(struct drm_device *dev, void *data, struct drm_file *file) } if (XE_IOCTL_ERR(xe, xe_vm_is_closed(vm))) { - DRM_ERROR("VM closed while we began looking up?\n"); + drm_err(&xe->drm, "VM closed while we began looking up?\n"); err = -ENOENT; goto put_vm; } -- 2.40.1