From patchwork Fri Aug 16 12:52:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jocelyn Falempe X-Patchwork-Id: 13766255 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9EC81C531DC for ; Fri, 16 Aug 2024 12:58:13 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6DAE110E66C; Fri, 16 Aug 2024 12:57:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="b7yeuK4+"; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by gabe.freedesktop.org (Postfix) with ESMTPS id 62B4910E64B for ; Fri, 16 Aug 2024 12:56:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1723813018; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=nA2fhJxmDHNUaunZRJWh3bds0Bd+LjK0XRFUieOvKyc=; b=b7yeuK4+i02sjDQVxafcGYIeEB0oIuNLuzQCo9i/TnpOttgvEUVAXrwzaFnIUWNy1QSLNg OY+gJXxd2nAZSxajv1eRCGNNsEnFtd8odqyE0rSn8fxTk4hZ0KYTbtKDM4Znzo2CFvPRqp yoxubxzCQNzJ4uqX3uJkuM4S4GHxD4w= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-160-ZXISmhc6M6uS0g20RoPHvw-1; Fri, 16 Aug 2024 08:56:55 -0400 X-MC-Unique: ZXISmhc6M6uS0g20RoPHvw-1 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D455C1955BED; Fri, 16 Aug 2024 12:56:53 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.39.193.28]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 34BF91956048; Fri, 16 Aug 2024 12:56:49 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , John Ogness , Javier Martinez Canillas , "Guilherme G . Piccoli" , bluescreen_avenger@verizon.net, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jocelyn Falempe Subject: [PATCH v2 4/5] drm/log: Do not draw if drm_master is taken Date: Fri, 16 Aug 2024 14:52:36 +0200 Message-ID: <20240816125612.1003295-5-jfalempe@redhat.com> In-Reply-To: <20240816125612.1003295-1-jfalempe@redhat.com> References: <20240816125612.1003295-1-jfalempe@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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 --- drivers/gpu/drm/drm_log.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_log.c b/drivers/gpu/drm/drm_log.c index 0739a4c72bb7..b94ce3ea48a0 100644 --- a/drivers/gpu/drm/drm_log.c +++ b/drivers/gpu/drm/drm_log.c @@ -22,6 +22,7 @@ #include "drm_draw.h" #include "drm_log.h" +#include "drm_internal.h" MODULE_AUTHOR("Jocelyn Falempe"); MODULE_DESCRIPTION("DRM boot logger"); @@ -361,10 +362,15 @@ static bool drm_log_active_output(void) bool active = false; mutex_lock(&drm_log_lock); - list_for_each_entry(dclient, &drm_log_clients, head) - if (dclient->n_scanout || !dclient->probed) - active = true; - + list_for_each_entry(dclient, &drm_log_clients, head) { + if (dclient->n_scanout || !dclient->probed) { + /* Also check that we are still the master */ + if (drm_master_internal_acquire(dclient->client.dev)) { + drm_master_internal_release(dclient->client.dev); + active = true; + } + } + } mutex_unlock(&drm_log_lock); return active; }