frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fbdevhw: Remove the non-sysfs hack for mapping from PCI to fbdev 

It's broken for devices with BARs above 4G, and the sysfs method should
work everywhere anyway.  As a pleasant side effect, this fixes some
warnings:

fbdevhw.c: In function 'fbdev_open_pci':
fbdevhw.c:333:4: warning: cast from pointer to integer of different size
fbdevhw.c:334:4: warning: cast from pointer to integer of different size
fbdevhw.c:336:4: warning: cast from pointer to integer of different size
fbdevhw.c:337:4: warning: cast from pointer to integer of different size

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Julien Cristau <jcristau@debian.org>
Signed-off-by: Adam Jackson <ajax@redhat.com>
This commit is contained in:
Adam Jackson 2011-01-20 00:14:11 -05:00
parent f1b7c9cead
commit ae16c5796f
1 changed files with 2 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hw/xfree86/fbdevhw/fbdevhw.c
View File

@ -264,14 +264,7 @@ fbdev_open_pci(struct pci_device * pPci, char **namep)
{ {
struct fb_fix_screeninfo fix; struct fb_fix_screeninfo fix;
char filename[256]; char filename[256];
int fd,i,j; int fd, i;
/* There are two ways to that we can determine which fb device is
* associated with this PCI device. The more modern way is to look in
* the sysfs directory for the PCI device for a file named
* "graphics/fb*"
*/
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
sprintf(filename, sprintf(filename,
@ -304,55 +297,10 @@ fbdev_open_pci(struct pci_device * pPci, char **namep)
} }
} }
/* The other way is to examine the resources associated with each fb
* device and see if there is a match with the PCI device. This technique
* has some problems on certain mixed 64-bit / 32-bit architectures.
* There is a flaw in the fb_fix_screeninfo structure in that it only
* returns the low 32-bits of the address of the resources associated with
* a device. However, on a mixed architecture the base addresses of PCI
* devices, even for 32-bit applications, may be higher than 0x0f0000000.
*/
for (i = 0; i < 8; i++) {
sprintf(filename,"/dev/fb%d",i);
if (-1 == (fd = open(filename,O_RDWR,0))) {
xf86DrvMsg(-1, X_WARNING,
"open %s: %s\n", filename, strerror(errno));
continue;
}
if (-1 == ioctl(fd,FBIOGET_FSCREENINFO,(void*)&fix)) {
close(fd);
continue;
}
for (j = 0; j < 6; j++) {
const pciaddr_t res_start = pPci->regions[j].base_addr;
const pciaddr_t res_end = res_start + pPci->regions[j].size;
if ((0 != fix.smem_len &&
(pciaddr_t) fix.smem_start >= res_start &&
(pciaddr_t) fix.smem_start < res_end) ||
(0 != fix.mmio_len &&
(pciaddr_t) fix.mmio_start >= res_start &&
(pciaddr_t) fix.mmio_start < res_end))
break;
}
if (j == 6) {
close(fd);
continue;
}
if (namep) {
*namep = xnfalloc(16);
strncpy(*namep,fix.id,16);
}
return fd;
}
if (namep) if (namep)
*namep = NULL; *namep = NULL;
xf86DrvMsg(-1, X_ERROR, xf86DrvMsg(-1, X_ERROR, "Unable to find a valid framebuffer device\n");
"Unable to find a valid framebuffer device\n");
return -1; return -1;
} }