From: Jocelyn Falempe <jfalempe@redhat.com>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch>,
John Ogness <john.ogness@linutronix.de>,
Javier Martinez Canillas <javierm@redhat.com>,
"Guilherme G . Piccoli" <gpiccoli@igalia.com>,
bluescreen_avenger@verizon.net,
Caleb Connolly <caleb.connolly@linaro.org>,
Petr Mladek <pmladek@suse.com>,
dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Cc: Jocelyn Falempe <jfalempe@redhat.com>
Subject: [PATCH v8 3/6] drm/log: Do not draw if drm_master is taken
Date: Fri, 15 Nov 2024 14:40:40 +0100 [thread overview]
Message-ID: <20241115142950.1758007-4-jfalempe@redhat.com> (raw)
In-Reply-To: <20241115142950.1758007-1-jfalempe@redhat.com>
When userspace takes drm_master, the drm_client buffer is no more
visible, so drm_log shouldn't waste CPU cycle to draw on it.
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
---
drivers/gpu/drm/clients/drm_log.c | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/clients/drm_log.c b/drivers/gpu/drm/clients/drm_log.c
index cb793a348f1f9..8eca8044f1f08 100644
--- a/drivers/gpu/drm/clients/drm_log.c
+++ b/drivers/gpu/drm/clients/drm_log.c
@@ -19,6 +19,7 @@
#include "drm_client_internal.h"
#include "../drm_draw.h"
+#include "../drm_internal.h"
MODULE_AUTHOR("Jocelyn Falempe");
MODULE_DESCRIPTION("DRM boot logger");
@@ -308,8 +309,13 @@ static void drm_log_write_thread(struct console *con, struct nbcon_write_context
if (!dlog->probed)
drm_log_init_client(dlog);
- for (i = 0; i < dlog->n_scanout; i++)
- drm_log_draw_kmsg_record(&dlog->scanout[i], wctxt->outbuf, wctxt->len);
+ /* Check that we are still the master before drawing */
+ if (drm_master_internal_acquire(dlog->client.dev)) {
+ drm_master_internal_release(dlog->client.dev);
+
+ for (i = 0; i < dlog->n_scanout; i++)
+ drm_log_draw_kmsg_record(&dlog->scanout[i], wctxt->outbuf, wctxt->len);
+ }
}
static void drm_log_lock(struct console *con, unsigned long *flags)
--
2.47.0
next prev parent reply other threads:[~2024-11-15 14:30 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 13:40 [PATCH v8 0/6] drm/log: Introduce a new boot logger to draw the kmsg on the screen Jocelyn Falempe
2024-11-15 13:40 ` [PATCH v8 1/6] drm/panic: Move drawing functions to drm_draw Jocelyn Falempe
2024-12-03 11:06 ` Jani Nikula
2024-12-03 13:56 ` Jocelyn Falempe
2024-12-03 14:08 ` Jani Nikula
2024-11-15 13:40 ` [PATCH v8 2/6] drm/log: Introduce a new boot logger to draw the kmsg on the screen Jocelyn Falempe
2024-12-03 8:48 ` Thomas Zimmermann
2024-12-03 9:22 ` Jocelyn Falempe
2024-12-03 9:35 ` Thomas Zimmermann
2024-12-03 9:56 ` Jocelyn Falempe
2024-11-15 13:40 ` Jocelyn Falempe [this message]
2024-11-15 13:40 ` [PATCH v8 4/6] drm/log: Color the timestamp, to improve readability Jocelyn Falempe
2024-11-15 13:40 ` [PATCH v8 5/6] drm/log: Implement suspend/resume Jocelyn Falempe
2024-11-15 13:40 ` [PATCH v8 6/6] drm/log: Add integer scaling support Jocelyn Falempe
2024-12-03 8:50 ` [PATCH v8 0/6] drm/log: Introduce a new boot logger to draw the kmsg on the screen Thomas Zimmermann
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=20241115142950.1758007-4-jfalempe@redhat.com \
--to=jfalempe@redhat.com \
--cc=airlied@gmail.com \
--cc=bluescreen_avenger@verizon.net \
--cc=caleb.connolly@linaro.org \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gpiccoli@igalia.com \
--cc=javierm@redhat.com \
--cc=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=pmladek@suse.com \
--cc=tzimmermann@suse.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®