From nobody Sun Feb 8 18:48:54 2026 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [195.130.137.89]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43A9D15F316 for ; Wed, 26 Jun 2024 08:41:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.130.137.89 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719391317; cv=none; b=jrdUnvSFaUVQvXzBvMv0ltK86ShYwqMomxVQX2vHs6EuBDI0fS1ZYGa3zbNDZWBCpklTP9hmn7AHTGhCN1kKqL91jdvQpUBzZjbKUwumwLNUo+J3ygReyY+VSYk7B4MAuhmAINTYD7ulxzMMXzobr92mo4cSir9L2RmAhtYN3sY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719391317; c=relaxed/simple; bh=vGvpvDkTEKPSeCsnGYZN5jSHNJXDkF8Oj7//DH35elU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QCDNQSjIDUUze04uR8HrP8cUTu8Fjh4M2yP16FxqfDJHYtAMMAVZnK3+ToTXEHsqI/iTUOt+A4J9BNIZA8gmJx0UuX9sQ0uLl1yZ5/cftZ8DQrKs4wlXdyAqc9ibG9LUbU7THbVrFip819lxkDEhOnwOFgd4bASH65OJduZtc5g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be; spf=none smtp.mailfrom=linux-m68k.org; arc=none smtp.client-ip=195.130.137.89 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux-m68k.org Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:1dff:b715:1a2c:c3f5]) by laurent.telenet-ops.be with bizsmtp id g8hm2C00K0lK4vA018hmnr; Wed, 26 Jun 2024 10:41:47 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1sMODm-000OVn-F9; Wed, 26 Jun 2024 10:41:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1sMODq-00Aong-AJ; Wed, 26 Jun 2024 10:41:46 +0200 From: Geert Uytterhoeven To: Jocelyn Falempe , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH 1/2] drm/panic: Do not select DRM_KMS_HELPER Date: Wed, 26 Jun 2024 10:41:44 +0200 Message-Id: <60155f8c939ed286e324a7c12a1daa69fe49fcf6.1719391132.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Content-Type: text/plain; charset="utf-8" DRM core code cannot call into DRM helper code, as this would lead to circular references in the modular case. Hence drop the selection of DRM_KMS_HELPER. It was unused anyway, as v10 switched from using the DRM format helpers to its own color format conversion, cfr. commit 9544309775c334c9 ("drm/panic: Add support for color format conversion")). Remove the unneeded include of . Fixes: bf9fb17c6672868d ("drm/panic: Add a drm panic handler") Signed-off-by: Geert Uytterhoeven Reviewed-by: Jocelyn Falempe --- drivers/gpu/drm/Kconfig | 1 - drivers/gpu/drm/drm_panic.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index b903a2c0b5e8f95c..ce9bf2b6e9d332d4 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -108,7 +108,6 @@ config DRM_KMS_HELPER config DRM_PANIC bool "Display a user-friendly message when a kernel panic occurs" depends on DRM && !(FRAMEBUFFER_CONSOLE && VT_CONSOLE) - select DRM_KMS_HELPER select FONT_SUPPORT help Enable a drm panic handler, which will display a user-friendly message diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 8d2eded1fd19ff6c..67f78b5a76b61e3d 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -20,7 +20,6 @@ #include =20 #include -#include #include #include #include --=20 2.34.1 From nobody Sun Feb 8 18:48:54 2026 Received: from albert.telenet-ops.be (albert.telenet-ops.be [195.130.137.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4375015D5DE for ; Wed, 26 Jun 2024 08:41:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.130.137.90 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719391317; cv=none; b=ZzEMMgJOHu1eGPrPTi6eTwJHJU/GX6S+4gGntexblflD0vyH4pKAdlZ1eM5Hq1w8OPqRoR3T53XJC/qVGUclj7YHlNCRhCUleq2Y9iLl4I6WVByN3JIxSRC31SddTKer6xvgCTOfTGDOkKM4Dmx2LcmKIp47L+ztFKb0ftEY9XI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719391317; c=relaxed/simple; bh=JAbpCj/RCVldgdIk3yRrqc8Eh1Edg+BwtOO7Sfn3Vyw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=S22InrIQooEyI0MHghBnDX85neH1Tye3IVwK8krqCfq5U/fwqbJqc4lFCATetT1xHyzZtFSVf0zYXKtcGUb+rK2osKUY+qdZMG7vEILw4/BDPZKmy3DZQXj3I54AdDMtErzHVmvF9p6kdcrbdzRZo1okeXyEqPlHRWwp2EYyRKQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be; spf=none smtp.mailfrom=linux-m68k.org; arc=none smtp.client-ip=195.130.137.90 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=glider.be Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux-m68k.org Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:1dff:b715:1a2c:c3f5]) by albert.telenet-ops.be with bizsmtp id g8hm2C00G0lK4vA068hmGN; Wed, 26 Jun 2024 10:41:47 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1sMODm-000OVr-Fx; Wed, 26 Jun 2024 10:41:46 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1sMODq-00Aonj-By; Wed, 26 Jun 2024 10:41:46 +0200 From: Geert Uytterhoeven To: Jocelyn Falempe , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , kernel test robot Subject: [PATCH 2/2] drm/panic: Restrict graphical logo handling to built-in Date: Wed, 26 Jun 2024 10:41:45 +0200 Message-Id: <4009fca99a7c05f617cc9899c6d0a5748415595d.1719391132.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Content-Type: text/plain; charset="utf-8" When CONFIG_DRM_PANIC=3Dy, but CONFIG_DRM=3Dm: ld: drivers/gpu/drm/drm_panic.o: in function `drm_panic_setup_logo': drivers/gpu/drm/drm_panic.c:99: multiple definition of `init_module'; d= rivers/gpu/drm/drm_drv.o:drivers/gpu/drm/drm_drv.c:1079: first defined here Fix this by restricting the graphical logo handling and its device_initcall() to the built-in case. Logos are freed during late kernel initialization, so they are no longer available at module load time anyway. Fixes: 294bbd1f2697ff28 ("drm/panic: Add support for drawing a monochrome g= raphical logo") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202406261341.GYsbLpN1-lkp@int= el.com/ Signed-off-by: Geert Uytterhoeven Reviewed-by: Jocelyn Falempe --- drivers/gpu/drm/drm_panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 67f78b5a76b61e3d..948aed00595eb6dd 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -91,7 +91,7 @@ static const struct drm_panic_line logo_ascii[] =3D { PANIC_LINE(" \\___)=3D(___/"), }; =20 -#ifdef CONFIG_LOGO +#if defined(CONFIG_LOGO) && !defined(MODULE) static const struct linux_logo *logo_mono; =20 static int drm_panic_setup_logo(void) --=20 2.34.1