X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=vgasrc%2Fclext.c;h=7d1a604d45fc117acd132ff7460eb54a43414d8d;hb=2469f89528a7da83eb608dfc86fda5fc780b8f92;hp=eaef60af50a109296cba3353605b7cf56dc042a1;hpb=add3becb5d4fa16092c26accd5265cfee7036ac7;p=seabios.git diff --git a/vgasrc/clext.c b/vgasrc/clext.c index eaef60a..7d1a604 100644 --- a/vgasrc/clext.c +++ b/vgasrc/clext.c @@ -10,14 +10,13 @@ #include "biosvar.h" // GET_GLOBAL #include "util.h" // dprintf #include "bregs.h" // struct bregs -#include "vbe.h" // struct vbe_info #include "stdvga.h" // VGAREG_SEQU_ADDRESS #include "pci.h" // pci_config_readl #include "pci_regs.h" // PCI_BASE_ADDRESS_0 /**************************************************************** - * tables + * Cirrus mode tables ****************************************************************/ /* VGA */ @@ -217,7 +216,7 @@ static u16 ccrtc_1600x1200x8[] VAR16 = { }; struct cirrus_mode_s { - u16 mode; + u16 mode, vesamode; struct vgamode_s info; u16 hidden_dac; /* 0x3c6 */ @@ -227,123 +226,177 @@ struct cirrus_mode_s { }; static struct cirrus_mode_s cirrus_modes[] VAR16 = { - {0x5f,{MM_PACKED,640,480,8},0x00, + {0x5f,0x101,{MM_PACKED,640,480,8,8,16,SEG_GRAPH},0x00, cseq_640x480x8,cgraph_svgacolor,ccrtc_640x480x8}, - {0x64,{MM_DIRECT,640,480,16},0xe1, + {0x64,0x111,{MM_DIRECT,640,480,16,8,16,SEG_GRAPH},0xe1, cseq_640x480x16,cgraph_svgacolor,ccrtc_640x480x16}, - {0x66,{MM_DIRECT,640,480,15},0xf0, + {0x66,0x110,{MM_DIRECT,640,480,15,8,16,SEG_GRAPH},0xf0, cseq_640x480x16,cgraph_svgacolor,ccrtc_640x480x16}, - {0x71,{MM_DIRECT,640,480,24},0xe5, + {0x71,0x112,{MM_DIRECT,640,480,24,8,16,SEG_GRAPH},0xe5, cseq_640x480x24,cgraph_svgacolor,ccrtc_640x480x24}, - {0x5c,{MM_PACKED,800,600,8},0x00, + {0x5c,0x103,{MM_PACKED,800,600,8,8,16,SEG_GRAPH},0x00, cseq_800x600x8,cgraph_svgacolor,ccrtc_800x600x8}, - {0x65,{MM_DIRECT,800,600,16},0xe1, + {0x65,0x114,{MM_DIRECT,800,600,16,8,16,SEG_GRAPH},0xe1, cseq_800x600x16,cgraph_svgacolor,ccrtc_800x600x16}, - {0x67,{MM_DIRECT,800,600,15},0xf0, + {0x67,0x113,{MM_DIRECT,800,600,15,8,16,SEG_GRAPH},0xf0, cseq_800x600x16,cgraph_svgacolor,ccrtc_800x600x16}, - {0x60,{MM_PACKED,1024,768,8},0x00, + {0x60,0x105,{MM_PACKED,1024,768,8,8,16,SEG_GRAPH},0x00, cseq_1024x768x8,cgraph_svgacolor,ccrtc_1024x768x8}, - {0x74,{MM_DIRECT,1024,768,16},0xe1, + {0x74,0x117,{MM_DIRECT,1024,768,16,8,16,SEG_GRAPH},0xe1, cseq_1024x768x16,cgraph_svgacolor,ccrtc_1024x768x16}, - {0x68,{MM_DIRECT,1024,768,15},0xf0, + {0x68,0x116,{MM_DIRECT,1024,768,15,8,16,SEG_GRAPH},0xf0, cseq_1024x768x16,cgraph_svgacolor,ccrtc_1024x768x16}, - {0x78,{MM_DIRECT,800,600,24},0xe5, + {0x78,0x115,{MM_DIRECT,800,600,24,8,16,SEG_GRAPH},0xe5, cseq_800x600x24,cgraph_svgacolor,ccrtc_800x600x24}, - {0x79,{MM_DIRECT,1024,768,24},0xe5, + {0x79,0x118,{MM_DIRECT,1024,768,24,8,16,SEG_GRAPH},0xe5, cseq_1024x768x24,cgraph_svgacolor,ccrtc_1024x768x24}, - {0x6d,{MM_PACKED,1280,1024,8},0x00, + {0x6d,0x107,{MM_PACKED,1280,1024,8,8,16,SEG_GRAPH},0x00, cseq_1280x1024x8,cgraph_svgacolor,ccrtc_1280x1024x8}, - {0x69,{MM_DIRECT,1280,1024,15},0xf0, + {0x69,0x119,{MM_DIRECT,1280,1024,15,8,16,SEG_GRAPH},0xf0, cseq_1280x1024x16,cgraph_svgacolor,ccrtc_1280x1024x16}, - {0x75,{MM_DIRECT,1280,1024,16},0xe1, + {0x75,0x11a,{MM_DIRECT,1280,1024,16,8,16,SEG_GRAPH},0xe1, cseq_1280x1024x16,cgraph_svgacolor,ccrtc_1280x1024x16}, - {0x7b,{MM_PACKED,1600,1200,8},0x00, + {0x7b,0xffff,{MM_PACKED,1600,1200,8,8,16,SEG_GRAPH},0x00, cseq_1600x1200x8,cgraph_svgacolor,ccrtc_1600x1200x8}, }; static struct cirrus_mode_s mode_switchback VAR16 = - {0xfe,{0xff},0,cseq_vga,cgraph_vga,ccrtc_vga}; - -static struct { - u16 vesamode, mode; -} cirrus_vesa_modelist[] VAR16 = { - // 640x480x8 - { 0x101, 0x5f }, - // 640x480x15 - { 0x110, 0x66 }, - // 640x480x16 - { 0x111, 0x64 }, - // 640x480x24 - { 0x112, 0x71 }, - // 800x600x8 - { 0x103, 0x5c }, - // 800x600x15 - { 0x113, 0x67 }, - // 800x600x16 - { 0x114, 0x65 }, - // 800x600x24 - { 0x115, 0x78 }, - // 1024x768x8 - { 0x105, 0x60 }, - // 1024x768x15 - { 0x116, 0x68 }, - // 1024x768x16 - { 0x117, 0x74 }, - // 1024x768x24 - { 0x118, 0x79 }, - // 1280x1024x8 - { 0x107, 0x6d }, - // 1280x1024x15 - { 0x119, 0x69 }, - // 1280x1024x16 - { 0x11a, 0x75 }, -}; + {0xfe,0xffff,{0xff},0,cseq_vga,cgraph_vga,ccrtc_vga}; + +int +is_cirrus_mode(struct vgamode_s *vmode_g) +{ + return (vmode_g >= &cirrus_modes[0].info + && vmode_g <= &cirrus_modes[ARRAY_SIZE(cirrus_modes)-1].info); +} + +struct vgamode_s * +clext_find_mode(int mode) +{ + struct cirrus_mode_s *table_g = cirrus_modes; + while (table_g < &cirrus_modes[ARRAY_SIZE(cirrus_modes)]) { + if (GET_GLOBAL(table_g->mode) == mode + || GET_GLOBAL(table_g->vesamode) == mode) + return &table_g->info; + table_g++; + } + return stdvga_find_mode(mode); +} + +void +clext_list_modes(u16 seg, u16 *dest, u16 *last) +{ + int i; + for (i=0; i= 0x100) + return -1; + stdvga_grdc_write(window + 9, val); return 0; } -static struct cirrus_mode_s * -cirrus_get_modeentry(int mode) +int +clext_get_linelength(struct vgamode_s *vmode_g) { - int transmode = cirrus_vesamode_to_mode(mode); - if (transmode) - mode = transmode; - struct cirrus_mode_s *table_g = cirrus_modes; - while (table_g < &cirrus_modes[ARRAY_SIZE(cirrus_modes)]) { - u16 tmode = GET_GLOBAL(table_g->mode); - if (tmode == mode) - return table_g; - table_g++; - } - return NULL; + u16 crtc_addr = stdvga_get_crtc(); + u8 reg13 = stdvga_crtc_read(crtc_addr, 0x13); + u8 reg1b = stdvga_crtc_read(crtc_addr, 0x1b); + return (((reg1b & 0x10) << 4) + reg13) * stdvga_bpp_factor(vmode_g) * 2; } -struct vgamode_s * -clext_find_mode(int mode) +int +clext_set_linelength(struct vgamode_s *vmode_g, int val) { - struct cirrus_mode_s *table_g = cirrus_get_modeentry(mode); - if (table_g) - return &table_g->info; - return stdvga_find_mode(mode); + u16 crtc_addr = stdvga_get_crtc(); + int factor = stdvga_bpp_factor(vmode_g) * 2; + int new_line_offset = DIV_ROUND_UP(val, factor); + stdvga_crtc_write(crtc_addr, 0x13, new_line_offset); + stdvga_crtc_mask(crtc_addr, 0x1b, 0x10, (new_line_offset & 0x100) >> 4); + return 0; } +int +clext_get_displaystart(struct vgamode_s *vmode_g) +{ + u16 crtc_addr = stdvga_get_crtc(); + u8 b2 = stdvga_crtc_read(crtc_addr, 0x0c); + u8 b1 = stdvga_crtc_read(crtc_addr, 0x0d); + u8 b3 = stdvga_crtc_read(crtc_addr, 0x1b); + u8 b4 = stdvga_crtc_read(crtc_addr, 0x1d); + int val = (b1 | (b2<<8) | ((b3 & 0x01) << 16) | ((b3 & 0x0c) << 15) + | ((b4 & 0x80) << 12)); + return val * stdvga_bpp_factor(vmode_g); +} + +int +clext_set_displaystart(struct vgamode_s *vmode_g, int val) +{ + u16 crtc_addr = stdvga_get_crtc(); + val /= stdvga_bpp_factor(vmode_g); + stdvga_crtc_write(crtc_addr, 0x0d, val); + stdvga_crtc_write(crtc_addr, 0x0c, val >> 8); + stdvga_crtc_mask(crtc_addr, 0x1d, 0x80, (val & 0x0800) >> 4); + stdvga_crtc_mask(crtc_addr, 0x1b, 0x0d + , ((val & 0x0100) >> 8) | ((val & 0x0600) >> 7)); + return 0; +} + +int +clext_size_state(int states) +{ + if (states & 8) + return -1; + return stdvga_size_state(states); +} + +int +clext_save_state(u16 seg, void *data, int states) +{ + if (states & 8) + return -1; + return stdvga_save_state(seg, data, states); +} + +int +clext_restore_state(u16 seg, void *data, int states) +{ + if (states & 8) + return -1; + return stdvga_restore_state(seg, data, states); +} + + +/**************************************************************** + * Mode setting + ****************************************************************/ + static void cirrus_switch_mode_setregs(u16 *data, u16 port) { @@ -382,18 +435,6 @@ cirrus_switch_mode(struct cirrus_mode_s *table) stdvga_attr_mask(0x10, 0x01, on); } -static u8 -cirrus_get_memsize(void) -{ - // get DRAM band width - u8 v = stdvga_sequ_read(0x0f); - u8 x = (v >> 3) & 0x03; - if (x == 0x03 && v & 0x80) - // 4MB - return 0x40; - return 0x04 << x; -} - static void cirrus_enable_16k_granularity(void) { @@ -401,44 +442,34 @@ cirrus_enable_16k_granularity(void) } static void -cirrus_clear_vram(u16 param) +cirrus_clear_vram(void) { cirrus_enable_16k_granularity(); - u8 count = cirrus_get_memsize() * 4; + u8 count = GET_GLOBAL(VBE_total_memory) / (16 * 1024); u8 i; for (i=0; ial = cirrus_get_memsize(); + regs->al = GET_GLOBAL(VBE_total_memory) / (64*1024); } static void @@ -500,7 +531,7 @@ ASM16( static void clext_1012a0(struct bregs *regs) { - struct cirrus_mode_s *table_g = cirrus_get_modeentry(regs->al & 0x7f); + struct vgamode_s *table_g = clext_find_mode(regs->al & 0x7f); regs->ah = (table_g ? 1 : 0); regs->si = 0xffff; regs->di = regs->ds = regs->es = regs->bx = (u32)a0h_callback; @@ -549,181 +580,28 @@ clext_1012(struct bregs *regs) /**************************************************************** - * vesa calls + * init ****************************************************************/ -void -clext_list_modes(u16 seg, u16 *dest, u16 *last) +static int +cirrus_check(void) { - int i; - for (i=0; i>= 1; - if (v != 0x04) - v++; - return v; -} - -static void -cirrus_set_line_offset(u16 new_line_offset) -{ - new_line_offset /= 8; - u16 crtc_addr = stdvga_get_crtc(); - stdvga_crtc_write(crtc_addr, 0x13, new_line_offset); - stdvga_crtc_mask(crtc_addr, 0x1b, 0x10, (new_line_offset & 0x100) >> 4); -} - -static u16 -cirrus_get_line_offset(void) -{ - u16 crtc_addr = stdvga_get_crtc(); - u8 reg13 = stdvga_crtc_read(crtc_addr, 0x13); - u8 reg1b = stdvga_crtc_read(crtc_addr, 0x1b); - return (((reg1b & 0x10) << 4) + reg13) * 8; -} - -static void -cirrus_set_start_addr(u32 addr) -{ - u16 crtc_addr = stdvga_get_crtc(); - stdvga_crtc_write(crtc_addr, 0x0d, addr); - stdvga_crtc_write(crtc_addr, 0x0c, addr >> 8); - stdvga_crtc_mask(crtc_addr, 0x1d, 0x80, (addr & 0x0800) >> 4); - stdvga_crtc_mask(crtc_addr, 0x1b, 0x0d - , ((addr & 0x0100) >> 8) | ((addr & 0x0600) >> 7)); -} - -static u32 -cirrus_get_start_addr(void) -{ - u16 crtc_addr = stdvga_get_crtc(); - u8 b2 = stdvga_crtc_read(crtc_addr, 0x0c); - u8 b1 = stdvga_crtc_read(crtc_addr, 0x0d); - u8 b3 = stdvga_crtc_read(crtc_addr, 0x1b); - u8 b4 = stdvga_crtc_read(crtc_addr, 0x1d); - return (b1 | (b2<<8) | ((b3 & 0x01) << 16) | ((b3 & 0x0c) << 15) - | ((b4 & 0x80) << 12)); -} - -static void -cirrus_vesa_05h(struct bregs *regs) -{ - if (regs->bl > 1) - goto fail; - if (regs->bh == 0) { - // set mempage - if (regs->dx >= 0x100) - goto fail; - stdvga_grdc_write(regs->bl + 9, regs->dx); - } else if (regs->bh == 1) { - // get mempage - regs->dx = stdvga_grdc_read(regs->bl + 9); - } else - goto fail; - - regs->ax = 0x004f; - return; -fail: - regs->ax = 0x014f; -} - -static void -cirrus_vesa_06h(struct bregs *regs) -{ - if (regs->bl > 2) { - regs->ax = 0x0100; - return; - } - - if (regs->bl == 0x00) { - cirrus_set_line_offset(cirrus_get_bpp_bytes() * regs->cx); - } else if (regs->bl == 0x02) { - cirrus_set_line_offset(regs->cx); - } - - u32 v = cirrus_get_line_offset(); - regs->cx = v / cirrus_get_bpp_bytes(); - regs->bx = v; - regs->dx = (cirrus_get_memsize() * 64 * 1024) / v; - regs->ax = 0x004f; -} - -static void -cirrus_vesa_07h(struct bregs *regs) -{ - if (regs->bl == 0x80 || regs->bl == 0x00) { - u32 addr = (cirrus_get_bpp_bytes() * regs->cx - + cirrus_get_line_offset() * regs->dx); - cirrus_set_start_addr(addr / 4); - } else if (regs->bl == 0x01) { - u32 addr = cirrus_get_start_addr() * 4; - u32 linelength = cirrus_get_line_offset(); - regs->dx = addr / linelength; - regs->cx = (addr % linelength) / cirrus_get_bpp_bytes(); - } else { - regs->ax = 0x0100; - return; - } - - regs->ax = 0x004f; -} - -static void -cirrus_vesa_10h(struct bregs *regs) -{ - if (regs->bl == 0x00) { - regs->bx = 0x0f30; - regs->ax = 0x004f; - return; - } - if (regs->bl == 0x01) { - SET_BDA(vbe_flag, regs->bh); - regs->ax = 0x004f; - return; - } - if (regs->bl == 0x02) { - regs->bh = GET_BDA(vbe_flag); - regs->ax = 0x004f; - return; - } - regs->ax = 0x014f; -} - -static void -cirrus_vesa_not_handled(struct bregs *regs) -{ - debug_stub(regs); - regs->ax = 0x014f; -} - -void -cirrus_vesa(struct bregs *regs) +cirrus_get_memsize(void) { - switch (regs->al) { - case 0x05: cirrus_vesa_05h(regs); break; - case 0x06: cirrus_vesa_06h(regs); break; - case 0x07: cirrus_vesa_07h(regs); break; - case 0x10: cirrus_vesa_10h(regs); break; - default: cirrus_vesa_not_handled(regs); break; - } + // get DRAM band width + u8 v = stdvga_sequ_read(0x0f); + u8 x = (v >> 3) & 0x03; + if (x == 0x03 && v & 0x80) + // 4MB + return 0x40; + return 0x04 << x; } - -/**************************************************************** - * init - ****************************************************************/ - int clext_init(void) { @@ -736,16 +614,6 @@ clext_init(void) return -1; dprintf(1, "cirrus init 2\n"); - SET_VGA(VBE_enabled, 1); - u32 lfb_addr = 0; - if (CONFIG_VGA_PCI) - lfb_addr = (pci_config_readl(GET_GLOBAL(VgaBDF), PCI_BASE_ADDRESS_0) - & PCI_BASE_ADDRESS_MEM_MASK); - SET_VGA(VBE_framebuffer, lfb_addr); - u16 totalmem = cirrus_get_memsize(); - SET_VGA(VBE_total_memory, totalmem * 64 * 1024); - SET_VGA(VBE_win_granularity, 16); - // memory setup stdvga_sequ_write(0x0a, stdvga_sequ_read(0x0f) & 0x18); // set vga mode @@ -754,5 +622,18 @@ clext_init(void) stdvga_grdc_write(0x31, 0x04); stdvga_grdc_write(0x31, 0x00); + if (GET_GLOBAL(HaveRunInit)) + return 0; + + u32 lfb_addr = 0; + int bdf = GET_GLOBAL(VgaBDF); + if (CONFIG_VGA_PCI && bdf >= 0) + lfb_addr = (pci_config_readl(bdf, PCI_BASE_ADDRESS_0) + & PCI_BASE_ADDRESS_MEM_MASK); + SET_VGA(VBE_framebuffer, lfb_addr); + u16 totalmem = cirrus_get_memsize(); + SET_VGA(VBE_total_memory, totalmem * 64 * 1024); + SET_VGA(VBE_win_granularity, 16); + return 0; }