sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lenovo/x60: native vga init: fix code style issues.

Browse Source 
Change-Id: I054edffbb38b13559da10180fc2c6cd9929ba162
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Reviewed-on: http://review.coreboot.org/3999
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
Denis 'GNUtoo' Carikli
2013-10-27 15:50:02 +01:00
committed by Alexandru Gagniuc
parent 33b09567d2
commit 2186b6538e
7 changed files with 238 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/mainboard/lenovo/x60/i915.c
View File

@@ -57,11 +57,7 @@ static unsigned int graphics;
static unsigned short addrport; static unsigned short addrport;
static unsigned short dataport; static unsigned short dataport;
static unsigned int physbase; static unsigned int physbase;
#if 0 //undefined reference
extern int oprom_is_loaded;
#else
int oprom_is_loaded; int oprom_is_loaded;
#endif
#define PGETBL_CTL 0x2020 #define PGETBL_CTL 0x2020
#define PGETBL_ENABLED 0x00000001 #define PGETBL_ENABLED 0x00000001
@@ -126,11 +122,12 @@ setgtt(int start, int end, unsigned long base, int inc)
{ {
int i; int i;
printk(BIOS_INFO, "%s(%d,%d,0x%08lx,%d);\n",__func__, start, end, base, inc); printk(BIOS_INFO, "%s(%d,%d,0x%08lx,%d);\n",
__func__, start, end, base, inc);
for(i = start; i < end; i++){ for (i = start; i < end; i++) {
u32 word = base + i*inc; u32 word = base + i*inc;
WRITE32(word|1,(i*4)|1); WRITE32(word|1, (i*4)|1);
} }
} }
@@ -142,16 +139,16 @@ int gtt_setup(unsigned int mmiobase)
PGETBL_save = read32(mmiobase + PGETBL_CTL) & ~PGETBL_ENABLED; PGETBL_save = read32(mmiobase + PGETBL_CTL) & ~PGETBL_ENABLED;
PGETBL_save |= PGETBL_ENABLED; PGETBL_save |= PGETBL_ENABLED;
printk(BIOS_DEBUG, "PGETBL_save=0x%lx\n",PGETBL_save ); printk(BIOS_DEBUG, "PGETBL_save=0x%lx\n", PGETBL_save);
write32(mmiobase + GFX_FLSH_CNTL, 0); write32(mmiobase + GFX_FLSH_CNTL, 0);
write32(mmiobase + PGETBL_CTL, PGETBL_save); write32(mmiobase + PGETBL_CTL, PGETBL_save);
/* verify */ /* verify */
if ( read32( mmiobase + PGETBL_CTL) & PGETBL_ENABLED ){ if (read32(mmiobase + PGETBL_CTL) & PGETBL_ENABLED) {
printk(BIOS_DEBUG, "gtt_setup is enabled!!!\n"); printk(BIOS_DEBUG, "gtt_setup is enabled.\n");
}else{ } else {
printk(BIOS_DEBUG, "gtt_setup failed!!!\n"); printk(BIOS_DEBUG, "gtt_setup failed!!!\n");
return 1; return 1;
} }
@@ -188,9 +185,8 @@ static void palette(void)
int i; int i;
unsigned long color = 0; unsigned long color = 0;
for(i = 0; i < 256; i++, color += 0x010101){ for (i = 0; i < 256; i++, color += 0x010101)
io_i915_WRITE32(color, _LGC_PALETTE_A + (i<<2)); io_i915_WRITE32(color, _LGC_PALETTE_A + (i<<2));
}
} }
int vbe_mode_info_valid(void); int vbe_mode_info_valid(void);
@@ -202,7 +198,8 @@ int vbe_mode_info_valid(void)
void fill_lb_framebuffer(struct lb_framebuffer *framebuffer); void fill_lb_framebuffer(struct lb_framebuffer *framebuffer);
void fill_lb_framebuffer(struct lb_framebuffer *framebuffer) void fill_lb_framebuffer(struct lb_framebuffer *framebuffer)
{ {
printk(BIOS_SPEW, "fill_lb_framebuffer: graphics is %p\n", (void *)graphics); printk(BIOS_SPEW, "fill_lb_framebuffer: graphics is %p\n",
(void *)graphics);
framebuffer->physical_address = graphics; framebuffer->physical_address = graphics;
framebuffer->x_resolution = 1024; framebuffer->x_resolution = 1024;
framebuffer->y_resolution = 768; framebuffer->y_resolution = 768;
@@ -228,10 +225,11 @@ static int run(int index)
if (index >= niodefs) if (index >= niodefs)
return index; return index;
/* state machine! */ /* state machine! */
for(i = index, id = &iodefs[i]; id->op; i++, id++){ for (i = index, id = &iodefs[i]; id->op; i++, id++) {
switch(id->op){ switch (id->op) {
case M: case M:
if (verbose & vmsg) printk(BIOS_SPEW, "%ld: %s\n", if (verbose & vmsg)
printk(BIOS_SPEW, "%ld: %s\n",
globalmicroseconds(), id->msg); globalmicroseconds(), id->msg);
break; break;
case P: case P:
@@ -242,14 +240,15 @@ static int run(int index)
if (verbose & vio) if (verbose & vio)
printk(BIOS_SPEW, "\texpect %08lx\n", id->data); printk(BIOS_SPEW, "\texpect %08lx\n", id->data);
/* we're looking for something. */ /* we're looking for something. */
if (lastidread->addr == id->addr){ if (lastidread->addr == id->addr) {
/* they're going to be polling. /* they're going to be polling.
* just do it 1000 times * just do it 1000 times
*/ */
for (t = 0; t < 1000 && id->data != u; t++){ for (t = 0; t < 1000 && id->data != u; t++)
u = READ32(id->addr); u = READ32(id->addr);
}
if (verbose & vspin) printk(BIOS_SPEW, if (verbose & vspin)
printk(BIOS_SPEW,
"%s: # loops %ld got %08lx want %08lx\n", "%s: # loops %ld got %08lx want %08lx\n",
regname(id->addr), regname(id->addr),
t, u, id->data); t, u, id->data);
@@ -258,20 +257,24 @@ static int run(int index)
break; break;
case W: case W:
WRITE32(id->data, id->addr); WRITE32(id->data, id->addr);
if (id->addr == PCH_PP_CONTROL){ if (id->addr == PCH_PP_CONTROL) {
if (verbose & vio) if (verbose & vio)
printk(BIOS_SPEW, "PCH_PP_CONTROL\n"); printk(BIOS_SPEW, "PCH_PP_CONTROL\n");
switch(id->data & 0xf){ switch (id->data & 0xf) {
case 8: break; case 8:
case 7: break; break;
default: udelay(100000); case 7:
break;
default:
udelay(100000);
if (verbose & vio) if (verbose & vio)
printk(BIOS_SPEW, "U %d\n", 100000); printk(BIOS_SPEW, "U %d\n",
100000);
} }
} }
break; break;
case V: case V:
if (id->count < 8){ if (id->count < 8) {
prev = verbose; prev = verbose;
verbose = id->count; verbose = id->count;
} else { } else {
@@ -284,7 +287,8 @@ static int run(int index)
return i+1; return i+1;
break; break;
default: default:
printk(BIOS_SPEW, "BAD TABLE, opcode %d @ %d\n", id->op, i); printk(BIOS_SPEW, "BAD TABLE, opcode %d @ %d\n",
id->op, i);
return -1; return -1;
} }
if (id->udelay) if (id->udelay)
@@ -311,31 +315,33 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
dataport = addrport + 4; dataport = addrport + 4;
physbase = pphysbase; physbase = pphysbase;
graphics = pgfx; graphics = pgfx;
printk(BIOS_SPEW, "i915lightup: graphics %p mmio %p" printk(BIOS_SPEW,
"addrport %04x physbase %08x\n", "i915lightup: graphics %p mmio %p addrport %04x physbase %08x\n",
(void *)graphics, mmio, addrport, physbase); (void *)graphics, mmio, addrport, physbase);
globalstart = rdtscll(); globalstart = rdtscll();
decode_edid((unsigned char *)&x60_edid_data, sizeof(x60_edid_data), &edid); decode_edid((unsigned char *)&x60_edid_data,
sizeof(x60_edid_data), &edid);
htotal = (edid.ha - 1) | ((edid.ha + edid.hbl- 1) << 16); htotal = (edid.ha - 1) | ((edid.ha + edid.hbl - 1) << 16);
printk(BIOS_SPEW, "I915_WRITE(HTOTAL(pipe), %08x)\n", htotal); printk(BIOS_SPEW, "I915_WRITE(HTOTAL(pipe), %08x)\n", htotal);
hblank = (edid.ha - 1) | ((edid.ha + edid.hbl- 1) << 16); hblank = (edid.ha - 1) | ((edid.ha + edid.hbl - 1) << 16);
printk(BIOS_SPEW, "I915_WRITE(HBLANK(pipe),0x%08x)\n", hblank); printk(BIOS_SPEW, "I915_WRITE(HBLANK(pipe),0x%08x)\n", hblank);
hsync = (edid.ha + edid.hso - 1) | hsync = (edid.ha + edid.hso - 1) |
((edid.ha + edid.hso + edid.hspw- 1) << 16); ((edid.ha + edid.hso + edid.hspw - 1) << 16);
printk(BIOS_SPEW, "I915_WRITE(HSYNC(pipe),0x%08x)\n", hsync); printk(BIOS_SPEW, "I915_WRITE(HSYNC(pipe),0x%08x)\n", hsync);
vtotal = (edid.va - 1) | ((edid.va + edid.vbl- 1) << 16); vtotal = (edid.va - 1) | ((edid.va + edid.vbl - 1) << 16);
printk(BIOS_SPEW, "I915_WRITE(VTOTAL(pipe), %08x)\n", vtotal); printk(BIOS_SPEW, "I915_WRITE(VTOTAL(pipe), %08x)\n", vtotal);
vblank = (edid.va - 1) | ((edid.va + edid.vbl- 1) << 16); vblank = (edid.va - 1) | ((edid.va + edid.vbl - 1) << 16);
printk(BIOS_SPEW, "I915_WRITE(VBLANK(pipe),0x%08x)\n", vblank); printk(BIOS_SPEW, "I915_WRITE(VBLANK(pipe),0x%08x)\n", vblank);
vsync = (edid.va + edid.vso - 1) |((edid.va + edid.vso + edid.vspw- 1) << 16); vsync = (edid.va + edid.vso - 1) |
((edid.va + edid.vso + edid.vspw - 1) << 16);
printk(BIOS_SPEW, "I915_WRITE(VSYNC(pipe),0x%08x)\n", vsync); printk(BIOS_SPEW, "I915_WRITE(VSYNC(pipe),0x%08x)\n", vsync);
printk(BIOS_SPEW, "Table has %d elements\n", niodefs); printk(BIOS_SPEW, "Table has %d elements\n", niodefs);
@@ -368,7 +374,7 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
* starting at physbase. * starting at physbase.
*/ */
if ( gtt_setup(pmmio) ){ if (gtt_setup(pmmio)) {
printk(BIOS_ERR, "ERROR: GTT Setup Failed!!!\n"); printk(BIOS_ERR, "ERROR: GTT Setup Failed!!!\n");
return 0; return 0;
} }

24
src/mainboard/lenovo/x60/i915_reg.h
View File

@@ -3701,20 +3701,20 @@
#define EDP_LINK_TRAIN_VOL_EMP_MASK_SNB (0x3f<<22) #define EDP_LINK_TRAIN_VOL_EMP_MASK_SNB (0x3f<<22)
/* IVB */ /* IVB */
#define EDP_LINK_TRAIN_400MV_0DB_IVB (0x24 <<22) #define EDP_LINK_TRAIN_400MV_0DB_IVB (0x24 << 22)
#define EDP_LINK_TRAIN_400MV_3_5DB_IVB (0x2a <<22) #define EDP_LINK_TRAIN_400MV_3_5DB_IVB (0x2a << 22)
#define EDP_LINK_TRAIN_400MV_6DB_IVB (0x2f <<22) #define EDP_LINK_TRAIN_400MV_6DB_IVB (0x2f << 22)
#define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 <<22) #define EDP_LINK_TRAIN_600MV_0DB_IVB (0x30 << 22)
#define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 <<22) #define EDP_LINK_TRAIN_600MV_3_5DB_IVB (0x36 << 22)
#define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 <<22) #define EDP_LINK_TRAIN_800MV_0DB_IVB (0x38 << 22)
#define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x33 <<22) #define EDP_LINK_TRAIN_800MV_3_5DB_IVB (0x33 << 22)
/* legacy values */ /* legacy values */
#define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 <<22) #define EDP_LINK_TRAIN_500MV_0DB_IVB (0x00 << 22)
#define EDP_LINK_TRAIN_1000MV_0DB_IVB (0x20 <<22) #define EDP_LINK_TRAIN_1000MV_0DB_IVB (0x20 << 22)
#define EDP_LINK_TRAIN_500MV_3_5DB_IVB (0x02 <<22) #define EDP_LINK_TRAIN_500MV_3_5DB_IVB (0x02 << 22)
#define EDP_LINK_TRAIN_1000MV_3_5DB_IVB (0x22 <<22) #define EDP_LINK_TRAIN_1000MV_3_5DB_IVB (0x22 << 22)
#define EDP_LINK_TRAIN_1000MV_6DB_IVB (0x23 <<22) #define EDP_LINK_TRAIN_1000MV_6DB_IVB (0x23 << 22)
#define EDP_LINK_TRAIN_VOL_EMP_MASK_IVB (0x3f<<22) #define EDP_LINK_TRAIN_VOL_EMP_MASK_IVB (0x3f<<22)

164
src/mainboard/lenovo/x60/i915io.c
View File

@@ -21,7 +21,7 @@
#include "i915io.h" #include "i915io.h"
struct iodef iodefs[] = { struct iodef iodefs[] = {
{V,0,}, {V, 0,},
{M, 1, "Linux agpgart interface v0.103", 0x0, 0x0, 0}, {M, 1, "Linux agpgart interface v0.103", 0x0, 0x0, 0},
{M, 1, "agpgart-intel 0000:00:00.0:Intel 945GM Chipset", 0x0, 0x0, 0}, {M, 1, "agpgart-intel 0000:00:00.0:Intel 945GM Chipset", 0x0, 0x0, 0},
{M, 1, "agpgart-intel 0000:00:00.0:detected gtt size:262144K total, 262144K mappable", 0x0, 0x0, 0}, {M, 1, "agpgart-intel 0000:00:00.0:detected gtt size:262144K total, 262144K mappable", 0x0, 0x0, 0},
@@ -36,7 +36,7 @@ struct iodef iodefs[] = {
{R, 1, "", PP_OFF_DELAYS, 0x00000000, 0}, {R, 1, "", PP_OFF_DELAYS, 0x00000000, 0},
{W, 1, "", PP_ON_DELAYS, 0x00000000, 0}, {W, 1, "", PP_ON_DELAYS, 0x00000000, 0},
{W, 1, "", PP_OFF_DELAYS, 0x00000000, 0}, {W, 1, "", PP_OFF_DELAYS, 0x00000000, 0},
{W, 1, "", INSTPM+0x24, MI_ARB_C3_LP_WRITE_ENABLE |0x08000800, 0}, {W, 1, "", INSTPM+0x24, MI_ARB_C3_LP_WRITE_ENABLE | 0x08000800, 0},
{W, 1, "", RENDER_RING_BASE, 0x00000000, 0}, {W, 1, "", RENDER_RING_BASE, 0x00000000, 0},
{W, 1, "", RENDER_RING_BASE+0x4, 0x00000000, 0}, {W, 1, "", RENDER_RING_BASE+0x4, 0x00000000, 0},
{W, 1, "", RENDER_RING_BASE+0x8, 0x00000000, 0}, {W, 1, "", RENDER_RING_BASE+0x8, 0x00000000, 0},
@@ -53,13 +53,13 @@ struct iodef iodefs[] = {
{W, 1, "", FENCE_REG_965_0+0x14, 0x00000000, 0}, {W, 1, "", FENCE_REG_965_0+0x14, 0x00000000, 0},
{W, 1, "", FENCE_REG_965_0+0x18, 0x00000000, 0}, {W, 1, "", FENCE_REG_965_0+0x18, 0x00000000, 0},
{W, 1, "", FENCE_REG_965_0+0x1c, 0x00000000, 0}, {W, 1, "", FENCE_REG_965_0+0x1c, 0x00000000, 0},
{R, 1, "", DCC, DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED | DCC_CHANNEL_XOR_BIT_17 |0x000f0202, 0}, {R, 1, "", DCC, DCC_ADDRESSING_MODE_DUAL_CHANNEL_INTERLEAVED | DCC_CHANNEL_XOR_BIT_17 | 0x000f0202, 0},
{M, 1, "[drm] Supports vblank timestamp caching Rev 1 (10.10.2010).", 0x0, 0x0, 0}, {M, 1, "[drm] Supports vblank timestamp caching Rev 1 (10.10.2010).", 0x0, 0x0, 0},
{M, 1, "[drm] Driver supports precise vblank timestamp query.", 0x0, 0x0, 0}, {M, 1, "[drm] Driver supports precise vblank timestamp query.", 0x0, 0x0, 0},
{M, 1, "i915 0000:00:02.0:Invalid ROM contents", 0x0, 0x0, 0}, {M, 1, "i915 0000:00:02.0:Invalid ROM contents", 0x0, 0x0, 0},
{M, 1, "[drm] failed to find VBIOS tables", 0x0, 0x0, 0}, {M, 1, "[drm] failed to find VBIOS tables", 0x0, 0x0, 0},
{M, 1, "vgaarb:device changed decodes:PCI:0000:00:02.0,olddecodes=io+mem,decodes=io+mem:owns=io+mem", 0x0, 0x0, 0}, {M, 1, "vgaarb:device changed decodes:PCI:0000:00:02.0,olddecodes=io+mem,decodes=io+mem:owns=io+mem", 0x0, 0x0, 0},
{W, 1, "", VGACNTRL, VGA_DISP_DISABLE |0x80000000, 0}, {W, 1, "", VGACNTRL, VGA_DISP_DISABLE | 0x80000000, 0},
{R, 1, "", PFIT_CONTROL, 0x00000000, 0}, {R, 1, "", PFIT_CONTROL, 0x00000000, 0},
{W, 1, "", 0x5100, 0x00000003, 0}, {W, 1, "", 0x5100, 0x00000003, 0},
{W, 1, "", 0x5104, 0x460100a1, 0}, {W, 1, "", 0x5104, 0x460100a1, 0},
@@ -202,14 +202,14 @@ struct iodef iodefs[] = {
{W, 1, "", IMR, 0xfffd73ae, 0}, {W, 1, "", IMR, 0xfffd73ae, 0},
{W, 1, "", IER, 0x00028053, 0}, {W, 1, "", IER, 0x00028053, 0},
{R, 1, "", PORT_HOTPLUG_EN, 0x00000000, 0}, {R, 1, "", PORT_HOTPLUG_EN, 0x00000000, 0},
{W, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 |0x00000220, 0}, {W, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 | 0x00000220, 0},
{R, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 |0x00000220, 0}, {R, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 | 0x00000220, 0},
{W, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_FORCE_DETECT | CRT_HOTPLUG_VOLTAGE_COMPARE_50 |0x00000228, 0}, {W, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_FORCE_DETECT | CRT_HOTPLUG_VOLTAGE_COMPARE_50 | 0x00000228, 0},
{R, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_FORCE_DETECT | CRT_HOTPLUG_VOLTAGE_COMPARE_50 |0x00000228, 0}, {R, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_FORCE_DETECT | CRT_HOTPLUG_VOLTAGE_COMPARE_50 | 0x00000228, 0},
{R, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 |0x00000220, 0}, {R, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 | 0x00000220, 0},
{R, 1, "", PORT_HOTPLUG_STAT, 0x00000000, 0}, {R, 1, "", PORT_HOTPLUG_STAT, 0x00000000, 0},
{W, 1, "", PORT_HOTPLUG_STAT, CRT_HOTPLUG_INT_STATUS |0x00000800, 0}, {W, 1, "", PORT_HOTPLUG_STAT, CRT_HOTPLUG_INT_STATUS | 0x00000800, 0},
{W, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 |0x00000220, 0}, {W, 1, "", PORT_HOTPLUG_EN, CRT_HOTPLUG_INT_EN | CRT_HOTPLUG_VOLTAGE_COMPARE_50 | 0x00000220, 0},
{W, 1, "", 0x5100, 0x00000002, 0}, {W, 1, "", 0x5100, 0x00000002, 0},
{W, 1, "", 0x5104, 0x460100a1, 0}, {W, 1, "", 0x5104, 0x460100a1, 0},
{R, 2, "", 0x5108, 0x00009c00, 0}, {R, 2, "", 0x5108, 0x00009c00, 0},
@@ -234,21 +234,21 @@ struct iodef iodefs[] = {
{W, 1, "", _PIPEACONF, 0x00000000, 0}, {W, 1, "", _PIPEACONF, 0x00000000, 0},
{R, 1, "", _DPLL_A, 0x94020003, 0}, {R, 1, "", _DPLL_A, 0x94020003, 0},
{R, 1, "", _PIPEACONF, 0x00000000, 0}, {R, 1, "", _PIPEACONF, 0x00000000, 0},
{W, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {W, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_GMBUS_INTERRUPT_STATUS | PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000a03, 0}, {R, 1, "", _PIPEASTAT, PIPE_GMBUS_INTERRUPT_STATUS | PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000a03, 0},
{W, 1, "", _PIPEASTAT, PIPE_GMBUS_INTERRUPT_STATUS | PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000a03, 0}, {W, 1, "", _PIPEASTAT, PIPE_GMBUS_INTERRUPT_STATUS | PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000a03, 0},
{R, 2, "", _PIPEASTAT, 0x00000000, 0}, {R, 2, "", _PIPEASTAT, 0x00000000, 0},
{R, 2, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 2, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 1, "", _PIPEASTAT, 0x00000000, 0}, {R, 1, "", _PIPEASTAT, 0x00000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _DSPBCNTR, 0x40000000, 0}, {W, 1, "", _DSPBCNTR, 0x40000000, 0},
{R, 1, "", _DSPBCNTR, 0x40000000, 0}, {R, 1, "", _DSPBCNTR, 0x40000000, 0},
{W, 1, "", _DSPBCNTR, 0x58000000, 0}, {W, 1, "", _DSPBCNTR, 0x58000000, 0},
{W, 1, "", _DSPBSTRIDE, 0x00001400, 0}, {W, 1, "", _DSPBSTRIDE, 0x00001400, 0},
{W, 1, "", _DSPBADDR, 0x00020000, 0}, {W, 1, "", _DSPBADDR, 0x00020000, 0},
{R, 2, "", DSPARB, ( DSPARB_CSTART_SHIFT &0x4)|0x00001d9c, 0}, {R, 2, "", DSPARB, (DSPARB_CSTART_SHIFT & 0x4) | 0x00001d9c, 0},
{W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK |0x80000000, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80000000, 0},
{W, 1, "", FW_BLC, 0x011d011a, 0}, {W, 1, "", FW_BLC, 0x011d011a, 0},
{W, 1, "", FW_BLC2, 0x00000102, 0}, {W, 1, "", FW_BLC2, 0x00000102, 0},
{R, 1, "", TV_CTL, 0x00000000, 0}, {R, 1, "", TV_CTL, 0x00000000, 0},
@@ -273,7 +273,7 @@ struct iodef iodefs[] = {
{W, 1, "", TV_CSC_V2, 0x06d00200, 0}, {W, 1, "", TV_CSC_V2, 0x06d00200, 0},
{W, 1, "", TV_CLR_KNOBS, 0x00606000, 0}, {W, 1, "", TV_CLR_KNOBS, 0x00606000, 0},
{W, 1, "", TV_CLR_LEVEL, 0x010b00e1, 0}, {W, 1, "", TV_CLR_LEVEL, 0x010b00e1, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _DSPBCNTR, 0x58000000, 0}, {R, 1, "", _DSPBCNTR, 0x58000000, 0},
{W, 1, "", _DSPBCNTR, 0x58000000, 0}, {W, 1, "", _DSPBCNTR, 0x58000000, 0},
{R, 1, "", _DSPBADDR, 0x00020000, 0}, {R, 1, "", _DSPBADDR, 0x00020000, 0},
@@ -284,7 +284,7 @@ struct iodef iodefs[] = {
{W, 1, "", _PFA_CTL_1, 0x80000000, 0}, {W, 1, "", _PFA_CTL_1, 0x80000000, 0},
{W, 1, "", _PFA_WIN_POS, 0x00360024, 0}, {W, 1, "", _PFA_WIN_POS, 0x00360024, 0},
{W, 1, "", _PFA_WIN_SZ, 0x02640198, 0}, {W, 1, "", _PFA_WIN_SZ, 0x02640198, 0},
{W, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {W, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{W, 1, "", _DSPBCNTR, 0x58000000, 0}, {W, 1, "", _DSPBCNTR, 0x58000000, 0},
{R, 1, "", _DSPBADDR, 0x00020000, 0}, {R, 1, "", _DSPBADDR, 0x00020000, 0},
{W, 1, "", _DSPBADDR, 0x00020000, 0}, {W, 1, "", _DSPBADDR, 0x00020000, 0},
@@ -497,26 +497,26 @@ struct iodef iodefs[] = {
{R, 1, "", TV_DAC, 0x70000000, 0}, {R, 1, "", TV_DAC, 0x70000000, 0},
{W, 1, "", TV_DAC, 0x00000000, 0}, {W, 1, "", TV_DAC, 0x00000000, 0},
{W, 1, "", TV_CTL, 0x000c0000, 0}, {W, 1, "", TV_CTL, 0x000c0000, 0},
{R, 2, "", DSPARB, ( DSPARB_CSTART_SHIFT &0x4)|0x00001d9c, 0}, {R, 2, "", DSPARB, (DSPARB_CSTART_SHIFT & 0x4) | 0x00001d9c, 0},
{W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK |0x80000000, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80000000, 0},
{W, 1, "", INSTPM+0x20, 0x0001002f, 0}, {W, 1, "", INSTPM+0x20, 0x0001002f, 0},
{W, 1, "", FW_BLC, 0x0101011a, 0}, {W, 1, "", FW_BLC, 0x0101011a, 0},
{W, 1, "", FW_BLC2, 0x00000102, 0}, {W, 1, "", FW_BLC2, 0x00000102, 0},
{W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK |0x80008000, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80008000, 0},
{R, 1, "", PP_CONTROL, 0xabcd0000, 0}, {R, 1, "", PP_CONTROL, 0xabcd0000, 0},
{R, 1, "", LVDS, 0x40000000, 0}, {R, 1, "", LVDS, 0x40000000, 0},
{R, 1, "", _DPLL_A, 0x94020003, 0}, {R, 1, "", _DPLL_A, 0x94020003, 0},
{W, 3, "", _DPLL_A, 0x94020003, 0}, {W, 3, "", _DPLL_A, 0x94020003, 0},
{R, 1, "", _DPLL_A, 0x94020003, 0}, {R, 1, "", _DPLL_A, 0x94020003, 0},
{R, 2, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 2, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _DSPBCNTR, 0x58000000, 0}, {R, 1, "", _DSPBCNTR, 0x58000000, 0},
{W, 1, "", _DSPBCNTR, 0xd8000000, 0}, {W, 1, "", _DSPBCNTR, 0xd8000000, 0},
{R, 1, "", _DSPBADDR, 0x00020000, 0}, {R, 1, "", _DSPBADDR, 0x00020000, 0},
{W, 1, "", _DSPBADDR, 0x00020000, 0}, {W, 1, "", _DSPBADDR, 0x00020000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 2, "", _PIPEASTAT, 0x00000000, 0}, {R, 2, "", _PIPEASTAT, 0x00000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _PALETTE_A, 0x00000000, 0}, {W, 1, "", _PALETTE_A, 0x00000000, 0},
{W, 1, "", _PALETTE_A+0x4, 0x00010101, 0}, {W, 1, "", _PALETTE_A+0x4, 0x00010101, 0},
{W, 1, "", _PALETTE_A+0x8, 0x00020202, 0}, {W, 1, "", _PALETTE_A+0x8, 0x00020202, 0},
@@ -781,96 +781,96 @@ struct iodef iodefs[] = {
{R, 1, "", LVDS, 0x40000000, 0}, {R, 1, "", LVDS, 0x40000000, 0},
{R, 1, "", _FDI_TXB_CTL, 0x00000000, 0}, {R, 1, "", _FDI_TXB_CTL, 0x00000000, 0},
{R, 1, "", TV_CTL, 0x800c0000, 0}, {R, 1, "", TV_CTL, 0x800c0000, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEBCONF, 0x00000000, 0}, {R, 1, "", _PIPEBCONF, 0x00000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 2, "", _PIPEASTAT, 0x00000000, 0}, {R, 2, "", _PIPEASTAT, 0x00000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 1, "", TV_DAC, 0x70000000, 0}, {R, 1, "", TV_DAC, 0x70000000, 0},
{R, 1, "", TV_CTL, 0x800c0000, 0}, {R, 1, "", TV_CTL, 0x800c0000, 0},
{W, 1, "", TV_CTL, 0x000c0007, 0}, {W, 1, "", TV_CTL, 0x000c0007, 0},
{W, 1, "", TV_DAC, 0x0f0000aa, 0}, {W, 1, "", TV_DAC, 0x0f0000aa, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 2, "", _PIPEASTAT, 0x00000000, 0}, {R, 2, "", _PIPEASTAT, 0x00000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 1, "", TV_DAC, 0x7f0000aa, 0}, {R, 1, "", TV_DAC, 0x7f0000aa, 0},
{W, 1, "", TV_DAC, 0x70000000, 0}, {W, 1, "", TV_DAC, 0x70000000, 0},
{W, 1, "", TV_CTL, 0x800c0000, 0}, {W, 1, "", TV_CTL, 0x800c0000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 4, "", _PIPEASTAT, 0x00000000, 0}, {R, 4, "", _PIPEASTAT, 0x00000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 1, "", TV_CTL, 0x800c0000, 0}, {R, 1, "", TV_CTL, 0x800c0000, 0},
{W, 1, "", TV_CTL, 0x000c0000, 0}, {W, 1, "", TV_CTL, 0x000c0000, 0},
{W, 1, "", INSTPM, 0x08000800, 0}, {W, 1, "", INSTPM, 0x08000800, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x62029b1b, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x62029b1b, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6217572c, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6217572c, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x63156af7, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x63156af7, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x64137fac, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x64137fac, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6510b8c6, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6510b8c6, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6607c3b5, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6607c3b5, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x661c804f, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x661c804f, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x671a949c, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x671a949c, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6818a96d, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6818a96d, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6915e1d1, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6915e1d1, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6a0cec77, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6a0cec77, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6b04d273, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6b04d273, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6c02e710, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6c02e710, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _VTOTAL_A, 0x044f03ff, 0}, {R, 1, "", _VTOTAL_A, 0x044f03ff, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6d00fb0c, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6d00fb0c, 0},
{R, 1, "", _HTOTAL_A, 0x06af04ff, 0}, {R, 1, "", _HTOTAL_A, 0x06af04ff, 0},
{R, 1, "", _VBLANK_A, 0x044f03ff, 0}, {R, 1, "", _VBLANK_A, 0x044f03ff, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
{R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6d1b0b04, 0}, {R, 1, "", _PIPEA_FLIPCOUNT_GM45, 0x6d1b0b04, 0},
{R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0}, {R, 1, "", _PIPEA_FRMCOUNT_GM45, 0x00000000, 0},
@@ -878,20 +878,20 @@ struct iodef iodefs[] = {
{W, 1, "", _DSPBCNTR, 0x58000000, 0}, {W, 1, "", _DSPBCNTR, 0x58000000, 0},
{R, 1, "", _DSPBADDR, 0x00020000, 0}, {R, 1, "", _DSPBADDR, 0x00020000, 0},
{W, 1, "", _DSPBADDR, 0x00020000, 0}, {W, 1, "", _DSPBADDR, 0x00020000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {W, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 2, "", _PIPEASTAT, 0x00000000, 0}, {R, 2, "", _PIPEASTAT, 0x00000000, 0},
{R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS |0x00000203, 0}, {R, 1, "", _PIPEASTAT, PIPE_VSYNC_INTERRUPT_STATUS | PIPE_VBLANK_INTERRUPT_STATUS | PIPE_OVERLAY_UPDATED_STATUS | 0x00000203, 0},
{R, 1, "", _DSPACNTR, 0x00000000, 0}, {R, 1, "", _DSPACNTR, 0x00000000, 0},
{R, 1, "", _DSPBCNTR, 0x58000000, 0}, {R, 1, "", _DSPBCNTR, 0x58000000, 0},
{R, 1, "", _PIPEACONF, PIPECONF_ENABLE |0x80000000, 0}, {R, 1, "", _PIPEACONF, PIPECONF_ENABLE | 0x80000000, 0},
{W, 1, "", _PIPEACONF, 0x00000000, 0}, {W, 1, "", _PIPEACONF, 0x00000000, 0},
{R, 2, "", _PIPEADSL, 0x000003ff, 0}, {R, 2, "", _PIPEADSL, 0x000003ff, 0},
{R, 1, "", _PIPEACONF, 0x00000000, 0}, {R, 1, "", _PIPEACONF, 0x00000000, 0},
{R, 1, "", _DPLL_A, 0x94020003, 0}, {R, 1, "", _DPLL_A, 0x94020003, 0},
{W, 1, "", _DPLL_A, 0x14020003, 0}, {W, 1, "", _DPLL_A, 0x14020003, 0},
{R, 2, "", DSPARB, ( DSPARB_CSTART_SHIFT &0x4)|0x00001d9c, 0}, {R, 2, "", DSPARB, (DSPARB_CSTART_SHIFT & 0x4) | 0x00001d9c, 0},
{W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK |0x80000000, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80000000, 0},
{W, 1, "", FW_BLC, 0x011d011a, 0}, {W, 1, "", FW_BLC, 0x011d011a, 0},
{W, 1, "", FW_BLC2, 0x00000102, 0}, {W, 1, "", FW_BLC2, 0x00000102, 0},
{R, 1, "", _DSPBCNTR, 0x58000000, 0}, {R, 1, "", _DSPBCNTR, 0x58000000, 0},
@@ -908,11 +908,11 @@ struct iodef iodefs[] = {
{R, 1, "", _PIPEBCONF, 0x00000000, 0}, {R, 1, "", _PIPEBCONF, 0x00000000, 0},
{R, 2, "", LVDS, 0x40000000, 0}, {R, 2, "", LVDS, 0x40000000, 0},
{W, 1, "", _FPB0, 0x00020e09, 0}, {W, 1, "", _FPB0, 0x00020e09, 0},
{W, 1, "", _FPB1, FP_M1_DIV_SHIFT | DPLLA_INPUT_BUFFER_ENABLE | VF_UNIT_CLOCK_GATE_DISABLE |0x00020e09, 0}, {W, 1, "", _FPB1, FP_M1_DIV_SHIFT | DPLLA_INPUT_BUFFER_ENABLE | VF_UNIT_CLOCK_GATE_DISABLE | 0x00020e09, 0},
{W, 1, "", _DPLL_B, DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS |0x18046000, 0}, {W, 1, "", _DPLL_B, DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS | 0x18046000, 0},
{R, 1, "", LVDS, 0x40000000, 0}, {R, 1, "", LVDS, 0x40000000, 0},
{W, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 |0xc0300300, 0}, {W, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 | 0xc0300300, 0},
{W, 2, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS |0x98046000, 0}, {W, 2, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS | 0x98046000, 0},
{R, 1, "", _PIPEBCONF, 0x00000000, 0}, {R, 1, "", _PIPEBCONF, 0x00000000, 0},
{W, 1, "", _HTOTAL_B, 0x053f03ff, 0}, {W, 1, "", _HTOTAL_B, 0x053f03ff, 0},
{W, 1, "", _HBLANK_B, 0x053f03ff, 0}, {W, 1, "", _HBLANK_B, 0x053f03ff, 0},
@@ -924,7 +924,7 @@ struct iodef iodefs[] = {
{W, 1, "", _DSPASIZE, 0x02ff03ff, 0}, {W, 1, "", _DSPASIZE, 0x02ff03ff, 0},
{W, 1, "", _DSPASTRIDE+0x4, 0x00000000, 0}, {W, 1, "", _DSPASTRIDE+0x4, 0x00000000, 0},
{W, 1, "", _PIPEBCONF, 0x00000000, 0}, {W, 1, "", _PIPEBCONF, 0x00000000, 0},
{R, 1, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS |0x98046000, 0}, {R, 1, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS | 0x98046000, 0},
{R, 1, "", _PIPEBCONF, 0x00000000, 0}, {R, 1, "", _PIPEBCONF, 0x00000000, 0},
{W, 1, "", _PIPEBCONF, 0x80000000, 0}, {W, 1, "", _PIPEBCONF, 0x80000000, 0},
{R, 1, "", _PIPEBSTAT, 0x00000040, 0}, {R, 1, "", _PIPEBSTAT, 0x00000040, 0},
@@ -939,21 +939,21 @@ struct iodef iodefs[] = {
{W, 1, "", _DSPACNTR, 0x59000000, 0}, {W, 1, "", _DSPACNTR, 0x59000000, 0},
{W, 1, "", _DSPASTRIDE, 0x00001000, 0}, {W, 1, "", _DSPASTRIDE, 0x00001000, 0},
{W, 1, "", _DSPAADDR, 0x00020000, 0}, {W, 1, "", _DSPAADDR, 0x00020000, 0},
{R, 2, "", DSPARB, ( DSPARB_CSTART_SHIFT &0x4)|0x00001d9c, 0}, {R, 2, "", DSPARB, (DSPARB_CSTART_SHIFT & 0x4) | 0x00001d9c, 0},
{W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK |0x80000000, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80000000, 0},
{W, 1, "", FW_BLC, 0x011d011a, 0}, {W, 1, "", FW_BLC, 0x011d011a, 0},
{W, 1, "", FW_BLC2, 0x00000102, 0}, {W, 1, "", FW_BLC2, 0x00000102, 0},
{R, 2, "", DSPARB, ( DSPARB_CSTART_SHIFT &0x4)|0x00001d9c, 0}, {R, 2, "", DSPARB, (DSPARB_CSTART_SHIFT & 0x4) | 0x00001d9c, 0},
{W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK |0x80000000, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80000000, 0},
{W, 1, "", INSTPM+0x20, 0x0001003f, 0}, {W, 1, "", INSTPM+0x20, 0x0001003f, 0},
{W, 1, "", FW_BLC, 0x011d0109, 0}, {W, 1, "", FW_BLC, 0x011d0109, 0},
{W, 1, "", FW_BLC2, 0x00000102, 0}, {W, 1, "", FW_BLC2, 0x00000102, 0},
{W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK |0x80008000, 0}, {W, 1, "", INSTPM+0x20, FW_BLC_SELF_EN_MASK | 0x80008000, 0},
{R, 1, "", PP_CONTROL, 0xabcd0000, 0}, {R, 1, "", PP_CONTROL, 0xabcd0000, 0},
{R, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 |0xc0300300, 0}, {R, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 | 0xc0300300, 0},
{R, 1, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS |0x98046000, 0}, {R, 1, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS | 0x98046000, 0},
{W, 3, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS |0x98046000, 0}, {W, 3, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS | 0x98046000, 0},
{R, 1, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS |0x98046000, 0}, {R, 1, "", _DPLL_B, DPLL_VCO_ENABLE | DPLL_VGA_MODE_DIS | DPLLB_MODE_LVDS | 0x98046000, 0},
{R, 2, "", _PIPEBCONF, 0x80000000, 0}, {R, 2, "", _PIPEBCONF, 0x80000000, 0},
{R, 1, "", _DSPACNTR, 0x59000000, 0}, {R, 1, "", _DSPACNTR, 0x59000000, 0},
{W, 1, "", _DSPACNTR, 0xd9000000, 0}, {W, 1, "", _DSPACNTR, 0xd9000000, 0},
@@ -1219,22 +1219,22 @@ struct iodef iodefs[] = {
{W, 1, "", 0xabf4, 0x00fdfdfd, 0}, {W, 1, "", 0xabf4, 0x00fdfdfd, 0},
{W, 1, "", 0xabf8, 0x00fefefe, 0}, {W, 1, "", 0xabf8, 0x00fefefe, 0},
{W, 1, "", 0xabfc, 0x00ffffff, 0}, {W, 1, "", 0xabfc, 0x00ffffff, 0},
{R, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 |0xc0300300, 0}, {R, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 | 0xc0300300, 0},
{W, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 |0xc0300300, 0}, {W, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 | 0xc0300300, 0},
{W, 1, "", PFIT_PGM_RATIOS, 0x00000000, 0}, {W, 1, "", PFIT_PGM_RATIOS, 0x00000000, 0},
{W, 1, "", PFIT_CONTROL, ( PFIT_PIPE_SHIFT &0x8)|0x00000008, 0}, {W, 1, "", PFIT_CONTROL, (PFIT_PIPE_SHIFT & 0x8) | 0x00000008, 0},
{R, 1, "", PP_CONTROL, 0xabcd0000, 0}, {R, 1, "", PP_CONTROL, 0xabcd0000, 0},
{W, 1, "", PP_CONTROL, POWER_TARGET_ON |0xabcd0001, 0}, {W, 1, "", PP_CONTROL, POWER_TARGET_ON | 0xabcd0001, 0},
{R, 1, "", PP_STATUS, PP_READY |( PP_SEQUENCE_SHIFT &0x8)|0x4000000a, 0}, {R, 1, "", PP_STATUS, PP_READY | (PP_SEQUENCE_SHIFT & 0x8) | 0x4000000a, 0},
{R, 1, "", PP_STATUS, PP_ON | PP_READY | PP_SEQUENCE_POWER_UP |( PP_SEQUENCE_SHIFT &0x8)|0xd000000a, 0}, {R, 1, "", PP_STATUS, PP_ON | PP_READY | PP_SEQUENCE_POWER_UP | (PP_SEQUENCE_SHIFT & 0x8) | 0xd000000a, 0},
{R, 1, "", BLC_PWM_CTL, 0x00000000, 0}, {R, 1, "", BLC_PWM_CTL, 0x00000000, 0},
{M, 1, "i915:fixme:max PWM is zero", 0x0, 0x0, 0}, {M, 1, "i915:fixme:max PWM is zero", 0x0, 0x0, 0},
{R, 1, "", BLC_PWM_CTL, 0x00000000, 0}, {R, 1, "", BLC_PWM_CTL, 0x00000000, 0},
{W, 1, "", BLC_PWM_CTL, 0x00000002, 0}, {W, 1, "", BLC_PWM_CTL, 0x00000002, 0},
{R, 2, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 |0xc0300300, 0}, {R, 2, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 | 0xc0300300, 0},
{R, 1, "", _FDI_TXB_CTL, 0x00000000, 0}, {R, 1, "", _FDI_TXB_CTL, 0x00000000, 0},
{R, 1, "", TV_CTL, 0x000c0000, 0}, {R, 1, "", TV_CTL, 0x000c0000, 0},
{R, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 |0xc0300300, 0}, {R, 1, "", LVDS, LVDS_ON | PLL_P1_DIVIDE_BY_TWO | DISPLAY_RATE_SELECT_FPA1 | 0xc0300300, 0},
{R, 1, "", _FDI_TXB_CTL, 0x00000000, 0}, {R, 1, "", _FDI_TXB_CTL, 0x00000000, 0},
{R, 1, "", TV_CTL, 0x000c0000, 0}, {R, 1, "", TV_CTL, 0x000c0000, 0},
{R, 1, "", _PIPEACONF, 0x00000000, 0}, {R, 1, "", _PIPEACONF, 0x00000000, 0},
@@ -2270,4 +2270,4 @@ struct iodef iodefs[] = {
{0,}, {0,},
}; };
int niodefs = sizeof (iodefs) / sizeof (iodefs[0]); int niodefs = sizeof(iodefs) / sizeof(iodefs[0]);

1
src/mainboard/lenovo/x60/i915io.h
View File

@@ -84,4 +84,3 @@ u32 pack_aux(u32 *src, int src_bytes);
void unpack_aux(u32 src, u32 *dst, int dst_bytes); void unpack_aux(u32 src, u32 *dst, int dst_bytes);
int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes, int intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes,
u32 *recv, int recv_size); u32 *recv, int recv_size);

4
src/mainboard/lenovo/x60/intel_dp.c
View File

@@ -140,7 +140,8 @@ intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes,
*/ */
if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) { if (status & DP_AUX_CH_CTL_RECEIVE_ERROR) {
printk(BIOS_SPEW, "[000000.0] [drm:%s], ", __func__); printk(BIOS_SPEW, "[000000.0] [drm:%s], ", __func__);
printk(BIOS_SPEW, "dp_aux_ch receive error status 0x%08x\n", status); printk(BIOS_SPEW,
"dp_aux_ch receive error status 0x%08x\n", status);
return -1; return -1;
} }
@@ -164,4 +165,3 @@ intel_dp_aux_ch(u32 ch_ctl, u32 ch_data, u32 *send, int send_bytes,
return recv_bytes; return recv_bytes;
} }

2
src/northbridge/intel/i945/gma.c
View File

@@ -56,7 +56,7 @@ static void gma_func0_init(struct device *dev)
iobase = dev->resource_list[1].base; iobase = dev->resource_list[1].base;
mmiobase = dev->resource_list[0].base; mmiobase = dev->resource_list[0].base;
physbase = pci_read_config32(dev, 0x5c) & ~0xf; physbase = pci_read_config32(dev, 0x5c) & ~0xf;
graphics_base = dev->resource_list[2].base + 0x20000 ; graphics_base = dev->resource_list[2].base + 0x20000;
int i915lightup(u32 physbase, u32 iobase, u32 mmiobase, u32 gfx); int i915lightup(u32 physbase, u32 iobase, u32 mmiobase, u32 gfx);
i915lightup(physbase, iobase, mmiobase, graphics_base); i915lightup(physbase, iobase, mmiobase, graphics_base);