diff options
| -rw-r--r-- | lib/Makefile | 1 | ||||
| -rw-r--r-- | share/man/man4/Makefile | 2 | ||||
| -rw-r--r-- | share/man/man4/dpms.4 (renamed from share/man/man4/man4.i386/dpms.4) | 0 | ||||
| -rw-r--r-- | sys/amd64/conf/NOTES | 6 | ||||
| -rw-r--r-- | sys/conf/files.amd64 | 3 | ||||
| -rw-r--r-- | sys/conf/files.i386 | 6 | ||||
| -rw-r--r-- | sys/conf/options.amd64 | 3 | ||||
| -rw-r--r-- | sys/dev/dpms/dpms.c | 106 | ||||
| -rw-r--r-- | sys/dev/fb/s3_pci.c | 2 | ||||
| -rw-r--r-- | sys/dev/fb/vesa.c | 530 | ||||
| -rw-r--r-- | sys/dev/fb/vesa.h | 8 | ||||
| -rw-r--r-- | sys/dev/fb/vga.c | 2 | ||||
| -rw-r--r-- | sys/dev/syscons/scvesactl.c | 2 | ||||
| -rw-r--r-- | sys/i386/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/i386/include/pc/vesa.h | 120 | ||||
| -rw-r--r-- | sys/i386/isa/dpms.c | 230 | ||||
| -rw-r--r-- | sys/i386/isa/vesa.c | 1696 | ||||
| -rw-r--r-- | sys/modules/Makefile | 3 | ||||
| -rw-r--r-- | sys/modules/dpms/Makefile | 8 | ||||
| -rw-r--r-- | sys/modules/vesa/Makefile | 10 |
20 files changed, 423 insertions, 2317 deletions
diff --git a/lib/Makefile b/lib/Makefile index 7cacb70..00b1c60 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -112,6 +112,7 @@ _libsmb= libsmb _libncp= libncp .endif _libsmb= libsmb +_libvgl= libvgl .endif .if ${MACHINE_ARCH} == "powerpc" diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 36d8928..dca2775 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -85,6 +85,7 @@ MAN= aac.4 \ digi.4 \ disc.4 \ divert.4 \ + ${_dpms.4} \ dpt.4 \ dummynet.4 \ ed.4 \ @@ -611,6 +612,7 @@ _amdtemp.4= amdtemp.4 _asmc.4= asmc.4 _coretemp.4= coretemp.4 _cpuctl.4= cpuctl.4 +_dpms.4= dpms.4 _hptiop.4= hptiop.4 _hptmv.4= hptmv.4 _hptrr.4= hptrr.4 diff --git a/share/man/man4/man4.i386/dpms.4 b/share/man/man4/dpms.4 index 2412b47..2412b47 100644 --- a/share/man/man4/man4.i386/dpms.4 +++ b/share/man/man4/dpms.4 diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index 27fe068..ada5e32 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -154,6 +154,12 @@ options AGP_DEBUG ##################################################################### # HARDWARE DEVICE CONFIGURATION +# To include support for VGA VESA video modes (depends on X86EMU) +options VESA + +# Turn on extra debugging checks and output for VESA support. +options VESA_DEBUG + # # Optional devices: # diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64 index efd76c0..01f5355 100644 --- a/sys/conf/files.amd64 +++ b/sys/conf/files.amd64 @@ -162,6 +162,7 @@ dev/atkbdc/atkbdc_subr.c optional atkbdc dev/atkbdc/psm.c optional psm atkbdc dev/coretemp/coretemp.c optional coretemp dev/cpuctl/cpuctl.c optional cpuctl +dev/dpms/dpms.c optional dpms x86emu # There are no systems with isa slots, so all ed isa entries should go.. dev/ed/if_ed_3c503.c optional ed isa ed_3c503 dev/ed/if_ed_isa.c optional ed isa @@ -169,6 +170,7 @@ dev/ed/if_ed_wd80x3.c optional ed isa dev/ed/if_ed_hpp.c optional ed isa ed_hpp dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb | vga +dev/fb/vesa.c optional vga vesa x86emu dev/fb/vga.c optional vga dev/ichwd/ichwd.c optional ichwd dev/if_ndis/if_ndis.c optional ndis @@ -217,6 +219,7 @@ dev/sio/sio_puc.c optional sio puc dev/speaker/spkr.c optional speaker dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/scterm-teken.c optional sc +dev/syscons/scvesactl.c optional sc vga vesa x86emu dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_amd64.c optional uart diff --git a/sys/conf/files.i386 b/sys/conf/files.i386 index 17cd70e..0a16cee 100644 --- a/sys/conf/files.i386 +++ b/sys/conf/files.i386 @@ -150,12 +150,14 @@ dev/ctau/if_ct.c optional ctau dev/cx/csigma.c optional cx dev/cx/cxddk.c optional cx dev/cx/if_cx.c optional cx +dev/dpms/dpms.c optional dpms x86emu dev/ed/if_ed_3c503.c optional ed isa ed_3c503 dev/ed/if_ed_isa.c optional ed isa dev/ed/if_ed_wd80x3.c optional ed isa dev/ed/if_ed_hpp.c optional ed isa ed_hpp dev/ed/if_ed_sic.c optional ed isa ed_sic dev/fb/fb.c optional fb | vga +dev/fb/vesa.c optional vga vesa x86emu dev/fb/vga.c optional vga dev/fdc/fdc.c optional fdc dev/fdc/fdc_acpi.c optional fdc @@ -217,7 +219,7 @@ dev/sio/sio_puc.c optional sio puc dev/speaker/spkr.c optional speaker dev/syscons/apm/apm_saver.c optional apm_saver apm dev/syscons/scterm-teken.c optional sc -dev/syscons/scvesactl.c optional sc vga vesa +dev/syscons/scvesactl.c optional sc vga vesa x86emu dev/syscons/scvgarndr.c optional sc vga dev/syscons/scvtb.c optional sc dev/uart/uart_cpu_i386.c optional uart @@ -329,7 +331,6 @@ i386/isa/clock.c optional native i386/xen/clock.c optional xen i386/xen/xen_clock_util.c optional xen i386/xen/xen_rtc.c optional xen -i386/isa/dpms.c optional dpms i386/isa/elcr.c standard i386/isa/elink.c optional ep | ie i386/isa/isa.c optional isa @@ -339,7 +340,6 @@ i386/isa/npx.c optional npx i386/isa/pmtimer.c optional pmtimer i386/isa/prof_machdep.c optional profiling-routine i386/isa/spic.c optional spic -i386/isa/vesa.c optional vga vesa i386/linux/imgact_linux.c optional compat_linux i386/linux/linux_dummy.c optional compat_linux i386/linux/linux_locore.s optional compat_linux \ diff --git a/sys/conf/options.amd64 b/sys/conf/options.amd64 index beb97ed..5617da4 100644 --- a/sys/conf/options.amd64 +++ b/sys/conf/options.amd64 @@ -37,6 +37,9 @@ VGA_NO_MODE_CHANGE opt_vga.h VGA_SLOW_IOACCESS opt_vga.h VGA_WIDTH90 opt_vga.h +VESA +VESA_DEBUG opt_vesa.h + # AGP debugging support AGP_DEBUG opt_agp.h diff --git a/sys/dev/dpms/dpms.c b/sys/dev/dpms/dpms.c index 723a6c0..ac729f9 100644 --- a/sys/dev/dpms/dpms.c +++ b/sys/dev/dpms/dpms.c @@ -67,7 +67,11 @@ __FBSDID("$FreeBSD$"); #include <sys/libkern.h> #include <sys/module.h> -#include <machine/vm86.h> +#include <vm/vm.h> +#include <vm/pmap.h> + +#include <contrib/x86emu/x86emu.h> +#include <contrib/x86emu/x86emu_regs.h> /* * VESA DPMS States @@ -90,6 +94,9 @@ struct dpms_softc { int dpms_initial_state; }; +static struct x86emu vesa_emu; +static unsigned char *emumem = NULL; + static int dpms_attach(device_t); static int dpms_detach(device_t); static int dpms_get_supported_states(int *); @@ -119,6 +126,59 @@ static driver_t dpms_driver = { static devclass_t dpms_devclass; DRIVER_MODULE(dpms, vgapci, dpms_driver, dpms_devclass, NULL, NULL); +MODULE_DEPEND(dpms, x86emu, 1, 1, 1); + +static uint8_t +vm86_emu_inb(struct x86emu *emu, uint16_t port) +{ + if (port == 0xb2) /* APM scratch register */ + return 0; + if (port >= 0x80 && port < 0x88) /* POST status register */ + return 0; + return inb(port); +} + +static uint16_t +vm86_emu_inw(struct x86emu *emu, uint16_t port) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return 0; + return inw(port); +} + +static uint32_t +vm86_emu_inl(struct x86emu *emu, uint16_t port) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return 0; + return inl(port); +} + +static void +vm86_emu_outb(struct x86emu *emu, uint16_t port, uint8_t val) +{ + if (port == 0xb2) /* APM scratch register */ + return; + if (port >= 0x80 && port < 0x88) /* POST status register */ + return; + outb(port, val); +} + +static void +vm86_emu_outw(struct x86emu *emu, uint16_t port, uint16_t val) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return; + outw(port, val); +} + +static void +vm86_emu_outl(struct x86emu *emu, uint16_t port, uint32_t val) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return; + outl(port, val); +} static void dpms_identify(driver_t *driver, device_t parent) @@ -132,6 +192,7 @@ dpms_identify(driver_t *driver, device_t parent) */ if (devclass_get_device(dpms_devclass, 0) == NULL) device_add_child(parent, "dpms", 0); + } static int @@ -139,6 +200,21 @@ dpms_probe(device_t dev) { int error, states; + emumem = pmap_mapbios(0x0, 0xc00000); + + memset(&vesa_emu, 0, sizeof(vesa_emu)); + x86emu_init_default(&vesa_emu); + + vesa_emu.emu_inb = vm86_emu_inb; + vesa_emu.emu_inw = vm86_emu_inw; + vesa_emu.emu_inl = vm86_emu_inl; + vesa_emu.emu_outb = vm86_emu_outb; + vesa_emu.emu_outw = vm86_emu_outw; + vesa_emu.emu_outl = vm86_emu_outl; + + vesa_emu.mem_base = (char *)emumem; + vesa_emu.mem_size = 1024 * 1024; + error = dpms_get_supported_states(&states); if (error) return (error); @@ -164,6 +240,8 @@ dpms_attach(device_t dev) static int dpms_detach(device_t dev) { + if (emumem) + pmap_unmapdev((vm_offset_t)emumem, 0xc00000); return (0); } @@ -189,21 +267,19 @@ dpms_resume(device_t dev) static int dpms_call_bios(int subfunction, int *bh) { - struct vm86frame vmf; - int error; + vesa_emu.x86.R_AX = VBE_DPMS_FUNCTION; + vesa_emu.x86.R_BL = subfunction; + vesa_emu.x86.R_BH = *bh; + vesa_emu.x86.R_ES = 0; + vesa_emu.x86.R_DI = 0; + x86emu_exec_intr(&vesa_emu, 0x10); - bzero(&vmf, sizeof(vmf)); - vmf.vmf_ax = VBE_DPMS_FUNCTION; - vmf.vmf_bl = subfunction; - vmf.vmf_bh = *bh; - vmf.vmf_es = 0; - vmf.vmf_di = 0; - error = vm86_intcall(0x10, &vmf); - if (error == 0 && (vmf.vmf_eax & 0xffff) != 0x004f) - error = ENXIO; - if (error == 0) - *bh = vmf.vmf_bh; - return (error); + if ((vesa_emu.x86.R_EAX & 0xffff) != 0x004f) + return (ENXIO); + + *bh = vesa_emu.x86.R_BH; + + return (0); } static int diff --git a/sys/dev/fb/s3_pci.c b/sys/dev/fb/s3_pci.c index 558329b..45facc9 100644 --- a/sys/dev/fb/s3_pci.c +++ b/sys/dev/fb/s3_pci.c @@ -56,7 +56,7 @@ __FBSDID("$FreeBSD$"); #include <machine/md_var.h> #include <machine/vm86.h> #include <machine/pc/bios.h> -#include <machine/pc/vesa.h> +#include <dev/fb/vesa.h> #include <dev/fb/fbreg.h> #include <dev/fb/vgareg.h> diff --git a/sys/dev/fb/vesa.c b/sys/dev/fb/vesa.c index 736daff..5a766dc 100644 --- a/sys/dev/fb/vesa.c +++ b/sys/dev/fb/vesa.c @@ -45,19 +45,16 @@ __FBSDID("$FreeBSD$"); #include <vm/vm_param.h> #include <vm/pmap.h> -#include <machine/md_var.h> -#include <machine/vm86.h> -#include <machine/pc/bios.h> -#include <machine/pc/vesa.h> +#include <dev/fb/vesa.h> #include <dev/fb/fbreg.h> #include <dev/fb/vgareg.h> -#ifndef __i386__ #include <isa/isareg.h> -#else -#include <i386/isa/isa.h> -#endif +#include <machine/cpufunc.h> + +#include <contrib/x86emu/x86emu.h> +#include <contrib/x86emu/x86emu_regs.h> #define VESA_VIA_CLE266 "VIA CLE266\r\n" @@ -76,8 +73,7 @@ typedef struct adp_state adp_state_t; /* VESA video adapter */ static video_adapter_t *vesa_adp = NULL; static int vesa_state_buf_size = 0; -#define VESA_VM86_BUFSIZE (3 * PAGE_SIZE) -static void *vesa_vm86_buf; +#define VESA_X86EMU_BUFSIZE (3 * PAGE_SIZE) /* VESA functions */ #if 0 @@ -109,7 +105,8 @@ static vi_fill_rect_t vesa_fill_rect; static vi_bitblt_t vesa_bitblt; static vi_diag_t vesa_diag; static int vesa_bios_info(int level); -static struct vm86context vesa_vmcontext; + +static struct x86emu vesa_emu; static video_switch_t vesavidsw = { vesa_probe, @@ -200,8 +197,6 @@ static int vesa_bios_set_start(int x, int y); static int vesa_map_gen_mode_num(int type, int color, int mode); static int vesa_translate_flags(u_int16_t vflags); static int vesa_translate_mmodel(u_int8_t vmodel); -static void *vesa_fix_ptr(u_int32_t p, u_int16_t seg, u_int16_t off, - u_char *buf); static int vesa_bios_init(void); static void vesa_clear_modes(video_info_t *info, int color); static vm_offset_t vesa_map_buffer(u_int paddr, size_t size); @@ -211,6 +206,77 @@ static void vesa_unmap_buffer(vm_offset_t vaddr, size_t size); static int vesa_get_origin(video_adapter_t *adp, off_t *offset); #endif +#define SEG_ADDR(x) (((x) >> 4) & 0x00F000) +#define SEG_OFF(x) ((x) & 0x0FFFF) + +#if _BYTE_ORDER == _LITTLE_ENDIAN +#define B_O16(x) (x) +#define B_O32(x) (x) +#else +#define B_O16(x) ((((x) & 0xff) << 8) | (((x) & 0xff) >> 8)) +#define B_O32(x) ((((x) & 0xff) << 24) | (((x) & 0xff00) << 8) \ + | (((x) & 0xff0000) >> 8) | (((x) & 0xff000000) >> 24)) +#endif + +#define L_ADD(x) (B_O32(x) & 0xffff) + ((B_O32(x) >> 12) & 0xffff00) +#define FARP(p) (((unsigned)(p & 0xffff0000) >> 12) | (p & 0xffff)) + +#define REALOFF(x) (x*4096) + +static unsigned char *emumem = NULL; + +static uint8_t +vm86_emu_inb(struct x86emu *emu, uint16_t port) +{ + if (port == 0xb2) /* APM scratch register */ + return 0; + if (port >= 0x80 && port < 0x88) /* POST status register */ + return 0; + return inb(port); +} + +static uint16_t +vm86_emu_inw(struct x86emu *emu, uint16_t port) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return 0; + return inw(port); +} + +static uint32_t +vm86_emu_inl(struct x86emu *emu, uint16_t port) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return 0; + return inl(port); +} + +static void +vm86_emu_outb(struct x86emu *emu, uint16_t port, uint8_t val) +{ + if (port == 0xb2) /* APM scratch register */ + return; + if (port >= 0x80 && port < 0x88) /* POST status register */ + return; + outb(port, val); +} + +static void +vm86_emu_outw(struct x86emu *emu, uint16_t port, uint16_t val) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return; + outw(port, val); +} + +static void +vm86_emu_outl(struct x86emu *emu, uint16_t port, uint32_t val) +{ + if (port >= 0x80 && port < 0x88) /* POST status register */ + return; + outl(port, val); +} + static void dump_buffer(u_char *buf, size_t len) { @@ -227,11 +293,9 @@ dump_buffer(u_char *buf, size_t len) static int int10_set_mode(int mode) { - struct vm86frame vmf; + vesa_emu.x86.R_EAX = 0x0000 | mode; + x86emu_exec_intr(&vesa_emu, 0x10); - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x0000 | mode; - vm86_intcall(0x10, &vmf); return 0; } @@ -239,84 +303,83 @@ int10_set_mode(int mode) static int vesa_bios_get_mode(int mode, struct vesa_mode *vmode) { - struct vm86frame vmf; u_char *buf; - int err; - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f01; - vmf.vmf_ecx = mode; - buf = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)buf, &vmf.vmf_es, &vmf.vmf_di); + vesa_emu.x86.R_EAX = 0x4f01; + vesa_emu.x86.R_ECX = mode; + + buf = (emumem + REALOFF(3)); + vesa_emu.x86.R_ES = SEG_ADDR(REALOFF(3)); + vesa_emu.x86.R_DI = SEG_OFF(REALOFF(3)); + + x86emu_exec_intr(&vesa_emu, 0x10); - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) return 1; + bcopy(buf, vmode, sizeof(*vmode)); + return 0; } static int vesa_bios_set_mode(int mode) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f02; - vmf.vmf_ebx = mode; - err = vm86_intcall(0x10, &vmf); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); + vesa_emu.x86.R_EAX = 0x4f02; + vesa_emu.x86.R_EBX = mode; + + x86emu_exec_intr(&vesa_emu, 0x10); + + return ((vesa_emu.x86.R_AX & 0xff) != 0x4f); } static int vesa_bios_get_dac(void) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f08; - vmf.vmf_ebx = 1; /* get DAC width */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 6; /* XXX */ - return ((vmf.vmf_ebx >> 8) & 0x00ff); + vesa_emu.x86.R_EAX = 0x4f08; + vesa_emu.x86.R_EBX = 1; + + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) + return 6; + + return ((vesa_emu.x86.R_EBX >> 8) & 0x00ff); } static int vesa_bios_set_dac(int bits) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f08; - vmf.vmf_ebx = (bits << 8); - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 6; /* XXX */ - return ((vmf.vmf_ebx >> 8) & 0x00ff); + vesa_emu.x86.R_EAX = 0x4f08; + vesa_emu.x86.R_EBX = (bits << 8); + + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) + return 6; + + return ((vesa_emu.x86.R_EBX >> 8) & 0x00ff); } static int vesa_bios_save_palette(int start, int colors, u_char *palette, int bits) { - struct vm86frame vmf; u_char *p; - int err; int i; - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 1; /* get primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - p = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); + vesa_emu.x86.R_EAX = 0x4f09; + vesa_emu.x86.R_EBX = 1; + vesa_emu.x86.R_ECX = colors; + vesa_emu.x86.R_EDX = start; - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) + vesa_emu.x86.R_ES = SEG_ADDR(REALOFF(2)); + vesa_emu.x86.R_DI = SEG_OFF(REALOFF(2)); + + p = emumem + REALOFF(2); + + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) return 1; bits = 8 - bits; @@ -332,21 +395,22 @@ static int vesa_bios_save_palette2(int start, int colors, u_char *r, u_char *g, u_char *b, int bits) { - struct vm86frame vmf; u_char *p; - int err; int i; - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 1; /* get primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - p = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); + vesa_emu.x86.R_EAX = 0x4f09; + vesa_emu.x86.R_EBX = 1; + vesa_emu.x86.R_ECX = colors; + vesa_emu.x86.R_EDX = start; + + vesa_emu.x86.R_ES = SEG_ADDR(REALOFF(2)); + vesa_emu.x86.R_DI = SEG_OFF(REALOFF(2)); + + p = emumem + REALOFF(2); + + x86emu_exec_intr(&vesa_emu, 0x10); - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) return 1; bits = 8 - bits; @@ -361,12 +425,11 @@ vesa_bios_save_palette2(int start, int colors, u_char *r, u_char *g, u_char *b, static int vesa_bios_load_palette(int start, int colors, u_char *palette, int bits) { - struct vm86frame vmf; u_char *p; - int err; int i; - p = vesa_vm86_buf; + p = (emumem + REALOFF(2)); + bits = 8 - bits; for (i = 0; i < colors; ++i) { p[i*4] = palette[i*3 + 2] >> bits; @@ -375,15 +438,17 @@ vesa_bios_load_palette(int start, int colors, u_char *palette, int bits) p[i*4 + 3] = 0; } - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 0; /* set primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); + vesa_emu.x86.R_EAX = 0x4f09; + vesa_emu.x86.R_EBX = 0; + vesa_emu.x86.R_ECX = colors; + vesa_emu.x86.R_EDX = start; + + vesa_emu.x86.R_ES = SEG_ADDR(REALOFF(2)); + vesa_emu.x86.R_DI = SEG_OFF(REALOFF(2)); - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); + x86emu_exec_intr(&vesa_emu, 0x10); + + return ((vesa_emu.x86.R_AX & 0xff) != 0x4f); } #ifdef notyet @@ -391,12 +456,11 @@ static int vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g, u_char *b, int bits) { - struct vm86frame vmf; u_char *p; - int err; int i; - p = vesa_vm86_buf; + p = (emumem + REALOFF(2)); + bits = 8 - bits; for (i = 0; i < colors; ++i) { p[i*4] = b[i] >> bits; @@ -405,92 +469,94 @@ vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g, u_char *b, p[i*4 + 3] = 0; } - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 0; /* set primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); + vesa_emu.x86.R_EAX = 0x4f09; + vesa_emu.x86.R_EBX = 0; + vesa_emu.x86.R_ECX = colors; + vesa_emu.x86.R_EDX = start; - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); + vesa_emu.x86.R_ES = SEG_ADDR(REALOFF(2)); + vesa_emu.x86.R_DI = SEG_OFF(REALOFF(2)); + + x86emu_exec_intr(&vesa_emu, 0x10); + + return ((vesa_emu.x86.R_AX & 0xff) != 0x4f) } #endif static int vesa_bios_state_buf_size(void) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f04; - vmf.vmf_ecx = STATE_ALL; - vmf.vmf_edx = STATE_SIZE; - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) + vesa_emu.x86.R_EAX = 0x4f04; + vesa_emu.x86.R_ECX = STATE_ALL; + vesa_emu.x86.R_EDX = STATE_SIZE; + + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) return 0; - return vmf.vmf_bx*64; + + return vesa_emu.x86.R_BX*64; } static int vesa_bios_save_restore(int code, void *p, size_t size) { - struct vm86frame vmf; u_char *buf; - int err; - if (size > VESA_VM86_BUFSIZE) + if (size > VESA_X86EMU_BUFSIZE) return (1); - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f04; - vmf.vmf_ecx = STATE_ALL; - vmf.vmf_edx = code; /* STATE_SAVE/STATE_LOAD */ - buf = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)buf, &vmf.vmf_es, &vmf.vmf_bx); + vesa_emu.x86.R_EAX = 0x4f04; + vesa_emu.x86.R_ECX = STATE_ALL; + vesa_emu.x86.R_EDX = code; + + buf = emumem + REALOFF(2); + + vesa_emu.x86.R_ES = SEG_ADDR(REALOFF(2)); + vesa_emu.x86.R_DI = SEG_OFF(REALOFF(2)); + bcopy(p, buf, size); - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); + x86emu_exec_intr(&vesa_emu, 0x10); + bcopy(buf, p, size); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); + + return ((vesa_emu.x86.R_AX & 0xff) != 0x4f); } static int vesa_bios_get_line_length(void) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f06; - vmf.vmf_ebx = 1; /* get scan line length */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) + vesa_emu.x86.R_EAX = 0x4f06; + vesa_emu.x86.R_EBX = 1; + + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) return -1; - return vmf.vmf_bx; /* line length in bytes */ + return vesa_emu.x86.R_BX; } static int vesa_bios_set_line_length(int pixel, int *bytes, int *lines) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f06; - vmf.vmf_ebx = 0; /* set scan line length in pixel */ - vmf.vmf_ecx = pixel; - err = vm86_intcall(0x10, &vmf); + vesa_emu.x86.R_EAX = 0x4f06; + vesa_emu.x86.R_EBX = 0; + vesa_emu.x86.R_ECX = pixel; + + x86emu_exec_intr(&vesa_emu, 0x10); + #if VESA_DEBUG > 1 - printf("bx:%d, cx:%d, dx:%d\n", vmf.vmf_bx, vmf.vmf_cx, vmf.vmf_dx); + printf("bx:%d, cx:%d, dx:%d\n", vesa_emu.x86.R_BX, vesa_emu.x86.R_CX, vesa_emu.x86.R_DX); #endif - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) + return -1; + if (bytes) - *bytes = vmf.vmf_bx; + *bytes = vesa_emu.x86.R_BX; if (lines) - *lines = vmf.vmf_dx; + *lines = vesa_emu.x86.R_DX; + return 0; } @@ -498,17 +564,17 @@ vesa_bios_set_line_length(int pixel, int *bytes, int *lines) static int vesa_bios_get_start(int *x, int *y) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f07; - vmf.vmf_ebx = 1; /* get display start */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - *x = vmf.vmf_cx; - *y = vmf.vmf_dx; + vesa_emu.x86.R_EAX = 0x4f07; + vesa_emu.x86.R_EBX = 1; + + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) + return -1; + + *x = vesa_emu.x86.R_CX; + *y = vesa_emu.x86.R_DX; + return 0; } #endif @@ -516,16 +582,14 @@ vesa_bios_get_start(int *x, int *y) static int vesa_bios_set_start(int x, int y) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f07; - vmf.vmf_ebx = 0x80; /* set display start */ - vmf.vmf_edx = y; - vmf.vmf_ecx = x; - err = vm86_intcall(0x10, &vmf); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); + vesa_emu.x86.R_EAX = 0x4f07; + vesa_emu.x86.R_EBX = 0x80; + vesa_emu.x86.R_EDX = y; + vesa_emu.x86.R_ECX = x; + + x86emu_exec_intr(&vesa_emu, 0x10); + + return ((vesa_emu.x86.R_AX & 0xff) != 0x4f); } /* map a generic video mode to a known mode */ @@ -595,30 +659,15 @@ vesa_translate_mmodel(u_int8_t vmodel) return V_INFO_MM_OTHER; } -static void -*vesa_fix_ptr(u_int32_t p, u_int16_t seg, u_int16_t off, u_char *buf) -{ - if (p == 0) - return NULL; - if (((p >> 16) == seg) && ((p & 0xffff) >= off)) - return (void *)(buf + ((p & 0xffff) - off)); - else { - p = BIOS_SADDRTOLADDR(p); - return (void *)BIOS_PADDRTOVADDR(p); - } -} - static int vesa_bios_init(void) { - static u_char buf[512]; - struct vm86frame vmf; + static struct vesa_info buf; struct vesa_mode vmode; video_info_t *p; u_char *vmbuf; int is_via_cle266; int modes; - int err; int i; if (vesa_init_done) @@ -629,28 +678,24 @@ vesa_bios_init(void) vesa_vmode_max = 0; vesa_vmode[0].vi_mode = EOT; - /* Allocate a buffer and add each page to the vm86 context. */ - vesa_vm86_buf = malloc(VESA_VM86_BUFSIZE, M_DEVBUF, M_WAITOK | M_ZERO); - KASSERT(((vm_offset_t)vesa_vm86_buf & PAGE_MASK) == 0, - ("bad vesa_vm86_buf alignment")); - for (i = 0; i < howmany(VESA_VM86_BUFSIZE, PAGE_SIZE); i++) - vm86_addpage(&vesa_vmcontext, i + 1, - (vm_offset_t)vesa_vm86_buf + PAGE_SIZE * i); - - vmbuf = vesa_vm86_buf; - bzero(&vmf, sizeof(vmf)); /* paranoia */ + vmbuf = (emumem + REALOFF(2)); bcopy("VBE2", vmbuf, 4); /* try for VBE2 data */ - vmf.vmf_eax = 0x4f00; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)vmbuf, &vmf.vmf_es, &vmf.vmf_di); - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f) || bcmp("VESA", vmbuf, 4)) + vesa_emu.x86.R_EAX = 0x4f00; + vesa_emu.x86.R_ES = SEG_ADDR(REALOFF(2)); + vesa_emu.x86.R_DI = SEG_OFF(REALOFF(2)); + + x86emu_exec_intr(&vesa_emu, 0x10); + + if (((vesa_emu.x86.R_AX & 0xff) != 0x4f) || bcmp("VESA", vmbuf, 4)) return 1; - bcopy(vmbuf, buf, sizeof(buf)); - vesa_adp_info = (struct vesa_info *)buf; + + bcopy(vmbuf, &buf, sizeof(buf)); + + vesa_adp_info = &buf; if (bootverbose) { printf("VESA: information block\n"); - dump_buffer(buf, 64); + dump_buffer((u_char *)&buf, sizeof(buf)); } if (vesa_adp_info->v_version < 0x0102) { printf("VESA: VBE version %d.%d is not supported; " @@ -662,28 +707,21 @@ vesa_bios_init(void) return 1; } - /* fix string ptrs */ - vesa_oemstr = (char *)vesa_fix_ptr(vesa_adp_info->v_oemstr, - vmf.vmf_es, vmf.vmf_di, buf); + vesa_oemstr = (char *)(emumem + L_ADD(vesa_adp_info->v_oemstr)); + is_via_cle266 = strcmp(vesa_oemstr, VESA_VIA_CLE266) == 0; if (vesa_adp_info->v_version >= 0x0200) { - vesa_venderstr = - (char *)vesa_fix_ptr(vesa_adp_info->v_venderstr, - vmf.vmf_es, vmf.vmf_di, buf); - vesa_prodstr = - (char *)vesa_fix_ptr(vesa_adp_info->v_prodstr, - vmf.vmf_es, vmf.vmf_di, buf); - vesa_revstr = - (char *)vesa_fix_ptr(vesa_adp_info->v_revstr, - vmf.vmf_es, vmf.vmf_di, buf); + vesa_venderstr = (char *)(emumem+L_ADD(vesa_adp_info->v_venderstr)); + vesa_prodstr = (char *)(emumem+L_ADD(vesa_adp_info->v_prodstr)); + vesa_revstr = (char *)(emumem+L_ADD(vesa_adp_info->v_revstr)); } - /* obtain video mode information */ - vesa_vmodetab = (u_int16_t *)vesa_fix_ptr(vesa_adp_info->v_modetable, - vmf.vmf_es, vmf.vmf_di, buf); + vesa_vmodetab = (u_int16_t *)(emumem+L_ADD(vesa_adp_info->v_modetable)); + if (vesa_vmodetab == NULL) return 1; + for (i = 0, modes = 0; (i < (M_VESA_MODE_MAX - M_VESA_BASE + 1)) && (vesa_vmodetab[i] != 0xffff); ++i) { @@ -834,7 +872,7 @@ vesa_map_buffer(u_int paddr, size_t size) off = paddr - trunc_page(paddr); vaddr = (vm_offset_t)pmap_mapdev(paddr - off, size + off); #if VESA_DEBUG > 1 - printf("vesa_map_buffer: paddr:%x vaddr:%x size:%x off:%x\n", + printf("vesa_map_buffer: paddr:%x vaddr:%tx size:%zx off:%x\n", paddr, vaddr, size, off); #endif return (vaddr + off); @@ -844,7 +882,7 @@ static void vesa_unmap_buffer(vm_offset_t vaddr, size_t size) { #if VESA_DEBUG > 1 - printf("vesa_unmap_buffer: vaddr:%x size:%x\n", vaddr, size); + printf("vesa_unmap_buffer: vaddr:%tx size:%zx\n", vaddr, size); #endif kmem_free(kernel_map, vaddr, size); } @@ -1088,7 +1126,7 @@ vesa_set_mode(video_adapter_t *adp, int mode) } else { vesa_adp->va_buffer = 0; vesa_adp->va_buffer_size = info.vi_buffer_size; - vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window); + vesa_adp->va_window = (vm_offset_t)(emumem+L_ADD(info.vi_window)); vesa_adp->va_window_size = info.vi_window_size; vesa_adp->va_window_gran = info.vi_window_gran; } @@ -1237,16 +1275,15 @@ vesa_load_state(video_adapter_t *adp, void *p) static int vesa_get_origin(video_adapter_t *adp, off_t *offset) { - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f05; - vmf.vmf_ebx = 0x10; /* WINDOW_A, XXX */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) + vesa_emu.x86.R_EAX = 0x4f05; + vesa_emu.x86.R_EBX = 0x10; + + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) return 1; - *offset = vmf.vmf_dx*adp->va_window_gran; + *offset = vesa_emu.x86.DX*adp->va_window_gran; + return 0; } #endif @@ -1254,9 +1291,6 @@ vesa_get_origin(video_adapter_t *adp, off_t *offset) static int vesa_set_origin(video_adapter_t *adp, off_t offset) { - struct vm86frame vmf; - int err; - /* * This function should return as quickly as possible to * maintain good performance of the system. For this reason, @@ -1273,18 +1307,19 @@ vesa_set_origin(video_adapter_t *adp, off_t offset) if (adp->va_window_gran == 0) return 1; - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f05; - vmf.vmf_ebx = 0; /* WINDOW_A, XXX */ - vmf.vmf_edx = offset/adp->va_window_gran; - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) + vesa_emu.x86.R_EAX = 0x4f05; + vesa_emu.x86.R_EBX = 0; + vesa_emu.x86.R_EDX = offset/adp->va_window_gran; + x86emu_exec_intr(&vesa_emu, 0x10); + + if ((vesa_emu.x86.R_AX & 0xff) != 0x4f) return 1; - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f05; - vmf.vmf_ebx = 1; /* WINDOW_B, XXX */ - vmf.vmf_edx = offset/adp->va_window_gran; - err = vm86_intcall(0x10, &vmf); + + vesa_emu.x86.R_EAX = 0x4f05; + vesa_emu.x86.R_EBX = 1; + vesa_emu.x86.R_EDX = offset/adp->va_window_gran; + x86emu_exec_intr(&vesa_emu, 0x10); + adp->va_window_orig = (offset/adp->va_window_gran)*adp->va_window_gran; return 0; /* XXX */ } @@ -1321,7 +1356,7 @@ vesa_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, int prot) { #if VESA_DEBUG > 0 - printf("vesa_mmap(): window:0x%x, buffer:0x%x, offset:0x%x\n", + printf("vesa_mmap(): window:0x%tx, buffer:0x%tx, offset:0x%tx\n", adp->va_info.vi_window, adp->va_info.vi_buffer, offset); #endif @@ -1618,6 +1653,22 @@ vesa_load(void) if (vesa_init_done) return 0; + /* Can `emumem' be NULL here? */ + emumem = pmap_mapbios(0x0, 0xc00000); + + memset(&vesa_emu, 0, sizeof(vesa_emu)); + x86emu_init_default(&vesa_emu); + + vesa_emu.emu_inb = vm86_emu_inb; + vesa_emu.emu_inw = vm86_emu_inw; + vesa_emu.emu_inl = vm86_emu_inl; + vesa_emu.emu_outb = vm86_emu_outb; + vesa_emu.emu_outw = vm86_emu_outw; + vesa_emu.emu_outl = vm86_emu_outl; + + vesa_emu.mem_base = (char *)emumem; + vesa_emu.mem_size = 1024 * 1024; + /* locate a VGA adapter */ s = spltty(); vesa_adp = NULL; @@ -1665,8 +1716,8 @@ vesa_unload(void) } splx(s); - if (vesa_vm86_buf != NULL) - free(vesa_vm86_buf, M_DEVBUF); + if (emumem) + pmap_unmapdev((vm_offset_t)emumem, 0xc00000); return error; } @@ -1692,5 +1743,6 @@ static moduledata_t vesa_mod = { }; DECLARE_MODULE(vesa, vesa_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); +MODULE_DEPEND(vesa, x86emu, 1, 1, 1); #endif /* VGA_NO_MODE_CHANGE */ diff --git a/sys/dev/fb/vesa.h b/sys/dev/fb/vesa.h index 06f1c11..bd9986b 100644 --- a/sys/dev/fb/vesa.h +++ b/sys/dev/fb/vesa.h @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef _MACHINE_PC_VESA_H -#define _MACHINE_PC_VESA_H +#ifndef _DEV_FB_VESA_H_ +#define _DEV_FB_VESA_H_ struct vesa_info { @@ -46,6 +46,8 @@ struct vesa_info u_int32_t v_venderstr; /* vender */ u_int32_t v_prodstr; /* product name */ u_int32_t v_revstr; /* product rev */ + u_int8_t v_strach[222]; + u_int8_t v_oemdata[256]; } __packed; struct vesa_mode @@ -117,4 +119,4 @@ int vesa_unload_ioctl(void); #endif -#endif /* !_MACHINE_PC_VESA_H */ +#endif /* !_DEV_FB_VESA_H_ */ diff --git a/sys/dev/fb/vga.c b/sys/dev/fb/vga.c index 425aec2..a2e99f2 100644 --- a/sys/dev/fb/vga.c +++ b/sys/dev/fb/vga.c @@ -156,7 +156,7 @@ vga_mmap(struct cdev *dev, vga_softc_t *sc, vm_offset_t offset, vm_offset_t *pad #include <isa/rtc.h> #ifdef __i386__ -#include <machine/pc/vesa.h> +#include <dev/fb/vesa.h> #endif #define probe_done(adp) ((adp)->va_flags & V_ADP_PROBED) diff --git a/sys/dev/syscons/scvesactl.c b/sys/dev/syscons/scvesactl.c index 9a2c253..b896484 100644 --- a/sys/dev/syscons/scvesactl.c +++ b/sys/dev/syscons/scvesactl.c @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); #include <sys/fbio.h> #include <sys/consio.h> -#include <machine/pc/vesa.h> +#include <dev/fb/vesa.h> #include <dev/fb/fbreg.h> #include <dev/syscons/syscons.h> diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index f772b25..876224e 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -353,7 +353,7 @@ options AGP_DEBUG ##################################################################### # HARDWARE DEVICE CONFIGURATION -# To include support for VGA VESA video modes +# To include support for VGA VESA video modes (depends on X86EMU) options VESA # Turn on extra debugging checks and output for VESA support. diff --git a/sys/i386/include/pc/vesa.h b/sys/i386/include/pc/vesa.h deleted file mode 100644 index 06f1c11..0000000 --- a/sys/i386/include/pc/vesa.h +++ /dev/null @@ -1,120 +0,0 @@ -/*- - * Copyright (c) 1998 Michael Smith and Kazutaka YOKOTA - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer as - * the first lines of this file unmodified. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * - * $FreeBSD$ - */ - -#ifndef _MACHINE_PC_VESA_H -#define _MACHINE_PC_VESA_H - -struct vesa_info -{ - /* mandatory fields */ - u_int8_t v_sig[4]; /* VESA */ - u_int16_t v_version; /* ver in BCD */ - u_int32_t v_oemstr; /* OEM string */ - u_int32_t v_flags; /* flags */ -#define V_DAC8 (1<<0) -#define V_NONVGA (1<<1) -#define V_SNOW (1<<2) - u_int32_t v_modetable; /* modes */ - u_int16_t v_memsize; /* in 64K */ - /* 2.0 */ - u_int16_t v_revision; /* software rev */ - u_int32_t v_venderstr; /* vender */ - u_int32_t v_prodstr; /* product name */ - u_int32_t v_revstr; /* product rev */ -} __packed; - -struct vesa_mode -{ - /* mandatory fields */ - u_int16_t v_modeattr; -#define V_MODESUPP (1<<0) /* VESA mode attributes */ -#define V_MODEOPTINFO (1<<1) -#define V_MODEBIOSOUT (1<<2) -#define V_MODECOLOR (1<<3) -#define V_MODEGRAPHICS (1<<4) -#define V_MODENONVGA (1<<5) -#define V_MODENONBANK (1<<6) -#define V_MODELFB (1<<7) -#define V_MODEVESA (1<<16) /* Private attributes */ - u_int8_t v_waattr; - u_int8_t v_wbattr; -#define V_WATTREXIST (1<<0) -#define V_WATTRREAD (1<<1) -#define V_WATTRWRITE (1<<2) - u_int16_t v_wgran; - u_int16_t v_wsize; - u_int16_t v_waseg; - u_int16_t v_wbseg; - u_int32_t v_posfunc; - u_int16_t v_bpscanline; - /* fields optional for 1.0/1.1 implementations */ - u_int16_t v_width; - u_int16_t v_height; - u_int8_t v_cwidth; - u_int8_t v_cheight; - u_int8_t v_planes; - u_int8_t v_bpp; - u_int8_t v_banks; - u_int8_t v_memmodel; -#define V_MMTEXT 0 -#define V_MMCGA 1 -#define V_MMHGC 2 -#define V_MMEGA 3 -#define V_MMPACKED 4 -#define V_MMSEQU256 5 -#define V_MMDIRCOLOR 6 -#define V_MMYUV 7 - u_int8_t v_banksize; - u_int8_t v_ipages; - u_int8_t v_reserved0; - /* fields for 1.2+ implementations */ - u_int8_t v_redmasksize; - u_int8_t v_redfieldpos; - u_int8_t v_greenmasksize; - u_int8_t v_greenfieldpos; - u_int8_t v_bluemasksize; - u_int8_t v_bluefieldpos; - u_int8_t v_resmasksize; - u_int8_t v_resfieldpos; - u_int8_t v_dircolormode; - /* 2.0 implementations */ - u_int32_t v_lfb; - u_int32_t v_offscreen; - u_int16_t v_offscreensize; -}; - -#ifdef _KERNEL - -#define VESA_MODE(x) ((x) >= M_VESA_BASE) - -int vesa_load_ioctl(void); -int vesa_unload_ioctl(void); - -#endif - -#endif /* !_MACHINE_PC_VESA_H */ diff --git a/sys/i386/isa/dpms.c b/sys/i386/isa/dpms.c deleted file mode 100644 index 723a6c0..0000000 --- a/sys/i386/isa/dpms.c +++ /dev/null @@ -1,230 +0,0 @@ -/*- - * Copyright (c) 2008 Yahoo!, Inc. - * All rights reserved. - * Written by: John Baldwin <jhb@FreeBSD.org> - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the author nor the names of any co-contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Copyright (c) 2004 Benjamin Close <Benjamin.Close@clearchain.com> - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -/* - * Support for managing the display via DPMS for suspend/resume. - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include <sys/param.h> -#include <sys/bus.h> -#include <sys/kernel.h> -#include <sys/libkern.h> -#include <sys/module.h> - -#include <machine/vm86.h> - -/* - * VESA DPMS States - */ -#define DPMS_ON 0x00 -#define DPMS_STANDBY 0x01 -#define DPMS_SUSPEND 0x02 -#define DPMS_OFF 0x04 -#define DPMS_REDUCEDON 0x08 - -#define VBE_DPMS_FUNCTION 0x4F10 -#define VBE_DPMS_GET_SUPPORTED_STATES 0x00 -#define VBE_DPMS_GET_STATE 0x02 -#define VBE_DPMS_SET_STATE 0x01 -#define VBE_MAJORVERSION_MASK 0x0F -#define VBE_MINORVERSION_MASK 0xF0 - -struct dpms_softc { - int dpms_supported_states; - int dpms_initial_state; -}; - -static int dpms_attach(device_t); -static int dpms_detach(device_t); -static int dpms_get_supported_states(int *); -static int dpms_get_current_state(int *); -static void dpms_identify(driver_t *, device_t); -static int dpms_probe(device_t); -static int dpms_resume(device_t); -static int dpms_set_state(int); -static int dpms_suspend(device_t); - -static device_method_t dpms_methods[] = { - DEVMETHOD(device_identify, dpms_identify), - DEVMETHOD(device_probe, dpms_probe), - DEVMETHOD(device_attach, dpms_attach), - DEVMETHOD(device_detach, dpms_detach), - DEVMETHOD(device_suspend, dpms_suspend), - DEVMETHOD(device_resume, dpms_resume), - { 0, 0 } -}; - -static driver_t dpms_driver = { - "dpms", - dpms_methods, - sizeof(struct dpms_softc), -}; - -static devclass_t dpms_devclass; - -DRIVER_MODULE(dpms, vgapci, dpms_driver, dpms_devclass, NULL, NULL); - -static void -dpms_identify(driver_t *driver, device_t parent) -{ - - /* - * XXX: The DPMS VBE only allows for manipulating a single - * monitor, but we don't know which one. Just attach to the - * first vgapci(4) device we encounter and hope it is the - * right one. - */ - if (devclass_get_device(dpms_devclass, 0) == NULL) - device_add_child(parent, "dpms", 0); -} - -static int -dpms_probe(device_t dev) -{ - int error, states; - - error = dpms_get_supported_states(&states); - if (error) - return (error); - device_set_desc(dev, "DPMS suspend/resume"); - device_quiet(dev); - return (BUS_PROBE_DEFAULT); -} - -static int -dpms_attach(device_t dev) -{ - struct dpms_softc *sc; - int error; - - sc = device_get_softc(dev); - error = dpms_get_supported_states(&sc->dpms_supported_states); - if (error) - return (error); - error = dpms_get_current_state(&sc->dpms_initial_state); - return (error); -} - -static int -dpms_detach(device_t dev) -{ - - return (0); -} - -static int -dpms_suspend(device_t dev) -{ - - dpms_set_state(DPMS_OFF); - return (0); -} - -static int -dpms_resume(device_t dev) -{ - struct dpms_softc *sc; - - sc = device_get_softc(dev); - dpms_set_state(sc->dpms_initial_state); - return (0); -} - -static int -dpms_call_bios(int subfunction, int *bh) -{ - struct vm86frame vmf; - int error; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_ax = VBE_DPMS_FUNCTION; - vmf.vmf_bl = subfunction; - vmf.vmf_bh = *bh; - vmf.vmf_es = 0; - vmf.vmf_di = 0; - error = vm86_intcall(0x10, &vmf); - if (error == 0 && (vmf.vmf_eax & 0xffff) != 0x004f) - error = ENXIO; - if (error == 0) - *bh = vmf.vmf_bh; - return (error); -} - -static int -dpms_get_supported_states(int *states) -{ - - *states = 0; - return (dpms_call_bios(VBE_DPMS_GET_SUPPORTED_STATES, states)); -} - -static int -dpms_get_current_state(int *state) -{ - - *state = 0; - return (dpms_call_bios(VBE_DPMS_GET_STATE, state)); -} - -static int -dpms_set_state(int state) -{ - - return (dpms_call_bios(VBE_DPMS_SET_STATE, &state)); -} diff --git a/sys/i386/isa/vesa.c b/sys/i386/isa/vesa.c deleted file mode 100644 index 736daff..0000000 --- a/sys/i386/isa/vesa.c +++ /dev/null @@ -1,1696 +0,0 @@ -/*- - * Copyright (c) 1998 Kazutaka YOKOTA and Michael Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer as - * the first lines of this file unmodified. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <sys/cdefs.h> -__FBSDID("$FreeBSD$"); - -#include "opt_vga.h" -#include "opt_vesa.h" - -#ifndef VGA_NO_MODE_CHANGE - -#include <sys/param.h> -#include <sys/systm.h> -#include <sys/kernel.h> -#include <sys/module.h> -#include <sys/malloc.h> -#include <sys/fbio.h> - -#include <vm/vm.h> -#include <vm/vm_extern.h> -#include <vm/vm_kern.h> -#include <vm/vm_param.h> -#include <vm/pmap.h> - -#include <machine/md_var.h> -#include <machine/vm86.h> -#include <machine/pc/bios.h> -#include <machine/pc/vesa.h> - -#include <dev/fb/fbreg.h> -#include <dev/fb/vgareg.h> - -#ifndef __i386__ -#include <isa/isareg.h> -#else -#include <i386/isa/isa.h> -#endif - -#define VESA_VIA_CLE266 "VIA CLE266\r\n" - -#ifndef VESA_DEBUG -#define VESA_DEBUG 0 -#endif - -/* VESA video adapter state buffer stub */ -struct adp_state { - int sig; -#define V_STATE_SIG 0x61736576 - u_char regs[1]; -}; -typedef struct adp_state adp_state_t; - -/* VESA video adapter */ -static video_adapter_t *vesa_adp = NULL; -static int vesa_state_buf_size = 0; -#define VESA_VM86_BUFSIZE (3 * PAGE_SIZE) -static void *vesa_vm86_buf; - -/* VESA functions */ -#if 0 -static int vesa_nop(void); -#endif -static int vesa_error(void); -static vi_probe_t vesa_probe; -static vi_init_t vesa_init; -static vi_get_info_t vesa_get_info; -static vi_query_mode_t vesa_query_mode; -static vi_set_mode_t vesa_set_mode; -static vi_save_font_t vesa_save_font; -static vi_load_font_t vesa_load_font; -static vi_show_font_t vesa_show_font; -static vi_save_palette_t vesa_save_palette; -static vi_load_palette_t vesa_load_palette; -static vi_set_border_t vesa_set_border; -static vi_save_state_t vesa_save_state; -static vi_load_state_t vesa_load_state; -static vi_set_win_org_t vesa_set_origin; -static vi_read_hw_cursor_t vesa_read_hw_cursor; -static vi_set_hw_cursor_t vesa_set_hw_cursor; -static vi_set_hw_cursor_shape_t vesa_set_hw_cursor_shape; -static vi_blank_display_t vesa_blank_display; -static vi_mmap_t vesa_mmap; -static vi_ioctl_t vesa_ioctl; -static vi_clear_t vesa_clear; -static vi_fill_rect_t vesa_fill_rect; -static vi_bitblt_t vesa_bitblt; -static vi_diag_t vesa_diag; -static int vesa_bios_info(int level); -static struct vm86context vesa_vmcontext; - -static video_switch_t vesavidsw = { - vesa_probe, - vesa_init, - vesa_get_info, - vesa_query_mode, - vesa_set_mode, - vesa_save_font, - vesa_load_font, - vesa_show_font, - vesa_save_palette, - vesa_load_palette, - vesa_set_border, - vesa_save_state, - vesa_load_state, - vesa_set_origin, - vesa_read_hw_cursor, - vesa_set_hw_cursor, - vesa_set_hw_cursor_shape, - vesa_blank_display, - vesa_mmap, - vesa_ioctl, - vesa_clear, - vesa_fill_rect, - vesa_bitblt, - vesa_error, - vesa_error, - vesa_diag, -}; - -static video_switch_t *prevvidsw; - -/* VESA BIOS video modes */ -#define VESA_MAXMODES 64 -#define EOT (-1) -#define NA (-2) - -#define MODE_TABLE_DELTA 8 - -static int vesa_vmode_max = 0; -static video_info_t vesa_vmode_empty = { EOT }; -static video_info_t *vesa_vmode = &vesa_vmode_empty; - -static int vesa_init_done = FALSE; -static int has_vesa_bios = FALSE; -static struct vesa_info *vesa_adp_info = NULL; -static u_int16_t *vesa_vmodetab = NULL; -static char *vesa_oemstr = NULL; -static char *vesa_venderstr = NULL; -static char *vesa_prodstr = NULL; -static char *vesa_revstr = NULL; - -/* local macros and functions */ -#define BIOS_SADDRTOLADDR(p) ((((p) & 0xffff0000) >> 12) + ((p) & 0x0000ffff)) - -static int int10_set_mode(int mode); -static int vesa_bios_get_mode(int mode, struct vesa_mode *vmode); -static int vesa_bios_set_mode(int mode); -static int vesa_bios_get_dac(void); -static int vesa_bios_set_dac(int bits); -static int vesa_bios_save_palette(int start, int colors, u_char *palette, - int bits); -static int vesa_bios_save_palette2(int start, int colors, u_char *r, u_char *g, - u_char *b, int bits); -static int vesa_bios_load_palette(int start, int colors, u_char *palette, - int bits); -#ifdef notyet -static int vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g, - u_char *b, int bits); -#endif -#define STATE_SIZE 0 -#define STATE_SAVE 1 -#define STATE_LOAD 2 -#define STATE_HW (1<<0) -#define STATE_DATA (1<<1) -#define STATE_DAC (1<<2) -#define STATE_REG (1<<3) -#define STATE_MOST (STATE_HW | STATE_DATA | STATE_REG) -#define STATE_ALL (STATE_HW | STATE_DATA | STATE_DAC | STATE_REG) -static int vesa_bios_state_buf_size(void); -static int vesa_bios_save_restore(int code, void *p, size_t size); -static int vesa_bios_get_line_length(void); -static int vesa_bios_set_line_length(int pixel, int *bytes, int *lines); -#if 0 -static int vesa_bios_get_start(int *x, int *y); -#endif -static int vesa_bios_set_start(int x, int y); -static int vesa_map_gen_mode_num(int type, int color, int mode); -static int vesa_translate_flags(u_int16_t vflags); -static int vesa_translate_mmodel(u_int8_t vmodel); -static void *vesa_fix_ptr(u_int32_t p, u_int16_t seg, u_int16_t off, - u_char *buf); -static int vesa_bios_init(void); -static void vesa_clear_modes(video_info_t *info, int color); -static vm_offset_t vesa_map_buffer(u_int paddr, size_t size); -static void vesa_unmap_buffer(vm_offset_t vaddr, size_t size); - -#if 0 -static int vesa_get_origin(video_adapter_t *adp, off_t *offset); -#endif - -static void -dump_buffer(u_char *buf, size_t len) -{ - int i; - - for(i = 0; i < len;) { - printf("%02x ", buf[i]); - if ((++i % 16) == 0) - printf("\n"); - } -} - -/* INT 10 BIOS calls */ -static int -int10_set_mode(int mode) -{ - struct vm86frame vmf; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x0000 | mode; - vm86_intcall(0x10, &vmf); - return 0; -} - -/* VESA BIOS calls */ -static int -vesa_bios_get_mode(int mode, struct vesa_mode *vmode) -{ - struct vm86frame vmf; - u_char *buf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f01; - vmf.vmf_ecx = mode; - buf = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)buf, &vmf.vmf_es, &vmf.vmf_di); - - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - bcopy(buf, vmode, sizeof(*vmode)); - return 0; -} - -static int -vesa_bios_set_mode(int mode) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f02; - vmf.vmf_ebx = mode; - err = vm86_intcall(0x10, &vmf); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); -} - -static int -vesa_bios_get_dac(void) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f08; - vmf.vmf_ebx = 1; /* get DAC width */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 6; /* XXX */ - return ((vmf.vmf_ebx >> 8) & 0x00ff); -} - -static int -vesa_bios_set_dac(int bits) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f08; - vmf.vmf_ebx = (bits << 8); - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 6; /* XXX */ - return ((vmf.vmf_ebx >> 8) & 0x00ff); -} - -static int -vesa_bios_save_palette(int start, int colors, u_char *palette, int bits) -{ - struct vm86frame vmf; - u_char *p; - int err; - int i; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 1; /* get primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - p = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); - - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - - bits = 8 - bits; - for (i = 0; i < colors; ++i) { - palette[i*3] = p[i*4 + 2] << bits; - palette[i*3 + 1] = p[i*4 + 1] << bits; - palette[i*3 + 2] = p[i*4] << bits; - } - return 0; -} - -static int -vesa_bios_save_palette2(int start, int colors, u_char *r, u_char *g, u_char *b, - int bits) -{ - struct vm86frame vmf; - u_char *p; - int err; - int i; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 1; /* get primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - p = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); - - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - - bits = 8 - bits; - for (i = 0; i < colors; ++i) { - r[i] = p[i*4 + 2] << bits; - g[i] = p[i*4 + 1] << bits; - b[i] = p[i*4] << bits; - } - return 0; -} - -static int -vesa_bios_load_palette(int start, int colors, u_char *palette, int bits) -{ - struct vm86frame vmf; - u_char *p; - int err; - int i; - - p = vesa_vm86_buf; - bits = 8 - bits; - for (i = 0; i < colors; ++i) { - p[i*4] = palette[i*3 + 2] >> bits; - p[i*4 + 1] = palette[i*3 + 1] >> bits; - p[i*4 + 2] = palette[i*3] >> bits; - p[i*4 + 3] = 0; - } - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 0; /* set primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); - - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); -} - -#ifdef notyet -static int -vesa_bios_load_palette2(int start, int colors, u_char *r, u_char *g, u_char *b, - int bits) -{ - struct vm86frame vmf; - u_char *p; - int err; - int i; - - p = vesa_vm86_buf; - bits = 8 - bits; - for (i = 0; i < colors; ++i) { - p[i*4] = b[i] >> bits; - p[i*4 + 1] = g[i] >> bits; - p[i*4 + 2] = r[i] >> bits; - p[i*4 + 3] = 0; - } - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f09; - vmf.vmf_ebx = 0; /* set primary palette data */ - vmf.vmf_ecx = colors; - vmf.vmf_edx = start; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)p, &vmf.vmf_es, &vmf.vmf_di); - - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); -} -#endif - -static int -vesa_bios_state_buf_size(void) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f04; - vmf.vmf_ecx = STATE_ALL; - vmf.vmf_edx = STATE_SIZE; - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 0; - return vmf.vmf_bx*64; -} - -static int -vesa_bios_save_restore(int code, void *p, size_t size) -{ - struct vm86frame vmf; - u_char *buf; - int err; - - if (size > VESA_VM86_BUFSIZE) - return (1); - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f04; - vmf.vmf_ecx = STATE_ALL; - vmf.vmf_edx = code; /* STATE_SAVE/STATE_LOAD */ - buf = vesa_vm86_buf; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)buf, &vmf.vmf_es, &vmf.vmf_bx); - bcopy(p, buf, size); - - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - bcopy(buf, p, size); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); -} - -static int -vesa_bios_get_line_length(void) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f06; - vmf.vmf_ebx = 1; /* get scan line length */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return -1; - return vmf.vmf_bx; /* line length in bytes */ -} - -static int -vesa_bios_set_line_length(int pixel, int *bytes, int *lines) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f06; - vmf.vmf_ebx = 0; /* set scan line length in pixel */ - vmf.vmf_ecx = pixel; - err = vm86_intcall(0x10, &vmf); -#if VESA_DEBUG > 1 - printf("bx:%d, cx:%d, dx:%d\n", vmf.vmf_bx, vmf.vmf_cx, vmf.vmf_dx); -#endif - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - if (bytes) - *bytes = vmf.vmf_bx; - if (lines) - *lines = vmf.vmf_dx; - return 0; -} - -#if 0 -static int -vesa_bios_get_start(int *x, int *y) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f07; - vmf.vmf_ebx = 1; /* get display start */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - *x = vmf.vmf_cx; - *y = vmf.vmf_dx; - return 0; -} -#endif - -static int -vesa_bios_set_start(int x, int y) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f07; - vmf.vmf_ebx = 0x80; /* set display start */ - vmf.vmf_edx = y; - vmf.vmf_ecx = x; - err = vm86_intcall(0x10, &vmf); - return ((err != 0) || (vmf.vmf_ax != 0x4f)); -} - -/* map a generic video mode to a known mode */ -static int -vesa_map_gen_mode_num(int type, int color, int mode) -{ - static struct { - int from; - int to; - } mode_map[] = { - { M_TEXT_132x25, M_VESA_C132x25 }, - { M_TEXT_132x43, M_VESA_C132x43 }, - { M_TEXT_132x50, M_VESA_C132x50 }, - { M_TEXT_132x60, M_VESA_C132x60 }, - }; - int i; - - for (i = 0; i < sizeof(mode_map)/sizeof(mode_map[0]); ++i) { - if (mode_map[i].from == mode) - return mode_map[i].to; - } - return mode; -} - -static int -vesa_translate_flags(u_int16_t vflags) -{ - static struct { - u_int16_t mask; - int set; - int reset; - } ftable[] = { - { V_MODECOLOR, V_INFO_COLOR, 0 }, - { V_MODEGRAPHICS, V_INFO_GRAPHICS, 0 }, - { V_MODELFB, V_INFO_LINEAR, 0 }, - }; - int flags; - int i; - - for (flags = 0, i = 0; i < sizeof(ftable)/sizeof(ftable[0]); ++i) { - flags |= (vflags & ftable[i].mask) ? - ftable[i].set : ftable[i].reset; - } - return flags; -} - -static int -vesa_translate_mmodel(u_int8_t vmodel) -{ - static struct { - u_int8_t vmodel; - int mmodel; - } mtable[] = { - { V_MMTEXT, V_INFO_MM_TEXT }, - { V_MMCGA, V_INFO_MM_CGA }, - { V_MMHGC, V_INFO_MM_HGC }, - { V_MMEGA, V_INFO_MM_PLANAR }, - { V_MMPACKED, V_INFO_MM_PACKED }, - { V_MMDIRCOLOR, V_INFO_MM_DIRECT }, - }; - int i; - - for (i = 0; mtable[i].mmodel >= 0; ++i) { - if (mtable[i].vmodel == vmodel) - return mtable[i].mmodel; - } - return V_INFO_MM_OTHER; -} - -static void -*vesa_fix_ptr(u_int32_t p, u_int16_t seg, u_int16_t off, u_char *buf) -{ - if (p == 0) - return NULL; - if (((p >> 16) == seg) && ((p & 0xffff) >= off)) - return (void *)(buf + ((p & 0xffff) - off)); - else { - p = BIOS_SADDRTOLADDR(p); - return (void *)BIOS_PADDRTOVADDR(p); - } -} - -static int -vesa_bios_init(void) -{ - static u_char buf[512]; - struct vm86frame vmf; - struct vesa_mode vmode; - video_info_t *p; - u_char *vmbuf; - int is_via_cle266; - int modes; - int err; - int i; - - if (vesa_init_done) - return 0; - - has_vesa_bios = FALSE; - vesa_adp_info = NULL; - vesa_vmode_max = 0; - vesa_vmode[0].vi_mode = EOT; - - /* Allocate a buffer and add each page to the vm86 context. */ - vesa_vm86_buf = malloc(VESA_VM86_BUFSIZE, M_DEVBUF, M_WAITOK | M_ZERO); - KASSERT(((vm_offset_t)vesa_vm86_buf & PAGE_MASK) == 0, - ("bad vesa_vm86_buf alignment")); - for (i = 0; i < howmany(VESA_VM86_BUFSIZE, PAGE_SIZE); i++) - vm86_addpage(&vesa_vmcontext, i + 1, - (vm_offset_t)vesa_vm86_buf + PAGE_SIZE * i); - - vmbuf = vesa_vm86_buf; - bzero(&vmf, sizeof(vmf)); /* paranoia */ - bcopy("VBE2", vmbuf, 4); /* try for VBE2 data */ - vmf.vmf_eax = 0x4f00; - vm86_getptr(&vesa_vmcontext, (vm_offset_t)vmbuf, &vmf.vmf_es, &vmf.vmf_di); - - err = vm86_datacall(0x10, &vmf, &vesa_vmcontext); - if ((err != 0) || (vmf.vmf_ax != 0x4f) || bcmp("VESA", vmbuf, 4)) - return 1; - bcopy(vmbuf, buf, sizeof(buf)); - vesa_adp_info = (struct vesa_info *)buf; - if (bootverbose) { - printf("VESA: information block\n"); - dump_buffer(buf, 64); - } - if (vesa_adp_info->v_version < 0x0102) { - printf("VESA: VBE version %d.%d is not supported; " - "version 1.2 or later is required.\n", - ((vesa_adp_info->v_version & 0xf000) >> 12) * 10 - + ((vesa_adp_info->v_version & 0x0f00) >> 8), - ((vesa_adp_info->v_version & 0x00f0) >> 4) * 10 - + (vesa_adp_info->v_version & 0x000f)); - return 1; - } - - /* fix string ptrs */ - vesa_oemstr = (char *)vesa_fix_ptr(vesa_adp_info->v_oemstr, - vmf.vmf_es, vmf.vmf_di, buf); - is_via_cle266 = strcmp(vesa_oemstr, VESA_VIA_CLE266) == 0; - - if (vesa_adp_info->v_version >= 0x0200) { - vesa_venderstr = - (char *)vesa_fix_ptr(vesa_adp_info->v_venderstr, - vmf.vmf_es, vmf.vmf_di, buf); - vesa_prodstr = - (char *)vesa_fix_ptr(vesa_adp_info->v_prodstr, - vmf.vmf_es, vmf.vmf_di, buf); - vesa_revstr = - (char *)vesa_fix_ptr(vesa_adp_info->v_revstr, - vmf.vmf_es, vmf.vmf_di, buf); - } - - /* obtain video mode information */ - vesa_vmodetab = (u_int16_t *)vesa_fix_ptr(vesa_adp_info->v_modetable, - vmf.vmf_es, vmf.vmf_di, buf); - if (vesa_vmodetab == NULL) - return 1; - for (i = 0, modes = 0; - (i < (M_VESA_MODE_MAX - M_VESA_BASE + 1)) - && (vesa_vmodetab[i] != 0xffff); ++i) { - if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode)) - continue; - - /* reject unsupported modes */ -#if 0 - if ((vmode.v_modeattr & (V_MODESUPP | V_MODEOPTINFO - | V_MODENONVGA)) - != (V_MODESUPP | V_MODEOPTINFO)) - continue; -#else - if ((vmode.v_modeattr & V_MODEOPTINFO) == 0) { -#if VESA_DEBUG > 1 - printf( - "Rejecting VESA %s mode: %d x %d x %d bpp attr = %x\n", - vmode.v_modeattr & V_MODEGRAPHICS ? "graphics" : "text", - vmode.v_width, vmode.v_height, vmode.v_bpp, - vmode.v_modeattr); -#endif - continue; - } -#endif - - /* expand the array if necessary */ - if (modes >= vesa_vmode_max) { - vesa_vmode_max += MODE_TABLE_DELTA; - p = malloc(sizeof(*vesa_vmode)*(vesa_vmode_max + 1), - M_DEVBUF, M_WAITOK); -#if VESA_DEBUG > 1 - printf("vesa_bios_init(): modes:%d, vesa_mode_max:%d\n", - modes, vesa_vmode_max); -#endif - if (modes > 0) { - bcopy(vesa_vmode, p, sizeof(*vesa_vmode)*modes); - free(vesa_vmode, M_DEVBUF); - } - vesa_vmode = p; - } - -#if VESA_DEBUG > 1 - printf("Found VESA %s mode: %d x %d x %d bpp\n", - vmode.v_modeattr & V_MODEGRAPHICS ? "graphics" : "text", - vmode.v_width, vmode.v_height, vmode.v_bpp); -#endif - if (is_via_cle266) { - if ((vmode.v_width & 0xff00) >> 8 == vmode.v_height - 1) { - vmode.v_width &= 0xff; - vmode.v_waseg = 0xb8000 >> 4; - } - } - - /* copy some fields */ - bzero(&vesa_vmode[modes], sizeof(vesa_vmode[modes])); - vesa_vmode[modes].vi_mode = vesa_vmodetab[i]; - vesa_vmode[modes].vi_width = vmode.v_width; - vesa_vmode[modes].vi_height = vmode.v_height; - vesa_vmode[modes].vi_depth = vmode.v_bpp; - vesa_vmode[modes].vi_planes = vmode.v_planes; - vesa_vmode[modes].vi_cwidth = vmode.v_cwidth; - vesa_vmode[modes].vi_cheight = vmode.v_cheight; - vesa_vmode[modes].vi_window = (u_int)vmode.v_waseg << 4; - /* XXX window B */ - vesa_vmode[modes].vi_window_size = vmode.v_wsize*1024; - vesa_vmode[modes].vi_window_gran = vmode.v_wgran*1024; - if (vmode.v_modeattr & V_MODELFB) - vesa_vmode[modes].vi_buffer = vmode.v_lfb; - else - vesa_vmode[modes].vi_buffer = 0; - /* XXX */ - vesa_vmode[modes].vi_buffer_size - = vesa_adp_info->v_memsize*64*1024; -#if 0 - if (vmode.v_offscreen > vmode.v_lfb) - vesa_vmode[modes].vi_buffer_size - = vmode.v_offscreen + vmode.v_offscreensize*1024 - - vmode.v_lfb; - else - vesa_vmode[modes].vi_buffer_size - = vmode.v_offscreen + vmode.v_offscreensize*1024 -#endif - vesa_vmode[modes].vi_mem_model - = vesa_translate_mmodel(vmode.v_memmodel); - vesa_vmode[modes].vi_pixel_fields[0] = 0; - vesa_vmode[modes].vi_pixel_fields[1] = 0; - vesa_vmode[modes].vi_pixel_fields[2] = 0; - vesa_vmode[modes].vi_pixel_fields[3] = 0; - vesa_vmode[modes].vi_pixel_fsizes[0] = 0; - vesa_vmode[modes].vi_pixel_fsizes[1] = 0; - vesa_vmode[modes].vi_pixel_fsizes[2] = 0; - vesa_vmode[modes].vi_pixel_fsizes[3] = 0; - if (vesa_vmode[modes].vi_mem_model == V_INFO_MM_PACKED) { - vesa_vmode[modes].vi_pixel_size = (vmode.v_bpp + 7)/8; - } else if (vesa_vmode[modes].vi_mem_model == V_INFO_MM_DIRECT) { - vesa_vmode[modes].vi_pixel_size = (vmode.v_bpp + 7)/8; - vesa_vmode[modes].vi_pixel_fields[0] - = vmode.v_redfieldpos; - vesa_vmode[modes].vi_pixel_fields[1] - = vmode.v_greenfieldpos; - vesa_vmode[modes].vi_pixel_fields[2] - = vmode.v_bluefieldpos; - vesa_vmode[modes].vi_pixel_fields[3] - = vmode.v_resfieldpos; - vesa_vmode[modes].vi_pixel_fsizes[0] - = vmode.v_redmasksize; - vesa_vmode[modes].vi_pixel_fsizes[1] - = vmode.v_greenmasksize; - vesa_vmode[modes].vi_pixel_fsizes[2] - = vmode.v_bluemasksize; - vesa_vmode[modes].vi_pixel_fsizes[3] - = vmode.v_resmasksize; - } else { - vesa_vmode[modes].vi_pixel_size = 0; - } - - vesa_vmode[modes].vi_flags - = vesa_translate_flags(vmode.v_modeattr) | V_INFO_VESA; - ++modes; - } - vesa_vmode[modes].vi_mode = EOT; - if (bootverbose) - printf("VESA: %d mode(s) found\n", modes); - - has_vesa_bios = (modes > 0); - if (!has_vesa_bios) - return (1); - - return (0); -} - -static void -vesa_clear_modes(video_info_t *info, int color) -{ - while (info->vi_mode != EOT) { - if ((info->vi_flags & V_INFO_COLOR) != color) - info->vi_mode = NA; - ++info; - } -} - -static vm_offset_t -vesa_map_buffer(u_int paddr, size_t size) -{ - vm_offset_t vaddr; - u_int off; - - off = paddr - trunc_page(paddr); - vaddr = (vm_offset_t)pmap_mapdev(paddr - off, size + off); -#if VESA_DEBUG > 1 - printf("vesa_map_buffer: paddr:%x vaddr:%x size:%x off:%x\n", - paddr, vaddr, size, off); -#endif - return (vaddr + off); -} - -static void -vesa_unmap_buffer(vm_offset_t vaddr, size_t size) -{ -#if VESA_DEBUG > 1 - printf("vesa_unmap_buffer: vaddr:%x size:%x\n", vaddr, size); -#endif - kmem_free(kernel_map, vaddr, size); -} - -/* entry points */ - -static int -vesa_configure(int flags) -{ - video_adapter_t *adp; - int adapters; - int error; - int i; - - if (vesa_init_done) - return 0; - if (flags & VIO_PROBE_ONLY) - return 0; /* XXX */ - - /* - * If the VESA module has already been loaded, abort loading - * the module this time. - */ - for (i = 0; (adp = vid_get_adapter(i)) != NULL; ++i) { - if (adp->va_flags & V_ADP_VESA) - return ENXIO; - if (adp->va_type == KD_VGA) - break; - } - /* - * The VGA adapter is not found. This is because either - * 1) the VGA driver has not been initialized, or 2) the VGA card - * is not present. If 1) is the case, we shall defer - * initialization for now and try again later. - */ - if (adp == NULL) { - vga_sub_configure = vesa_configure; - return ENODEV; - } - - /* count number of registered adapters */ - for (++i; vid_get_adapter(i) != NULL; ++i) - ; - adapters = i; - - /* call VESA BIOS */ - vesa_adp = adp; - if (vesa_bios_init()) { - vesa_adp = NULL; - return ENXIO; - } - vesa_adp->va_flags |= V_ADP_VESA; - - /* remove conflicting modes if we have more than one adapter */ - if (adapters > 1) { - vesa_clear_modes(vesa_vmode, - (vesa_adp->va_flags & V_ADP_COLOR) ? - V_INFO_COLOR : 0); - } - - if ((error = vesa_load_ioctl()) == 0) { - prevvidsw = vidsw[vesa_adp->va_index]; - vidsw[vesa_adp->va_index] = &vesavidsw; - vesa_init_done = TRUE; - } else { - vesa_adp = NULL; - return error; - } - - return 0; -} - -#if 0 -static int -vesa_nop(void) -{ - return 0; -} -#endif - -static int -vesa_error(void) -{ - return 1; -} - -static int -vesa_probe(int unit, video_adapter_t **adpp, void *arg, int flags) -{ - return (*prevvidsw->probe)(unit, adpp, arg, flags); -} - -static int -vesa_init(int unit, video_adapter_t *adp, int flags) -{ - return (*prevvidsw->init)(unit, adp, flags); -} - -static int -vesa_get_info(video_adapter_t *adp, int mode, video_info_t *info) -{ - int i; - - if ((*prevvidsw->get_info)(adp, mode, info) == 0) - return 0; - - if (adp != vesa_adp) - return 1; - - mode = vesa_map_gen_mode_num(vesa_adp->va_type, - vesa_adp->va_flags & V_ADP_COLOR, mode); - for (i = 0; vesa_vmode[i].vi_mode != EOT; ++i) { - if (vesa_vmode[i].vi_mode == NA) - continue; - if (vesa_vmode[i].vi_mode == mode) { - *info = vesa_vmode[i]; - return 0; - } - } - return 1; -} - -static int -vesa_query_mode(video_adapter_t *adp, video_info_t *info) -{ - int i; - - if ((*prevvidsw->query_mode)(adp, info) == 0) - return 0; - if (adp != vesa_adp) - return ENODEV; - - for (i = 0; vesa_vmode[i].vi_mode != EOT; ++i) { - if ((info->vi_width != 0) - && (info->vi_width != vesa_vmode[i].vi_width)) - continue; - if ((info->vi_height != 0) - && (info->vi_height != vesa_vmode[i].vi_height)) - continue; - if ((info->vi_cwidth != 0) - && (info->vi_cwidth != vesa_vmode[i].vi_cwidth)) - continue; - if ((info->vi_cheight != 0) - && (info->vi_cheight != vesa_vmode[i].vi_cheight)) - continue; - if ((info->vi_depth != 0) - && (info->vi_depth != vesa_vmode[i].vi_depth)) - continue; - if ((info->vi_planes != 0) - && (info->vi_planes != vesa_vmode[i].vi_planes)) - continue; - /* pixel format, memory model */ - if ((info->vi_flags != 0) - && (info->vi_flags != vesa_vmode[i].vi_flags)) - continue; - *info = vesa_vmode[i]; - return 0; - } - return ENODEV; -} - -static int -vesa_set_mode(video_adapter_t *adp, int mode) -{ - video_info_t info; - int len; - - if (adp != vesa_adp) - return (*prevvidsw->set_mode)(adp, mode); - - mode = vesa_map_gen_mode_num(adp->va_type, - adp->va_flags & V_ADP_COLOR, mode); -#if VESA_DEBUG > 0 - printf("VESA: set_mode(): %d(%x) -> %d(%x)\n", - adp->va_mode, adp->va_mode, mode, mode); -#endif - /* - * If the current mode is a VESA mode and the new mode is not, - * restore the state of the adapter first by setting one of the - * standard VGA mode, so that non-standard, extended SVGA registers - * are set to the state compatible with the standard VGA modes. - * Otherwise (*prevvidsw->set_mode)() may not be able to set up - * the new mode correctly. - */ - if (VESA_MODE(adp->va_mode)) { - if ((*prevvidsw->get_info)(adp, mode, &info) == 0) { - int10_set_mode(adp->va_initial_bios_mode); - if (adp->va_info.vi_flags & V_INFO_LINEAR) - vesa_unmap_buffer(adp->va_buffer, - vesa_adp_info->v_memsize*64*1024); - /* - * Once (*prevvidsw->get_info)() succeeded, - * (*prevvidsw->set_mode)() below won't fail... - */ - } - } - - /* we may not need to handle this mode after all... */ - if ((*prevvidsw->set_mode)(adp, mode) == 0) - return 0; - - /* is the new mode supported? */ - if (vesa_get_info(adp, mode, &info)) - return 1; - /* assert(VESA_MODE(mode)); */ - -#if VESA_DEBUG > 0 - printf("VESA: about to set a VESA mode...\n"); -#endif - /* don't use the linear frame buffer for text modes. XXX */ - if (!(info.vi_flags & V_INFO_GRAPHICS)) - info.vi_flags &= ~V_INFO_LINEAR; - - if (vesa_bios_set_mode(mode | ((info.vi_flags & V_INFO_LINEAR) ? 0x4000 : 0))) - return 1; - - if (adp->va_info.vi_flags & V_INFO_LINEAR) - vesa_unmap_buffer(adp->va_buffer, - vesa_adp_info->v_memsize*64*1024); - -#if VESA_DEBUG > 0 - printf("VESA: mode set!\n"); -#endif - vesa_adp->va_mode = mode; - vesa_adp->va_flags &= ~V_ADP_COLOR; - vesa_adp->va_flags |= - (info.vi_flags & V_INFO_COLOR) ? V_ADP_COLOR : 0; - vesa_adp->va_crtc_addr = - (vesa_adp->va_flags & V_ADP_COLOR) ? COLOR_CRTC : MONO_CRTC; - if (info.vi_flags & V_INFO_LINEAR) { -#if VESA_DEBUG > 1 - printf("VESA: setting up LFB\n"); -#endif - vesa_adp->va_buffer = - vesa_map_buffer(info.vi_buffer, - vesa_adp_info->v_memsize*64*1024); - vesa_adp->va_buffer_size = info.vi_buffer_size; - vesa_adp->va_window = vesa_adp->va_buffer; - vesa_adp->va_window_size = info.vi_buffer_size/info.vi_planes; - vesa_adp->va_window_gran = info.vi_buffer_size/info.vi_planes; - } else { - vesa_adp->va_buffer = 0; - vesa_adp->va_buffer_size = info.vi_buffer_size; - vesa_adp->va_window = BIOS_PADDRTOVADDR(info.vi_window); - vesa_adp->va_window_size = info.vi_window_size; - vesa_adp->va_window_gran = info.vi_window_gran; - } - vesa_adp->va_window_orig = 0; - len = vesa_bios_get_line_length(); - if (len > 0) { - vesa_adp->va_line_width = len; - } else if (info.vi_flags & V_INFO_GRAPHICS) { - switch (info.vi_depth/info.vi_planes) { - case 1: - vesa_adp->va_line_width = info.vi_width/8; - break; - case 2: - vesa_adp->va_line_width = info.vi_width/4; - break; - case 4: - vesa_adp->va_line_width = info.vi_width/2; - break; - case 8: - default: /* shouldn't happen */ - vesa_adp->va_line_width = info.vi_width; - break; - case 15: - case 16: - vesa_adp->va_line_width = info.vi_width*2; - break; - case 24: - case 32: - vesa_adp->va_line_width = info.vi_width*4; - break; - } - } else { - vesa_adp->va_line_width = info.vi_width; - } - vesa_adp->va_disp_start.x = 0; - vesa_adp->va_disp_start.y = 0; -#if VESA_DEBUG > 0 - printf("vesa_set_mode(): vi_width:%d, len:%d, line_width:%d\n", - info.vi_width, len, vesa_adp->va_line_width); -#endif - bcopy(&info, &vesa_adp->va_info, sizeof(vesa_adp->va_info)); - - /* move hardware cursor out of the way */ - (*vidsw[vesa_adp->va_index]->set_hw_cursor)(vesa_adp, -1, -1); - - return 0; -} - -static int -vesa_save_font(video_adapter_t *adp, int page, int fontsize, int fontwidth, - u_char *data, int ch, int count) -{ - return (*prevvidsw->save_font)(adp, page, fontsize, fontwidth, data, - ch, count); -} - -static int -vesa_load_font(video_adapter_t *adp, int page, int fontsize, int fontwidth, - u_char *data, int ch, int count) -{ - return (*prevvidsw->load_font)(adp, page, fontsize, fontwidth, data, - ch, count); -} - -static int -vesa_show_font(video_adapter_t *adp, int page) -{ - return (*prevvidsw->show_font)(adp, page); -} - -static int -vesa_save_palette(video_adapter_t *adp, u_char *palette) -{ - int bits; - int error; - - if ((adp == vesa_adp) && (vesa_adp_info->v_flags & V_DAC8) - && VESA_MODE(adp->va_mode)) { - bits = vesa_bios_get_dac(); - error = vesa_bios_save_palette(0, 256, palette, bits); - if (error == 0) - return 0; - if (bits != 6) - return error; - } - - return (*prevvidsw->save_palette)(adp, palette); -} - -static int -vesa_load_palette(video_adapter_t *adp, u_char *palette) -{ -#ifdef notyet - int bits; - int error; - - if ((adp == vesa_adp) && (vesa_adp_info->v_flags & V_DAC8) - && VESA_MODE(adp->va_mode) && ((bits = vesa_bios_set_dac(8)) > 6)) { - error = vesa_bios_load_palette(0, 256, palette, bits); - if (error == 0) - return 0; - if (vesa_bios_set_dac(6) != 6) - return 1; - } -#endif /* notyet */ - - return (*prevvidsw->load_palette)(adp, palette); -} - -static int -vesa_set_border(video_adapter_t *adp, int color) -{ - return (*prevvidsw->set_border)(adp, color); -} - -static int -vesa_save_state(video_adapter_t *adp, void *p, size_t size) -{ - if (adp != vesa_adp) - return (*prevvidsw->save_state)(adp, p, size); - - if (vesa_state_buf_size == 0) - vesa_state_buf_size = vesa_bios_state_buf_size(); - if (size == 0) - return (sizeof(int) + vesa_state_buf_size); - else if (size < (sizeof(int) + vesa_state_buf_size)) - return 1; - - ((adp_state_t *)p)->sig = V_STATE_SIG; - bzero(((adp_state_t *)p)->regs, vesa_state_buf_size); - return vesa_bios_save_restore(STATE_SAVE, ((adp_state_t *)p)->regs, - vesa_state_buf_size); -} - -static int -vesa_load_state(video_adapter_t *adp, void *p) -{ - if ((adp != vesa_adp) || (((adp_state_t *)p)->sig != V_STATE_SIG)) - return (*prevvidsw->load_state)(adp, p); - - return vesa_bios_save_restore(STATE_LOAD, ((adp_state_t *)p)->regs, - vesa_state_buf_size); -} - -#if 0 -static int -vesa_get_origin(video_adapter_t *adp, off_t *offset) -{ - struct vm86frame vmf; - int err; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f05; - vmf.vmf_ebx = 0x10; /* WINDOW_A, XXX */ - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - *offset = vmf.vmf_dx*adp->va_window_gran; - return 0; -} -#endif - -static int -vesa_set_origin(video_adapter_t *adp, off_t offset) -{ - struct vm86frame vmf; - int err; - - /* - * This function should return as quickly as possible to - * maintain good performance of the system. For this reason, - * error checking is kept minimal and let the VESA BIOS to - * detect error. - */ - if (adp != vesa_adp) - return (*prevvidsw->set_win_org)(adp, offset); - - /* if this is a linear frame buffer, do nothing */ - if (adp->va_info.vi_flags & V_INFO_LINEAR) - return 0; - /* XXX */ - if (adp->va_window_gran == 0) - return 1; - - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f05; - vmf.vmf_ebx = 0; /* WINDOW_A, XXX */ - vmf.vmf_edx = offset/adp->va_window_gran; - err = vm86_intcall(0x10, &vmf); - if ((err != 0) || (vmf.vmf_ax != 0x4f)) - return 1; - bzero(&vmf, sizeof(vmf)); - vmf.vmf_eax = 0x4f05; - vmf.vmf_ebx = 1; /* WINDOW_B, XXX */ - vmf.vmf_edx = offset/adp->va_window_gran; - err = vm86_intcall(0x10, &vmf); - adp->va_window_orig = (offset/adp->va_window_gran)*adp->va_window_gran; - return 0; /* XXX */ -} - -static int -vesa_read_hw_cursor(video_adapter_t *adp, int *col, int *row) -{ - return (*prevvidsw->read_hw_cursor)(adp, col, row); -} - -static int -vesa_set_hw_cursor(video_adapter_t *adp, int col, int row) -{ - return (*prevvidsw->set_hw_cursor)(adp, col, row); -} - -static int -vesa_set_hw_cursor_shape(video_adapter_t *adp, int base, int height, - int celsize, int blink) -{ - return (*prevvidsw->set_hw_cursor_shape)(adp, base, height, celsize, - blink); -} - -static int -vesa_blank_display(video_adapter_t *adp, int mode) -{ - /* XXX: use VESA DPMS */ - return (*prevvidsw->blank_display)(adp, mode); -} - -static int -vesa_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, - int prot) -{ -#if VESA_DEBUG > 0 - printf("vesa_mmap(): window:0x%x, buffer:0x%x, offset:0x%x\n", - adp->va_info.vi_window, adp->va_info.vi_buffer, offset); -#endif - - if ((adp == vesa_adp) && (adp->va_info.vi_flags & V_INFO_LINEAR)) { - /* va_window_size == va_buffer_size/vi_planes */ - /* XXX: is this correct? */ - if (offset > adp->va_window_size - PAGE_SIZE) - return -1; - *paddr = adp->va_info.vi_buffer + offset; - return 0; - } else { - return (*prevvidsw->mmap)(adp, offset, paddr, prot); - } -} - -static int -vesa_clear(video_adapter_t *adp) -{ - return (*prevvidsw->clear)(adp); -} - -static int -vesa_fill_rect(video_adapter_t *adp, int val, int x, int y, int cx, int cy) -{ - return (*prevvidsw->fill_rect)(adp, val, x, y, cx, cy); -} - -static int -vesa_bitblt(video_adapter_t *adp,...) -{ - /* FIXME */ - return 1; -} - -static int -get_palette(video_adapter_t *adp, int base, int count, - u_char *red, u_char *green, u_char *blue, u_char *trans) -{ - u_char *r; - u_char *g; - u_char *b; - int bits; - int error; - - if ((base < 0) || (base >= 256) || (count < 0) || (count > 256)) - return 1; - if ((base + count) > 256) - return 1; - if (!(vesa_adp_info->v_flags & V_DAC8) || !VESA_MODE(adp->va_mode)) - return 1; - - bits = vesa_bios_get_dac(); - if (bits <= 6) - return 1; - - r = malloc(count*3, M_DEVBUF, M_WAITOK); - g = r + count; - b = g + count; - error = vesa_bios_save_palette2(base, count, r, g, b, bits); - if (error == 0) { - copyout(r, red, count); - copyout(g, green, count); - copyout(b, blue, count); - if (trans != NULL) { - bzero(r, count); - copyout(r, trans, count); - } - } - free(r, M_DEVBUF); - - /* if error && bits != 6 at this point, we are in trouble... XXX */ - return error; -} - -static int -set_palette(video_adapter_t *adp, int base, int count, - u_char *red, u_char *green, u_char *blue, u_char *trans) -{ - return 1; -#ifdef notyet - u_char *r; - u_char *g; - u_char *b; - int bits; - int error; - - if ((base < 0) || (base >= 256) || (base + count > 256)) - return 1; - if (!(vesa_adp_info->v_flags & V_DAC8) || !VESA_MODE(adp->va_mode) - || ((bits = vesa_bios_set_dac(8)) <= 6)) - return 1; - - r = malloc(count*3, M_DEVBUF, M_WAITOK); - g = r + count; - b = g + count; - copyin(red, r, count); - copyin(green, g, count); - copyin(blue, b, count); - - error = vesa_bios_load_palette2(base, count, r, g, b, bits); - free(r, M_DEVBUF); - if (error == 0) - return 0; - - /* if the following call fails, we are in trouble... XXX */ - vesa_bios_set_dac(6); - return 1; -#endif /* notyet */ -} - -static int -vesa_ioctl(video_adapter_t *adp, u_long cmd, caddr_t arg) -{ - int bytes; - - if (adp != vesa_adp) - return (*prevvidsw->ioctl)(adp, cmd, arg); - - switch (cmd) { - case FBIO_SETWINORG: /* set frame buffer window origin */ - if (!VESA_MODE(adp->va_mode)) - return (*prevvidsw->ioctl)(adp, cmd, arg); - return (vesa_set_origin(adp, *(off_t *)arg) ? ENODEV : 0); - - case FBIO_SETDISPSTART: /* set display start address */ - if (!VESA_MODE(adp->va_mode)) - return (*prevvidsw->ioctl)(adp, cmd, arg); - if (vesa_bios_set_start(((video_display_start_t *)arg)->x, - ((video_display_start_t *)arg)->y)) - return ENODEV; - adp->va_disp_start.x = ((video_display_start_t *)arg)->x; - adp->va_disp_start.y = ((video_display_start_t *)arg)->y; - return 0; - - case FBIO_SETLINEWIDTH: /* set line length in pixel */ - if (!VESA_MODE(adp->va_mode)) - return (*prevvidsw->ioctl)(adp, cmd, arg); - if (vesa_bios_set_line_length(*(u_int *)arg, &bytes, NULL)) - return ENODEV; - adp->va_line_width = bytes; -#if VESA_DEBUG > 1 - printf("new line width:%d\n", adp->va_line_width); -#endif - return 0; - - case FBIO_GETPALETTE: /* get color palette */ - if (get_palette(adp, ((video_color_palette_t *)arg)->index, - ((video_color_palette_t *)arg)->count, - ((video_color_palette_t *)arg)->red, - ((video_color_palette_t *)arg)->green, - ((video_color_palette_t *)arg)->blue, - ((video_color_palette_t *)arg)->transparent)) - return (*prevvidsw->ioctl)(adp, cmd, arg); - return 0; - - - case FBIO_SETPALETTE: /* set color palette */ - if (set_palette(adp, ((video_color_palette_t *)arg)->index, - ((video_color_palette_t *)arg)->count, - ((video_color_palette_t *)arg)->red, - ((video_color_palette_t *)arg)->green, - ((video_color_palette_t *)arg)->blue, - ((video_color_palette_t *)arg)->transparent)) - return (*prevvidsw->ioctl)(adp, cmd, arg); - return 0; - - case FBIOGETCMAP: /* get color palette */ - if (get_palette(adp, ((struct fbcmap *)arg)->index, - ((struct fbcmap *)arg)->count, - ((struct fbcmap *)arg)->red, - ((struct fbcmap *)arg)->green, - ((struct fbcmap *)arg)->blue, NULL)) - return (*prevvidsw->ioctl)(adp, cmd, arg); - return 0; - - case FBIOPUTCMAP: /* set color palette */ - if (set_palette(adp, ((struct fbcmap *)arg)->index, - ((struct fbcmap *)arg)->count, - ((struct fbcmap *)arg)->red, - ((struct fbcmap *)arg)->green, - ((struct fbcmap *)arg)->blue, NULL)) - return (*prevvidsw->ioctl)(adp, cmd, arg); - return 0; - - default: - return (*prevvidsw->ioctl)(adp, cmd, arg); - } -} - -static int -vesa_diag(video_adapter_t *adp, int level) -{ - int error; - - /* call the previous handler first */ - error = (*prevvidsw->diag)(adp, level); - if (error) - return error; - - if (adp != vesa_adp) - return 1; - - if (level <= 0) - return 0; - - return 0; -} - -static int -vesa_bios_info(int level) -{ -#if VESA_DEBUG > 1 - struct vesa_mode vmode; - int i; -#endif - - if (bootverbose) { - /* general adapter information */ - printf( - "VESA: v%d.%d, %dk memory, flags:0x%x, mode table:%p (%x)\n", - ((vesa_adp_info->v_version & 0xf000) >> 12) * 10 + - ((vesa_adp_info->v_version & 0x0f00) >> 8), - ((vesa_adp_info->v_version & 0x00f0) >> 4) * 10 + - (vesa_adp_info->v_version & 0x000f), - vesa_adp_info->v_memsize * 64, vesa_adp_info->v_flags, - vesa_vmodetab, vesa_adp_info->v_modetable); - - /* OEM string */ - if (vesa_oemstr != NULL) - printf("VESA: %s\n", vesa_oemstr); - } - - if (level <= 0) - return 0; - - if (vesa_adp_info->v_version >= 0x0200 && bootverbose) { - /* vender name, product name, product revision */ - printf("VESA: %s %s %s\n", - (vesa_venderstr != NULL) ? vesa_venderstr : "unknown", - (vesa_prodstr != NULL) ? vesa_prodstr : "unknown", - (vesa_revstr != NULL) ? vesa_revstr : "?"); - } - -#if VESA_DEBUG > 1 - /* mode information */ - for (i = 0; - (i < (M_VESA_MODE_MAX - M_VESA_BASE + 1)) - && (vesa_vmodetab[i] != 0xffff); ++i) { - if (vesa_bios_get_mode(vesa_vmodetab[i], &vmode)) - continue; - - /* print something for diagnostic purpose */ - printf("VESA: mode:0x%03x, flags:0x%04x", - vesa_vmodetab[i], vmode.v_modeattr); - if (vmode.v_modeattr & V_MODEOPTINFO) { - if (vmode.v_modeattr & V_MODEGRAPHICS) { - printf(", G %dx%dx%d %d, ", - vmode.v_width, vmode.v_height, - vmode.v_bpp, vmode.v_planes); - } else { - printf(", T %dx%d, ", - vmode.v_width, vmode.v_height); - } - printf("font:%dx%d, ", - vmode.v_cwidth, vmode.v_cheight); - printf("pages:%d, mem:%d", - vmode.v_ipages + 1, vmode.v_memmodel); - } - if (vmode.v_modeattr & V_MODELFB) { - printf("\nVESA: LFB:0x%x, off:0x%x, off_size:0x%x", - vmode.v_lfb, vmode.v_offscreen, - vmode.v_offscreensize*1024); - } - printf("\n"); - printf("VESA: window A:0x%x (%x), window B:0x%x (%x), ", - vmode.v_waseg, vmode.v_waattr, - vmode.v_wbseg, vmode.v_wbattr); - printf("size:%dk, gran:%dk\n", - vmode.v_wsize, vmode.v_wgran); - } -#endif /* VESA_DEBUG > 1 */ - - return 0; -} - -/* module loading */ - -static int -vesa_load(void) -{ - int error; - int s; - - if (vesa_init_done) - return 0; - - /* locate a VGA adapter */ - s = spltty(); - vesa_adp = NULL; - error = vesa_configure(0); - splx(s); - - if (error == 0) - vesa_bios_info(bootverbose); - - return error; -} - -static int -vesa_unload(void) -{ - u_char palette[256*3]; - int error; - int bits; - int s; - - /* if the adapter is currently in a VESA mode, don't unload */ - if ((vesa_adp != NULL) && VESA_MODE(vesa_adp->va_mode)) - return EBUSY; - /* - * FIXME: if there is at least one vty which is in a VESA mode, - * we shouldn't be unloading! XXX - */ - - s = spltty(); - if ((error = vesa_unload_ioctl()) == 0) { - if (vesa_adp != NULL) { - if (vesa_adp_info->v_flags & V_DAC8) { - bits = vesa_bios_get_dac(); - if (bits > 6) { - vesa_bios_save_palette(0, 256, - palette, bits); - vesa_bios_set_dac(6); - vesa_bios_load_palette(0, 256, - palette, 6); - } - } - vesa_adp->va_flags &= ~V_ADP_VESA; - vidsw[vesa_adp->va_index] = prevvidsw; - } - } - splx(s); - - if (vesa_vm86_buf != NULL) - free(vesa_vm86_buf, M_DEVBUF); - - return error; -} - -static int -vesa_mod_event(module_t mod, int type, void *data) -{ - switch (type) { - case MOD_LOAD: - return vesa_load(); - case MOD_UNLOAD: - return vesa_unload(); - default: - return EOPNOTSUPP; - } - return 0; -} - -static moduledata_t vesa_mod = { - "vesa", - vesa_mod_event, - NULL, -}; - -DECLARE_MODULE(vesa, vesa_mod, SI_SUB_DRIVERS, SI_ORDER_MIDDLE); - -#endif /* VGA_NO_MODE_CHANGE */ diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 9f5dbea..8f37b61 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -482,6 +482,7 @@ _cpufreq= cpufreq .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _cyclic= cyclic .endif +_dpms= dpms _drm= drm .if ${MK_CDDL} != "no" || defined(ALL_MODULES) _dtrace= dtrace @@ -532,9 +533,11 @@ _scsi_low= scsi_low _smbfs= smbfs _sound= sound _speaker= speaker +_splash= splash _sppp= sppp _tmpfs= tmpfs _twa= twa +_vesa= vesa _wi= wi _wpi= wpi _wpifw= wpifw diff --git a/sys/modules/dpms/Makefile b/sys/modules/dpms/Makefile index a58072e..d1d58ff 100644 --- a/sys/modules/dpms/Makefile +++ b/sys/modules/dpms/Makefile @@ -1,9 +1,9 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../i386/isa - KMOD= dpms -SRCS= dpms.c -SRCS+= bus_if.h device_if.h +SRCS= bus_if.h device_if.h + +.PATH: ${.CURDIR}/../../dev/dpms +SRCS+= dpms.c .include <bsd.kmod.mk> diff --git a/sys/modules/vesa/Makefile b/sys/modules/vesa/Makefile index eb49f93..8b45915 100644 --- a/sys/modules/vesa/Makefile +++ b/sys/modules/vesa/Makefile @@ -1,8 +1,12 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../dev/syscons ${.CURDIR}/../../i386/isa - KMOD= vesa -SRCS= vesa.c scvesactl.c opt_vga.h opt_vesa.h +SRCS= opt_vga.h opt_vesa.h + +.PATH: ${.CURDIR}/../../dev/fb +SRCS+= vesa.c + +.PATH: ${.CURDIR}/../../dev/syscons +SRCS+= scvesactl.c .include <bsd.kmod.mk> |
