From: "Michel Dänzer" <michel@daenzer.net> To: Christian Koenig <christian.koenig@amd.com>, Huang Rui <ray.huang@amd.com>, Junwei Zhang <Jerry.Zhang@amd.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <maxime.ripard@bootlin.com>, Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie> Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] drm: Only #define DEBUG if CONFIG_DYNAMIC_DEBUG is disabled Date: Wed, 5 Dec 2018 17:56:20 +0100 [thread overview] Message-ID: <20181205165621.5805-1-michel@daenzer.net> (raw) From: Michel Dänzer <michel.daenzer@amd.com> The following cases are possible for pr_debug(): 1. CONFIG_DYNAMIC_DEBUG disabled a) DEBUG not defined: pr_debug() translates to no_printk(...), i.e. it never generates any output. b) DEBUG defined: pr_debug() translates to printk(KERN_DEBUG ...), i.e. it generates output which doesn't appear in dmesg by default, can be enabled dynamically. 2. CONFIG_DYNAMIC_DEBUG enabled: pr_debug() translates to dynamic_pr_debug() a) DEBUG not defined: dynamic_pr_debug() generates no output by default, can be enabled dynamically. b) DEBUG defined: dynamic_pr_debug() generates output by default, can be disabled dynamically. The intention for drm_debug_printer() is to generate output which doesn't appear in dmesg by default, but can be enabled dynamically, i.e. cases 1b) and 2a). However, defining DEBUG unconditionally gave us 2b) instead of 2a) with CONFIG_DYNAMIC_DEBUG enabled. Fixes: 79a5ad2fdb3c ("drm: Enable pr_debug() for drm_printer") Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> --- drivers/gpu/drm/drm_print.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 0e7fc3e7dfb4..ee56e4a1b343 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -23,11 +23,13 @@ * Rob Clark <robdclark@gmail.com> */ -#define DEBUG /* for pr_debug() */ - #include <stdarg.h> #include <linux/seq_file.h> #include <drm/drmP.h> + +#ifndef CONFIG_DYNAMIC_DEBUG +#define DEBUG /* for pr_debug() */ +#endif #include <drm/drm_print.h> void __drm_puts_coredump(struct drm_printer *p, const char *str) -- 2.20.0.rc2
WARNING: multiple messages have this Message-ID (diff)
From: "Michel Dänzer" <michel@daenzer.net> To: Christian Koenig <christian.koenig@amd.com>, Huang Rui <ray.huang@amd.com>, Junwei Zhang <Jerry.Zhang@amd.com>, Maarten Lankhorst <maarten.lankhorst@linux.intel.com>, Maxime Ripard <maxime.ripard@bootlin.com>, Sean Paul <sean@poorly.run>, David Airlie <airlied@linux.ie> Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 1/2] drm: Only #define DEBUG if CONFIG_DYNAMIC_DEBUG is disabled Date: Wed, 5 Dec 2018 17:56:20 +0100 [thread overview] Message-ID: <20181205165621.5805-1-michel@daenzer.net> (raw) From: Michel Dänzer <michel.daenzer@amd.com> The following cases are possible for pr_debug(): 1. CONFIG_DYNAMIC_DEBUG disabled a) DEBUG not defined: pr_debug() translates to no_printk(...), i.e. it never generates any output. b) DEBUG defined: pr_debug() translates to printk(KERN_DEBUG ...), i.e. it generates output which doesn't appear in dmesg by default, can be enabled dynamically. 2. CONFIG_DYNAMIC_DEBUG enabled: pr_debug() translates to dynamic_pr_debug() a) DEBUG not defined: dynamic_pr_debug() generates no output by default, can be enabled dynamically. b) DEBUG defined: dynamic_pr_debug() generates output by default, can be disabled dynamically. The intention for drm_debug_printer() is to generate output which doesn't appear in dmesg by default, but can be enabled dynamically, i.e. cases 1b) and 2a). However, defining DEBUG unconditionally gave us 2b) instead of 2a) with CONFIG_DYNAMIC_DEBUG enabled. Fixes: 79a5ad2fdb3c ("drm: Enable pr_debug() for drm_printer") Signed-off-by: Michel Dänzer <michel.daenzer@amd.com> --- drivers/gpu/drm/drm_print.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_print.c b/drivers/gpu/drm/drm_print.c index 0e7fc3e7dfb4..ee56e4a1b343 100644 --- a/drivers/gpu/drm/drm_print.c +++ b/drivers/gpu/drm/drm_print.c @@ -23,11 +23,13 @@ * Rob Clark <robdclark@gmail.com> */ -#define DEBUG /* for pr_debug() */ - #include <stdarg.h> #include <linux/seq_file.h> #include <drm/drmP.h> + +#ifndef CONFIG_DYNAMIC_DEBUG +#define DEBUG /* for pr_debug() */ +#endif #include <drm/drm_print.h> void __drm_puts_coredump(struct drm_printer *p, const char *str) -- 2.20.0.rc2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2018-12-05 17:02 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-12-05 16:56 Michel Dänzer [this message] 2018-12-05 16:56 ` [PATCH 1/2] drm: Only #define DEBUG if CONFIG_DYNAMIC_DEBUG is disabled Michel Dänzer 2018-12-05 16:56 ` [PATCH 2/2] drm/ttm: Use pr_debug for all output from ttm_bo_evict Michel Dänzer 2018-12-05 16:56 ` Michel Dänzer 2018-12-06 2:43 ` Zhang, Jerry(Junwei) 2018-12-06 2:43 ` Zhang, Jerry(Junwei) 2018-12-06 9:09 ` Michel Dänzer 2018-12-06 9:09 ` Michel Dänzer 2018-12-06 9:33 ` Koenig, Christian 2018-12-06 9:33 ` Koenig, Christian 2018-12-06 9:38 ` Michel Dänzer 2018-12-06 9:38 ` Michel Dänzer 2018-12-06 9:50 ` Michel Dänzer 2018-12-06 9:39 ` Zhang, Jerry(Junwei) 2018-12-06 9:39 ` Zhang, Jerry(Junwei) 2018-12-06 9:49 ` Christian König 2018-12-06 9:49 ` Christian König 2018-12-06 9:54 ` Michel Dänzer 2018-12-06 9:54 ` Michel Dänzer 2018-12-06 16:46 ` Joe Perches 2018-12-06 17:28 ` Michel Dänzer 2018-12-06 17:28 ` Michel Dänzer 2018-12-06 2:40 ` [PATCH 1/2] drm: Only #define DEBUG if CONFIG_DYNAMIC_DEBUG is disabled Zhang, Jerry(Junwei) 2018-12-06 2:40 ` Zhang, Jerry(Junwei) 2018-12-06 2:51 ` Joe Perches 2018-12-06 9:23 ` Michel Dänzer 2018-12-06 11:41 ` Joe Perches 2018-12-06 11:52 ` Michel Dänzer 2018-12-06 11:52 ` Michel Dänzer 2018-12-06 12:23 ` Joe Perches 2018-12-06 14:41 ` Michel Dänzer 2018-12-06 14:41 ` Michel Dänzer 2018-12-06 16:10 ` Daniel Thompson 2018-12-06 16:10 ` Daniel Thompson 2018-12-06 16:14 ` Michel Dänzer 2018-12-06 16:14 ` Michel Dänzer 2018-12-06 16:22 ` Joe Perches 2018-12-06 9:12 ` Chris Wilson 2018-12-06 9:12 ` Chris Wilson 2018-12-06 9:21 ` Michel Dänzer 2018-12-06 9:28 ` Chris Wilson 2018-12-06 9:28 ` Chris Wilson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20181205165621.5805-1-michel@daenzer.net \ --to=michel@daenzer.net \ --cc=Jerry.Zhang@amd.com \ --cc=airlied@linux.ie \ --cc=christian.koenig@amd.com \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=maarten.lankhorst@linux.intel.com \ --cc=maxime.ripard@bootlin.com \ --cc=ray.huang@amd.com \ --cc=sean@poorly.run \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.