SeaBIOS October 2012

seabios@seabios.org

27 participants
89 discussions

[PATCH 01/13] geodevga: move framebuffer setup from dc_setup(..) to geodevga_init(..)
by Christian Gmeiner 08 Oct '12

08 Oct '12

Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index 5b42e00..9fab5e9 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -218,22 +218,10 @@ static void dc_setup(void) geode_dc_write(DC_CB_ST_OFFSET, 0x0); geode_dc_write(DC_CURS_ST_OFFSET, 0x0); - /* read fb-bar from pci, then point dc to the fb base */ - u32 fb = GET_GLOBAL(GeodeFB); - if (geode_dc_read(DC_GLIU0_MEM_OFFSET) != fb) - geode_dc_write(DC_GLIU0_MEM_OFFSET, fb); - geode_dc_mask(DC_DISPLAY_CFG, ~DC_CFG_MSK, DC_DISPLAY_CFG_GDEN|DC_DISPLAY_CFG_TRUP); geode_dc_write(DC_GENERAL_CFG, DC_DISPLAY_CFG_VGAE); geode_dc_write(DC_UNLOCK, DC_LOCK_LOCK); - - u32 fb_size = framebuffer_size(); // in byte - dprintf(1, "%d KB of video memory at 0x%08x\n", fb_size / 1024, fb); - - /* update VBE variables */ - SET_VGA(VBE_framebuffer, fb); - SET_VGA(VBE_total_memory, fb_size / 1024 / 64); // number of 64K blocks } /* Setup the vp (video processor) portion of the geodelx @@ -408,6 +396,23 @@ int geodevga_init(void) dprintf(1, "dc addr: 0x%08x\n", GET_GLOBAL(GeodeDC)); dprintf(1, "vp addr: 0x%08x\n", GET_GLOBAL(GeodeVP)); + /* setup framebuffer */ + geode_dc_write(DC_UNLOCK, DC_LOCK_UNLOCK); + + /* read fb-bar from pci, then point dc to the fb base */ + u32 fb = GET_GLOBAL(GeodeFB); + if (geode_dc_read(DC_GLIU0_MEM_OFFSET) != fb) + geode_dc_write(DC_GLIU0_MEM_OFFSET, fb); + + geode_dc_write(DC_UNLOCK, DC_LOCK_LOCK); + + u32 fb_size = framebuffer_size(); // in byte + dprintf(1, "%d KB of video memory at 0x%08x\n", fb_size / 1024, fb); + + /* update VBE variables */ + SET_VGA(VBE_framebuffer, fb); + SET_VGA(VBE_total_memory, fb_size / 1024 / 64); // number of 64K blocks + vp_setup(); dc_setup(); -- 1.7.12.2.421.g261b511

2 14

[PATCH 1/8] Rename defines to better match a well defined naming schema
by Christian Gmeiner 08 Oct '12

08 Oct '12

The following nameing schema is used: PART_REGISTER_BIT_DESCRIPTION Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 8 ++++---- vgasrc/geodevga.h | 18 +++++++++--------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index cf1382d..7d780c2 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -206,8 +206,8 @@ static void dc_setup(void) if (geode_dc_read(DC_GLIU0_MEM_OFFSET) != fb) geode_dc_write(DC_GLIU0_MEM_OFFSET, fb); - geode_dc_mask(DC_DISPLAY_CFG, ~DC_CFG_MSK, DC_GDEN|DC_TRUP); - geode_dc_write(DC_GENERAL_CFG, DC_VGAE); + geode_dc_mask(DC_DISPLAY_CFG, ~DC_CFG_MSK, DC_DISPLAY_CFG_GDEN|DC_DISPLAY_CFG_TRUP); + geode_dc_write(DC_GENERAL_CFG, DC_DISPLAY_CFG_VGAE); geode_dc_write(DC_UNLOCK, DC_LOCK_LOCK); @@ -241,13 +241,13 @@ static void vp_setup(void) u32 reg = geode_vp_read(VP_MISC); dprintf(1,"VP_SETUP VP_MISC=0x%08x\n",reg); - geode_vp_write(VP_MISC, VP_BYP_BOTH); + geode_vp_write(VP_MISC, VP_DCFG_BYP_BOTH); reg = geode_vp_read(VP_MISC); dprintf(1,"VP_SETUP VP_MISC=0x%08x\n",reg); reg = geode_vp_read(VP_DCFG); dprintf(1,"VP_SETUP VP_DCFG=0x%08x\n",reg); - geode_vp_mask(VP_DCFG, 0, VP_CRT_EN|VP_HSYNC_EN|VP_VSYNC_EN|VP_DAC_BL_EN|VP_CRT_SKEW); + geode_vp_mask(VP_DCFG, 0, VP_DCFG_CRT_EN|VP_DCFG_HSYNC_EN|VP_DCFG_VSYNC_EN|VP_DCFG_DAC_BL_EN|VP_DCFG_CRT_SKEW); reg = geode_vp_read(VP_DCFG); dprintf(1,"VP_SETUP VP_DCFG=0x%08x\n",reg); } diff --git a/vgasrc/geodevga.h b/vgasrc/geodevga.h index 14e33d6..0fc8cfe 100644 --- a/vgasrc/geodevga.h +++ b/vgasrc/geodevga.h @@ -49,17 +49,17 @@ /* DC bits */ -#define DC_VGAE (1 << 7) -#define DC_GDEN (1 << 3) -#define DC_TRUP (1 << 6) +#define DC_DISPLAY_CFG_VGAE (1 << 7) +#define DC_DISPLAY_CFG_GDEN (1 << 3) +#define DC_DISPLAY_CFG_TRUP (1 << 6) /* VP bits */ -#define VP_CRT_EN (1 << 0) -#define VP_HSYNC_EN (1 << 1) -#define VP_VSYNC_EN (1 << 2) -#define VP_DAC_BL_EN (1 << 3) -#define VP_CRT_SKEW (1 << 16) -#define VP_BYP_BOTH (1 << 0) +#define VP_DCFG_CRT_EN (1 << 0) +#define VP_DCFG_HSYNC_EN (1 << 1) +#define VP_DCFG_VSYNC_EN (1 << 2) +#define VP_DCFG_DAC_BL_EN (1 << 3) +#define VP_DCFG_CRT_SKEW (1 << 16) +#define VP_DCFG_BYP_BOTH (1 << 0) /* Mask */ #define DC_CFG_MSK 0xf000a6 -- 1.7.12.2.421.g261b511

3 12

[PATCH 14/14] geodevga: fix wrong define name
by Christian Gmeiner 05 Oct '12

05 Oct '12

Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 2 +- vgasrc/geodevga.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index 512184e..2b636f3 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -284,7 +284,7 @@ int geodevga_set_mode(struct vgamode_s *vmode_g, int flags) dcfg |= DC_DISPLAY_CFG_GDEN; /* enable graphics */ dcfg |= DC_DISPLAY_CFG_TRUP; /* update working timing registers */ - gcfg |= DC_DISPLAY_CFG_VGAE; /* enable VGA */ + gcfg |= DC_GENERAL_CFG_VGAE; /* enable VGA */ /* write main configuration register */ geode_dc_mask(DC_DISPLAY_CFG, ~DC_CFG_MSK, dcfg); diff --git a/vgasrc/geodevga.h b/vgasrc/geodevga.h index 5ab7119..15880dd 100644 --- a/vgasrc/geodevga.h +++ b/vgasrc/geodevga.h @@ -65,7 +65,7 @@ /* DC bits */ -#define DC_DISPLAY_CFG_VGAE (1 << 7) +#define DC_GENERAL_CFG_VGAE (1 << 7) #define DC_DISPLAY_CFG_GDEN (1 << 3) #define DC_DISPLAY_CFG_TRUP (1 << 6) -- 1.7.12.2.421.g261b511

1 0

[PATCH 0/13] geodevga: VESA support preparations
by Christian Gmeiner 05 Oct '12

05 Oct '12

Hi all, this patch-set sets the cornerstone for VESA support, which should land at the end of next week :) The patches are on top of my previous patch-set. --- Christian Gmeiner, MSc

1 0

Re: [SeaBIOS] VideoBios question
by Kevin O'Connor 04 Oct '12

04 Oct '12

On Wed, Oct 03, 2012 at 04:16:59PM +0200, Christian Gmeiner wrote: > Hi all. > > As you may noticed I am working on the SeaVideoBios (Geode part). And > I am running into > a simple question: > > What is the default state/video mode the VideoBios should enter > during/after init? > > In general I need to set the wanted mode via int10 AH=00h > Would it be okay to have no mode set during init and trust that the > mode is set before > using it? SeaBIOS will always set the mode (to AH=03h) immiediately after initializing the vgabios. I've observed this behaviour in other off the shelf BIOS implementation as well. -Kevin

1 0

Re: [SeaBIOS] VideoBios question
by Peter Stuge 03 Oct '12

03 Oct '12

Christian Gmeiner wrote: > What is the default state/video mode the VideoBios should enter > during/after init? Traditional VGA BIOSes always init mode 3. //Peter

1 0

VideoBios question
by Christian Gmeiner 03 Oct '12

03 Oct '12

Hi all. As you may noticed I am working on the SeaVideoBios (Geode part). And I am running into a simple question: What is the default state/video mode the VideoBios should enter during/after init? In general I need to set the wanted mode via int10 AH=00h Would it be okay to have no mode set during init and trust that the mode is set before using it? thanks --- Christian Gmeiner, MSc

1 0

Re: [SeaBIOS] [PATCH 5/8] Setup output based on .config
by Kevin O'Connor 02 Oct '12

02 Oct '12

On Tue, Oct 02, 2012 at 05:28:04PM +0200, Christian Gmeiner wrote: > 2012/10/2 Kevin O'Connor <kevin(a)koconnor.net>: > > On Mon, Oct 01, 2012 at 02:02:46PM +0200, Christian Gmeiner wrote: > >> The geode hardware can be configured to use different > >> outputs. This patch adds support this feature based on > >> the current .config > > [...] > >> + if (CONFIG_VGA_OUTPUT_PANEL || CONFIG_VGA_OUTPUT_CRT_PANEL) { > > > > This patch seems to use kconfig defines that are only defined in patch > > 6. When sending a multi-series patch, it's important that each > > individual commit compiles and functions properly. > > > > Otherwise, the patch series seems fine to me. > > > > Shall I resend a v2 which corrects this? Nah. If there's no other comments, I can reorder them and add a "geodevga:" prefix when I commit. -Kevin

1 0

[PATCH 5/8] Setup output based on .config
by Christian Gmeiner 01 Oct '12

01 Oct '12

The geode hardware can be configured to use different outputs. This patch adds support this feature based on the current .config Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- vgasrc/geodevga.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/vgasrc/geodevga.c b/vgasrc/geodevga.c index 263ef68..9429856 100644 --- a/vgasrc/geodevga.c +++ b/vgasrc/geodevga.c @@ -244,12 +244,37 @@ static void dc_setup(void) */ static void vp_setup(void) { + u32 msr_addr; + u64 msr; + dprintf(2,"VP_SETUP\n"); + /* set output to crt and RGB/YUV */ if (CONFIG_VGA_GEODEGX2) - geode_msr_mask(VP_MSR_CONFIG_GX2, 0xf8, 0); + msr_addr = VP_MSR_CONFIG_GX2; else - geode_msr_mask(VP_MSR_CONFIG_LX, 0xf8, 0); + msr_addr = VP_MSR_CONFIG_LX; + + /* set output mode (RGB/YUV) */ + msr = geode_msr_read(msr_addr); + msr &= ~VP_MSR_CONFIG_FMT; // mask out FMT (bits 5:3) + + if (CONFIG_VGA_OUTPUT_PANEL || CONFIG_VGA_OUTPUT_CRT_PANEL) { + msr |= VP_MSR_CONFIG_FMT_FP; // flat panel + + if (CONFIG_VGA_OUTPUT_CRT_PANEL) { + msr |= VP_MSR_CONFIG_FPC; // simultaneous Flat Panel and CRT + dprintf(1, "output: simultaneous Flat Panel and CRT\n"); + } else { + msr &= ~VP_MSR_CONFIG_FPC; // no simultaneous Flat Panel and CRT + dprintf(1, "ouput: flat panel\n"); + } + } else { + msr |= VP_MSR_CONFIG_FMT_CRT; // CRT only + dprintf(1, "output: CRT\n"); + } + geode_msr_mask(msr_addr, ~msr, msr); + /* Set mmio registers * there may be some timing issues here, the reads seem -- 1.7.12.2.421.g261b511

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SeaBIOS October 2012