Commit a80da738 authored by David Vrabel's avatar David Vrabel Committed by Linus Torvalds
Browse files

[PATCH] gx1fb: (try to) play nicer with various BIOSes 



Seems that the CS5530A chip used in Geode GX1 systems has some crazy feature
that causes SMI traps when accessing the PCI configuration space of the video
device.  Various GX1 BIOSes seem to use this 'feature' to hide the real BARs
of the device.  This patch disables these traps (in an early PCI fixup) so
that Linux sees the real, physical BARs and not the virtual ones provided by
the BIOS.

This should allow the GX1 framebuffer driver to work on more systems that have
different BIOSes as the driver no longer guesses at what the virtual BARs
mean.

I'm not entirely sure it the correct solution as I can neither test regular
VGA console nor the X's 'cyrix' video driver so there might be some breakage
there -- probably best to get some more testers before applying it.

Signed-off-by: default avatarAntonino Daplas <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4836f574

arch/i386/pci/fixup.c

+16 −0
Original line number Diff line number Diff line
@@ -449,3 +449,19 @@ static void __devinit pci_post_fixup_toshiba_ohci1394(struct pci_dev *dev) 
}

DECLARE_PCI_FIXUP_ENABLE(PCI_VENDOR_ID_TI, 0x8032,

			 pci_post_fixup_toshiba_ohci1394);





/*

 * Prevent the BIOS trapping accesses to the Cyrix CS5530A video device

 * configuration space.

 */

static void __devinit pci_early_fixup_cyrix_5530(struct pci_dev *dev)

{

	u8 r;

	/* clear 'F4 Video Configuration Trap' bit */

	pci_read_config_byte(dev, 0x42, &r);

	r &= 0xfd;

	pci_write_config_byte(dev, 0x42, r);

}

DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_LEGACY,

			pci_early_fixup_cyrix_5530);

drivers/video/geode/gx1fb_core.c

+4 −7
Original line number Diff line number Diff line
@@ -215,11 +215,11 @@ static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *d 
	if (ret < 0)

		return ret;



	ret = pci_request_region(dev, 1, "gx1fb (video)");

	ret = pci_request_region(dev, 0, "gx1fb (video)");

	if (ret < 0)

		return ret;

	par->vid_regs = ioremap(pci_resource_start(dev, 1),

				pci_resource_len(dev, 1));

	par->vid_regs = ioremap(pci_resource_start(dev, 0),

				pci_resource_len(dev, 0));

	if (!par->vid_regs)

		return -ENOMEM;
@@ -229,12 +229,9 @@ static int __init gx1fb_map_video_memory(struct fb_info *info, struct pci_dev *d 
	if (!par->dc_regs)

		return -ENOMEM;



	ret = pci_request_region(dev, 0, "gx1fb (frame buffer)");

	if (ret < 0 )

		return -EBUSY;

	if ((fb_len = gx1_frame_buffer_size()) < 0)

		return -ENOMEM;

	info->fix.smem_start = pci_resource_start(dev, 0);

	info->fix.smem_start = gx_base + 0x800000;

	info->fix.smem_len = fb_len;

	info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);

	if (!info->screen_base)

CRA Git | Maintained and supported by SUSTech CRA and CCSE