Attachment #167248 for bug #239840

View | Details | Raw Unified | Return to bug 239840
Collapse All | Expand All




     */

    for (i = 0; i < 8; i++) {

	sprintf(filename, 
		"/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics/fb%d",
		pPci->domain, pPci->bus, pPci->dev, pPci->func, i);

	fd = open(filename, O_RDONLY, 0);

    if (fd == -1) {
        close(fd);
        sprintf(filename, 
            "/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics:fb%d",
            pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
        fd = open(filename, O_RDONLY, 0);
    }

	if (fd != -1) {
	    close(fd);
	    sprintf(filename, "/dev/fb%d", i);

Return to bug 239840

Lines 314-324 Link Here

(-)xorg-server-1.5.1/hw/xfree86/fbdevhw/fbdevhw.c.old (-1 / +10 lines)
314	*/	314	*/
315		315
316	for (i = 0; i < 8; i++) {	316	for (i = 0; i < 8; i++) {
		317
317	sprintf(filename,	318	sprintf(filename,
318	"/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics/fb%d",	319	"/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics/fb%d",
319	pPci->domain, pPci->bus, pPci->dev, pPci->func, i);	320	pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
320
321	fd = open(filename, O_RDONLY, 0);	321	fd = open(filename, O_RDONLY, 0);
		322
		323	if (fd == -1) {
		324	close(fd);
		325	sprintf(filename,
		326	"/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics:fb%d",
		327	pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
		328	fd = open(filename, O_RDONLY, 0);
		329	}
		330
322	if (fd != -1) {	331	if (fd != -1) {
323	close(fd);	332	close(fd);
324	sprintf(filename, "/dev/fb%d", i);	333	sprintf(filename, "/dev/fb%d", i);