summaryrefslogtreecommitdiff
path: root/src/mainboard
diff options
context:
space:
mode:
authorVladimir Serbinenko <phcoder@gmail.com>2014-02-15 14:05:29 +0100
committerVladimir Serbinenko <phcoder@gmail.com>2014-02-16 02:01:47 +0100
commit80865c961915dd2ca866c8e59874098a6af3dbcb (patch)
treeebcd0bc641c33104f3da4a7d58b034d10c06120b /src/mainboard
parent7b54ca228e99c4ae86e74c33715cc33fc283d346 (diff)
downloadcoreboot-80865c961915dd2ca866c8e59874098a6af3dbcb.tar.xz
lenovo/x60: Change to common EDID framework.
Currently lenovo/x60 gfx init provides vbe_mode_info_valid in incompatible way. Use EDID framework as do other inits. Change-Id: I887abd5a09064f26f473a2bf9caa2eb33e269c07 Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com> Reviewed-on: http://review.coreboot.org/5238 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com> Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Diffstat (limited to 'src/mainboard')
-rw-r--r--src/mainboard/lenovo/x60/i915.c32
1 files changed, 3 insertions, 29 deletions
diff --git a/src/mainboard/lenovo/x60/i915.c b/src/mainboard/lenovo/x60/i915.c
index b8b2b39027..4870fd83dc 100644
--- a/src/mainboard/lenovo/x60/i915.c
+++ b/src/mainboard/lenovo/x60/i915.c
@@ -177,8 +177,6 @@ static unsigned long globalmicroseconds(void)
extern struct iodef iodefs[];
extern int niodefs;
-static int i915_init_done = 0;
-
/* fill the palette. This runs when the P opcode is hit. */
static void palette(void)
{
@@ -189,32 +187,6 @@ static void palette(void)
io_i915_WRITE32(color, _LGC_PALETTE_A + (i<<2));
}
-int vbe_mode_info_valid(void);
-int vbe_mode_info_valid(void)
-{
- return i915_init_done;
-}
-
-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);
- framebuffer->physical_address = graphics;
- framebuffer->x_resolution = 1024;
- framebuffer->y_resolution = 768;
- framebuffer->bytes_per_line = 4096;
- framebuffer->bits_per_pixel = 32;
- framebuffer->red_mask_pos = 16;
- framebuffer->red_mask_size = 8;
- framebuffer->green_mask_pos = 8;
- framebuffer->green_mask_size = 8;
- framebuffer->blue_mask_pos = 0;
- framebuffer->blue_mask_size = 8;
- framebuffer->reserved_mask_pos = 24;
- framebuffer->reserved_mask_size = 8;
-}
-
static unsigned long times[4096];
static int run(int index)
@@ -394,6 +366,8 @@ int i915lightup(unsigned int pphysbase, unsigned int piobase,
memset((void *)graphics, 0x00, FRAME_BUFFER_BYTES);
printk(BIOS_SPEW, "%ld microseconds\n", globalmicroseconds());
- i915_init_done = 1;
+
+ set_vbe_mode_info_valid(&edid, graphics);
+
return 0;
}