From patchwork Fri Oct 18 15:26:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 13841959 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 C0636D2FFFA for ; Fri, 18 Oct 2024 15:26:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2FA1B10E953; Fri, 18 Oct 2024 15:26:57 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="k3C16OyO"; dkim-atps=neutral Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by gabe.freedesktop.org (Postfix) with ESMTPS id AF28A10E95F for ; Fri, 18 Oct 2024 15:26:55 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 995021BF208; Fri, 18 Oct 2024 15:26:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1729265214; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zgyO7dIQcIllwdnmEg0IQTCT+gft9OECU9gbzrUZIvU=; b=k3C16OyO1gVTsFWB4qndxTa3+HfEL16s0zitKtfOrC04mvJf5VIsbGGXZV8cxX6TD6Z9OO 2RlbuywlOTkbbYdHJtp23rG//iFIJ19iLgHf1R5J5a0YyZc0ONNgFfHvtTnOHddabxOv/D ohttQBhkrreXff7T1WRWdheDFvMdDwg27MltzYJ1FKFcBRomBnN7xgt6YeBntJcPs9iLO1 5WsnV3UZiRgK7xFKxVapTs9Y9R2M7BGbdfBFqrKqUdRon7V/oHe9BfvFm3QOSdOgwJ/jkv diy3VxLRsV83dYYfJItiY4tvkBcs6cqO0vLJRMj1rwmd9n+uHeHQtrfBgvStTg== From: Luca Ceresoli Date: Fri, 18 Oct 2024 17:26:51 +0200 Subject: [PATCH 1/2] drm/drm_mode_object: fix typo in kerneldoc MIME-Version: 1.0 Message-Id: <20241018-drm-small-improvements-v1-1-cc316e1a98c9@bootlin.com> References: <20241018-drm-small-improvements-v1-0-cc316e1a98c9@bootlin.com> In-Reply-To: <20241018-drm-small-improvements-v1-0-cc316e1a98c9@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.1 X-GND-Sasl: luca.ceresoli@bootlin.com 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" Remove unintended extra word. Signed-off-by: Luca Ceresoli Reviewed-by: Dmitry Baryshkov --- include/drm/drm_mode_object.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/drm/drm_mode_object.h b/include/drm/drm_mode_object.h index 08d7a7f0188f..c68edbd126d0 100644 --- a/include/drm/drm_mode_object.h +++ b/include/drm/drm_mode_object.h @@ -35,7 +35,7 @@ struct drm_file; * @id: userspace visible identifier * @type: type of the object, one of DRM_MODE_OBJECT\_\* * @properties: properties attached to this object, including values - * @refcount: reference count for objects which with dynamic lifetime + * @refcount: reference count for objects with dynamic lifetime * @free_cb: free function callback, only set for objects with dynamic lifetime * * Base structure for modeset objects visible to userspace. Objects can be From patchwork Fri Oct 18 15:26:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Ceresoli X-Patchwork-Id: 13841960 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 55F7DD30011 for ; Fri, 18 Oct 2024 15:27:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 79DBB10E95B; Fri, 18 Oct 2024 15:26:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=bootlin.com header.i=@bootlin.com header.b="gfwoivWF"; dkim-atps=neutral Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4A93710E965 for ; Fri, 18 Oct 2024 15:26:56 +0000 (UTC) Received: by mail.gandi.net (Postfix) with ESMTPSA id 618361BF20B; Fri, 18 Oct 2024 15:26:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bootlin.com; s=gm1; t=1729265215; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FGK9fEgqI+13HgE5VhXXxqWGt4Xoy4ktT4WvsnSGxdc=; b=gfwoivWFx8APqHTwPluRpdOziuW8xr69rPjImANC0BvOuePgwpY6IkDjfzUGvafXJb7mc9 /dltg/JRZTaf6Ysh70FpyuCmn5eOA1FE2xh70vD/Bc/nDFHp6snQ4g0IkvszUaY6OEsK1X w5KvOUzzvt9GU46h9Gu5nK03y+iPCKKzEz1PGP/exW7f1Jxdj6DVeEb5xKbpd8Q7LUT1zX g75Hv1nddmzE+RN2QCgy7qoaJ3tVlumtbXaUFrcXiF5kFFEYiee4gmHCWWPJTY9xggY9JS B+oYDxi+Z/65tq/+ha/zNyekTUv3nAPbqNF0OtNcpYW39kXMgMf23rEyDUZZ7A== From: Luca Ceresoli Date: Fri, 18 Oct 2024 17:26:52 +0200 Subject: [PATCH 2/2] drm/atomic-helper: improve CRTC enabled/connectors mismatch logging message MIME-Version: 1.0 Message-Id: <20241018-drm-small-improvements-v1-2-cc316e1a98c9@bootlin.com> References: <20241018-drm-small-improvements-v1-0-cc316e1a98c9@bootlin.com> In-Reply-To: <20241018-drm-small-improvements-v1-0-cc316e1a98c9@bootlin.com> To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Thomas Petazzoni , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Ceresoli X-Mailer: b4 0.14.1 X-GND-Sasl: luca.ceresoli@bootlin.com 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" This message reports a mismatch between new_crtc_state->enable and has_connectors, which should be either both true or both false. However it does not mention which one is true and which is false, which can be useful for debugging. Add the value of both avriables to the log message. Signed-off-by: Luca Ceresoli --- drivers/gpu/drm/drm_atomic_helper.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c index 43cdf39019a4..3c3bdef9bcf3 100644 --- a/drivers/gpu/drm/drm_atomic_helper.c +++ b/drivers/gpu/drm/drm_atomic_helper.c @@ -666,8 +666,9 @@ drm_atomic_helper_check_modeset(struct drm_device *dev, } if (new_crtc_state->enable != has_connectors) { - drm_dbg_atomic(dev, "[CRTC:%d:%s] enabled/connectors mismatch\n", - crtc->base.id, crtc->name); + drm_dbg_atomic(dev, "[CRTC:%d:%s] enabled/connectors mismatch (%d/%d)\n", + crtc->base.id, crtc->name, + new_crtc_state->enable, has_connectors); return -EINVAL; }