From nobody Wed Nov 27 08:29:10 2024 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2F98821503B for ; Fri, 11 Oct 2024 10:56:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728644165; cv=none; b=gNOCghJWZlXRzr9L29OTZPPsCLEnhdx7och9kydBCZwkpt8odCaoyEBE1AftHbB2r0pbB7LpVPH6pX0qjyiZEYoQqLxbAAKKUrycYxN+Bdr1EFbbh7CJLmpY5IO633jgBoHexvMqdcO1pD0iPvEBILuvRPP1sc/bXuMFkBgrJAs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728644165; c=relaxed/simple; bh=cjilviGyJuljwu8i+kuDwZz6YJqTMJ0enhZ6iiPxH1Y=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=phg7EbPwK5ZZntddMHqwFfqXL+NAyv3gwAg6aHB2HNirrI5P326XyszMOqqT8e1RyIVp4slkUYgTI0U4G7RXGaLN+L4aY5knS27aXRfhndZm6bVgSm+W31k+EtSqrMtDuCe2D4nCaWwpff1uBj3RTA9IiIHFdrJbz6OPyp02MsY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=APak0JPH; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="APak0JPH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1728644163; 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=ESAFmO5CDFEtABw+ze2jRMM8mwaGYPOwHPSKAEXy4z4=; b=APak0JPHVA0zBhzvOAXQFzYty7r5KBw33bI5zunmE3uAR+4+JmQoR/oer0jBcl6PkU0ZIO 5ja867iA6e9SjDItKAHkYyIdCkzEm2dJU1Z7cg/1bjDy11frR3I0e8vVY++MaKk5e9IzzM L12lrSHWCreczfWzLvgl/NVqc3TiGS8= 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-696-JoxU1mbbNZWQG0H2YU9auw-1; Fri, 11 Oct 2024 06:56:01 -0400 X-MC-Unique: JoxU1mbbNZWQG0H2YU9auw-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 8B5DC1954B18; Fri, 11 Oct 2024 10:55:59 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.39.192.224]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 9EFFC19560AA; Fri, 11 Oct 2024 10:55:54 +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, Caleb Connolly , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Jocelyn Falempe Subject: [PATCH v4 4/7] drm/log: Do not draw if drm_master is taken Date: Fri, 11 Oct 2024 12:50:01 +0200 Message-ID: <20241011105526.615812-5-jfalempe@redhat.com> In-Reply-To: <20241011105526.615812-1-jfalempe@redhat.com> References: <20241011105526.615812-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 Content-Type: text/plain; charset="utf-8" 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 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_log.c b/drivers/gpu/drm/drm_log.c index 376ee173d99d..226e206e8b6a 100644 --- a/drivers/gpu/drm/drm_log.c +++ b/drivers/gpu/drm/drm_log.c @@ -18,6 +18,7 @@ #include =20 #include "drm_draw.h" +#include "drm_internal.h" #include "drm_log.h" =20 MODULE_AUTHOR("Jocelyn Falempe"); @@ -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); =20 - for (i =3D 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 =3D 0; i < dlog->n_scanout; i++) + drm_log_draw_kmsg_record(&dlog->scanout[i], wctxt->outbuf, wctxt->len); + } } =20 static void drm_log_lock(struct console *con, unsigned long *flags) --=20 2.46.2