GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
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,7 +122,8 @@ 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;
@ -150,7 +147,7 @@ int gtt_setup(unsigned int mmiobase)
/* 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,10 +185,9 @@ 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);
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;
@ -231,7 +228,8 @@ static int run(int index)
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:
@ -246,10 +244,11 @@ static int run(int index)
/* 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);
@ -262,11 +261,15 @@ static int run(int index)
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;
@ -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,13 +315,14 @@ 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);
@ -335,7 +340,8 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
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);

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;
} }