SeaBIOS September 2012

seabios@seabios.org

27 participants
112 discussions

[PATCH 6/4] Make use of geodevga_set_mode()
by Christian Gmeiner 01 Sep '12

01 Sep '12

Make use of geodevga_set_mode(). --- vgasrc/vgahw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vgasrc/vgahw.h b/vgasrc/vgahw.h index 044cd32..43cfaee 100644 --- a/vgasrc/vgahw.h +++ b/vgasrc/vgahw.h @@ -22,6 +22,8 @@ static inline int vgahw_set_mode(struct vgamode_s *vmode_g, int flags) { return clext_set_mode(vmode_g, flags); if (CONFIG_VGA_BOCHS) return bochsvga_set_mode(vmode_g, flags); + if (CONFIG_VGA_GEODELX) + return geodevga_set_mode(vmode_g, flags); return stdvga_set_mode(vmode_g, flags); } -- 1.7.11.rc2.5.g68f532f

1 1

[PATCH 5/4] Add geodevga_set_mode() function
by Christian Gmeiner 01 Sep '12

01 Sep '12

We need to set the DC register visibility before we can call stdvga_set_mode(). Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 41 +++++++++++++++++++++++++++++++++++++++++ vgasrc/geodevga.h | 1 + 2 files changed, 42 insertions(+) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index bff856a..dab2b2a 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -170,6 +170,47 @@ static void dc_unmap(void) dc_map(0); } +/**************************************************************** + * Mode setting + ****************************************************************/ + +int geodevga_set_mode(struct vgamode_s *vmode_g, int flags) +{ + /* we need set the DC register visibility within the standard + * VGA memory space (0xA0000 - 0xBffff). + * + * bit: + * 7:3 RSVD + * 2:1 VG_RG_MAP + * 00: Disabled + * 01: 0xA0000 + * 10: 0xB0000 + * 11: 0xB8000 + * 0 PACK_CH4 + */ + + u8 reg; + + switch (vmode_g->sstart) { + case SEG_GRAPH: + reg = 0x02; + break; + case SEG_MTEXT: + reg = 0x04; + break; + case SEG_CTEXT: + reg = 0x06; + break; + default: + reg = 0x00; + break; + } + + stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_MODE_CONTROL, reg); + + return stdvga_set_mode(vmode_g, flags); +} + /**************************************************************** * Init Functions diff --git a/vgasrc/geodevga.h b/vgasrc/geodevga.h index fd7ce43..86f5d48 100644 --- a/vgasrc/geodevga.h +++ b/vgasrc/geodevga.h @@ -71,5 +71,6 @@ #define DC_CFG_MSK 0xf000a6 int geodevga_init(); +int geodevga_set_mode(struct vgamode_s *vmode_g, int flags); #endif -- 1.7.11.rc2.5.g68f532f

1 1

[PATCH 4/4] Report stdvga modes in VBE via int10 (AX = 4F00h)
by Christian Gmeiner 01 Sep '12

01 Sep '12

Report stdvga modes in VBE via int10 (AX = 4F00h) --- vgasrc/stdvgamodes.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/vgasrc/stdvgamodes.c b/vgasrc/stdvgamodes.c index 5497da8..84846ad 100644 --- a/vgasrc/stdvgamodes.c +++ b/vgasrc/stdvgamodes.c @@ -334,6 +334,16 @@ stdvga_find_mode(int mode) void stdvga_list_modes(u16 seg, u16 *dest, u16 *last) { + int i; + for (i = 0; i < ARRAY_SIZE(vga_modes); i++) { + struct stdvga_mode_s *stdmode_g = &vga_modes[i]; + u16 mode = GET_GLOBAL(stdmode_g->mode); + if (mode == 0xffff) + continue; + SET_FARVAR(seg, *dest, mode); + dest++; + } + SET_FARVAR(seg, *dest, 0xffff); } -- 1.7.11.rc2.5.g68f532f

1 1

[PATCH 3/4] Unlock CRTC access and use Standard VGA IO port
by Christian Gmeiner 01 Sep '12

01 Sep '12

If we unlock CRTC access once we can simply make use of standard VGA IO port access functions. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 38 ++++++-------------------------------- 1 file changed, 6 insertions(+), 32 deletions(-) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index f7fd895..31632e7 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -107,36 +107,6 @@ static int legacyio_check(void) } /**************************************************************** -* Extened CRTC Register functions -****************************************************************/ -static void crtce_lock(void) -{ - stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_REGISTER_LOCK - , CRTCE_LOCK); -} - -static void crtce_unlock(void) -{ - stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_REGISTER_LOCK - , CRTCE_UNLOCK); -} - -static u8 crtce_read(u8 reg) -{ - crtce_unlock(); - u8 val = stdvga_crtc_read(VGAREG_VGA_CRTC_ADDRESS, reg); - crtce_lock(); - return val; -} - -static void crtce_write(u8 reg, u8 val) -{ - crtce_unlock(); - stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, reg, val); - crtce_lock(); -} - -/**************************************************************** * Display Controller Functions ****************************************************************/ static u32 dc_read(u16 seg, u32 reg) @@ -174,7 +144,7 @@ static u16 dc_map(u16 seg) { u8 reg; - reg = crtce_read(EXTENDED_MODE_CONTROL); + reg = stdvga_crtc_read(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_MODE_CONTROL); reg &= 0xf9; switch (seg) { case SEG_GRAPH: @@ -191,7 +161,7 @@ static u16 dc_map(u16 seg) break; } - crtce_write(EXTENDED_MODE_CONTROL,reg); + stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_MODE_CONTROL,reg); return seg; } @@ -366,6 +336,10 @@ int geodevga_init(void) // Device should be at 00:01.1 SET_VGA(VgaBDF, pci_to_bdf(0, 1, 1)); + // unlock crtc so we can use Standard VGA IO port access functions + stdvga_crtc_write(VGAREG_VGA_CRTC_ADDRESS, EXTENDED_REGISTER_LOCK + , CRTCE_UNLOCK); + vp_setup(); dc_setup(); -- 1.7.11.rc2.5.g68f532f

1 1

[PATCH 2/4] Check if we run already and abort if needed.
by Christian Gmeiner 01 Sep '12

01 Sep '12

Every other vbios impl in seabios does this so we should do it too. Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index c634f79..f7fd895 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -345,6 +345,9 @@ int geodevga_init(void) dprintf(1,"GEODEVGA_INIT legacyio_check=0x%x\n",ret); } + if (GET_GLOBAL(HaveRunInit)) + return 0; + // Updated timings from geode datasheets, table 6-53 in particular static u8 *new_crtc[] VAR16 = { geode_crtc_01, geode_crtc_01, geode_crtc_03, geode_crtc_03, -- 1.7.11.rc2.5.g68f532f

1 1

[PATCH 1/4] change return value of dc_setup() and vp_setup() to void
by Christian Gmeiner 01 Sep '12

01 Sep '12

There is no reason to have a return value of type int for dc_setup() and vp_setup() as they return nothing else then 0. Also add missing static to vp_setup(). Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index 5c6caf0..c634f79 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -210,7 +210,7 @@ static void dc_unmap(void) * for features not accessible from the VGA registers, * the dc's pci bar can be mapped to a vga memory segment */ -static int dc_setup(void) +static void dc_setup(void) { u32 fb, dc_fb; u16 seg; @@ -237,8 +237,6 @@ static int dc_setup(void) dc_lock(seg); dc_unmap(); - - return 0; } /* Setup the vp (video processor) portion of the geodelx @@ -247,7 +245,7 @@ static int dc_setup(void) * The High Mem Access virtual register is used to configure the * pci mmio bar from 16bit friendly io space. */ -int vp_setup(void) +static void vp_setup(void) { u32 reg,vp; @@ -277,8 +275,6 @@ int vp_setup(void) geode_memWrite(vp+VP_DCFG, ~0,VP_CRT_EN+VP_HSYNC_EN+VP_VSYNC_EN+VP_DAC_BL_EN+VP_CRT_SKEW); reg = geode_memRead(vp+VP_DCFG); dprintf(1,"VP_SETUP VP_DCFG=0x%08x\n",reg); - - return 0; } static u8 geode_crtc_01[] VAR16 = { @@ -366,8 +362,9 @@ int geodevga_init(void) if (GET_GLOBAL(VgaBDF) < 0) // Device should be at 00:01.1 SET_VGA(VgaBDF, pci_to_bdf(0, 1, 1)); - ret |= vp_setup(); - ret |= dc_setup(); + + vp_setup(); + dc_setup(); return ret; } -- 1.7.11.rc2.5.g68f532f

1 1

[PATCH 1/6] vgasrc: Add skeleton for VBE function 15h (VBE/DDC Standard)
by Hiroshi Miura(＠osmf) 01 Sep '12

01 Sep '12

posted in Wed Mar 7 03:41:06 CET 2012 Signed-off-by: Julian Pidancet <julian.pidancet(a)gmail.com> Signed-off-by: Hiroshi Miura <miurahr(a)linux.com> --- src/vbe.h | 5 +++++ vgasrc/stdvga.c | 11 +++++++++++ vgasrc/stdvga.h | 2 ++ vgasrc/vbe.c | 34 ++++++++++++++++++++++++++++++++++ vgasrc/vgahw.h | 8 ++++++++ 5 files changed, 60 insertions(+)

2 1

[PATCH 2/6] bochsvga: Implement vbe 15h function
by Hiroshi Miura 01 Sep '12

01 Sep '12

Posted Wed Mar 7 03:41:07 CET 2012 This patch adds the ability for the Bochs VGA ROM to return information about a generic SVGA monitor. It uses a hardcoded EDID for now, but we can easily immagine contructing an EDID at run time with the help of some support code. Returning an EDID with decent timings may be necessary in case we want to use a resolution superior to 1024x768 with Xorg. Inspired by this patch I digged out from the vgabios mailing list: http://old.nabble.com/VBE-BIOS-support-for-monitor-information-(EDID)-td229… Untested with Xorg. Signed-off-by: Julian Pidancet <julian.pidancet(a)gmail.com> Signed-off-by: Hiroshi Miura <miurahr(a)linux.com> --- vgasrc/bochsvga.c | 88 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vgasrc/bochsvga.h | 2 ++ vgasrc/vgahw.h | 4 +++ 3 files changed, 94 insertions(+)

1 0

[PATCH 1/6] vgasrc: Add skeleton for VBE function 15h (VBE/DDC Standard)
by Hiroshi Miura 01 Sep '12

01 Sep '12

1 0

[PATCH 6/6] vgabios: bochs support ddc preferred mode
by Hiroshi Miura 01 Sep '12

01 Sep '12

It provide a selection feature of preferred resolution from Bochs DISPI XRES API in bochsvga driver. Signed-off-by: Hiroshi Miura <miurahr(a)linux.com> --- vgasrc/bochsvga.c | 2 ++ 1 file changed, 2 insertions(+)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS September 2012