fbdev: Detect primary display device

PATCH In review Antonino A. Daplas 3 participants 4 messages May 27, 2007 – May 28, 2007 Framebuffer layer

Share & tools

Antonino A. Daplas

author

2007-05-27 09:52 UTC #0 lore raw

PATCH 8/9 fbdev: Detect primary display device

Add function helper, fb_is_display_device(). Given struct fb_info, it will return a nonzero value if the device is the primary display.

Currently, only the i386 is supported, other platforms only have stubs. For the i386, the function checks for the IORESOURCE_ROM_SHADOW flag.

Signed-off-by Antonino Daplas <[email protected]>

---

 arch/i386/Makefile         |    1 +
 arch/i386/video/Makefile   |    1 +
 arch/i386/video/fbdev.c    |   34 ++++++++++++++++++++++++++++++++++
 include/asm-alpha/fb.h     |    6 ++++++
 include/asm-arm/fb.h       |    6 ++++++
 include/asm-arm26/fb.h     |    6 ++++++
 include/asm-avr32/fb.h     |    6 ++++++
 include/asm-blackfin/fb.h  |    6 ++++++
 include/asm-cris/fb.h      |    6 ++++++
 include/asm-frv/fb.h       |    6 ++++++
 include/asm-h8300/fb.h     |    6 ++++++
 include/asm-i386/fb.h      |    3 +++
 include/asm-ia64/fb.h      |    6 ++++++
 include/asm-m32r/fb.h      |    6 ++++++
 include/asm-m68k/fb.h      |    6 ++++++
 include/asm-m68knommu/fb.h |    6 ++++++
 include/asm-mips/fb.h      |    6 ++++++
 include/asm-parisc/fb.h    |    6 ++++++
 include/asm-powerpc/fb.h   |    6 ++++++
 include/asm-s390/fb.h      |    6 ++++++
 include/asm-sh/fb.h        |    6 ++++++
 include/asm-sh64/fb.h      |    6 ++++++
 include/asm-sparc/fb.h     |    6 ++++++
 include/asm-sparc64/fb.h   |    6 ++++++
 include/asm-v850/fb.h      |    6 ++++++
 include/asm-x86_64/fb.h    |    7 ++++++-
 include/asm-xtensa/fb.h    |    6 ++++++
 27 files changed, 177 insertions(+), 1 deletions(-)

arch/i386/Makefile +1 -0

index 3eb063e..01f0ff0 100644
@@ -111,6 +111,7 @@ drivers-$(CONFIG_PCI)			+= arch/i386/pci
 # must be linked after kernel/
 drivers-$(CONFIG_OPROFILE)		+= arch/i386/oprofile/
 drivers-$(CONFIG_PM)			+= arch/i386/power/
+drivers-$(CONFIG_FB)                    += arch/i386/video/
 
 CFLAGS += $(mflags-y)
 AFLAGS += $(mflags-y)

arch/i386/video/Makefile new file +1 -0

new file mode 100644
index 0000000..2c447c9
@@ -0,0 +1 @@
+obj-$(CONFIG_FB)               += fbdev.o

arch/i386/video/fbdev.c new file +34 -0

new file mode 100644
index 0000000..7fc712c
@@ -0,0 +1,34 @@
+/*
+ * arch/i386/video/fbdev.c - i386 Framebuffer
+ *
+ * Copyright (C) 2007 Antonino Daplas <[email protected]>
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file COPYING in the main directory of this archive
+ * for more details.
+ *
+ */
+#include <linux/fb.h>
+#include <linux/pci.h>
+
+int fb_is_primary_device(struct fb_info *info)
+{
+	struct device *device;
+	struct pci_dev *pci_dev = NULL;
+	struct resource *res = NULL;
+	int retval = 0;
+
+	device = info->device;
+
+	if (device)
+		pci_dev = to_pci_dev(device);
+
+	if (pci_dev)
+		res = &pci_dev->resource[PCI_ROM_RESOURCE];
+
+	if (res && res->flags & IORESOURCE_ROM_SHADOW)
+		retval = 1;
+
+	return retval;
+}
+EXPORT_SYMBOL(fb_is_primary_device);

include/asm-alpha/fb.h +6 -0

index ca714a4..f87e4ca 100644
@@ -1,7 +1,13 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/device.h>
 
 /* Caching is off in the I/O space quadrant by design.  */
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-arm/fb.h +6 -0

index 4bf5b88..43fb2bc 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -10,4 +11,9 @@ static inline void fb_pgprotect(struct f
 	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-arm26/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-avr32/fb.h +6 -0

index d22a4a8..b39a0f0 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -12,4 +13,9 @@ static inline void fb_pgprotect(struct f
 				     | (_PAGE_BUFFER | _PAGE_DIRTY));
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-blackfin/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-cris/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-frv/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-h8300/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-i386/fb.h +3 -0

index d30073c..d1c6297 100644
@@ -1,9 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>
 
+extern int fb_is_primary_device(struct fb_info *info);
+
 static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
 				unsigned long off)
 {

include/asm-ia64/fb.h +6 -0

index c06b45b..9150ebd 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -13,4 +14,9 @@ static inline void fb_pgprotect(struct f
 		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-m32r/fb.h +6 -0

index 4bf5b88..43fb2bc 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -10,4 +11,9 @@ static inline void fb_pgprotect(struct f
 	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-m68k/fb.h +6 -0

index dc12b5a..e51656f 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>
 #include <asm/setup.h>

@@ -24,4 +25,9 @@ static inline void fb_pgprotect(struct f
 }
 #endif /* CONFIG_SUN3 */
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-m68knommu/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-mips/fb.h +6 -0

index ac23d96..cc740a9 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -10,4 +11,9 @@ static inline void fb_pgprotect(struct f
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-parisc/fb.h +6 -0

index d5e47ed..be603ee 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -10,4 +11,9 @@ static inline void fb_pgprotect(struct f
 	pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE;
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-powerpc/fb.h +6 -0

index e13d6eb..0f124d0 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -12,4 +13,9 @@ static inline void fb_pgprotect(struct f
 						 vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-s390/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-sh/fb.h +6 -0

index 4bf5b88..43fb2bc 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -10,4 +11,9 @@ static inline void fb_pgprotect(struct f
 	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-sh64/fb.h +6 -0

index 4bf5b88..43fb2bc 100644
@@ -1,6 +1,7 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
 
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -10,4 +11,9 @@ static inline void fb_pgprotect(struct f
 	vma->vm_page_prot = pgprot_writecombine(vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-sparc/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-sparc64/fb.h +6 -0

index 8703c70..175f0fb 100644
@@ -1,5 +1,6 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -9,4 +10,9 @@ static inline void fb_pgprotect(struct f
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-v850/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-x86_64/fb.h +6 -1

index d30073c..2e66064 100644
@@ -1,6 +1,6 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
-
+#include <linux/fb.h>
 #include <linux/fs.h>
 #include <asm/page.h>

@@ -11,4 +11,9 @@ static inline void fb_pgprotect(struct f
 		pgprot_val(vma->vm_page_prot) |= _PAGE_PCD;
 }
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

include/asm-xtensa/fb.h +6 -0

index 9f8c88d..f2752d4 100644
@@ -1,6 +1,12 @@
 #ifndef _ASM_FB_H_
 #define _ASM_FB_H_
+#include <linux/fb.h>
 
 #define fb_pgprotect(...) do {} while (0)
 
+static inline int fb_is_primary_device(struct fb_screeninfo *info)
+{
+	return 0;
+}
+
 #endif /* _ASM_FB_H_ */

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/

David Miller

2007-05-27 22:45 UTC #1 lore raw

From: "Antonino A. Daplas" <[email protected]>
Date: Sun, 27 May 2007 17:43:41 +0800

Quoted 7 lines

Add function helper, fb_is_display_device(). Given struct fb_info, it will return a nonzero value if the device is the primary display.
Currently, only the i386 is supported, other platforms only have stubs. For the i386, the function checks for the IORESOURCE_ROM_SHADOW flag.
Signed-off-by Antonino Daplas <[email protected]>

Thank you so much for following up on this work.

I'll try to get the sparc side implemented some time this coming week.

Thanks again.

Geert Uytterhoeven

2007-05-28 08:38 UTC #2 lore raw

In reply to Antonino A. Daplas

Quoted 1 line · Antonino A. Daplas

Add function helper, fb_is_display_device(). Given struct fb_info, it will

                             ^^^^^^^
			     primary

Quoted 3 lines

return a nonzero value if the device is the primary display.
+static inline int fb_is_primary_device(struct fb_screeninfo *info)

                                                 ^^^^^^^^^^^^^
						 fb_info

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds