From nobody Mon Sep 8 19:00:54 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5C0AC6FA8E for ; Sun, 26 Feb 2023 07:22:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229577AbjBZHWx (ORCPT ); Sun, 26 Feb 2023 02:22:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49468 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjBZHWs (ORCPT ); Sun, 26 Feb 2023 02:22:48 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2001E1165A for ; Sat, 25 Feb 2023 23:22:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677396128; cv=none; d=zohomail.in; s=zohoarc; b=IRZg++YFZzekwlGeZB4bOA5b0B4GHAFxOExWLVu22m8a71BQCsEcQQsM7BZlPrmCr+rBTKUc3p2j/y7fi/jhxNRZjD2oD3IJ3uQu65ko4imu2LhAMHEmIpv1vkthBEFQuIMSXpqA6eOLnMPOQ3mt6WmF9StzDBwWVXw+3voVDxk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677396128; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=ykbDZjpo3GoSJkEnk8HZkyQxPpEKEwTEICIBvoJR3fA=; b=VlxCP/KoZ2BB+YSJ/m/vXHvjdv4YTaiY0uOrVVXAGWhOCGOfiEm/GemFNR0c8kYaZAJfIgwVaUl+1Ea5ybuIAYiYTZwQld94jvxZlQLo87V8Zpk07ey8+AyTOSqvQJs6S5gjIqiNZaQpcqW2vsaHZotfKV8KUnqNtGJI/lhOabQ= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677396128; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=ykbDZjpo3GoSJkEnk8HZkyQxPpEKEwTEICIBvoJR3fA=; b=reFGlCq2XKMw+dDeI6TlOd9MSDnILmAZgYn+NtWHAhx99Z3IbcI7KhJmgAmkj7UX dmeYG5h3O1pRSWNjjwIV+R4CgPRBKnhAfiqbp6COP+MITgnWT4hM1A5m++WXSv7980q uFWVV8tSqXXw+3po+u470Gv3YocAIT0KtPrts3e0= Received: from kampyooter.. (122.170.64.102 [122.170.64.102]) by mx.zoho.in with SMTPS id 1677396127837757.0244316179945; Sun, 26 Feb 2023 12:52:07 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg Cc: linux-kernel , dri-devel Message-ID: <89f0aa1f26696846c2303527fe4d133bb4ff4bf6.1677395403.git.code@siddh.me> Subject: [PATCH v7 1/7] drm/print: Fix and add support for NULL as first argument in drm_* macros Date: Sun, 26 Feb 2023 12:51:48 +0530 X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Comments say macros DRM_DEBUG_* are deprecated in favor of drm_dbg_*(NULL, ...), but they have broken support for it, as the macro will result in `(NULL) ? (NULL)->dev : NULL`. Thus, fix them by separating logic to get dev ptr in a new function, which will return the dev ptr if arg is not NULL. Use it in drm_dbg_*, and also in __DRM_DEFINE_DBG_RATELIMITED, where a similar (but correct) NULL check was in place. Also, add support for NULL in __drm_printk, so that all the drm_* macros will hence support NULL as the first argument. This also means that deprecation comments mentioning pr_()* can now be changed to the drm equivalents. There is a need to support device pointers, as in some cases, we may not have drm_device but just the device ptr, such as when dealing with struct mipi_dsi_host. Before this change, passing just mipi_dsi_host would have worked, since due to preprocessing, the resultant would be "host->dev", but now due to NULL check that cannot happen. Signed-off-by: Siddh Raman Pant --- include/drm/drm_print.h | 114 ++++++++++++++++++++++++++++++---------- 1 file changed, 87 insertions(+), 27 deletions(-) diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index a93a387f8a1a..1a7d4064d120 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -34,6 +34,7 @@ #include =20 #include +#include =20 /* Do *not* use outside of drm_print.[ch]! */ extern unsigned long __drm_debug; @@ -445,15 +446,73 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct= device *dev, #define DRM_DEV_DEBUG_KMS(dev, fmt, ...) \ drm_dev_dbg(dev, DRM_UT_KMS, fmt, ##__VA_ARGS__) =20 +/* Helpers for struct drm_device based logging. */ + +/** + * __drm_dev_ptr - Helper function to get drm->dev pointer. + * @drm: struct drm_device pointer. + * + * RETURNS: + * The struct device pointer (NULL if @drm is NULL). + */ +static inline struct device *__drm_dev_ptr(const struct drm_device *drm) +{ + if (drm) + return drm->dev; + + return NULL; +} + +/** + * __dev_ptr - Helper function to get the same device pointer. + * @dev: struct device pointer, or NULL. + * + * RETURNS: + * The struct device pointer (NULL if @dev is NULL). + */ +static inline struct device *__dev_ptr(const struct device *dev) +{ + return (struct device *)dev; +} + +/** + * __get_dev_ptr - Helper to get device pointer given struct drm_device *, + * or struct device *, or NULL. + * + * Primarily for use in drm_*() print macros, since they need to handle NU= LL + * as the first argument passed. + * + * struct device pointers are supported for edge cases (such as mipi_dsi_h= ost), + * the default (and recommended) way is to pass struct drm_device pointer. + */ +#define __get_dev_ptr(drm) \ + _Generic((drm), \ + struct device * : \ + __dev_ptr, \ + const struct device * : \ + __dev_ptr, \ + default : \ + __drm_dev_ptr \ + )(drm) + /* * struct drm_device based logging * * Prefer drm_device based logging over device or prink based logging. + * + * The below macros support device pointers to cope for edge cases where + * we only have device (like in mipi_dsi_host) but not drm_device. */ =20 /* Helper for struct drm_device based logging. */ #define __drm_printk(drm, level, type, fmt, ...) \ - dev_##level##type((drm)->dev, "[drm] " fmt, ##__VA_ARGS__) +({ \ + struct device *__dev_ =3D __get_dev_ptr(drm); \ + if (__dev_) \ + dev_##level##type(__dev_, "[drm] " fmt, ##__VA_ARGS__); \ + else \ + pr_##level##type("[drm] " fmt, ##__VA_ARGS__); \ +}) =20 =20 #define drm_info(drm, fmt, ...) \ @@ -487,25 +546,25 @@ void __drm_dev_dbg(struct _ddebug *desc, const struct= device *dev, =20 =20 #define drm_dbg_core(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_CORE, fmt, ##__VA_ARGS__) -#define drm_dbg_driver(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRIVER, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_CORE, fmt, ##__VA_ARGS__) +#define drm_dbg_driver(drm, fmt, ...) \ + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_DRIVER, fmt, ##__VA_ARGS__) #define drm_dbg_kms(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_KMS, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_KMS, fmt, ##__VA_ARGS__) #define drm_dbg_prime(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_PRIME, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_PRIME, fmt, ##__VA_ARGS__) #define drm_dbg_atomic(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_ATOMIC, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_ATOMIC, fmt, ##__VA_ARGS__) #define drm_dbg_vbl(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_VBL, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_VBL, fmt, ##__VA_ARGS__) #define drm_dbg_state(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_STATE, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_STATE, fmt, ##__VA_ARGS__) #define drm_dbg_lease(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_LEASE, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_LEASE, fmt, ##__VA_ARGS__) #define drm_dbg_dp(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DP, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_DP, fmt, ##__VA_ARGS__) #define drm_dbg_drmres(drm, fmt, ...) \ - drm_dev_dbg((drm) ? (drm)->dev : NULL, DRM_UT_DRMRES, fmt, ##__VA_ARGS__) + drm_dev_dbg(__get_dev_ptr(drm), DRM_UT_DRMRES, fmt, ##__VA_ARGS__) =20 #define drm_dbg(drm, fmt, ...) drm_dbg_driver(drm, fmt, ##__VA_ARGS__) =20 @@ -533,31 +592,31 @@ void __drm_err(const char *format, ...); #define _DRM_PRINTK(once, level, fmt, ...) \ printk##once(KERN_##level "[" DRM_NAME "] " fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_info(). */ +/* NOTE: this is deprecated in favor of drm_info(NULL, ...). */ #define DRM_INFO(fmt, ...) \ _DRM_PRINTK(, INFO, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_notice(). */ +/* NOTE: this is deprecated in favor of drm_notice(NULL, ...). */ #define DRM_NOTE(fmt, ...) \ _DRM_PRINTK(, NOTICE, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_warn(). */ +/* NOTE: this is deprecated in favor of drm_warn(NULL, ...). */ #define DRM_WARN(fmt, ...) \ _DRM_PRINTK(, WARNING, fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_info_once(). */ +/* NOTE: this is deprecated in favor of drm_info_once(NULL, ...). */ #define DRM_INFO_ONCE(fmt, ...) \ _DRM_PRINTK(_once, INFO, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_notice_once(). */ +/* NOTE: this is deprecated in favor of drm_notice_once(NULL, ...). */ #define DRM_NOTE_ONCE(fmt, ...) \ _DRM_PRINTK(_once, NOTICE, fmt, ##__VA_ARGS__) -/* NOTE: this is deprecated in favor of pr_warn_once(). */ +/* NOTE: this is deprecated in favor of drm_warn_once(NULL, ...). */ #define DRM_WARN_ONCE(fmt, ...) \ _DRM_PRINTK(_once, WARNING, fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_err(). */ +/* NOTE: this is deprecated in favor of drm_err(NULL, ...). */ #define DRM_ERROR(fmt, ...) \ __drm_err(fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of pr_err_ratelimited(). */ +/* NOTE: this is deprecated in favor of drm_err_ratelimited(NULL, ...). */ #define DRM_ERROR_RATELIMITED(fmt, ...) \ DRM_DEV_ERROR_RATELIMITED(NULL, fmt, ##__VA_ARGS__) =20 @@ -593,13 +652,14 @@ void __drm_err(const char *format, ...); #define DRM_DEBUG_DP(fmt, ...) \ __drm_dbg(DRM_UT_DP, fmt, ## __VA_ARGS__) =20 -#define __DRM_DEFINE_DBG_RATELIMITED(category, drm, fmt, ...) \ -({ \ - static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, DEFAULT_RA= TELIMIT_BURST);\ - const struct drm_device *drm_ =3D (drm); \ - \ - if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_)) \ - drm_dev_printk(drm_ ? drm_->dev : NULL, KERN_DEBUG, fmt, ## __VA_ARGS__)= ; \ +#define __DRM_DEFINE_DBG_RATELIMITED(category, drm, fmt, ...) \ +({ \ + static DEFINE_RATELIMIT_STATE(rs_, DEFAULT_RATELIMIT_INTERVAL, \ + DEFAULT_RATELIMIT_BURST); \ + \ + if (drm_debug_enabled(DRM_UT_ ## category) && __ratelimit(&rs_))\ + drm_dev_printk(__get_dev_ptr(drm), KERN_DEBUG, \ + fmt, ## __VA_ARGS__); \ }) =20 #define drm_dbg_kms_ratelimited(drm, fmt, ...) \ --=20 2.39.1 From nobody Mon Sep 8 19:00:54 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0CF50C7EE2E for ; Sun, 26 Feb 2023 07:22:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229547AbjBZHWu (ORCPT ); Sun, 26 Feb 2023 02:22:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbjBZHWs (ORCPT ); Sun, 26 Feb 2023 02:22:48 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 200BE11672 for ; Sat, 25 Feb 2023 23:22:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677396129; cv=none; d=zohomail.in; s=zohoarc; b=fHLumIJDTrUlndkZzNV0bct/FAp0nKPPEPWt/81iKdaSWzrrR3eb9rQL6OBp+dFx/KIfY4EZgj6Z9xBT07aO9GZUgg5MsOGNOMElgKANhdnEfw9hX5j3VuF9FwB5NAH8/DmvH7vbiHBhE36urcIX2j5XJUtdq9kQ8p2W7kTVQZE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677396129; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HIfNyHsjcILZU5s+jcIJqhvxO/AvcQ7lKLAK/tEncF0=; b=UGNP+WUbxAlO3JVZKbjUoiP9ZvrSWqD2YRHP7F3bEMdDW8CcFbWsefDarW1gGejnG+8OmtvQCCr/IIch5Za6JSeAt2kNCuAnIl86Xx0Byezw2NQ+Mk4BA3CiWu2//pOGWpm3QMlT5HtsIOU6vYbRDC4mn0Bi2/bKfuVbyDlsYBw= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677396129; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=HIfNyHsjcILZU5s+jcIJqhvxO/AvcQ7lKLAK/tEncF0=; b=K+biD2IAotacJymEpYzejrVmkUOtg8wFtAKGTHsl2bB/TKNhsMPzFC4bXaVTyzxF RSIst/uUclX0MQ8HjJRHf6YGvPdGSdiEB861+ix5SIqMrUdV0O6LyHzahM/2pmbCoMy F5t/Aguvaf4o71NcyvHK1OeAOVpAU+GwQlQpSU5o= Received: from kampyooter.. (122.170.64.102 [122.170.64.102]) by mx.zoho.in with SMTPS id 1677396128247823.6164607619477; Sun, 26 Feb 2023 12:52:08 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg Cc: linux-kernel , dri-devel Message-ID: Subject: [PATCH v7 2/7] drm: Remove usage of deprecated DRM_INFO Date: Sun, 26 Feb 2023 12:51:49 +0530 X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" drm_print.h says DRM_INFO is deprecated in favor of drm_info(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_client_modeset.c | 2 +- drivers/gpu/drm/drm_connector.c | 7 ++++--- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_pci.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_cli= ent_modeset.c index 1b12a3c201a3..ae19734974b5 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -331,7 +331,7 @@ static bool drm_client_target_cloned(struct drm_device = *dev, DRM_DEBUG_KMS("can clone using 1024x768\n"); return true; } - DRM_INFO("kms: can't enable cloning when we probably wanted to.\n"); + drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n"); return false; } =20 diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index ca5fb54b7aab..cd1a23fc82e1 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -168,13 +168,14 @@ static void drm_connector_get_cmdline_mode(struct drm= _connector *connector) return; =20 if (mode->force) { - DRM_INFO("forcing %s connector %s\n", connector->name, - drm_get_connector_force_name(mode->force)); + drm_info(connector->dev, "forcing %s connector %s\n", + connector->name, drm_get_connector_force_name(mode->force)); connector->force =3D mode->force; } =20 if (mode->panel_orientation !=3D DRM_MODE_PANEL_ORIENTATION_UNKNOWN) { - DRM_INFO("cmdline forces connector %s panel_orientation to %d\n", + drm_info(connector->dev, + "cmdline forces connector %s panel_orientation to %d\n", connector->name, mode->panel_orientation); drm_connector_set_panel_orientation(connector, mode->panel_orientation); diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index c6eb8972451a..b08b502285c7 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -941,7 +941,7 @@ int drm_dev_register(struct drm_device *dev, unsigned l= ong flags) if (drm_core_check_feature(dev, DRIVER_MODESET)) drm_modeset_register_all(dev); =20 - DRM_INFO("Initialized %s %d.%d.%d %s for %s on minor %d\n", + drm_info(dev, "Initialized %s %d.%d.%d %s for %s on minor %d\n", driver->name, driver->major, driver->minor, driver->patchlevel, driver->date, dev->dev ? dev_name(dev->dev) : "virtual device", diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 39d35fc3a43b..7dfb837d1325 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -262,7 +262,7 @@ void drm_legacy_pci_exit(const struct drm_driver *drive= r, } mutex_unlock(&legacy_dev_list_lock); } - DRM_INFO("Module unloaded\n"); + drm_info(NULL, "Module unloaded\n"); } EXPORT_SYMBOL(drm_legacy_pci_exit); =20 --=20 2.39.1 From nobody Mon Sep 8 19:00:54 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E6574C6FA8E for ; Sun, 26 Feb 2023 07:23:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229632AbjBZHWz (ORCPT ); Sun, 26 Feb 2023 02:22:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229486AbjBZHWt (ORCPT ); Sun, 26 Feb 2023 02:22:49 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C77911E86 for ; Sat, 25 Feb 2023 23:22:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677396130; cv=none; d=zohomail.in; s=zohoarc; b=KxddhieU05Ln4k1acieltQY7v0EoaLjC60fmQKJEmH3vOg2rDE98vLCdFsxajRFzRrgQARJGG0AyAbEjBk1dq6e0FQ6NV9lMYyAxhAgBP2Fc2hgLWiIZrvsQ9rRaRG4Thh4/gnXA0PEkoMAERiTT9TDMtzRhnQYNWrIcTcZMmcs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677396130; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=8G/F/eygNJ3r9G90eWZBfkKRI/vHqXgYNYardtRrrwk=; b=NIPJMHX52JXzcej7jDIbJ7xo+IByYy/I+VqquURN2YMANf3chidykb3PxuJSNWcZQMAHUiBrPhDl3mS1WhjYUOSUqSGJ6UjE5FCuuUuowBaEXQpWgcC9AQFSssAMsyND416MkcQxsEDgeII4QExaZB9PFe1fUDVgIY/oIwXV5Hc= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677396130; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=8G/F/eygNJ3r9G90eWZBfkKRI/vHqXgYNYardtRrrwk=; b=LCZPCXDv4ycYlMgR8K8wtZdCgx7hbLG1+ug7V9FXnb3im7D5sQRZdo6YXilFh80z 9zsKwmJLqYhenz21JnA3bm+CjRuHVlvFjqOiLZ4Txhvwa44VWwOpqA9NKEYEiKx6RvC fdp4mgiofe6YoFgnYNia0w73NX+poOkA/xshRbHY= Received: from kampyooter.. (122.170.64.102 [122.170.64.102]) by mx.zoho.in with SMTPS id 1677396128649235.6112975918394; Sun, 26 Feb 2023 12:52:08 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg Cc: linux-kernel , dri-devel Message-ID: <496db3221937d0955e1771016f24489872737ffb.1677395403.git.code@siddh.me> Subject: [PATCH v7 3/7] drm: Remove usage of deprecated DRM_NOTE Date: Sun, 26 Feb 2023 12:51:50 +0530 X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" drm_print.h says DRM_NOTE is deprecated in favor of drm_notice(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_displayid.c | 2 +- drivers/gpu/drm/drm_kms_helper_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayi= d.c index 38ea8203df45..67fed6cee9e9 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -26,7 +26,7 @@ static int validate_displayid(const u8 *displayid, int le= ngth, int idx) for (i =3D 0; i < dispid_length; i++) csum +=3D displayid[idx + i]; if (csum) { - DRM_NOTE("DisplayID checksum invalid, remainder is %d\n", csum); + drm_notice(NULL, "DisplayID checksum invalid, remainder is %d\n", csum); return -EINVAL; } =20 diff --git a/drivers/gpu/drm/drm_kms_helper_common.c b/drivers/gpu/drm/drm_= kms_helper_common.c index 0bf0fc1abf54..7a41373b67dc 100644 --- a/drivers/gpu/drm/drm_kms_helper_common.c +++ b/drivers/gpu/drm/drm_kms_helper_common.c @@ -41,7 +41,7 @@ MODULE_LICENSE("GPL and additional rights"); /* Backward compatibility for drm_kms_helper.edid_firmware */ static int edid_firmware_set(const char *val, const struct kernel_param *k= p) { - DRM_NOTE("drm_kms_helper.edid_firmware is deprecated, please use drm.edid= _firmware instead.\n"); + drm_notice(NULL, "drm_kms_helper.edid_firmware is deprecated, please use = drm.edid_firmware instead.\n"); =20 return __drm_set_edid_firmware_path(val); } --=20 2.39.1 From nobody Mon Sep 8 19:00:54 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 473DEC7EE30 for ; Sun, 26 Feb 2023 07:23:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229661AbjBZHXF (ORCPT ); Sun, 26 Feb 2023 02:23:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49690 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229478AbjBZHWx (ORCPT ); Sun, 26 Feb 2023 02:22:53 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BF2911E96 for ; Sat, 25 Feb 2023 23:22:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677396131; cv=none; d=zohomail.in; s=zohoarc; b=bkaBulE3nroyNx9wKzHhN+sQdQl7C7TfbhE2xypDhLuiUZ6blPaZo9OU6QwY3578FgJRI8uDH9wyOMrryYz2vaK+E+6j2Tp+udQytAaiIqWZye1vNgEGdttOCvv8+B4TcBBUWAHjX0zEyHqQNrmob6YE3yWTuGX8Z2qFyVL1EHs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677396131; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HaKaomCRXh14JqBjzpbEiHGAotJl6jTVfrVg6rW8TPs=; b=N0NbUkClMYWtSOoB7MEp/ZlsX2pwqWqPgcu2CZruw7znpkm0ltZ0v9yojYbo8C80bReM2jAVi/Y65HAL1juKk3cVDZBy5BlaSzz85ocv+ejvVhEhbegmFQEE/DJNOaP/xL9qs0cU3AnmdwEenYRC6q3jNaOUUkJ79xIko3rNCu4= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677396131; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=HaKaomCRXh14JqBjzpbEiHGAotJl6jTVfrVg6rW8TPs=; b=UtXdUsprjkCLpmx3bx5qWMm/WL1xzyt2z97dT7UB4C07BUzLxXWNIZU96cNWISn8 QkfRsai0a4FBaHBzxAeURNcKp9F2eB34K8/Nvozxu26bxWzAD8MZ2fzmaEPeZbbicIi rgfZtibBc6Xc3oJQcfr/IF3/Tj45LmEuxv2QY2EA= Received: from kampyooter.. (122.170.64.102 [122.170.64.102]) by mx.zoho.in with SMTPS id 1677396129077283.55537310929174; Sun, 26 Feb 2023 12:52:09 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg Cc: linux-kernel , dri-devel Message-ID: Subject: [PATCH v7 4/7] drm: Remove usage of deprecated DRM_ERROR Date: Sun, 26 Feb 2023 12:51:51 +0530 X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" drm_print.h says DRM_ERROR is deprecated in favor of drm_err(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_bridge.c | 8 ++++---- drivers/gpu/drm/drm_bufs.c | 8 ++++---- drivers/gpu/drm/drm_client_modeset.c | 4 ++-- drivers/gpu/drm/drm_context.c | 4 ++-- drivers/gpu/drm/drm_crtc_helper.c | 8 ++++---- drivers/gpu/drm/drm_debugfs_crc.c | 3 ++- drivers/gpu/drm/drm_drv.c | 16 ++++++++-------- drivers/gpu/drm/drm_flip_work.c | 2 +- drivers/gpu/drm/drm_framebuffer.c | 3 ++- drivers/gpu/drm/drm_gem.c | 2 +- drivers/gpu/drm/drm_gem_dma_helper.c | 2 +- drivers/gpu/drm/drm_hashtab.c | 4 ++-- drivers/gpu/drm/drm_lock.c | 16 ++++++++-------- drivers/gpu/drm/drm_mipi_dbi.c | 2 +- drivers/gpu/drm/drm_mipi_dsi.c | 12 ++++++------ drivers/gpu/drm/drm_mm.c | 8 ++++---- drivers/gpu/drm/drm_mode_config.c | 2 +- drivers/gpu/drm/drm_modes.c | 26 +++++++++++++------------- drivers/gpu/drm/drm_modeset_helper.c | 2 +- drivers/gpu/drm/drm_plane.c | 2 +- drivers/gpu/drm/drm_scatter.c | 9 +++++---- drivers/gpu/drm/drm_vm.c | 2 +- 22 files changed, 74 insertions(+), 71 deletions(-) diff --git a/drivers/gpu/drm/drm_bridge.c b/drivers/gpu/drm/drm_bridge.c index c3d69af02e79..3d27f08db74d 100644 --- a/drivers/gpu/drm/drm_bridge.c +++ b/drivers/gpu/drm/drm_bridge.c @@ -351,11 +351,11 @@ int drm_bridge_attach(struct drm_encoder *encoder, st= ruct drm_bridge *bridge, list_del(&bridge->chain_node); =20 #ifdef CONFIG_OF - DRM_ERROR("failed to attach bridge %pOF to encoder %s: %d\n", - bridge->of_node, encoder->name, ret); + drm_err(encoder->dev, "failed to attach bridge %pOF to encoder %s: %d\n", + bridge->of_node, encoder->name, ret); #else - DRM_ERROR("failed to attach bridge to encoder %s: %d\n", - encoder->name, ret); + drm_err(encoder->dev, "failed to attach bridge to encoder %s: %d\n", + encoder->name, ret); #endif =20 return ret; diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 86700560fea2..aa66fe16ea6e 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -1470,15 +1470,15 @@ int drm_legacy_freebufs(struct drm_device *dev, voi= d *data, if (copy_from_user(&idx, &request->list[i], sizeof(idx))) return -EFAULT; if (idx < 0 || idx >=3D dma->buf_count) { - DRM_ERROR("Index %d (of %d max)\n", - idx, dma->buf_count - 1); + drm_err(dev, "Index %d (of %d max)\n", + idx, dma->buf_count - 1); return -EINVAL; } idx =3D array_index_nospec(idx, dma->buf_count); buf =3D dma->buflist[idx]; if (buf->file_priv !=3D file_priv) { - DRM_ERROR("Process %d freeing buffer not owned\n", - task_pid_nr(current)); + drm_err(dev, "Process %d freeing buffer not owned\n", + task_pid_nr(current)); return -EINVAL; } drm_legacy_free_buffer(dev, buf); diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_cli= ent_modeset.c index ae19734974b5..e2403b8c6347 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -808,7 +808,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, offsets =3D kcalloc(connector_count, sizeof(*offsets), GFP_KERNEL); enabled =3D kcalloc(connector_count, sizeof(bool), GFP_KERNEL); if (!crtcs || !modes || !enabled || !offsets) { - DRM_ERROR("Memory allocation failed\n"); + drm_err(client->dev, "Memory allocation failed\n"); ret =3D -ENOMEM; goto out; } @@ -832,7 +832,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, offsets, enabled, width, height) && !drm_client_target_preferred(connectors, connector_count, modes, offsets, enabled, width, height)) - DRM_ERROR("Unable to find initial modes\n"); + drm_err(client->dev, "Unable to find initial modes\n"); =20 DRM_DEBUG_KMS("picking CRTCs for %dx%d config\n", width, height); diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index a0fc779e5e1e..bf1fc8bb97de 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -270,7 +270,7 @@ int drm_legacy_setsareactx(struct drm_device *dev, void= *data, static int drm_context_switch(struct drm_device * dev, int old, int new) { if (test_and_set_bit(0, &dev->context_flag)) { - DRM_ERROR("Reentering -- FIXME\n"); + drm_err(dev, "Reentering -- FIXME\n"); return -EBUSY; } =20 @@ -301,7 +301,7 @@ static int drm_context_switch_complete(struct drm_devic= e *dev, dev->last_context =3D new; /* PRE/POST: This is the _only_ writer. */ =20 if (!_DRM_LOCK_IS_HELD(file_priv->master->lock.hw_lock->lock)) { - DRM_ERROR("Lock isn't held after context switch\n"); + drm_err(dev, "Lock isn't held after context switch\n"); } =20 /* If a context switch is ever initiated diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_h= elper.c index a209659a996c..b74b4301a471 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -768,8 +768,8 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, if (!drm_crtc_helper_set_mode(set->crtc, set->mode, set->x, set->y, save_set.fb)) { - DRM_ERROR("failed to set mode on [CRTC:%d:%s]\n", - set->crtc->base.id, set->crtc->name); + drm_err(dev, "failed to set mode on [CRTC:%d:%s]\n", + set->crtc->base.id, set->crtc->name); set->crtc->primary->fb =3D save_set.fb; ret =3D -EINVAL; goto fail; @@ -826,7 +826,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, if (mode_changed && !drm_crtc_helper_set_mode(save_set.crtc, save_set.mode, save_set.x, save_set.y, save_set.fb)) - DRM_ERROR("failed to restore config after modeset failure\n"); + drm_err(dev, "failed to restore config after modeset failure\n"); =20 kfree(save_connector_encoders); kfree(save_encoder_crtcs); @@ -996,7 +996,7 @@ void drm_helper_resume_force_mode(struct drm_device *de= v) =20 /* Restoring the old config should never fail! */ if (ret =3D=3D false) - DRM_ERROR("failed to set mode on crtc %p\n", crtc); + drm_err(dev, "failed to set mode on crtc %p\n", crtc); =20 /* Turn off outputs that were already powered off */ if (drm_helper_choose_crtc_dpms(crtc)) { diff --git a/drivers/gpu/drm/drm_debugfs_crc.c b/drivers/gpu/drm/drm_debugf= s_crc.c index bbc3bc4ba844..a59ef3f0e4a1 100644 --- a/drivers/gpu/drm/drm_debugfs_crc.c +++ b/drivers/gpu/drm/drm_debugfs_crc.c @@ -416,7 +416,8 @@ int drm_crtc_add_crc_entry(struct drm_crtc *crtc, bool = has_frame, spin_unlock_irqrestore(&crc->lock, flags); =20 if (!was_overflow) - DRM_ERROR("Overflow of CRC buffer, userspace reads too slow.\n"); + drm_err(crtc->dev, + "Overflow of CRC buffer, userspace reads too slow.\n"); =20 return -ENOBUFS; } diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index b08b502285c7..dc2ee4983db2 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -177,7 +177,7 @@ static int drm_minor_register(struct drm_device *dev, u= nsigned int type) } else { ret =3D drm_debugfs_init(minor, minor->index, drm_debugfs_root); if (ret) { - DRM_ERROR("DRM: Failed to initialize /sys/kernel/debug/dri.\n"); + drm_err(dev, "DRM: Failed to initialize /sys/kernel/debug/dri.\n"); goto err_debugfs; } } @@ -425,7 +425,7 @@ void drm_put_dev(struct drm_device *dev) DRM_DEBUG("\n"); =20 if (!dev) { - DRM_ERROR("cleanup called no dev\n"); + drm_err(NULL, "cleanup called no dev\n"); return; } =20 @@ -540,7 +540,7 @@ static struct inode *drm_fs_inode_new(void) =20 r =3D simple_pin_fs(&drm_fs_type, &drm_fs_mnt, &drm_fs_cnt); if (r < 0) { - DRM_ERROR("Cannot mount pseudo fs: %d\n", r); + drm_err(NULL, "Cannot mount pseudo fs: %d\n", r); return ERR_PTR(r); } =20 @@ -610,7 +610,7 @@ static int drm_dev_init(struct drm_device *dev, int ret; =20 if (!drm_core_init_complete) { - DRM_ERROR("DRM core is not initialized\n"); + drm_err(NULL, "DRM core is not initialized\n"); return -ENODEV; } =20 @@ -630,7 +630,7 @@ static int drm_dev_init(struct drm_device *dev, if (drm_core_check_feature(dev, DRIVER_COMPUTE_ACCEL) && (drm_core_check_feature(dev, DRIVER_RENDER) || drm_core_check_feature(dev, DRIVER_MODESET))) { - DRM_ERROR("DRM driver can't be both a compute acceleration and graphics = driver\n"); + drm_err(dev, "DRM driver can't be both a compute acceleration and graphi= cs driver\n"); return -EINVAL; } =20 @@ -655,7 +655,7 @@ static int drm_dev_init(struct drm_device *dev, inode =3D drm_fs_inode_new(); if (IS_ERR(inode)) { ret =3D PTR_ERR(inode); - DRM_ERROR("Cannot allocate anonymous inode: %d\n", ret); + drm_err(dev, "Cannot allocate anonymous inode: %d\n", ret); goto err; } =20 @@ -686,7 +686,7 @@ static int drm_dev_init(struct drm_device *dev, if (drm_core_check_feature(dev, DRIVER_GEM)) { ret =3D drm_gem_init(dev); if (ret) { - DRM_ERROR("Cannot initialize graphics execution manager (GEM)\n"); + drm_err(dev, "Cannot initialize graphics execution manager (GEM)\n"); goto err; } } @@ -1097,7 +1097,7 @@ static int __init drm_core_init(void) =20 ret =3D drm_sysfs_init(); if (ret < 0) { - DRM_ERROR("Cannot create DRM class: %d\n", ret); + drm_err(NULL, "Cannot create DRM class: %d\n", ret); goto error; } =20 diff --git a/drivers/gpu/drm/drm_flip_work.c b/drivers/gpu/drm/drm_flip_wor= k.c index 060b753881a2..8cbf325a0414 100644 --- a/drivers/gpu/drm/drm_flip_work.c +++ b/drivers/gpu/drm/drm_flip_work.c @@ -82,7 +82,7 @@ void drm_flip_work_queue(struct drm_flip_work *work, void= *val) if (task) { drm_flip_work_queue_task(work, task); } else { - DRM_ERROR("%s could not allocate task!\n", work->name); + drm_err(NULL, "%s could not allocate task!\n", work->name); work->func(work, val); } } diff --git a/drivers/gpu/drm/drm_framebuffer.c b/drivers/gpu/drm/drm_frameb= uffer.c index aff3746dedfb..b21071919644 100644 --- a/drivers/gpu/drm/drm_framebuffer.c +++ b/drivers/gpu/drm/drm_framebuffer.c @@ -1070,7 +1070,8 @@ static void legacy_remove_fb(struct drm_framebuffer *= fb) =20 /* should turn off the crtc */ if (drm_crtc_force_disable(crtc)) - DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); + drm_err(dev, "failed to reset crtc %p when fb was deleted\n", + crtc); } } =20 diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index aa15c52ae182..0ca1512e7485 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -101,7 +101,7 @@ drm_gem_init(struct drm_device *dev) vma_offset_manager =3D drmm_kzalloc(dev, sizeof(*vma_offset_manager), GFP_KERNEL); if (!vma_offset_manager) { - DRM_ERROR("out of memory\n"); + drm_err(dev, "out of memory\n"); return -ENOMEM; } =20 diff --git a/drivers/gpu/drm/drm_gem_dma_helper.c b/drivers/gpu/drm/drm_gem= _dma_helper.c index df89fbd2d35c..0f903cc8914a 100644 --- a/drivers/gpu/drm/drm_gem_dma_helper.c +++ b/drivers/gpu/drm/drm_gem_dma_helper.c @@ -583,7 +583,7 @@ drm_gem_dma_prime_import_sg_table_vmap(struct drm_devic= e *dev, =20 ret =3D dma_buf_vmap_unlocked(attach->dmabuf, &map); if (ret) { - DRM_ERROR("Failed to vmap PRIME buffer\n"); + drm_err(dev, "Failed to vmap PRIME buffer\n"); return ERR_PTR(ret); } =20 diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index 60afa1865559..a1ebf8e056c7 100644 --- a/drivers/gpu/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c @@ -53,7 +53,7 @@ int drm_ht_create(struct drm_open_hash *ht, unsigned int = order) else ht->table =3D vzalloc(array_size(size, sizeof(*ht->table))); if (!ht->table) { - DRM_ERROR("Out of memory for hash table\n"); + drm_err(NULL, "Out of memory for hash table\n"); return -ENOMEM; } return 0; @@ -157,7 +157,7 @@ int drm_ht_just_insert_please(struct drm_open_hash *ht,= struct drm_hash_item *it } while(ret && (unshifted_key !=3D first)); =20 if (ret) { - DRM_ERROR("Available key bit space exhausted\n"); + drm_err(NULL, "Available key bit space exhausted\n"); return -EINVAL; } return 0; diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 1efbd5389d89..411f75a1ee14 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -79,8 +79,8 @@ int drm_lock_take(struct drm_lock_data *lock_data, if (_DRM_LOCKING_CONTEXT(old) =3D=3D context) { if (old & _DRM_LOCK_HELD) { if (context !=3D DRM_KERNEL_CONTEXT) { - DRM_ERROR("%d holds heavyweight lock\n", - context); + drm_err(NULL, "%d holds heavyweight lock\n", + context); } return 0; } @@ -142,8 +142,8 @@ static int drm_legacy_lock_free(struct drm_lock_data *l= ock_data, } while (prev !=3D old); =20 if (_DRM_LOCK_IS_HELD(old) && _DRM_LOCKING_CONTEXT(old) !=3D context) { - DRM_ERROR("%d freed heavyweight lock held by %d\n", - context, _DRM_LOCKING_CONTEXT(old)); + drm_err(NULL, "%d freed heavyweight lock held by %d\n", + context, _DRM_LOCKING_CONTEXT(old)); return 1; } wake_up_interruptible(&lock_data->lock_queue); @@ -175,8 +175,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data, ++file_priv->lock_count; =20 if (lock->context =3D=3D DRM_KERNEL_CONTEXT) { - DRM_ERROR("Process %d using kernel context %d\n", - task_pid_nr(current), lock->context); + drm_err(dev, "Process %d using kernel context %d\n", + task_pid_nr(current), lock->context); return -EINVAL; } =20 @@ -263,8 +263,8 @@ int drm_legacy_unlock(struct drm_device *dev, void *dat= a, struct drm_file *file_ return -EOPNOTSUPP; =20 if (lock->context =3D=3D DRM_KERNEL_CONTEXT) { - DRM_ERROR("Process %d using kernel context %d\n", - task_pid_nr(current), lock->context); + drm_err(dev, "Process %d using kernel context %d\n", + task_pid_nr(current), lock->context); return -EINVAL; } =20 diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index c871d9f096b8..58ff9503a403 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -603,7 +603,7 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev = *dbidev, drm_mode_copy(&dbidev->mode, mode); ret =3D mipi_dbi_rotate_mode(&dbidev->mode, rotation); if (ret) { - DRM_ERROR("Illegal rotation value %u\n", rotation); + drm_err(drm, "Illegal rotation value %u\n", rotation); return -EINVAL; } =20 diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 4bc15fbd009d..0bc5d1b6a467 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c @@ -161,13 +161,13 @@ of_mipi_dsi_device_add(struct mipi_dsi_host *host, st= ruct device_node *node) u32 reg; =20 if (of_modalias_node(node, info.type, sizeof(info.type)) < 0) { - drm_err(host, "modalias failure on %pOF\n", node); + drm_err(host->dev, "modalias failure on %pOF\n", node); return ERR_PTR(-EINVAL); } =20 ret =3D of_property_read_u32(node, "reg", ®); if (ret) { - drm_err(host, "device node %pOF has no valid reg property: %d\n", + drm_err(host->dev, "device node %pOF has no valid reg property: %d\n", node, ret); return ERR_PTR(-EINVAL); } @@ -205,18 +205,18 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *h= ost, int ret; =20 if (!info) { - drm_err(host, "invalid mipi_dsi_device_info pointer\n"); + drm_err(host->dev, "invalid mipi_dsi_device_info pointer\n"); return ERR_PTR(-EINVAL); } =20 if (info->channel > 3) { - drm_err(host, "invalid virtual channel: %u\n", info->channel); + drm_err(host->dev, "invalid virtual channel: %u\n", info->channel); return ERR_PTR(-EINVAL); } =20 dsi =3D mipi_dsi_device_alloc(host); if (IS_ERR(dsi)) { - drm_err(host, "failed to allocate DSI device %ld\n", + drm_err(host->dev, "failed to allocate DSI device %ld\n", PTR_ERR(dsi)); return dsi; } @@ -227,7 +227,7 @@ mipi_dsi_device_register_full(struct mipi_dsi_host *hos= t, =20 ret =3D mipi_dsi_device_add(dsi); if (ret) { - drm_err(host, "failed to add DSI device %d\n", ret); + drm_err(host->dev, "failed to add DSI device %d\n", ret); kfree(dsi); return ERR_PTR(ret); } diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index 8257f9d4f619..0a8d62c8f359 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm/drm_mm.c @@ -126,14 +126,14 @@ static void show_leaks(struct drm_mm *mm) =20 list_for_each_entry(node, drm_mm_nodes(mm), node_list) { if (!node->stack) { - DRM_ERROR("node [%08llx + %08llx]: unknown owner\n", - node->start, node->size); + drm_err(NULL, "node [%08llx + %08llx]: unknown owner\n", + node->start, node->size); continue; } =20 stack_depot_snprint(node->stack, buf, BUFSZ, 0); - DRM_ERROR("node [%08llx + %08llx]: inserted at\n%s", - node->start, node->size, buf); + drm_err(NULL, "node [%08llx + %08llx]: inserted at\n%s", + node->start, node->size, buf); } =20 kfree(buf); diff --git a/drivers/gpu/drm/drm_mode_config.c b/drivers/gpu/drm/drm_mode_c= onfig.c index 87eb591fe9b5..b86473ab9ff7 100644 --- a/drivers/gpu/drm/drm_mode_config.c +++ b/drivers/gpu/drm/drm_mode_config.c @@ -513,7 +513,7 @@ void drm_mode_config_cleanup(struct drm_device *dev) if (WARN_ON(!list_empty(&dev->mode_config.connector_list))) { drm_connector_list_iter_begin(dev, &conn_iter); drm_for_each_connector_iter(connector, &conn_iter) - DRM_ERROR("connector %s leaked!\n", connector->name); + drm_err(dev, "connector %s leaked!\n", connector->name); drm_connector_list_iter_end(&conn_iter); } =20 diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index ac9a406250c5..f5171bf91eae 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -373,8 +373,8 @@ static int fill_analog_mode(struct drm_device *dev, if (!bt601 && (hact_duration_ns < params->hact_ns.min || hact_duration_ns > params->hact_ns.max)) { - DRM_ERROR("Invalid horizontal active area duration: %uns (min: %u, max %= u)\n", - hact_duration_ns, params->hact_ns.min, params->hact_ns.max); + drm_err(dev, "Invalid horizontal active area duration: %uns (min: %u, ma= x %u)\n", + hact_duration_ns, params->hact_ns.min, params->hact_ns.max); return -EINVAL; } =20 @@ -385,8 +385,8 @@ static int fill_analog_mode(struct drm_device *dev, if (!bt601 && (hblk_duration_ns < params->hblk_ns.min || hblk_duration_ns > params->hblk_ns.max)) { - DRM_ERROR("Invalid horizontal blanking duration: %uns (min: %u, max %u)\= n", - hblk_duration_ns, params->hblk_ns.min, params->hblk_ns.max); + drm_err(dev, "Invalid horizontal blanking duration: %uns (min: %u, max %= u)\n", + hblk_duration_ns, params->hblk_ns.min, params->hblk_ns.max); return -EINVAL; } =20 @@ -397,8 +397,8 @@ static int fill_analog_mode(struct drm_device *dev, if (!bt601 && (hslen_duration_ns < params->hslen_ns.min || hslen_duration_ns > params->hslen_ns.max)) { - DRM_ERROR("Invalid horizontal sync duration: %uns (min: %u, max %u)\n", - hslen_duration_ns, params->hslen_ns.min, params->hslen_ns.max); + drm_err(dev, "Invalid horizontal sync duration: %uns (min: %u, max %u)\n= ", + hslen_duration_ns, params->hslen_ns.min, params->hslen_ns.max); return -EINVAL; } =20 @@ -409,7 +409,7 @@ static int fill_analog_mode(struct drm_device *dev, if (!bt601 && (porches_duration_ns > (params->hfp_ns.max + params->hbp_ns.max) || porches_duration_ns < (params->hfp_ns.min + params->hbp_ns.min))) { - DRM_ERROR("Invalid horizontal porches duration: %uns\n", porches_duratio= n_ns); + drm_err(dev, "Invalid horizontal porches duration: %uns\n", porches_dura= tion_ns); return -EINVAL; } =20 @@ -431,8 +431,8 @@ static int fill_analog_mode(struct drm_device *dev, if (!bt601 && (hfp_duration_ns < params->hfp_ns.min || hfp_duration_ns > params->hfp_ns.max)) { - DRM_ERROR("Invalid horizontal front porch duration: %uns (min: %u, max %= u)\n", - hfp_duration_ns, params->hfp_ns.min, params->hfp_ns.max); + drm_err(dev, "Invalid horizontal front porch duration: %uns (min: %u, ma= x %u)\n", + hfp_duration_ns, params->hfp_ns.min, params->hfp_ns.max); return -EINVAL; } =20 @@ -443,8 +443,8 @@ static int fill_analog_mode(struct drm_device *dev, if (!bt601 && (hbp_duration_ns < params->hbp_ns.min || hbp_duration_ns > params->hbp_ns.max)) { - DRM_ERROR("Invalid horizontal back porch duration: %uns (min: %u, max %u= )\n", - hbp_duration_ns, params->hbp_ns.min, params->hbp_ns.max); + drm_err(dev, "Invalid horizontal back porch duration: %uns (min: %u, max= %u)\n", + hbp_duration_ns, params->hbp_ns.min, params->hbp_ns.max); return -EINVAL; } =20 @@ -495,8 +495,8 @@ static int fill_analog_mode(struct drm_device *dev, =20 vtotal =3D vactive + vfp + vslen + vbp; if (params->num_lines !=3D vtotal) { - DRM_ERROR("Invalid vertical total: %upx (expected %upx)\n", - vtotal, params->num_lines); + drm_err(dev, "Invalid vertical total: %upx (expected %upx)\n", + vtotal, params->num_lines); return -EINVAL; } =20 diff --git a/drivers/gpu/drm/drm_modeset_helper.c b/drivers/gpu/drm/drm_mod= eset_helper.c index f858dfedf2cf..e26b0285dde6 100644 --- a/drivers/gpu/drm/drm_modeset_helper.c +++ b/drivers/gpu/drm/drm_modeset_helper.c @@ -235,7 +235,7 @@ int drm_mode_config_helper_resume(struct drm_device *de= v) =20 ret =3D drm_atomic_helper_resume(dev, dev->mode_config.suspend_state); if (ret) - DRM_ERROR("Failed to resume (%d)\n", ret); + drm_err(dev, "Failed to resume (%d)\n", ret); dev->mode_config.suspend_state =3D NULL; =20 drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 0); diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 24e7998d1731..fc11efd5e560 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -611,7 +611,7 @@ void drm_plane_force_disable(struct drm_plane *plane) plane->old_fb =3D plane->fb; ret =3D plane->funcs->disable_plane(plane, NULL); if (ret) { - DRM_ERROR("failed to disable plane with busy fb\n"); + drm_err(plane->dev, "failed to disable plane with busy fb\n"); plane->old_fb =3D NULL; return; } diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index f4e6184d1877..5b0b2140d535 100644 --- a/drivers/gpu/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c @@ -170,9 +170,10 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *= data, j++, tmp++) { if (*tmp !=3D 0xcafebabe && error =3D=3D 0) { error =3D 1; - DRM_ERROR("Scatter allocation error, " - "pagelist does not match " - "virtual mapping\n"); + drm_err(dev, + "Scatter allocation error, " + "pagelist does not match " + "virtual mapping\n"); } } tmp =3D page_address(entry->pagelist[i]); @@ -183,7 +184,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *d= ata, } } if (error =3D=3D 0) - DRM_ERROR("Scatter allocation matches pagelist\n"); + drm_err(dev, "Scatter allocation matches pagelist\n"); } #endif =20 diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index f024dc93939e..cdb956af2079 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -547,7 +547,7 @@ static int drm_mmap_locked(struct file *filp, struct vm= _area_struct *vma) return drm_mmap_dma(filp, vma); =20 if (drm_ht_find_item(&dev->map_hash, vma->vm_pgoff, &hash)) { - DRM_ERROR("Could not find map\n"); + drm_err(dev, "Could not find map\n"); return -EINVAL; } =20 --=20 2.39.1 From nobody Mon Sep 8 19:00:54 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A2AEAC64ED6 for ; Sun, 26 Feb 2023 07:23:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229696AbjBZHXK (ORCPT ); Sun, 26 Feb 2023 02:23:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49692 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229593AbjBZHWx (ORCPT ); Sun, 26 Feb 2023 02:22:53 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 69B8113D47 for ; Sat, 25 Feb 2023 23:22:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677396130; cv=none; d=zohomail.in; s=zohoarc; b=LGDzxsudMgiWRWW1VGNYVix0wVbTLIo13cggM9qX0daHT1XHwD2+LA5Ts8Si8NzVo6Ysa5tQTZpU38mMzIh8NsFRQIOAOvgUvqnf0gssGLKjr485LiWc5LrtisbNKRQbqnYSDiq3v4is6/9p+DkbDOZYvCGzxou4z80wfM1/2S4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677396130; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=MM6NDS3DYbrTPsENiA9WP09s9YXSm2EGpxLb3P2rDzU=; b=Rh5OSBg0+WPxDWnF7ZM/MGz03lP9knkxbBTc8hkZGBCpw7+bimKN/bT0abTi7QFw5ReNB9Q7j0o2VMHk6CRmT8IHOcIOnf/8KUA4Vfy1KI7Ge42WzsxJfb25uuNrKJX8DH++kkwmxo3gkljpyVy2tWE1vpTFCdUTsCOZ7mpV1H0= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677396130; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=MM6NDS3DYbrTPsENiA9WP09s9YXSm2EGpxLb3P2rDzU=; b=PVqTUg0NXPse90bTau9rOrufxJCV+T/Rs4X+PJvmUE6hAJJhMt1wX4iXNPj6q0JO gnThkTkbHDXRXCM2LhZYYtEFhCzm8D7OgaFhOEQz9cT3SKXJ7zI4+dw+eNzKFFDGeX6 YJJJWm7ShlZPazeqKaQhtmB5c91CXAX+0YJNMy7w= Received: from kampyooter.. (122.170.64.102 [122.170.64.102]) by mx.zoho.in with SMTPS id 1677396129453721.2850056096812; Sun, 26 Feb 2023 12:52:09 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg Cc: linux-kernel , dri-devel Message-ID: Subject: [PATCH v7 5/7] drm: Remove usage of deprecated DRM_DEBUG Date: Sun, 26 Feb 2023 12:51:52 +0530 X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" drm_print.h says DRM_DEBUG is deprecated in favor of drm_dbg_core(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_agpsupport.c | 4 +- drivers/gpu/drm/drm_bufs.c | 114 +++++++++++++++--------------- drivers/gpu/drm/drm_context.c | 14 ++-- drivers/gpu/drm/drm_dma.c | 10 +-- drivers/gpu/drm/drm_drv.c | 10 +-- drivers/gpu/drm/drm_gem.c | 5 +- drivers/gpu/drm/drm_hashtab.c | 6 +- drivers/gpu/drm/drm_irq.c | 4 +- drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_legacy_misc.c | 4 +- drivers/gpu/drm/drm_lock.c | 20 +++--- drivers/gpu/drm/drm_mode_object.c | 6 +- drivers/gpu/drm/drm_pci.c | 12 ++-- drivers/gpu/drm/drm_plane.c | 12 ++-- drivers/gpu/drm/drm_scatter.c | 10 +-- drivers/gpu/drm/drm_syncobj.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 14 ++-- drivers/gpu/drm/drm_vm.c | 43 ++++++----- 18 files changed, 150 insertions(+), 142 deletions(-) diff --git a/drivers/gpu/drm/drm_agpsupport.c b/drivers/gpu/drm/drm_agpsupp= ort.c index a4ad6fd13abc..d27686d6e82d 100644 --- a/drivers/gpu/drm/drm_agpsupport.c +++ b/drivers/gpu/drm/drm_agpsupport.c @@ -315,8 +315,8 @@ int drm_legacy_agp_bind(struct drm_device *dev, struct = drm_agp_binding *request) if (retcode) return retcode; entry->bound =3D dev->agp->base + (page << PAGE_SHIFT); - DRM_DEBUG("base =3D 0x%lx entry->bound =3D 0x%lx\n", - dev->agp->base, entry->bound); + drm_dbg_core(dev, "base =3D 0x%lx entry->bound =3D 0x%lx\n", + dev->agp->base, entry->bound); return 0; } EXPORT_SYMBOL(drm_legacy_agp_bind); diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index aa66fe16ea6e..a767f51c5369 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -171,8 +171,8 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, kfree(map); return -EINVAL; } - DRM_DEBUG("offset =3D 0x%08llx, size =3D 0x%08lx, type =3D %d\n", - (unsigned long long)map->offset, map->size, map->type); + drm_dbg_core(dev, "offset =3D 0x%08llx, size =3D 0x%08lx, type =3D %d\n", + (unsigned long long)map->offset, map->size, map->type); =20 /* page-align _DRM_SHM maps. They are allocated here so there is no secur= ity * hole created by that and it works around various broken drivers that u= se @@ -205,10 +205,10 @@ static int drm_addmap_core(struct drm_device *dev, re= source_size_t offset, list =3D drm_find_matching_map(dev, map); if (list !=3D NULL) { if (list->map->size !=3D map->size) { - DRM_DEBUG("Matching maps of type %d with " - "mismatched sizes, (%ld vs %ld)\n", - map->type, map->size, - list->map->size); + drm_dbg_core(dev, "Matching maps of type %d with " + "mismatched sizes, (%ld vs %ld)\n", + map->type, map->size, + list->map->size); list->map->size =3D map->size; } =20 @@ -239,9 +239,9 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, list =3D drm_find_matching_map(dev, map); if (list !=3D NULL) { if (list->map->size !=3D map->size) { - DRM_DEBUG("Matching maps of type %d with " - "mismatched sizes, (%ld vs %ld)\n", - map->type, map->size, list->map->size); + drm_dbg_core(dev, "Matching maps of type %d with " + "mismatched sizes, (%ld vs %ld)\n", + map->type, map->size, list->map->size); list->map->size =3D map->size; } =20 @@ -250,8 +250,8 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, return 0; } map->handle =3D vmalloc_user(map->size); - DRM_DEBUG("%lu %d %p\n", - map->size, order_base_2(map->size), map->handle); + drm_dbg_core(dev, "%lu %d %p\n", + map->size, order_base_2(map->size), map->handle); if (!map->handle) { kfree(map); return -ENOMEM; @@ -308,8 +308,8 @@ static int drm_addmap_core(struct drm_device *dev, reso= urce_size_t offset, kfree(map); return -EPERM; } - DRM_DEBUG("AGP offset =3D 0x%08llx, size =3D 0x%08lx\n", - (unsigned long long)map->offset, map->size); + drm_dbg_core(dev, "AGP offset =3D 0x%08llx, size =3D 0x%08lx\n", + (unsigned long long)map->offset, map->size); =20 break; } @@ -745,13 +745,13 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, byte_count =3D 0; agp_offset =3D dev->agp->base + request->agp_start; =20 - DRM_DEBUG("count: %d\n", count); - DRM_DEBUG("order: %d\n", order); - DRM_DEBUG("size: %d\n", size); - DRM_DEBUG("agp_offset: %lx\n", agp_offset); - DRM_DEBUG("alignment: %d\n", alignment); - DRM_DEBUG("page_order: %d\n", page_order); - DRM_DEBUG("total: %d\n", total); + drm_dbg_core(dev, "count: %d\n", count); + drm_dbg_core(dev, "order: %d\n", order); + drm_dbg_core(dev, "size: %d\n", size); + drm_dbg_core(dev, "agp_offset: %lx\n", agp_offset); + drm_dbg_core(dev, "alignment: %d\n", alignment); + drm_dbg_core(dev, "page_order: %d\n", page_order); + drm_dbg_core(dev, "total: %d\n", total); =20 if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -766,7 +766,7 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, } } if (!list_empty(&dev->agp->memory) && !valid) { - DRM_DEBUG("zone invalid\n"); + drm_dbg_core(dev, "zone invalid\n"); return -EINVAL; } spin_lock(&dev->buf_lock); @@ -829,14 +829,15 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, return -ENOMEM; } =20 - DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); + drm_dbg_core(dev, "buffer %d @ %p\n", entry->buf_count, + buf->address); =20 offset +=3D alignment; entry->buf_count++; byte_count +=3D PAGE_SIZE << page_order; } =20 - DRM_DEBUG("byte_count: %d\n", byte_count); + drm_dbg_core(dev, "byte_count: %d\n", byte_count); =20 temp_buflist =3D krealloc(dma->buflist, (dma->buf_count + entry->buf_count) * @@ -859,8 +860,8 @@ int drm_legacy_addbufs_agp(struct drm_device *dev, dma->page_count +=3D byte_count >> PAGE_SHIFT; dma->byte_count +=3D byte_count; =20 - DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count); - DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count); + drm_dbg_core(dev, "dma->buf_count : %d\n", dma->buf_count); + drm_dbg_core(dev, "entry->buf_count : %d\n", entry->buf_count); =20 mutex_unlock(&dev->struct_mutex); =20 @@ -908,8 +909,8 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, order =3D order_base_2(request->size); size =3D 1 << order; =20 - DRM_DEBUG("count=3D%d, size=3D%d (%d), order=3D%d\n", - request->count, request->size, size, order); + drm_dbg_core(dev, "count=3D%d, size=3D%d (%d), order=3D%d\n", + request->count, request->size, size, order); =20 if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -971,8 +972,8 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, } memcpy(temp_pagelist, dma->pagelist, dma->page_count * sizeof(*dma->pagelist)); - DRM_DEBUG("pagelist: %d entries\n", - dma->page_count + (count << page_order)); + drm_dbg_core(dev, "pagelist: %d entries\n", + dma->page_count + (count << page_order)); =20 entry->buf_size =3D size; entry->page_order =3D page_order; @@ -1011,9 +1012,9 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, } entry->seglist[entry->seg_count++] =3D dmah; for (i =3D 0; i < (1 << page_order); i++) { - DRM_DEBUG("page %d @ 0x%08lx\n", - dma->page_count + page_count, - (unsigned long)dmah->vaddr + PAGE_SIZE * i); + drm_dbg_core(dev, "page %d @ 0x%08lx\n", + dma->page_count + page_count, + (unsigned long)dmah->vaddr + PAGE_SIZE * i); temp_pagelist[dma->page_count + page_count++] =3D (unsigned long)dmah->vaddr + PAGE_SIZE * i; } @@ -1047,8 +1048,8 @@ int drm_legacy_addbufs_pci(struct drm_device *dev, return -ENOMEM; } =20 - DRM_DEBUG("buffer %d @ %p\n", - entry->buf_count, buf->address); + drm_dbg_core(dev, "buffer %d @ %p\n", + entry->buf_count, buf->address); } byte_count +=3D PAGE_SIZE << page_order; } @@ -1136,13 +1137,13 @@ static int drm_legacy_addbufs_sg(struct drm_device = *dev, byte_count =3D 0; agp_offset =3D request->agp_start; =20 - DRM_DEBUG("count: %d\n", count); - DRM_DEBUG("order: %d\n", order); - DRM_DEBUG("size: %d\n", size); - DRM_DEBUG("agp_offset: %lu\n", agp_offset); - DRM_DEBUG("alignment: %d\n", alignment); - DRM_DEBUG("page_order: %d\n", page_order); - DRM_DEBUG("total: %d\n", total); + drm_dbg_core(dev, "count: %d\n", count); + drm_dbg_core(dev, "order: %d\n", order); + drm_dbg_core(dev, "size: %d\n", size); + drm_dbg_core(dev, "agp_offset: %lu\n", agp_offset); + drm_dbg_core(dev, "alignment: %d\n", alignment); + drm_dbg_core(dev, "page_order: %d\n", page_order); + drm_dbg_core(dev, "total: %d\n", total); =20 if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -1208,14 +1209,15 @@ static int drm_legacy_addbufs_sg(struct drm_device = *dev, return -ENOMEM; } =20 - DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address); + drm_dbg_core(dev, "buffer %d @ %p\n", entry->buf_count, + buf->address); =20 offset +=3D alignment; entry->buf_count++; byte_count +=3D PAGE_SIZE << page_order; } =20 - DRM_DEBUG("byte_count: %d\n", byte_count); + drm_dbg_core(dev, "byte_count: %d\n", byte_count); =20 temp_buflist =3D krealloc(dma->buflist, (dma->buf_count + entry->buf_count) * @@ -1238,8 +1240,8 @@ static int drm_legacy_addbufs_sg(struct drm_device *d= ev, dma->page_count +=3D byte_count >> PAGE_SHIFT; dma->byte_count +=3D byte_count; =20 - DRM_DEBUG("dma->buf_count : %d\n", dma->buf_count); - DRM_DEBUG("entry->buf_count : %d\n", entry->buf_count); + drm_dbg_core(dev, "dma->buf_count : %d\n", dma->buf_count); + drm_dbg_core(dev, "entry->buf_count : %d\n", entry->buf_count); =20 mutex_unlock(&dev->struct_mutex); =20 @@ -1340,7 +1342,7 @@ int __drm_legacy_infobufs(struct drm_device *dev, ++count; } =20 - DRM_DEBUG("count =3D %d\n", count); + drm_dbg_core(dev, "count =3D %d\n", count); =20 if (*p >=3D count) { for (i =3D 0, count =3D 0; i < DRM_MAX_ORDER + 1; i++) { @@ -1349,12 +1351,12 @@ int __drm_legacy_infobufs(struct drm_device *dev, if (from->buf_count) { if (f(data, count, from) < 0) return -EFAULT; - DRM_DEBUG("%d %d %d %d %d\n", - i, - dma->bufs[i].buf_count, - dma->bufs[i].buf_size, - dma->bufs[i].low_mark, - dma->bufs[i].high_mark); + drm_dbg_core(dev, "%d %d %d %d %d\n", + i, + dma->bufs[i].buf_count, + dma->bufs[i].buf_size, + dma->bufs[i].low_mark, + dma->bufs[i].high_mark); ++count; } } @@ -1417,8 +1419,8 @@ int drm_legacy_markbufs(struct drm_device *dev, void = *data, if (!dma) return -EINVAL; =20 - DRM_DEBUG("%d, %d, %d\n", - request->size, request->low_mark, request->high_mark); + drm_dbg_core(dev, "%d, %d, %d\n", + request->size, request->low_mark, request->high_mark); order =3D order_base_2(request->size); if (order < DRM_MIN_ORDER || order > DRM_MAX_ORDER) return -EINVAL; @@ -1465,7 +1467,7 @@ int drm_legacy_freebufs(struct drm_device *dev, void = *data, if (!dma) return -EINVAL; =20 - DRM_DEBUG("%d\n", request->count); + drm_dbg_core(dev, "%d\n", request->count); for (i =3D 0; i < request->count; i++) { if (copy_from_user(&idx, &request->list[i], sizeof(idx))) return -EFAULT; @@ -1565,7 +1567,7 @@ int __drm_legacy_mapbufs(struct drm_device *dev, void= *data, int *p, } done: *p =3D dma->buf_count; - DRM_DEBUG("%d buffers, retcode =3D %d\n", *p, retcode); + drm_dbg_core(dev, "%d buffers, retcode =3D %d\n", *p, retcode); =20 return retcode; } diff --git a/drivers/gpu/drm/drm_context.c b/drivers/gpu/drm/drm_context.c index bf1fc8bb97de..8b7b925aee97 100644 --- a/drivers/gpu/drm/drm_context.c +++ b/drivers/gpu/drm/drm_context.c @@ -274,7 +274,7 @@ static int drm_context_switch(struct drm_device * dev, = int old, int new) return -EBUSY; } =20 - DRM_DEBUG("Context switch from %d to %d\n", old, new); + drm_dbg_core(dev, "Context switch from %d to %d\n", old, new); =20 if (new =3D=3D dev->last_context) { clear_bit(0, &dev->context_flag); @@ -371,9 +371,9 @@ int drm_legacy_addctx(struct drm_device *dev, void *dat= a, /* Skip kernel's context and get a new one. */ tmp_handle =3D drm_legacy_ctxbitmap_next(dev); } - DRM_DEBUG("%d\n", tmp_handle); + drm_dbg_core(dev, "%d\n", tmp_handle); if (tmp_handle < 0) { - DRM_DEBUG("Not enough free contexts.\n"); + drm_dbg_core(dev, "Not enough free contexts.\n"); /* Should this return -EBUSY instead? */ return tmp_handle; } @@ -382,7 +382,7 @@ int drm_legacy_addctx(struct drm_device *dev, void *dat= a, =20 ctx_entry =3D kmalloc(sizeof(*ctx_entry), GFP_KERNEL); if (!ctx_entry) { - DRM_DEBUG("out of memory\n"); + drm_dbg_core(dev, "out of memory\n"); return -ENOMEM; } =20 @@ -439,7 +439,7 @@ int drm_legacy_switchctx(struct drm_device *dev, void *= data, if (!drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; =20 - DRM_DEBUG("%d\n", ctx->handle); + drm_dbg_core(dev, "%d\n", ctx->handle); return drm_context_switch(dev, dev->last_context, ctx->handle); } =20 @@ -462,7 +462,7 @@ int drm_legacy_newctx(struct drm_device *dev, void *dat= a, if (!drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; =20 - DRM_DEBUG("%d\n", ctx->handle); + drm_dbg_core(dev, "%d\n", ctx->handle); drm_context_switch_complete(dev, file_priv, ctx->handle); =20 return 0; @@ -487,7 +487,7 @@ int drm_legacy_rmctx(struct drm_device *dev, void *data, if (!drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; =20 - DRM_DEBUG("%d\n", ctx->handle); + drm_dbg_core(dev, "%d\n", ctx->handle); if (ctx->handle !=3D DRM_KERNEL_CONTEXT) { if (dev->driver->context_dtor) dev->driver->context_dtor(dev, ctx->handle); diff --git a/drivers/gpu/drm/drm_dma.c b/drivers/gpu/drm/drm_dma.c index eb6b741a6f99..dac137072c33 100644 --- a/drivers/gpu/drm/drm_dma.c +++ b/drivers/gpu/drm/drm_dma.c @@ -94,11 +94,11 @@ void drm_legacy_dma_takedown(struct drm_device *dev) /* Clear dma buffers */ for (i =3D 0; i <=3D DRM_MAX_ORDER; i++) { if (dma->bufs[i].seg_count) { - DRM_DEBUG("order %d: buf_count =3D %d," - " seg_count =3D %d\n", - i, - dma->bufs[i].buf_count, - dma->bufs[i].seg_count); + drm_dbg_core(dev, "order %d: buf_count =3D %d," + " seg_count =3D %d\n", + i, + dma->bufs[i].buf_count, + dma->bufs[i].seg_count); for (j =3D 0; j < dma->bufs[i].seg_count; j++) { if (dma->bufs[i].seglist[j]) { dmah =3D dma->bufs[i].seglist[j]; diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index dc2ee4983db2..d95bd16769f2 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -166,7 +166,7 @@ static int drm_minor_register(struct drm_device *dev, u= nsigned int type) unsigned long flags; int ret; =20 - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); =20 minor =3D *drm_minor_get_slot(dev, type); if (!minor) @@ -195,7 +195,7 @@ static int drm_minor_register(struct drm_device *dev, u= nsigned int type) spin_unlock_irqrestore(&drm_minor_lock, flags); } =20 - DRM_DEBUG("new minor registered %d\n", minor->index); + drm_dbg_core(dev, "new minor registered %d\n", minor->index); return 0; =20 err_debugfs: @@ -422,7 +422,7 @@ void drm_minor_release(struct drm_minor *minor) */ void drm_put_dev(struct drm_device *dev) { - DRM_DEBUG("\n"); + drm_dbg_core(NULL, "\n"); =20 if (!dev) { drm_err(NULL, "cleanup called no dev\n"); @@ -1046,7 +1046,7 @@ static int drm_stub_open(struct inode *inode, struct = file *filp) struct drm_minor *minor; int err; =20 - DRM_DEBUG("\n"); + drm_dbg_core(NULL, "\n"); =20 minor =3D drm_minor_acquire(iminor(inode)); if (IS_ERR(minor)) @@ -1115,7 +1115,7 @@ static int __init drm_core_init(void) =20 drm_core_init_complete =3D true; =20 - DRM_DEBUG("Initialized\n"); + drm_dbg_core(NULL, "Initialized\n"); return 0; =20 error: diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index 0ca1512e7485..ffe07660d51f 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c @@ -705,7 +705,7 @@ int drm_gem_objects_lookup(struct drm_file *filp, void = __user *bo_handles, =20 if (copy_from_user(handles, bo_handles, count * sizeof(u32))) { ret =3D -EFAULT; - DRM_DEBUG("Failed to copy in GEM handles\n"); + drm_dbg_core(filp->minor->dev, "Failed to copy in GEM handles\n"); goto out; } =20 @@ -760,7 +760,8 @@ long drm_gem_dma_resv_wait(struct drm_file *filep, u32 = handle, =20 obj =3D drm_gem_object_lookup(filep, handle); if (!obj) { - DRM_DEBUG("Failed to look up GEM BO %d\n", handle); + drm_dbg_core(filep->minor->dev, + "Failed to look up GEM BO %d\n", handle); return -EINVAL; } =20 diff --git a/drivers/gpu/drm/drm_hashtab.c b/drivers/gpu/drm/drm_hashtab.c index a1ebf8e056c7..357f20d73b43 100644 --- a/drivers/gpu/drm/drm_hashtab.c +++ b/drivers/gpu/drm/drm_hashtab.c @@ -67,10 +67,12 @@ void drm_ht_verbose_list(struct drm_open_hash *ht, unsi= gned long key) int count =3D 0; =20 hashed_key =3D hash_long(key, ht->order); - DRM_DEBUG("Key is 0x%08lx, Hashed key is 0x%08x\n", key, hashed_key); + drm_dbg_core(NULL, "Key is 0x%08lx, Hashed key is 0x%08x\n", + key, hashed_key); h_list =3D &ht->table[hashed_key]; hlist_for_each_entry(entry, h_list, head) - DRM_DEBUG("count %d, key: 0x%08lx\n", count++, entry->key); + drm_dbg_core(NULL, "count %d, key: 0x%08lx\n", + count++, entry->key); } =20 static struct hlist_node *drm_ht_find_key(struct drm_open_hash *ht, diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index d327638e15ee..e70d6975310c 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -78,7 +78,7 @@ static int drm_legacy_irq_install(struct drm_device *dev,= int irq) return -EBUSY; dev->irq_enabled =3D true; =20 - DRM_DEBUG("irq=3D%d\n", irq); + drm_dbg_core(dev, "irq=3D%d\n", irq); =20 /* Before installing handler */ if (dev->driver->irq_preinstall) @@ -146,7 +146,7 @@ int drm_legacy_irq_uninstall(struct drm_device *dev) if (!irq_enabled) return -EINVAL; =20 - DRM_DEBUG("irq=3D%d\n", dev->irq); + drm_dbg_core(dev, "irq=3D%d\n", dev->irq); =20 if (drm_core_check_feature(dev, DRIVER_LEGACY)) vga_client_unregister(to_pci_dev(dev->dev)); diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index 150fe1555068..af72fc38bb7c 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -677,7 +677,7 @@ int drm_mode_get_lease_ioctl(struct drm_device *dev, count++; } =20 - DRM_DEBUG("lease holds %d objects\n", count); + drm_dbg_core(dev, "lease holds %d objects\n", count); if (ret =3D=3D 0) arg->count_objects =3D count; =20 diff --git a/drivers/gpu/drm/drm_legacy_misc.c b/drivers/gpu/drm/drm_legacy= _misc.c index d4c5434062d7..ad0eef292cb0 100644 --- a/drivers/gpu/drm/drm_legacy_misc.c +++ b/drivers/gpu/drm/drm_legacy_misc.c @@ -70,7 +70,7 @@ int drm_legacy_setup(struct drm_device * dev) return ret; =20 =20 - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); return 0; } =20 @@ -95,7 +95,7 @@ void drm_legacy_dev_reinit(struct drm_device *dev) dev->last_context =3D 0; dev->if_version =3D 0; =20 - DRM_DEBUG("lastclose completed\n"); + drm_dbg_core(dev, "lastclose completed\n"); } =20 void drm_master_legacy_init(struct drm_master *master) diff --git a/drivers/gpu/drm/drm_lock.c b/drivers/gpu/drm/drm_lock.c index 411f75a1ee14..fea573dcb016 100644 --- a/drivers/gpu/drm/drm_lock.c +++ b/drivers/gpu/drm/drm_lock.c @@ -180,10 +180,10 @@ int drm_legacy_lock(struct drm_device *dev, void *dat= a, return -EINVAL; } =20 - DRM_DEBUG("%d (pid %d) requests lock (0x%08x), flags =3D 0x%08x\n", - lock->context, task_pid_nr(current), - master->lock.hw_lock ? master->lock.hw_lock->lock : -1, - lock->flags); + drm_dbg_core(dev, "%d (pid %d) requests lock (0x%08x), flags =3D 0x%08x\n= ", + lock->context, task_pid_nr(current), + master->lock.hw_lock ? master->lock.hw_lock->lock : -1, + lock->flags); =20 add_wait_queue(&master->lock.lock_queue, &entry); spin_lock_bh(&master->lock.spinlock); @@ -219,8 +219,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data, __set_current_state(TASK_RUNNING); remove_wait_queue(&master->lock.lock_queue, &entry); =20 - DRM_DEBUG("%d %s\n", lock->context, - ret ? "interrupted" : "has lock"); + drm_dbg_core(dev, "%d %s\n", lock->context, + ret ? "interrupted" : "has lock"); if (ret) return ret; =20 /* don't set the block all signals on the master process for now=20 @@ -234,8 +234,8 @@ int drm_legacy_lock(struct drm_device *dev, void *data, if (dev->driver->dma_quiescent && (lock->flags & _DRM_LOCK_QUIESCENT)) { if (dev->driver->dma_quiescent(dev)) { - DRM_DEBUG("%d waiting for DMA quiescent\n", - lock->context); + drm_dbg_core(dev, "%d waiting for DMA quiescent\n", + lock->context); return -EBUSY; } } @@ -345,8 +345,8 @@ void drm_legacy_lock_release(struct drm_device *dev, st= ruct file *filp) return; =20 if (drm_legacy_i_have_hw_lock(dev, file_priv)) { - DRM_DEBUG("File %p released, freeing lock for context %d\n", - filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); + drm_dbg_core(dev, "File %p released, freeing lock for context %d\n", + filp, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); drm_legacy_lock_free(&file_priv->master->lock, _DRM_LOCKING_CONTEXT(file_priv->master->lock.hw_lock->lock)); } diff --git a/drivers/gpu/drm/drm_mode_object.c b/drivers/gpu/drm/drm_mode_o= bject.c index ba1608effc0f..6e5a970043fc 100644 --- a/drivers/gpu/drm/drm_mode_object.c +++ b/drivers/gpu/drm/drm_mode_object.c @@ -192,7 +192,8 @@ EXPORT_SYMBOL(drm_mode_object_find); void drm_mode_object_put(struct drm_mode_object *obj) { if (obj->free_cb) { - DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount)); + drm_dbg_core(NULL, "OBJ ID: %d (%d)\n", obj->id, + kref_read(&obj->refcount)); kref_put(&obj->refcount, obj->free_cb); } } @@ -209,7 +210,8 @@ EXPORT_SYMBOL(drm_mode_object_put); void drm_mode_object_get(struct drm_mode_object *obj) { if (obj->free_cb) { - DRM_DEBUG("OBJ ID: %d (%d)\n", obj->id, kref_read(&obj->refcount)); + drm_dbg_core(NULL, "OBJ ID: %d (%d)\n", obj->id, + kref_read(&obj->refcount)); kref_get(&obj->refcount); } } diff --git a/drivers/gpu/drm/drm_pci.c b/drivers/gpu/drm/drm_pci.c index 7dfb837d1325..485ec407a115 100644 --- a/drivers/gpu/drm/drm_pci.c +++ b/drivers/gpu/drm/drm_pci.c @@ -85,8 +85,8 @@ static int drm_legacy_pci_irq_by_busid(struct drm_device = *dev, struct drm_irq_bu =20 p->irq =3D pdev->irq; =20 - DRM_DEBUG("%d:%d:%d =3D> IRQ %d\n", p->busnum, p->devnum, p->funcnum, - p->irq); + drm_dbg_core(dev, "%d:%d:%d =3D> IRQ %d\n", + p->busnum, p->devnum, p->funcnum, p->irq); return 0; } =20 @@ -151,12 +151,12 @@ static int drm_legacy_get_pci_dev(struct pci_dev *pde= v, struct drm_device *dev; int ret; =20 - DRM_DEBUG("\n"); - dev =3D drm_dev_alloc(driver, &pdev->dev); if (IS_ERR(dev)) return PTR_ERR(dev); =20 + drm_dbg_core(dev, "\n"); + ret =3D pci_enable_device(pdev); if (ret) goto err_free; @@ -203,7 +203,7 @@ int drm_legacy_pci_init(const struct drm_driver *driver, const struct pci_device_id *pid; int i; =20 - DRM_DEBUG("\n"); + drm_dbg_core(NULL, "\n"); =20 if (WARN_ON(!(driver->driver_features & DRIVER_LEGACY))) return -EINVAL; @@ -247,7 +247,7 @@ void drm_legacy_pci_exit(const struct drm_driver *drive= r, { struct drm_device *dev, *tmp; =20 - DRM_DEBUG("\n"); + drm_dbg_core(NULL, "\n"); =20 if (!(driver->driver_features & DRIVER_LEGACY)) { WARN_ON(1); diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index fc11efd5e560..1e8727b7bce9 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -1260,17 +1260,19 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, switch (page_flip->flags & DRM_MODE_PAGE_FLIP_TARGET) { case DRM_MODE_PAGE_FLIP_TARGET_ABSOLUTE: if ((int)(target_vblank - current_vblank) > 1) { - DRM_DEBUG("Invalid absolute flip target %u, " - "must be <=3D %u\n", target_vblank, - current_vblank + 1); + drm_dbg_core(dev, + "Invalid absolute flip target %u, " + "must be <=3D %u\n", target_vblank, + current_vblank + 1); drm_crtc_vblank_put(crtc); return -EINVAL; } break; case DRM_MODE_PAGE_FLIP_TARGET_RELATIVE: if (target_vblank !=3D 0 && target_vblank !=3D 1) { - DRM_DEBUG("Invalid relative flip target %u, " - "must be 0 or 1\n", target_vblank); + drm_dbg_core(dev, + "Invalid relative flip target %u, " + "must be 0 or 1\n", target_vblank); drm_crtc_vblank_put(crtc); return -EINVAL; } diff --git a/drivers/gpu/drm/drm_scatter.c b/drivers/gpu/drm/drm_scatter.c index 5b0b2140d535..08b3eb586484 100644 --- a/drivers/gpu/drm/drm_scatter.c +++ b/drivers/gpu/drm/drm_scatter.c @@ -82,7 +82,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *dat= a, struct drm_sg_mem *entry; unsigned long pages, i, j; =20 - DRM_DEBUG("\n"); + drm_dbg_core(dev, "\n"); =20 if (!drm_core_check_feature(dev, DRIVER_LEGACY)) return -EOPNOTSUPP; @@ -101,7 +101,7 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *d= ata, return -ENOMEM; =20 pages =3D (request->size + PAGE_SIZE - 1) / PAGE_SIZE; - DRM_DEBUG("size=3D%ld pages=3D%ld\n", request->size, pages); + drm_dbg_core(dev, "size=3D%ld pages=3D%ld\n", request->size, pages); =20 entry->pages =3D pages; entry->pagelist =3D kcalloc(pages, sizeof(*entry->pagelist), GFP_KERNEL); @@ -132,8 +132,8 @@ int drm_legacy_sg_alloc(struct drm_device *dev, void *d= ata, =20 entry->handle =3D ScatterHandle((unsigned long)entry->virtual); =20 - DRM_DEBUG("handle =3D %08lx\n", entry->handle); - DRM_DEBUG("virtual =3D %p\n", entry->virtual); + drm_dbg_core(dev, "handle =3D %08lx\n", entry->handle); + drm_dbg_core(dev, "virtual =3D %p\n", entry->virtual); =20 for (i =3D (unsigned long)entry->virtual, j =3D 0; j < pages; i +=3D PAGE_SIZE, j++) { @@ -213,7 +213,7 @@ int drm_legacy_sg_free(struct drm_device *dev, void *da= ta, if (!entry || entry->handle !=3D request->handle) return -EINVAL; =20 - DRM_DEBUG("virtual =3D %p\n", entry->virtual); + drm_dbg_core(dev, "virtual =3D %p\n", entry->virtual); =20 drm_sg_cleanup(entry); =20 diff --git a/drivers/gpu/drm/drm_syncobj.c b/drivers/gpu/drm/drm_syncobj.c index 0c2be8360525..e84957a0f319 100644 --- a/drivers/gpu/drm/drm_syncobj.c +++ b/drivers/gpu/drm/drm_syncobj.c @@ -298,7 +298,7 @@ void drm_syncobj_add_point(struct drm_syncobj *syncobj, prev =3D drm_syncobj_fence_get(syncobj); /* You are adding an unorder point to timeline, which could cause payload= returned from query_ioctl is 0! */ if (prev && prev->seqno >=3D point) - DRM_DEBUG("You are adding an unorder point to timeline!\n"); + drm_dbg_core(NULL, "You are adding an unorder point to timeline!\n"); dma_fence_chain_init(chain, prev, fence, point); rcu_assign_pointer(syncobj->fence, &chain->base); =20 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 183130355997..6b090d71d45a 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -342,8 +342,8 @@ int drm_sysfs_connector_add(struct drm_connector *conne= ctor) if (r) goto err_free; =20 - DRM_DEBUG("adding \"%s\" to sysfs\n", - connector->name); + drm_dbg_core(dev, "adding \"%s\" to sysfs\n", + connector->name); =20 r =3D device_add(kdev); if (r) { @@ -371,8 +371,8 @@ void drm_sysfs_connector_remove(struct drm_connector *c= onnector) if (connector->ddc) sysfs_remove_link(&connector->kdev->kobj, "ddc"); =20 - DRM_DEBUG("removing \"%s\" from sysfs\n", - connector->name); + drm_dbg_core(connector->dev, "removing \"%s\" from sysfs\n", + connector->name); =20 device_unregister(connector->kdev); connector->kdev =3D NULL; @@ -383,7 +383,7 @@ void drm_sysfs_lease_event(struct drm_device *dev) char *event_string =3D "LEASE=3D1"; char *envp[] =3D { event_string, NULL }; =20 - DRM_DEBUG("generating lease event\n"); + drm_dbg_core(dev, "generating lease event\n"); =20 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); } @@ -404,7 +404,7 @@ void drm_sysfs_hotplug_event(struct drm_device *dev) char *event_string =3D "HOTPLUG=3D1"; char *envp[] =3D { event_string, NULL }; =20 - DRM_DEBUG("generating hotplug event\n"); + drm_dbg_core(dev, "generating hotplug event\n"); =20 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); } @@ -460,7 +460,7 @@ void drm_sysfs_connector_status_event(struct drm_connec= tor *connector, snprintf(prop_id, ARRAY_SIZE(prop_id), "PROPERTY=3D%u", property->base.id); =20 - DRM_DEBUG("generating connector status event\n"); + drm_dbg_core(dev, "generating connector status event\n"); =20 kobject_uevent_env(&dev->primary->kdev->kobj, KOBJ_CHANGE, envp); } diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index cdb956af2079..6349807e8898 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -168,12 +168,11 @@ static vm_fault_t drm_vm_fault(struct vm_fault *vmf) get_page(page); vmf->page =3D page; =20 - DRM_DEBUG - ("baddr =3D 0x%llx page =3D 0x%p, offset =3D 0x%llx, count=3D%d\n", - (unsigned long long)baddr, - agpmem->memory->pages[offset], - (unsigned long long)offset, - page_count(page)); + drm_dbg_core(dev, "baddr =3D 0x%llx page =3D 0x%p, offset =3D 0x%llx, co= unt=3D%d\n", + (unsigned long long)baddr, + agpmem->memory->pages[offset], + (unsigned long long)offset, + page_count(page)); return 0; } vm_fault_error: @@ -215,7 +214,7 @@ static vm_fault_t drm_vm_shm_fault(struct vm_fault *vmf) get_page(page); vmf->page =3D page; =20 - DRM_DEBUG("shm_fault 0x%lx\n", offset); + drm_dbg_core(NULL, "shm_fault 0x%lx\n", offset); return 0; } =20 @@ -236,8 +235,8 @@ static void drm_vm_shm_close(struct vm_area_struct *vma) struct drm_map_list *r_list; int found_maps =3D 0; =20 - DRM_DEBUG("0x%08lx,0x%08lx\n", - vma->vm_start, vma->vm_end - vma->vm_start); + drm_dbg_core(dev, "0x%08lx,0x%08lx\n", + vma->vm_start, vma->vm_end - vma->vm_start); =20 map =3D vma->vm_private_data; =20 @@ -319,7 +318,7 @@ static vm_fault_t drm_vm_dma_fault(struct vm_fault *vmf) get_page(page); vmf->page =3D page; =20 - DRM_DEBUG("dma_fault 0x%lx (page %lu)\n", offset, page_nr); + drm_dbg_core(dev, "dma_fault 0x%lx (page %lu)\n", offset, page_nr); return 0; } =20 @@ -391,8 +390,8 @@ static void drm_vm_open_locked(struct drm_device *dev, { struct drm_vma_entry *vma_entry; =20 - DRM_DEBUG("0x%08lx,0x%08lx\n", - vma->vm_start, vma->vm_end - vma->vm_start); + drm_dbg_core(dev, "0x%08lx,0x%08lx\n", + vma->vm_start, vma->vm_end - vma->vm_start); =20 vma_entry =3D kmalloc(sizeof(*vma_entry), GFP_KERNEL); if (vma_entry) { @@ -417,8 +416,8 @@ static void drm_vm_close_locked(struct drm_device *dev, { struct drm_vma_entry *pt, *temp; =20 - DRM_DEBUG("0x%08lx,0x%08lx\n", - vma->vm_start, vma->vm_end - vma->vm_start); + drm_dbg_core(dev, "0x%08lx,0x%08lx\n", + vma->vm_start, vma->vm_end - vma->vm_start); =20 list_for_each_entry_safe(pt, temp, &dev->vmalist, head) { if (pt->vma =3D=3D vma) { @@ -466,8 +465,8 @@ static int drm_mmap_dma(struct file *filp, struct vm_ar= ea_struct *vma) =20 dev =3D priv->minor->dev; dma =3D dev->dma; - DRM_DEBUG("start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\n", - vma->vm_start, vma->vm_end, vma->vm_pgoff); + drm_dbg_core(dev, "start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\= n", + vma->vm_start, vma->vm_end, vma->vm_pgoff); =20 /* Length must match exact page count */ if (!dma || (length >> PAGE_SHIFT) !=3D dma->page_count) { @@ -528,8 +527,8 @@ static int drm_mmap_locked(struct file *filp, struct vm= _area_struct *vma) resource_size_t offset =3D 0; struct drm_hash_item *hash; =20 - DRM_DEBUG("start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\n", - vma->vm_start, vma->vm_end, vma->vm_pgoff); + drm_dbg_core(dev, "start =3D 0x%lx, end =3D 0x%lx, page offset =3D 0x%lx\= n", + vma->vm_start, vma->vm_end, vma->vm_pgoff); =20 if (!priv->authenticated) return -EACCES; @@ -600,10 +599,10 @@ static int drm_mmap_locked(struct file *filp, struct = vm_area_struct *vma) vma->vm_end - vma->vm_start, vma->vm_page_prot)) return -EAGAIN; - DRM_DEBUG(" Type =3D %d; start =3D 0x%lx, end =3D 0x%lx," - " offset =3D 0x%llx\n", - map->type, - vma->vm_start, vma->vm_end, (unsigned long long)(map->offset + offset= )); + drm_dbg_core(dev, + " Type =3D %d; start =3D 0x%lx, end =3D 0x%lx, offset =3D 0x%llx= \n", + map->type, vma->vm_start, vma->vm_end, + (unsigned long long)(map->offset + offset)); =20 vma->vm_ops =3D &drm_vm_ops; break; --=20 2.39.1 From nobody Mon Sep 8 19:00:54 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1D031C7EE2E for ; Sun, 26 Feb 2023 07:23:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229643AbjBZHW7 (ORCPT ); Sun, 26 Feb 2023 02:22:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49542 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229556AbjBZHWu (ORCPT ); Sun, 26 Feb 2023 02:22:50 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DAFD712F13 for ; Sat, 25 Feb 2023 23:22:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677396131; cv=none; d=zohomail.in; s=zohoarc; b=UyZGAbUGpmuA9MFPY08QUqshTZfyfgndRi59TNpzENqUwUcA0irPsr06hkCO+t9KUs3iwYOEBNzKsBiBAKWtT9pQgoi8fz4NJ88L8Epo1kfFxWtUhiqSxnTCFWfxa/6IndSHQFVlgMJRLLVA8yRHDjZKrMxoqUcTXkeY6wVQvOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677396131; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=Imhm3KADBFUzpqoR6YK0c7WlVUrrNnl5QByQ64s0W3k=; b=I2K30Obz8Gv8MdDKAskiMo4cZTcSwd01gTRlYuVnr9hRxYIeVO6tJXgKm4+H9b8Cl18j6cS/PqSPXya4flP8Kc3ZjPF3R3/RUcPAERqLG8IBfZ9tiUYrkC51MyosQhgEi9tZSIHi+sEJqCZEG5NjgTqjuB8qb8wggiIkt73oJ+U= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677396131; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=Imhm3KADBFUzpqoR6YK0c7WlVUrrNnl5QByQ64s0W3k=; b=Vn/O6em6/LzhuR55MbOAKdyAEiYYYg/cQ8z9cntCOo2TDZ1tUaSMACKn2+mhcplv RNbIzc9ZTW4KGEVWfwfHCV9QNY+6NRm8QwEOss1rx1NxX/xoKWOedJXJjdn5espie6v mbEZqdB0VhPgejiF/xSzi5FFAu9RNyp35S68sdLE= Received: from kampyooter.. (122.170.64.102 [122.170.64.102]) by mx.zoho.in with SMTPS id 1677396129966293.123440320678; Sun, 26 Feb 2023 12:52:09 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg Cc: linux-kernel , dri-devel Message-ID: Subject: [PATCH v7 6/7] drm: Remove usage of deprecated DRM_DEBUG_DRIVER Date: Sun, 26 Feb 2023 12:51:53 +0530 X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" drm_print.h says DRM_DEBUG_DRIVER is deprecated. Thus, use newer drm_dbg_driver(). Also fix the deprecation comment in drm_print.h which mentions drm_dbg() instead of drm_dbg_driver(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_mipi_dbi.c | 10 +++++----- include/drm/drm_print.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index 58ff9503a403..ab5dd5933a1a 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -70,11 +70,11 @@ #define MIPI_DBI_DEBUG_COMMAND(cmd, data, len) \ ({ \ if (!len) \ - DRM_DEBUG_DRIVER("cmd=3D%02x\n", cmd); \ + drm_dbg_driver(NULL, "cmd=3D%02x\n", cmd); \ else if (len <=3D 32) \ - DRM_DEBUG_DRIVER("cmd=3D%02x, par=3D%*ph\n", cmd, (int)len, data);\ + drm_dbg_driver(NULL, "cmd=3D%02x, par=3D%*ph\n", cmd, (int)len, data);\ else \ - DRM_DEBUG_DRIVER("cmd=3D%02x, len=3D%zu\n", cmd, len); \ + drm_dbg_driver(NULL, "cmd=3D%02x, len=3D%zu\n", cmd, len); \ }) =20 static const u8 mipi_dbi_dcs_read_commands[] =3D { @@ -708,7 +708,7 @@ bool mipi_dbi_display_is_on(struct mipi_dbi *dbi) DCS_POWER_MODE_DISPLAY_NORMAL_MODE | DCS_POWER_MODE_SLEEP_MODE)) return false; =20 - DRM_DEBUG_DRIVER("Display is ON\n"); + drm_dbg_driver(NULL, "Display is ON\n"); =20 return true; } @@ -1256,7 +1256,7 @@ int mipi_dbi_spi_init(struct spi_device *spi, struct = mipi_dbi *dbi, =20 mutex_init(&dbi->cmdlock); =20 - DRM_DEBUG_DRIVER("SPI speed: %uMHz\n", spi->max_speed_hz / 1000000); + drm_dbg_driver(NULL, "SPI speed: %uMHz\n", spi->max_speed_hz / 1000000); =20 return 0; } diff --git a/include/drm/drm_print.h b/include/drm/drm_print.h index 1a7d4064d120..764f965a6660 100644 --- a/include/drm/drm_print.h +++ b/include/drm/drm_print.h @@ -624,7 +624,7 @@ void __drm_err(const char *format, ...); #define DRM_DEBUG(fmt, ...) \ __drm_dbg(DRM_UT_CORE, fmt, ##__VA_ARGS__) =20 -/* NOTE: this is deprecated in favor of drm_dbg(NULL, ...). */ +/* NOTE: this is deprecated in favor of drm_dbg_driver(NULL, ...). */ #define DRM_DEBUG_DRIVER(fmt, ...) \ __drm_dbg(DRM_UT_DRIVER, fmt, ##__VA_ARGS__) =20 --=20 2.39.1 From nobody Mon Sep 8 19:00:54 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A9D8C64ED6 for ; Sun, 26 Feb 2023 07:23:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229660AbjBZHXO (ORCPT ); Sun, 26 Feb 2023 02:23:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49844 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229635AbjBZHW4 (ORCPT ); Sun, 26 Feb 2023 02:22:56 -0500 Received: from sender-of-o50.zoho.in (sender-of-o50.zoho.in [103.117.158.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D3F7211D for ; Sat, 25 Feb 2023 23:22:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677396135; cv=none; d=zohomail.in; s=zohoarc; b=HG1qhtwob/qaM9m0Jqf+gyBJNEwucjErxQZWQAq5yQNlZDLEjCVMg6SCwcU09EePDtI7stbPaEugA1Ngi/Rw4L4GY0qDuysRLMqo0GiXRkM2MSTL7NBjyI9t/3kYw6xwYta/RDGEmrbSV7mwhkCyJdLYWbPfD69YSNtpus80FfU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.in; s=zohoarc; t=1677396135; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=HvpogCAO4+Ce/JExy2Ty5vKfzJ+uXHYrO1HaFFeKRJ8=; b=b17b1kn/WuNEnhB6qoHvaNUxq7p4U+DTE2eD/eUjbfwShJKjbyKvq4e4Sl7x+GPPc91pTKs5W2koPV8CMncCh0EZe5LF1kQVjOO84UwVjv2+yy8kYJMk1/IZN2TfaTTXO9CUzmFQVMvpGIC1IoNecbotlcDb9jyILNq4/ig7K5M= ARC-Authentication-Results: i=1; mx.zohomail.in; dkim=pass header.i=siddh.me; spf=pass smtp.mailfrom=code@siddh.me; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1677396135; s=zmail; d=siddh.me; i=code@siddh.me; h=From:From:To:To:Cc:Cc:Message-ID:Subject:Subject:Date:Date:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Content-Type:Message-Id:Reply-To; bh=HvpogCAO4+Ce/JExy2Ty5vKfzJ+uXHYrO1HaFFeKRJ8=; b=gSFvsVlKMw2zTtIy/1X14XIA9wPzE6XcUs/5gjowql0bUc4MnTwGhseyh6i+94fS JKRk/BU8gM7B67CjfdQf08HMIYSow3jTt9TZINBk0WrphQqdnsWCYBtFdHJAMMOFC9a Wxd1pH3owianm9kt8kt60Fm4sY6STy0Dgqh76VvM= Received: from kampyooter.. (122.170.64.102 [122.170.64.102]) by mx.zoho.in with SMTPS id 1677396130373500.2654526510513; Sun, 26 Feb 2023 12:52:10 +0530 (IST) From: Siddh Raman Pant To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Jim Cromie , Sam Ravnborg Cc: linux-kernel , dri-devel Message-ID: Subject: [PATCH v7 7/7] drm: Remove usage of deprecated DRM_DEBUG_KMS Date: Sun, 26 Feb 2023 12:51:54 +0530 X-Mailer: git-send-email 2.39.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" drm_print.h says DRM_DEBUG_KMS is deprecated in favor of drm_dbg_kms(). Signed-off-by: Siddh Raman Pant --- drivers/gpu/drm/drm_client_modeset.c | 112 ++++++++++++++----------- drivers/gpu/drm/drm_color_mgmt.c | 4 +- drivers/gpu/drm/drm_connector.c | 21 ++--- drivers/gpu/drm/drm_crtc.c | 36 ++++---- drivers/gpu/drm/drm_crtc_helper.c | 54 ++++++------ drivers/gpu/drm/drm_debugfs_crc.c | 5 +- drivers/gpu/drm/drm_displayid.c | 4 +- drivers/gpu/drm/drm_edid.c | 17 ++-- drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +- drivers/gpu/drm/drm_lease.c | 2 +- drivers/gpu/drm/drm_mipi_dbi.c | 7 +- drivers/gpu/drm/drm_modes.c | 10 +-- drivers/gpu/drm/drm_plane.c | 32 +++---- drivers/gpu/drm/drm_probe_helper.c | 39 ++++----- drivers/gpu/drm/drm_rect.c | 4 +- drivers/gpu/drm/drm_sysfs.c | 8 +- 16 files changed, 189 insertions(+), 170 deletions(-) diff --git a/drivers/gpu/drm/drm_client_modeset.c b/drivers/gpu/drm/drm_cli= ent_modeset.c index e2403b8c6347..4e08ae688b83 100644 --- a/drivers/gpu/drm/drm_client_modeset.c +++ b/drivers/gpu/drm/drm_client_modeset.c @@ -242,8 +242,9 @@ static void drm_client_connectors_enabled(struct drm_co= nnector **connectors, for (i =3D 0; i < connector_count; i++) { connector =3D connectors[i]; enabled[i] =3D drm_connector_enabled(connector, true); - DRM_DEBUG_KMS("connector %d enabled? %s\n", connector->base.id, - connector->display_info.non_desktop ? "non desktop" : str_yes_no(= enabled[i])); + drm_dbg_kms(connector->dev, "connector %d enabled? %s\n", + connector->base.id, + connector->display_info.non_desktop ? "non desktop" : str_yes_no(en= abled[i])); =20 any_enabled |=3D enabled[i]; } @@ -303,7 +304,7 @@ static bool drm_client_target_cloned(struct drm_device = *dev, } =20 if (can_clone) { - DRM_DEBUG_KMS("can clone using command line\n"); + drm_dbg_kms(dev, "can clone using command line\n"); return true; } =20 @@ -328,7 +329,7 @@ static bool drm_client_target_cloned(struct drm_device = *dev, } =20 if (can_clone) { - DRM_DEBUG_KMS("can clone using 1024x768\n"); + drm_dbg_kms(dev, "can clone using 1024x768\n"); return true; } drm_info(dev, "kms: can't enable cloning when we probably wanted to.\n"); @@ -352,8 +353,9 @@ static int drm_client_get_tile_offsets(struct drm_conne= ctor **connectors, continue; =20 if (!modes[i] && (h_idx || v_idx)) { - DRM_DEBUG_KMS("no modes for connector tiled %d %d\n", i, - connector->base.id); + drm_dbg_kms(connector->dev, + "no modes for connector tiled %d %d\n", + i, connector->base.id); continue; } if (connector->tile_h_loc < h_idx) @@ -364,7 +366,8 @@ static int drm_client_get_tile_offsets(struct drm_conne= ctor **connectors, } offsets[idx].x =3D hoffset; offsets[idx].y =3D voffset; - DRM_DEBUG_KMS("returned %d %d for %d %d\n", hoffset, voffset, h_idx, v_id= x); + drm_dbg_kms(NULL, "returned %d %d for %d %d\n", + hoffset, voffset, h_idx, v_idx); return 0; } =20 @@ -421,14 +424,16 @@ static bool drm_client_target_preferred(struct drm_co= nnector **connectors, drm_client_get_tile_offsets(connectors, connector_count, modes, offsets= , i, connector->tile_h_loc, connector->tile_v_loc); } - DRM_DEBUG_KMS("looking for cmdline mode on connector %d\n", - connector->base.id); + drm_dbg_kms(connector->dev, + "looking for cmdline mode on connector %d\n", + connector->base.id); =20 /* got for command line mode first */ modes[i] =3D drm_connector_pick_cmdline_mode(connector); if (!modes[i]) { - DRM_DEBUG_KMS("looking for preferred mode on connector %d %d\n", - connector->base.id, connector->tile_group ? connector->tile_grou= p->id : 0); + drm_dbg_kms(connector->dev, + "looking for preferred mode on connector %d %d\n", + connector->base.id, connector->tile_group ? connector->tile_group-= >id : 0); modes[i] =3D drm_connector_has_preferred_mode(connector, width, height); } /* No preferred modes, pick one off the list */ @@ -450,16 +455,17 @@ static bool drm_client_target_preferred(struct drm_co= nnector **connectors, (connector->tile_h_loc =3D=3D 0 && connector->tile_v_loc =3D=3D 0 && !drm_connector_get_tiled_mode(connector))) { - DRM_DEBUG_KMS("Falling back to non tiled mode on Connector %d\n", - connector->base.id); + drm_dbg_kms(connector->dev, + "Falling back to non tiled mode on Connector %d\n", + connector->base.id); modes[i] =3D drm_connector_fallback_non_tiled_mode(connector); } else { modes[i] =3D drm_connector_get_tiled_mode(connector); } } =20 - DRM_DEBUG_KMS("found mode %s\n", modes[i] ? modes[i]->name : - "none"); + drm_dbg_kms(connector->dev, "found mode %s\n", + modes[i] ? modes[i]->name : "none"); conn_configured |=3D BIT_ULL(i); } =20 @@ -619,15 +625,17 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, num_connectors_detected++; =20 if (!enabled[i]) { - DRM_DEBUG_KMS("connector %s not enabled, skipping\n", - connector->name); + drm_dbg_kms(connector->dev, + "connector %s not enabled, skipping\n", + connector->name); conn_configured |=3D BIT(i); continue; } =20 if (connector->force =3D=3D DRM_FORCE_OFF) { - DRM_DEBUG_KMS("connector %s is disabled by user, skipping\n", - connector->name); + drm_dbg_kms(connector->dev, + "connector %s is disabled by user, skipping\n", + connector->name); enabled[i] =3D false; continue; } @@ -637,8 +645,9 @@ static bool drm_client_firmware_config(struct drm_clien= t_dev *client, if (connector->force > DRM_FORCE_OFF) goto bail; =20 - DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n", - connector->name); + drm_dbg_kms(connector->dev, + "connector %s has no encoder or crtc, skipping\n", + connector->name); enabled[i] =3D false; conn_configured |=3D BIT(i); continue; @@ -655,28 +664,32 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, */ for (j =3D 0; j < count; j++) { if (crtcs[j] =3D=3D new_crtc) { - DRM_DEBUG_KMS("fallback: cloned configuration\n"); + drm_dbg_kms(connector->dev, + "fallback: cloned configuration\n"); goto bail; } } =20 - DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n", - connector->name); + drm_dbg_kms(connector->dev, + "looking for cmdline mode on connector %s\n", + connector->name); =20 /* go for command line mode first */ modes[i] =3D drm_connector_pick_cmdline_mode(connector); =20 /* try for preferred next */ if (!modes[i]) { - DRM_DEBUG_KMS("looking for preferred mode on connector %s %d\n", - connector->name, connector->has_tile); + drm_dbg_kms(connector->dev, + "looking for preferred mode on connector %s %d\n", + connector->name, connector->has_tile); modes[i] =3D drm_connector_has_preferred_mode(connector, width, height); } =20 /* No preferred mode marked by the EDID? Are there any modes? */ if (!modes[i] && !list_empty(&connector->modes)) { - DRM_DEBUG_KMS("using first mode listed on connector %s\n", - connector->name); + drm_dbg_kms(connector->dev, + "using first mode listed on connector %s\n", + connector->name); modes[i] =3D list_first_entry(&connector->modes, struct drm_display_mode, head); @@ -695,8 +708,9 @@ static bool drm_client_firmware_config(struct drm_clien= t_dev *client, * This is crtc->mode and not crtc->state->mode for the * fastboot check to work correctly. */ - DRM_DEBUG_KMS("looking for current mode on connector %s\n", - connector->name); + drm_dbg_kms(connector->dev, + "looking for current mode on connector %s\n", + connector->name); modes[i] =3D &connector->state->crtc->mode; } /* @@ -705,18 +719,20 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, */ if (connector->has_tile && num_tiled_conns < connector->num_h_tile * connector->num_v_tile) { - DRM_DEBUG_KMS("Falling back to non tiled mode on Connector %d\n", - connector->base.id); + drm_dbg_kms(connector->dev, + "Falling back to non tiled mode on Connector %d\n", + connector->base.id); modes[i] =3D drm_connector_fallback_non_tiled_mode(connector); } crtcs[i] =3D new_crtc; =20 - DRM_DEBUG_KMS("connector %s on [CRTC:%d:%s]: %dx%d%s\n", - connector->name, - connector->state->crtc->base.id, - connector->state->crtc->name, - modes[i]->hdisplay, modes[i]->vdisplay, - modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" : ""); + drm_dbg_kms(connector->dev, + "connector %s on [CRTC:%d:%s]: %dx%d%s\n", + connector->name, + connector->state->crtc->base.id, + connector->state->crtc->name, + modes[i]->hdisplay, modes[i]->vdisplay, + modes[i]->flags & DRM_MODE_FLAG_INTERLACE ? "i" : ""); =20 fallback =3D false; conn_configured |=3D BIT(i); @@ -732,15 +748,15 @@ static bool drm_client_firmware_config(struct drm_cli= ent_dev *client, */ if (num_connectors_enabled !=3D num_connectors_detected && num_connectors_enabled < dev->mode_config.num_crtc) { - DRM_DEBUG_KMS("fallback: Not all outputs enabled\n"); - DRM_DEBUG_KMS("Enabled: %i, detected: %i\n", num_connectors_enabled, - num_connectors_detected); + drm_dbg_kms(NULL, "fallback: Not all outputs enabled\n"); + drm_dbg_kms(NULL, "Enabled: %i, detected: %i\n", + num_connectors_enabled, num_connectors_detected); fallback =3D true; } =20 if (fallback) { bail: - DRM_DEBUG_KMS("Not using firmware configuration\n"); + drm_dbg_kms(NULL, "Not using firmware configuration\n"); memcpy(enabled, save_enabled, count); ret =3D false; } @@ -777,7 +793,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, int i, ret =3D 0; bool *enabled; =20 - DRM_DEBUG_KMS("\n"); + drm_dbg_kms(dev, "\n"); =20 if (!width) width =3D dev->mode_config.max_width; @@ -819,7 +835,7 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, for (i =3D 0; i < connector_count; i++) total_modes_count +=3D connectors[i]->funcs->fill_modes(connectors[i], w= idth, height); if (!total_modes_count) - DRM_DEBUG_KMS("No connectors reported connected with modes\n"); + drm_dbg_kms(dev, "No connectors reported connected with modes\n"); drm_client_connectors_enabled(connectors, connector_count, enabled); =20 if (!drm_client_firmware_config(client, connectors, connector_count, crtc= s, @@ -834,8 +850,8 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, offsets, enabled, width, height)) drm_err(client->dev, "Unable to find initial modes\n"); =20 - DRM_DEBUG_KMS("picking CRTCs for %dx%d config\n", - width, height); + drm_dbg_kms(dev, "picking CRTCs for %dx%d config\n", + width, height); =20 drm_client_pick_crtcs(client, connectors, connector_count, crtcs, modes, 0, width, height); @@ -853,8 +869,8 @@ int drm_client_modeset_probe(struct drm_client_dev *cli= ent, unsigned int width, struct drm_mode_set *modeset =3D drm_client_find_modeset(client, crtc); struct drm_connector *connector =3D connectors[i]; =20 - DRM_DEBUG_KMS("desired mode %s set on crtc %d (%d,%d)\n", - mode->name, crtc->base.id, offset->x, offset->y); + drm_dbg_kms(dev, "desired mode %s set on crtc %d (%d,%d)\n", + mode->name, crtc->base.id, offset->x, offset->y); =20 if (WARN_ON_ONCE(modeset->num_connectors =3D=3D DRM_CLIENT_MAX_CLONED_C= ONNECTORS || (dev->mode_config.num_crtc > 1 && modeset->num_connectors =3D=3D 1))= ) { diff --git a/drivers/gpu/drm/drm_color_mgmt.c b/drivers/gpu/drm/drm_color_m= gmt.c index d021497841b8..a2761a6ce11f 100644 --- a/drivers/gpu/drm/drm_color_mgmt.c +++ b/drivers/gpu/drm/drm_color_mgmt.c @@ -612,7 +612,7 @@ int drm_color_lut_check(const struct drm_property_blob = *lut, u32 tests) if (tests & DRM_COLOR_LUT_EQUAL_CHANNELS) { if (entry[i].red !=3D entry[i].blue || entry[i].red !=3D entry[i].green) { - DRM_DEBUG_KMS("All LUT entries must have equal r/g/b\n"); + drm_dbg_kms(NULL, "All LUT entries must have equal r/g/b\n"); return -EINVAL; } } @@ -621,7 +621,7 @@ int drm_color_lut_check(const struct drm_property_blob = *lut, u32 tests) if (entry[i].red < entry[i - 1].red || entry[i].green < entry[i - 1].green || entry[i].blue < entry[i - 1].blue) { - DRM_DEBUG_KMS("LUT entries must never decrease.\n"); + drm_dbg_kms(NULL, "LUT entries must never decrease.\n"); return -EINVAL; } } diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connecto= r.c index cd1a23fc82e1..457bf4c205c3 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -181,13 +181,14 @@ static void drm_connector_get_cmdline_mode(struct drm= _connector *connector) mode->panel_orientation); } =20 - DRM_DEBUG_KMS("cmdline mode for connector %s %s %dx%d@%dHz%s%s%s\n", - connector->name, mode->name, - mode->xres, mode->yres, - mode->refresh_specified ? mode->refresh : 60, - mode->rb ? " reduced blanking" : "", - mode->margins ? " with margins" : "", - mode->interlace ? " interlaced" : ""); + drm_dbg_kms(connector->dev, + "cmdline mode for connector %s %s %dx%d@%dHz%s%s%s\n", + connector->name, mode->name, + mode->xres, mode->yres, + mode->refresh_specified ? mode->refresh : 60, + mode->rb ? " reduced blanking" : "", + mode->margins ? " with margins" : "", + mode->interlace ? " interlaced" : ""); } =20 static void drm_connector_free(struct kref *kref) @@ -247,9 +248,9 @@ static int __drm_connector_init(struct drm_device *dev, /* connector index is used with 32bit bitmasks */ ret =3D ida_alloc_max(&config->connector_ida, 31, GFP_KERNEL); if (ret < 0) { - DRM_DEBUG_KMS("Failed to allocate %s connector index: %d\n", - drm_connector_enum_list[connector_type].name, - ret); + drm_dbg_kms(dev, "Failed to allocate %s connector index: %d\n", + drm_connector_enum_list[connector_type].name, + ret); goto out_put; } connector->index =3D ret; diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index df9bf3c9206e..adc426561e17 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -730,10 +730,10 @@ int drm_mode_setcrtc(struct drm_device *dev, void *da= ta, =20 crtc =3D drm_crtc_find(dev, file_priv, crtc_req->crtc_id); if (!crtc) { - DRM_DEBUG_KMS("Unknown CRTC ID %d\n", crtc_req->crtc_id); + drm_dbg_kms(dev, "Unknown CRTC ID %d\n", crtc_req->crtc_id); return -ENOENT; } - DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); + drm_dbg_kms(dev, "[CRTC:%d:%s]\n", crtc->base.id, crtc->name); =20 plane =3D crtc->primary; =20 @@ -756,7 +756,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, old_fb =3D plane->fb; =20 if (!old_fb) { - DRM_DEBUG_KMS("CRTC doesn't have current FB\n"); + drm_dbg_kms(dev, "CRTC doesn't have current FB\n"); ret =3D -EINVAL; goto out; } @@ -767,8 +767,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, } else { fb =3D drm_framebuffer_lookup(dev, file_priv, crtc_req->fb_id); if (!fb) { - DRM_DEBUG_KMS("Unknown FB ID%d\n", - crtc_req->fb_id); + drm_dbg_kms(dev, "Unknown FB ID%d\n", crtc_req->fb_id); ret =3D -ENOENT; goto out; } @@ -781,7 +780,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, } if (!file_priv->aspect_ratio_allowed && (crtc_req->mode.flags & DRM_MODE_FLAG_PIC_AR_MASK) !=3D DRM_MODE_FLA= G_PIC_AR_NONE) { - DRM_DEBUG_KMS("Unexpected aspect-ratio flag bits\n"); + drm_dbg_kms(dev, "Unexpected aspect-ratio flag bits\n"); ret =3D -EINVAL; goto out; } @@ -789,8 +788,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, =20 ret =3D drm_mode_convert_umode(dev, mode, &crtc_req->mode); if (ret) { - DRM_DEBUG_KMS("Invalid mode (ret=3D%d, status=3D%s)\n", - ret, drm_get_mode_status_name(mode->status)); + drm_dbg_kms(dev, "Invalid mode (ret=3D%d, status=3D%s)\n", + ret, drm_get_mode_status_name(mode->status)); drm_mode_debug_printmodeline(mode); goto out; } @@ -807,9 +806,8 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data, fb->format->format, fb->modifier); if (ret) { - DRM_DEBUG_KMS("Invalid pixel format %p4cc, modifier 0x%llx\n", - &fb->format->format, - fb->modifier); + drm_dbg_kms(dev, "Invalid pixel format %p4cc, modifier 0x%llx\n", + &fb->format->format, fb->modifier); goto out; } } @@ -822,14 +820,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *da= ta, } =20 if (crtc_req->count_connectors =3D=3D 0 && mode) { - DRM_DEBUG_KMS("Count connectors is 0 but mode set\n"); + drm_dbg_kms(dev, "Count connectors is 0 but mode set\n"); ret =3D -EINVAL; goto out; } =20 if (crtc_req->count_connectors > 0 && (!mode || !fb)) { - DRM_DEBUG_KMS("Count connectors is %d but no mode or fb set\n", - crtc_req->count_connectors); + drm_dbg_kms(dev, "Count connectors is %d but no mode or fb set\n", + crtc_req->count_connectors); ret =3D -EINVAL; goto out; } @@ -861,14 +859,14 @@ int drm_mode_setcrtc(struct drm_device *dev, void *da= ta, =20 connector =3D drm_connector_lookup(dev, file_priv, out_id); if (!connector) { - DRM_DEBUG_KMS("Connector id %d unknown\n", - out_id); + drm_dbg_kms(dev, "Connector id %d unknown\n", + out_id); ret =3D -ENOENT; goto out; } - DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", - connector->base.id, - connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s]\n", + connector->base.id, + connector->name); =20 connector_set[i] =3D connector; } diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_h= elper.c index b74b4301a471..59e7b86eab93 100644 --- a/drivers/gpu/drm/drm_crtc_helper.c +++ b/drivers/gpu/drm/drm_crtc_helper.c @@ -338,7 +338,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, if (encoder_funcs->mode_fixup) { if (!(ret =3D encoder_funcs->mode_fixup(encoder, mode, adjusted_mode))) { - DRM_DEBUG_KMS("Encoder fixup failed\n"); + drm_dbg_kms(dev, "Encoder fixup failed\n"); goto done; } } @@ -347,11 +347,11 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, if (crtc_funcs->mode_fixup) { if (!(ret =3D crtc_funcs->mode_fixup(crtc, mode, adjusted_mode))) { - DRM_DEBUG_KMS("CRTC fixup failed\n"); + drm_dbg_kms(dev, "CRTC fixup failed\n"); goto done; } } - DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name); + drm_dbg_kms(dev, "[CRTC:%d:%s]\n", crtc->base.id, crtc->name); =20 drm_mode_copy(&crtc->hwmode, adjusted_mode); =20 @@ -390,8 +390,8 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc, if (!encoder_funcs) continue; =20 - DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%s]\n", - encoder->base.id, encoder->name, mode->name); + drm_dbg_kms(dev, "[ENCODER:%d:%s] set [MODE:%s]\n", + encoder->base.id, encoder->name, mode->name); if (encoder_funcs->mode_set) encoder_funcs->mode_set(encoder, mode, adjusted_mode); } @@ -567,7 +567,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, int ret; int i; =20 - DRM_DEBUG_KMS("\n"); + drm_dbg_kms(NULL, "\n"); =20 BUG_ON(!set); BUG_ON(!set->crtc); @@ -586,13 +586,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *s= et, set->fb =3D NULL; =20 if (set->fb) { - DRM_DEBUG_KMS("[CRTC:%d:%s] [FB:%d] #connectors=3D%d (x y) (%i %i)\n", - set->crtc->base.id, set->crtc->name, - set->fb->base.id, - (int)set->num_connectors, set->x, set->y); + drm_dbg_kms(dev, "[CRTC:%d:%s] [FB:%d] #connectors=3D%d (x y) (%i %i)\n", + set->crtc->base.id, set->crtc->name, + set->fb->base.id, + (int)set->num_connectors, set->x, set->y); } else { - DRM_DEBUG_KMS("[CRTC:%d:%s] [NOFB]\n", - set->crtc->base.id, set->crtc->name); + drm_dbg_kms(dev, "[CRTC:%d:%s] [NOFB]\n", + set->crtc->base.id, set->crtc->name); drm_crtc_helper_disable(set->crtc); return 0; } @@ -642,7 +642,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, if (set->crtc->primary->fb !=3D set->fb) { /* If we have no fb then treat it as a full mode set */ if (set->crtc->primary->fb =3D=3D NULL) { - DRM_DEBUG_KMS("crtc has no fb, full mode set\n"); + drm_dbg_kms(dev, "crtc has no fb, full mode set\n"); mode_changed =3D true; } else if (set->fb->format !=3D set->crtc->primary->fb->format) { mode_changed =3D true; @@ -654,7 +654,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, fb_changed =3D true; =20 if (!drm_mode_equal(set->mode, &set->crtc->mode)) { - DRM_DEBUG_KMS("modes are different, full mode set\n"); + drm_dbg_kms(dev, "modes are different, full mode set\n"); drm_mode_debug_printmodeline(&set->crtc->mode); drm_mode_debug_printmodeline(set->mode); mode_changed =3D true; @@ -690,7 +690,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, fail =3D 1; =20 if (connector->dpms !=3D DRM_MODE_DPMS_ON) { - DRM_DEBUG_KMS("connector dpms not on, full mode switch\n"); + drm_dbg_kms(dev, "connector dpms not on, full mode switch\n"); mode_changed =3D true; } =20 @@ -699,7 +699,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, } =20 if (new_encoder !=3D connector->encoder) { - DRM_DEBUG_KMS("encoder changed, full mode switch\n"); + drm_dbg_kms(dev, "encoder changed, full mode switch\n"); mode_changed =3D true; /* If the encoder is reused for another connector, then * the appropriate crtc will be set later. @@ -740,17 +740,17 @@ int drm_crtc_helper_set_config(struct drm_mode_set *s= et, goto fail; } if (new_crtc !=3D connector->encoder->crtc) { - DRM_DEBUG_KMS("crtc changed, full mode switch\n"); + drm_dbg_kms(dev, "crtc changed, full mode switch\n"); mode_changed =3D true; connector->encoder->crtc =3D new_crtc; } if (new_crtc) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [CRTC:%d:%s]\n", - connector->base.id, connector->name, - new_crtc->base.id, new_crtc->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] to [CRTC:%d:%s]\n", + connector->base.id, connector->name, + new_crtc->base.id, new_crtc->name); } else { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [NOCRTC]\n", - connector->base.id, connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] to [NOCRTC]\n", + connector->base.id, connector->name); } } drm_connector_list_iter_end(&conn_iter); @@ -761,8 +761,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set, =20 if (mode_changed) { if (drm_helper_crtc_in_use(set->crtc)) { - DRM_DEBUG_KMS("attempting to set mode from" - " userspace\n"); + drm_dbg_kms(dev, "attempting to set mode from userspace\n"); drm_mode_debug_printmodeline(set->mode); set->crtc->primary->fb =3D set->fb; if (!drm_crtc_helper_set_mode(set->crtc, set->mode, @@ -774,10 +773,11 @@ int drm_crtc_helper_set_config(struct drm_mode_set *s= et, ret =3D -EINVAL; goto fail; } - DRM_DEBUG_KMS("Setting connector DPMS state to on\n"); + drm_dbg_kms(dev, "Setting connector DPMS state to on\n"); for (i =3D 0; i < set->num_connectors; i++) { - DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]-= >base.id, - set->connectors[i]->name); + drm_dbg_kms(dev, "\t[CONNECTOR:%d:%s] set DPMS on\n", + set->connectors[i]->base.id, + set->connectors[i]->name); set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON); } } diff --git a/drivers/gpu/drm/drm_debugfs_crc.c b/drivers/gpu/drm/drm_debugf= s_crc.c index a59ef3f0e4a1..f29d286f4760 100644 --- a/drivers/gpu/drm/drm_debugfs_crc.c +++ b/drivers/gpu/drm/drm_debugfs_crc.c @@ -131,8 +131,9 @@ static ssize_t crc_control_write(struct file *file, con= st char __user *ubuf, return 0; =20 if (len > PAGE_SIZE - 1) { - DRM_DEBUG_KMS("Expected < %lu bytes into crtc crc control\n", - PAGE_SIZE); + drm_dbg_kms(crtc->dev, + "Expected < %lu bytes into crtc crc control\n", + PAGE_SIZE); return -E2BIG; } =20 diff --git a/drivers/gpu/drm/drm_displayid.c b/drivers/gpu/drm/drm_displayi= d.c index 67fed6cee9e9..5304ab4337b3 100644 --- a/drivers/gpu/drm/drm_displayid.c +++ b/drivers/gpu/drm/drm_displayid.c @@ -15,8 +15,8 @@ static int validate_displayid(const u8 *displayid, int le= ngth, int idx) =20 base =3D (const struct displayid_header *)&displayid[idx]; =20 - DRM_DEBUG_KMS("base revision 0x%x, length %d, %d %d\n", - base->rev, base->bytes, base->prod_id, base->ext_count); + drm_dbg_kms(NULL, "base revision 0x%x, length %d, %d %d\n", + base->rev, base->bytes, base->prod_id, base->ext_count); =20 /* +1 for DispID checksum */ dispid_length =3D sizeof(*base) + base->bytes + 1; diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 3d0a4da661bc..71adb2e6bffd 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -1986,7 +1986,7 @@ bool drm_edid_block_valid(u8 *_block, int block_num, = bool print_bad_edid, =20 status =3D edid_block_check(block, is_base_block); if (status =3D=3D EDID_BLOCK_HEADER_REPAIR) { - DRM_DEBUG_KMS("Fixing EDID header, your hardware may be failing\n"); + drm_dbg_kms(NULL, "Fixing EDID header, your hardware may be failing\n"); edid_header_fix(block); =20 /* Retry with fixed header, update status if that worked. */ @@ -2172,8 +2172,9 @@ drm_do_probe_ddc_edid(void *data, u8 *buf, unsigned i= nt block, size_t len) ret =3D i2c_transfer(adapter, &msgs[3 - xfers], xfers); =20 if (ret =3D=3D -ENXIO) { - DRM_DEBUG_KMS("drm: skipping non-existent adapter %s\n", - adapter->name); + drm_dbg_kms(NULL, + "drm: skipping non-existent adapter %s\n", + adapter->name); break; } } while (ret !=3D xfers && --retries); @@ -5576,7 +5577,7 @@ static int _drm_edid_to_sad(const struct drm_edid *dr= m_edid, } cea_db_iter_end(&iter); =20 - DRM_DEBUG_KMS("Found %d Short Audio Descriptors\n", count); + drm_dbg_kms(NULL, "Found %d Short Audio Descriptors\n", count); =20 return count; } @@ -5621,7 +5622,7 @@ static int _drm_edid_to_speaker_allocation(const stru= ct drm_edid *drm_edid, } cea_db_iter_end(&iter); =20 - DRM_DEBUG_KMS("Found %d Speaker Allocation Data Blocks\n", count); + drm_dbg_kms(NULL, "Found %d Speaker Allocation Data Blocks\n", count); =20 return count; } @@ -5748,7 +5749,7 @@ static bool _drm_detect_monitor_audio(const struct dr= m_edid *drm_edid) drm_edid_iter_end(&edid_iter); =20 if (has_audio) { - DRM_DEBUG_KMS("Monitor has basic audio support\n"); + drm_dbg_kms(NULL, "Monitor has basic audio support\n"); goto end; } =20 @@ -5759,8 +5760,8 @@ static bool _drm_detect_monitor_audio(const struct dr= m_edid *drm_edid) int i; =20 for (i =3D 0; i < cea_db_payload_len(db); i +=3D 3) - DRM_DEBUG_KMS("CEA audio format %d\n", - (data[i] >> 3) & 0xf); + drm_dbg_kms(NULL, "CEA audio format %d\n", + (data[i] >> 3) & 0xf); has_audio =3D true; break; } diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_g= em_shmem_helper.c index 259176d78f3b..032b9f7926dd 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c @@ -175,7 +175,7 @@ static int drm_gem_shmem_get_pages_locked(struct drm_ge= m_shmem_object *shmem) =20 pages =3D drm_gem_get_pages(obj); if (IS_ERR(pages)) { - DRM_DEBUG_KMS("Failed to get pages (%ld)\n", PTR_ERR(pages)); + drm_dbg_kms(NULL, "Failed to get pages (%ld)\n", PTR_ERR(pages)); shmem->pages_use_count =3D 0; return PTR_ERR(pages); } @@ -328,7 +328,7 @@ static int drm_gem_shmem_vmap_locked(struct drm_gem_shm= em_object *shmem, } =20 if (ret) { - DRM_DEBUG_KMS("Failed to vmap pages, error %d\n", ret); + drm_dbg_kms(NULL, "Failed to vmap pages, error %d\n", ret); goto err_put_pages; } =20 diff --git a/drivers/gpu/drm/drm_lease.c b/drivers/gpu/drm/drm_lease.c index af72fc38bb7c..c1b8717b5794 100644 --- a/drivers/gpu/drm/drm_lease.c +++ b/drivers/gpu/drm/drm_lease.c @@ -403,7 +403,7 @@ static int fill_object_idr(struct drm_device *dev, } =20 if (!drm_mode_object_lease_required(objects[o]->type)) { - DRM_DEBUG_KMS("invalid object for lease\n"); + drm_dbg_kms(dev, "invalid object for lease\n"); ret =3D -EINVAL; goto out_free_objects; } diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index ab5dd5933a1a..793fdd7da1d0 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c @@ -265,7 +265,8 @@ static void mipi_dbi_fb_dirty(struct iosys_map *src, st= ruct drm_framebuffer *fb, =20 full =3D width =3D=3D fb->width && height =3D=3D fb->height; =20 - DRM_DEBUG_KMS("Flushing [FB:%d] " DRM_RECT_FMT "\n", fb->base.id, DRM_REC= T_ARG(rect)); + drm_dbg_kms(fb->dev, "Flushing [FB:%d] " DRM_RECT_FMT "\n", + fb->base.id, DRM_RECT_ARG(rect)); =20 if (!dbi->dc || !full || swap || fb->format->format =3D=3D DRM_FORMAT_XRGB8888) { @@ -408,7 +409,7 @@ void mipi_dbi_pipe_disable(struct drm_simple_display_pi= pe *pipe) { struct mipi_dbi_dev *dbidev =3D drm_to_mipi_dbi_dev(pipe->crtc.dev); =20 - DRM_DEBUG_KMS("\n"); + drm_dbg_kms(&dbidev->drm, "\n"); =20 if (dbidev->backlight) backlight_disable(dbidev->backlight); @@ -627,7 +628,7 @@ int mipi_dbi_dev_init_with_formats(struct mipi_dbi_dev = *dbidev, drm->mode_config.max_height =3D dbidev->mode.vdisplay; dbidev->rotation =3D rotation; =20 - DRM_DEBUG_KMS("rotation =3D %u\n", rotation); + drm_dbg_kms(drm, "rotation =3D %u\n", rotation); =20 return 0; } diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index f5171bf91eae..440e3b015cc6 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -53,11 +53,11 @@ * drm_mode_debug_printmodeline - print a mode to dmesg * @mode: mode to print * - * Describe @mode using DRM_DEBUG. + * Describe @mode using drm_dbg_kms(). */ void drm_mode_debug_printmodeline(const struct drm_display_mode *mode) { - DRM_DEBUG_KMS("Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode)); + drm_dbg_kms(NULL, "Modeline " DRM_MODE_FMT "\n", DRM_MODE_ARG(mode)); } EXPORT_SYMBOL(drm_mode_debug_printmodeline); =20 @@ -1813,9 +1813,9 @@ void drm_mode_prune_invalid(struct drm_device *dev, } if (verbose) { drm_mode_debug_printmodeline(mode); - DRM_DEBUG_KMS("Not using %s mode: %s\n", - mode->name, - drm_get_mode_status_name(mode->status)); + drm_dbg_kms(dev, "Not using %s mode: %s\n", + mode->name, + drm_get_mode_status_name(mode->status)); } drm_mode_destroy(dev, mode); } diff --git a/drivers/gpu/drm/drm_plane.c b/drivers/gpu/drm/drm_plane.c index 1e8727b7bce9..12fed5f812a1 100644 --- a/drivers/gpu/drm/drm_plane.c +++ b/drivers/gpu/drm/drm_plane.c @@ -275,7 +275,7 @@ static int __drm_universal_plane_init(struct drm_device= *dev, plane->format_types =3D kmalloc_array(format_count, sizeof(uint32_t), GFP_KERNEL); if (!plane->format_types) { - DRM_DEBUG_KMS("out of memory when allocating plane\n"); + drm_dbg_kms(dev, "out of memory when allocating plane\n"); drm_mode_object_unregister(dev, &plane->base); return -ENOMEM; } @@ -302,7 +302,7 @@ static int __drm_universal_plane_init(struct drm_device= *dev, GFP_KERNEL); =20 if (format_modifier_count && !plane->modifiers) { - DRM_DEBUG_KMS("out of memory when allocating plane\n"); + drm_dbg_kms(dev, "out of memory when allocating plane\n"); kfree(plane->format_types); drm_mode_object_unregister(dev, &plane->base); return -ENOMEM; @@ -786,7 +786,7 @@ static int __setplane_check(struct drm_plane *plane, =20 /* Check whether this plane is usable on this CRTC */ if (!(plane->possible_crtcs & drm_crtc_mask(crtc))) { - DRM_DEBUG_KMS("Invalid crtc for plane\n"); + drm_dbg_kms(plane->dev, "Invalid crtc for plane\n"); return -EINVAL; } =20 @@ -794,8 +794,9 @@ static int __setplane_check(struct drm_plane *plane, ret =3D drm_plane_check_pixel_format(plane, fb->format->format, fb->modifier); if (ret) { - DRM_DEBUG_KMS("Invalid pixel format %p4cc, modifier 0x%llx\n", - &fb->format->format, fb->modifier); + drm_dbg_kms(fb->dev, + "Invalid pixel format %p4cc, modifier 0x%llx\n", + &fb->format->format, fb->modifier); return ret; } =20 @@ -804,8 +805,8 @@ static int __setplane_check(struct drm_plane *plane, crtc_x > INT_MAX - (int32_t) crtc_w || crtc_h > INT_MAX || crtc_y > INT_MAX - (int32_t) crtc_h) { - DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n", - crtc_w, crtc_h, crtc_x, crtc_y); + drm_dbg_kms(crtc->dev, "Invalid CRTC coordinates %ux%u+%d+%d\n", + crtc_w, crtc_h, crtc_x, crtc_y); return -ERANGE; } =20 @@ -982,24 +983,23 @@ int drm_mode_setplane(struct drm_device *dev, void *d= ata, */ plane =3D drm_plane_find(dev, file_priv, plane_req->plane_id); if (!plane) { - DRM_DEBUG_KMS("Unknown plane ID %d\n", - plane_req->plane_id); + drm_dbg_kms(dev, "Unknown plane ID %d\n", plane_req->plane_id); return -ENOENT; } =20 if (plane_req->fb_id) { fb =3D drm_framebuffer_lookup(dev, file_priv, plane_req->fb_id); if (!fb) { - DRM_DEBUG_KMS("Unknown framebuffer ID %d\n", - plane_req->fb_id); + drm_dbg_kms(dev, "Unknown framebuffer ID %d\n", + plane_req->fb_id); return -ENOENT; } =20 crtc =3D drm_crtc_find(dev, file_priv, plane_req->crtc_id); if (!crtc) { drm_framebuffer_put(fb); - DRM_DEBUG_KMS("Unknown crtc ID %d\n", - plane_req->crtc_id); + drm_dbg_kms(dev, "Unknown crtc ID %d\n", + plane_req->crtc_id); return -ENOENT; } } @@ -1048,7 +1048,7 @@ static int drm_mode_cursor_universal(struct drm_crtc = *crtc, if (req->handle) { fb =3D drm_internal_framebuffer_create(dev, &fbreq, file_priv); if (IS_ERR(fb)) { - DRM_DEBUG_KMS("failed to wrap cursor buffer in drm framebuffer\n"); + drm_dbg_kms(dev, "failed to wrap cursor buffer in drm framebuffer\n"); return PTR_ERR(fb); } =20 @@ -1119,7 +1119,7 @@ static int drm_mode_cursor_common(struct drm_device *= dev, =20 crtc =3D drm_crtc_find(dev, file_priv, req->crtc_id); if (!crtc) { - DRM_DEBUG_KMS("Unknown CRTC ID %d\n", req->crtc_id); + drm_dbg_kms(dev, "Unknown CRTC ID %d\n", req->crtc_id); return -ENOENT; } =20 @@ -1340,7 +1340,7 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, * to modifier changes. */ if (old_fb->format->format !=3D fb->format->format) { - DRM_DEBUG_KMS("Page flip is not allowed to change frame buffer format.\n= "); + drm_dbg_kms(dev, "Page flip is not allowed to change frame buffer format= .\n"); ret =3D -EINVAL; goto out; } diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe= _helper.c index 8127be134c39..8f3174107141 100644 --- a/drivers/gpu/drm/drm_probe_helper.c +++ b/drivers/gpu/drm/drm_probe_helper.c @@ -532,8 +532,8 @@ int drm_helper_probe_single_connector_modes(struct drm_= connector *connector, =20 drm_modeset_acquire_init(&ctx, 0); =20 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id, - connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s]\n", connector->base.id, + connector->name); =20 retry: ret =3D drm_modeset_lock(&dev->mode_config.connection_mutex, &ctx); @@ -576,11 +576,12 @@ int drm_helper_probe_single_connector_modes(struct dr= m_connector *connector, * check here, and if anything changed start the hotplug code. */ if (old_status !=3D connector->status) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n", - connector->base.id, - connector->name, - drm_get_connector_status_name(old_status), - drm_get_connector_status_name(connector->status)); + drm_dbg_kms(dev, + "[CONNECTOR:%d:%s] status updated from %s to %s\n", + connector->base.id, + connector->name, + drm_get_connector_status_name(old_status), + drm_get_connector_status_name(connector->status)); =20 /* * The hotplug event code might call into the fb @@ -598,8 +599,8 @@ int drm_helper_probe_single_connector_modes(struct drm_= connector *connector, drm_kms_helper_poll_enable(dev); =20 if (connector->status =3D=3D connector_status_disconnected) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n", - connector->base.id, connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] disconnected\n", + connector->base.id, connector->name); drm_connector_update_edid_property(connector, NULL); drm_mode_prune_invalid(dev, &connector->modes, false); goto exit; @@ -657,8 +658,8 @@ int drm_helper_probe_single_connector_modes(struct drm_= connector *connector, =20 drm_mode_sort(&connector->modes); =20 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id, - connector->name); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] probed modes :\n", + connector->base.id, connector->name); list_for_each_entry(mode, &connector->modes, head) { drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V); drm_mode_debug_printmodeline(mode); @@ -792,14 +793,14 @@ static void output_poll_execute(struct work_struct *w= ork) old =3D drm_get_connector_status_name(old_status); new =3D drm_get_connector_status_name(connector->status); =20 - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] " - "status updated from %s to %s\n", - connector->base.id, - connector->name, - old, new); - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n", - connector->base.id, connector->name, - old_epoch_counter, connector->epoch_counter); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] " + "status updated from %s to %s\n", + connector->base.id, + connector->name, + old, new); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] epoch counter %llu -> %llu\n", + connector->base.id, connector->name, + old_epoch_counter, connector->epoch_counter); =20 changed =3D true; } diff --git a/drivers/gpu/drm/drm_rect.c b/drivers/gpu/drm/drm_rect.c index 85c79a38c13a..8f4abcb1cbd8 100644 --- a/drivers/gpu/drm/drm_rect.c +++ b/drivers/gpu/drm/drm_rect.c @@ -228,9 +228,9 @@ EXPORT_SYMBOL(drm_rect_calc_vscale); void drm_rect_debug_print(const char *prefix, const struct drm_rect *r, bo= ol fixed_point) { if (fixed_point) - DRM_DEBUG_KMS("%s" DRM_RECT_FP_FMT "\n", prefix, DRM_RECT_FP_ARG(r)); + drm_dbg_kms(NULL, "%s" DRM_RECT_FP_FMT "\n", prefix, DRM_RECT_FP_ARG(r)); else - DRM_DEBUG_KMS("%s" DRM_RECT_FMT "\n", prefix, DRM_RECT_ARG(r)); + drm_dbg_kms(NULL, "%s" DRM_RECT_FMT "\n", prefix, DRM_RECT_ARG(r)); } EXPORT_SYMBOL(drm_rect_debug_print); =20 diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 6b090d71d45a..873818348bb4 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -179,10 +179,10 @@ static ssize_t status_store(struct device *device, ret =3D -EINVAL; =20 if (old_force !=3D connector->force || !connector->force) { - DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force updated from %d to %d or reprobin= g\n", - connector->base.id, - connector->name, - old_force, connector->force); + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] force updated from %d to %d or repro= bing\n", + connector->base.id, + connector->name, + old_force, connector->force); =20 connector->funcs->fill_modes(connector, dev->mode_config.max_width, --=20 2.39.1