From: Mario Limonciello <superm1@kernel.org>
To: David Airlie <airlied@gmail.com>, Bjorn Helgaas <bhelgaas@google.com>
Cc: "Alex Deucher" <alexander.deucher@amd.com>,
"Christian König" <christian.koenig@amd.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Lukas Wunner" <lukas@wunner.de>,
"Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Woodhouse" <dwmw2@infradead.org>,
"Lu Baolu" <baolu.lu@linux.intel.com>,
"Joerg Roedel" <joro@8bytes.org>, "Will Deacon" <will@kernel.org>,
"Robin Murphy" <robin.murphy@arm.com>,
"Alex Williamson" <alex.williamson@redhat.com>,
"Jaroslav Kysela" <perex@perex.cz>,
"Takashi Iwai" <tiwai@suse.com>,
dri-devel@lists.freedesktop.org (open list:DRM DRIVERS),
linux-kernel@vger.kernel.org (open list),
iommu@lists.linux.dev (open list:INTEL IOMMU (VT-d)),
linux-pci@vger.kernel.org (open list:PCI SUBSYSTEM),
kvm@vger.kernel.org (open list:VFIO DRIVER),
linux-sound@vger.kernel.org (open list:SOUND),
"Daniel Dadap" <ddadap@nvidia.com>,
"Mario Limonciello" <mario.limonciello@amd.com>,
"kernel test robot" <lkp@intel.com>
Subject: [PATCH v7 6/9] Fix access to video_is_primary_device() when compiled without CONFIG_VIDEO
Date: Sun, 6 Jul 2025 09:36:10 -0500 [thread overview]
Message-ID: <20250706143613.1972252-7-superm1@kernel.org> (raw)
In-Reply-To: <20250706143613.1972252-1-superm1@kernel.org>
From: Mario Limonciello <mario.limonciello@amd.com>
When compiled without CONFIG_VIDEO the architecture specific
implementations of video_is_primary_device() include prototypes and
assume that video-common.c will be linked. Guard against this so that the
fallback inline implementation that returns false will be used when
compiled without CONFIG_VIDEO.
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202506221312.49Fy1aNA-lkp@intel.com/
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v5:
* add tag
v4:
* new patch
---
arch/parisc/include/asm/video.h | 2 +-
arch/sparc/include/asm/video.h | 2 ++
arch/x86/include/asm/video.h | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/parisc/include/asm/video.h b/arch/parisc/include/asm/video.h
index c5dff3223194a..a9d50ebd6e769 100644
--- a/arch/parisc/include/asm/video.h
+++ b/arch/parisc/include/asm/video.h
@@ -6,7 +6,7 @@
struct device;
-#if defined(CONFIG_STI_CORE)
+#if defined(CONFIG_STI_CORE) && defined(CONFIG_VIDEO)
bool video_is_primary_device(struct device *dev);
#define video_is_primary_device video_is_primary_device
#endif
diff --git a/arch/sparc/include/asm/video.h b/arch/sparc/include/asm/video.h
index a6f48f52db584..773717b6d4914 100644
--- a/arch/sparc/include/asm/video.h
+++ b/arch/sparc/include/asm/video.h
@@ -19,8 +19,10 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot,
#define pgprot_framebuffer pgprot_framebuffer
#endif
+#ifdef CONFIG_VIDEO
bool video_is_primary_device(struct device *dev);
#define video_is_primary_device video_is_primary_device
+#endif
static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n)
{
diff --git a/arch/x86/include/asm/video.h b/arch/x86/include/asm/video.h
index 0950c9535fae9..08ec328203ef8 100644
--- a/arch/x86/include/asm/video.h
+++ b/arch/x86/include/asm/video.h
@@ -13,8 +13,10 @@ pgprot_t pgprot_framebuffer(pgprot_t prot,
unsigned long offset);
#define pgprot_framebuffer pgprot_framebuffer
+#ifdef CONFIG_VIDEO
bool video_is_primary_device(struct device *dev);
#define video_is_primary_device video_is_primary_device
+#endif
#include <asm-generic/video.h>
--
2.43.0
next prev parent reply other threads:[~2025-07-06 14:36 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-06 14:36 [PATCH v7 0/9] Adjust fbcon console device detection Mario Limonciello
2025-07-06 14:36 ` [PATCH v7 1/9] PCI: Add helper for checking if a PCI device is a display controller Mario Limonciello
2025-07-06 14:36 ` [PATCH v7 2/9] vfio/pci: Use pci_is_display() Mario Limonciello
2025-07-06 14:36 ` [PATCH v7 3/9] vga_switcheroo: " Mario Limonciello
2025-07-06 14:36 ` [PATCH v7 4/9] iommu/vt-d: " Mario Limonciello
2025-07-06 14:36 ` [PATCH v7 5/9] ALSA: hda: " Mario Limonciello
2025-07-06 14:36 ` Mario Limonciello [this message]
2025-07-06 14:36 ` [PATCH v7 7/9] PCI/VGA: Replace vga_is_firmware_default() with a screen info check Mario Limonciello
2025-07-06 14:36 ` [PATCH v7 8/9] fbcon: Use screen info to find primary device Mario Limonciello
2025-07-14 15:12 ` kernel test robot
2025-07-06 14:36 ` [PATCH v7 9/9] PCI: Add a new 'boot_display' attribute Mario Limonciello
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=20250706143613.1972252-7-superm1@kernel.org \
--to=superm1@kernel.org \
--cc=airlied@gmail.com \
--cc=alex.williamson@redhat.com \
--cc=alexander.deucher@amd.com \
--cc=baolu.lu@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=christian.koenig@amd.com \
--cc=ddadap@nvidia.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=dwmw2@infradead.org \
--cc=iommu@lists.linux.dev \
--cc=joro@8bytes.org \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=lkp@intel.com \
--cc=lukas@wunner.de \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mario.limonciello@amd.com \
--cc=mripard@kernel.org \
--cc=perex@perex.cz \
--cc=robin.murphy@arm.com \
--cc=simona@ffwll.ch \
--cc=tiwai@suse.com \
--cc=tzimmermann@suse.de \
--cc=will@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.