Denis Carikli (GNUtoo@no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/5108
-gerrit
commit b973a224a5854c2054f75a2c23c90def3683eb72 Author: Peter Stuge peter@stuge.se Date: Mon Oct 28 01:27:04 2013 +0100
Lenovo X60: Native VGA init: Remove the framebuffer offset.
Without that fix, the i915 linux kenrel driver often crash when it loads.
That fix puts the framebuffer address at a location different from the one used by the i915 linux kenrel driver.
Change-Id: Ie8eb18385c5bbbf6a8ca8c8a012513712c1b669c Signed-off-by: Denis 'GNUtoo' Carikli GNUtoo@no-log.org --- src/mainboard/lenovo/x60/i915io.c | 6 +++--- src/northbridge/intel/i945/gma.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/mainboard/lenovo/x60/i915io.c b/src/mainboard/lenovo/x60/i915io.c index 3552867..d38b66d 100644 --- a/src/mainboard/lenovo/x60/i915io.c +++ b/src/mainboard/lenovo/x60/i915io.c @@ -938,7 +938,7 @@ struct iodef iodefs[] = { {R, 1, "", _DSPACNTR, 0x41000000, 0}, {W, 1, "", _DSPACNTR, 0x59000000, 0}, {W, 1, "", _DSPASTRIDE, 0x00001000, 0}, -{W, 1, "", _DSPAADDR, 0x00020000, 0}, +{W, 1, "", _DSPAADDR, 0x00000000, 0}, {R, 2, "", DSPARB, (DSPARB_CSTART_SHIFT & 0x4) | 0x00001d9c, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80000000, 0}, {W, 1, "", FW_BLC, 0x011d011a, 0}, @@ -957,8 +957,8 @@ struct iodef iodefs[] = { {R, 2, "", _PIPEBCONF, 0x80000000, 0}, {R, 1, "", _DSPACNTR, 0x59000000, 0}, {W, 1, "", _DSPACNTR, 0xd9000000, 0}, -{R, 1, "", _DSPAADDR, 0x00020000, 0}, -{W, 1, "", _DSPAADDR, 0x00020000, 0}, +{R, 1, "", _DSPAADDR, 0x00000000, 0}, +{W, 1, "", _DSPAADDR, 0x00000000, 0}, {R, 1, "", _PIPEBSTAT, 0x00000202, 0}, {W, 1, "", _PIPEBSTAT, 0x00000202, 0}, {R, 3, "", _PIPEBSTAT, 0x00000000, 0}, diff --git a/src/northbridge/intel/i945/gma.c b/src/northbridge/intel/i945/gma.c index 433152c..9a825d7 100644 --- a/src/northbridge/intel/i945/gma.c +++ b/src/northbridge/intel/i945/gma.c @@ -55,7 +55,7 @@ static void gma_func0_init(struct device *dev) u32 iobase, mmiobase, graphics_base; iobase = dev->resource_list[1].base; mmiobase = dev->resource_list[0].base; - graphics_base = dev->resource_list[2].base + 0x20000; + graphics_base = dev->resource_list[2].base;
printk(BIOS_SPEW, "GMADR=0x%08x GTTADR=0x%08x\n", pci_read_config32(dev, 0x18),