Skip to content

Commit 036105e

Browse files
committed
video: Provide screen_info_get_pci_dev() to find screen_info's PCI device
Add screen_info_get_pci_dev() to find the PCI device of an instance of screen_info. Does nothing on systems without PCI bus. v3: * search PCI device with pci_get_base_class() (Sui) v2: * remove ret from screen_info_pci_dev() (Javier) Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Javier Martinez Canillas <javierm@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20240212090736.11464-3-tzimmermann@suse.de
1 parent 75fa9b7 commit 036105e

3 files changed

Lines changed: 59 additions & 0 deletions

File tree

drivers/video/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ obj-$(CONFIG_VIDEO) += cmdline.o nomodeset.o
88
obj-$(CONFIG_HDMI) += hdmi.o
99

1010
screen_info-y := screen_info_generic.o
11+
screen_info-$(CONFIG_PCI) += screen_info_pci.o
1112

1213
obj-$(CONFIG_VT) += console/
1314
obj-$(CONFIG_FB_STI) += console/

drivers/video/screen_info_pci.c

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// SPDX-License-Identifier: GPL-2.0
2+
3+
#include <linux/pci.h>
4+
#include <linux/screen_info.h>
5+
6+
static struct pci_dev *__screen_info_pci_dev(struct resource *res)
7+
{
8+
struct pci_dev *pdev = NULL;
9+
const struct resource *r = NULL;
10+
11+
if (!(res->flags & IORESOURCE_MEM))
12+
return NULL;
13+
14+
while (!r && (pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
15+
r = pci_find_resource(pdev, res);
16+
}
17+
18+
return pdev;
19+
}
20+
21+
/**
22+
* screen_info_pci_dev() - Return PCI parent device that contains screen_info's framebuffer
23+
* @si: the screen_info
24+
*
25+
* Returns:
26+
* The screen_info's parent device or NULL on success, or a pointer-encoded
27+
* errno value otherwise. The value NULL is not an error. It signals that no
28+
* PCI device has been found.
29+
*/
30+
struct pci_dev *screen_info_pci_dev(const struct screen_info *si)
31+
{
32+
struct resource res[SCREEN_INFO_MAX_RESOURCES];
33+
ssize_t i, numres;
34+
35+
numres = screen_info_resources(si, res, ARRAY_SIZE(res));
36+
if (numres < 0)
37+
return ERR_PTR(numres);
38+
39+
for (i = 0; i < numres; ++i) {
40+
struct pci_dev *pdev = __screen_info_pci_dev(&res[i]);
41+
42+
if (pdev)
43+
return pdev;
44+
}
45+
46+
return NULL;
47+
}
48+
EXPORT_SYMBOL(screen_info_pci_dev);

include/linux/screen_info.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
*/
1010
#define SCREEN_INFO_MAX_RESOURCES 3
1111

12+
struct pci_dev;
1213
struct resource;
1314

1415
static inline bool __screen_info_has_lfb(unsigned int type)
@@ -104,6 +105,15 @@ static inline unsigned int screen_info_video_type(const struct screen_info *si)
104105

105106
ssize_t screen_info_resources(const struct screen_info *si, struct resource *r, size_t num);
106107

108+
#if defined(CONFIG_PCI)
109+
struct pci_dev *screen_info_pci_dev(const struct screen_info *si);
110+
#else
111+
static inline struct pci_dev *screen_info_pci_dev(const struct screen_info *si)
112+
{
113+
return NULL;
114+
}
115+
#endif
116+
107117
extern struct screen_info screen_info;
108118

109119
#endif /* _SCREEN_INFO_H */

0 commit comments

Comments
 (0)