On Sun, Sep 16, 2012 at 01:03:18PM +0900, Hiroshi Miura wrote:
This patch adds the ability for the Bochs VGA ROM to return information about a HD wide monitor.
It is constructed from defitions at run time.
[...]
--- /dev/null +++ b/vgasrc/bochsedid.c @@ -0,0 +1,147 @@ +// VESA VBE EDID capability for virtual display +// +// Copyright (C) 2012 Hiroshi Miura miurahr@linux.com +// +// This file may be distributed under the terms of the GNU LGPLv3 license.
+#include "vbe.h" // VBE_CAPABILITY_8BIT_DAC +#include "biosvar.h" // GET_GLOBAL +#include "util.h" // dprintf +#include "config.h" // CONFIG_* +#include "bochsedid.h"
+int bochs_get_ddc_capabilities(u16 unit) +{
- if (unit != 0)
return -1;- return (1 << 8) | VBE_DDC1_PROTOCOL_SUPPORTED;
+}
+u8 most_chromaticity[8] VAR16 = {0xA6,0x55,0x48,0x9B,0x26,0x12,0x50,0x54}; +unsigned char vgabios_name[] VAR16 = "Sea VGABIOS"; +struct edid_detailed_timing edid_dtd_1280x1024 VAR16 = {
0x2a30, 0x00, 0x98, 0x51, 0x00, 0x2A,0x40, 0x30, 0x70, 0x13, 0x00, 0x2C, 0xE1, 0x10,0x00, 0x00, 0x1E};+struct edid_detailed_timing edid_dtd_1152x864 VAR16 = {
0x2a30, 0x80, 0xC0, 0x41, 0x60, 0x24,0x30, 0x40, 0x80, 0x13, 0x00, 0x2C, 0xE1, 0x10,0x00, 0x00, 0x1E};+struct edid_detailed_timing edid_dtd_1600x1200 VAR16 = {
0x3c8c, 0x40, 0x30, 0x62, 0xB0, 0x32,0x40, 0x40, 0xC0, 0x13, 0x00, 0x2C, 0xE1, 0x10,0x00, 0x00, 0x1E};+struct edid_detailed_timing edid_dtd_1920x1200 VAR16 = {
0x4B7D, 0xB0, 0xA0, 0x72, 0xB0, 0x2D,0x40, 0x88, 0xC8, 0x55, 0x75, 0x21,0x00, 0x00, 0x1C};+struct edid_monitor_range_limit edid_range_limit VAR16 = {
- {0x00,0x00,0x00,0xfD,0x00},
- 50,150, /* Vertical 50Hz - 150Hz */
- 31,135, /* Horiz 31kHz - 135kHz */
- 20, /* clock 200MHz */
- 0, /* no ext */
- 0x0A,0x20,0x20,
- 0x2020,
- 0x20,0x20 /* padding */
- };
+int bochs_read_edid_block0(u16 unit, u16 block, u16 seg, void *data, u8 next) +{
- struct edid_info *info = data;
- int i;
- memset_far(seg, info, 0, sizeof(*info));
- /* header */
- SET_FARVAR(seg, info->header[0], 0);
- for (i = 1; i < 7; i++) {
SET_FARVAR(seg, info->header[i], 0xFF);- }
- SET_FARVAR(seg, info->header[7], 0);
- /* Vendor/Product/Serial/Date */
- SET_FARVAR(seg, info->vendor, 0x2104);
- SET_FARVAR(seg, info->product,0xCDAB);
- SET_FARVAR(seg, info->serial, 0x00000000);
- /* date/version */
- SET_FARVAR(seg, info->week,36);
- SET_FARVAR(seg, info->year,22); /* 2012 */
- SET_FARVAR(seg, info->major_version,1);
- SET_FARVAR(seg, info->minor_version,3); /* 1.3 */
- /* video prameters */
- SET_FARVAR(seg, info->video_setup,0x0F);
- /* Video signal interface (analogue, 0.700 : 0.300 : 1.000 V p-p,
Video Setup: Blank Level = Black Level, Separate Sync H & V Signals aresupported, Composite Sync Signal on Horizontal is supported, CompositeSync Signal on Green Video is supported, Serration on the Vertical Syncis supported) */- SET_FARVAR(seg, info->screen_width,0x21);
- SET_FARVAR(seg, info->screen_height,0x19); /* 330 mm * 250 mm */
- SET_FARVAR(seg, info->gamma,0x78); /* 2.2 */
- SET_FARVAR(seg, info->feature_flag,0x0F); /* no DMPS states, RGB, display is continuous frequency, prefered mode */
- SET_FARVAR(seg, info->least_chromaticity[0],0x78);
- SET_FARVAR(seg, info->least_chromaticity[1],0xF5);
- memcpy_far(seg, info->most_chromaticity, get_global_seg(), most_chromaticity,
sizeof (most_chromaticity));- SET_FARVAR(seg, info->established_timing[0], 0xFF);
- SET_FARVAR(seg, info->established_timing[1], 0xEF);
- SET_FARVAR(seg, info->established_timing[2], 0x80);
- /* 720x400@70Hz, 720x400@88Hz, 640x480@60Hz, 640x480@67Hz, 640x480@72Hz, 640x480@75Hz,
800x600@56Hz, 800x600@60Hz, 800x600@72Hz, 800x600@75Hz, 832x624@75Hz, 1152x870@75Hz,not 1024x768@87Hz(I), 1024x768@60Hz, 1024x768@70Hz, 1024x768@75Hz, 1280x1024@75Hz */- /* standard timings */
- SET_FARVAR(seg, info->standard_timing[0], EDID_STD_640x480_85Hz);
- SET_FARVAR(seg, info->standard_timing[1], EDID_STD_800x600_85Hz);
- SET_FARVAR(seg, info->standard_timing[2], EDID_STD_1024x768_85Hz);
- SET_FARVAR(seg, info->standard_timing[3], EDID_STD_1280x720_70Hz);
- SET_FARVAR(seg, info->standard_timing[4], EDID_STD_1280x960_60Hz);
- SET_FARVAR(seg, info->standard_timing[5], EDID_STD_1440x900_60Hz);
- SET_FARVAR(seg, info->standard_timing[6], EDID_STD_1600x1200_60Hz);
- SET_FARVAR(seg, info->standard_timing[7], EDID_STD_NOP);
- /* detailed timing blocks */
- memcpy_far(seg, &(info->desc[0].dtd), get_global_seg(), &edid_dtd_1600x1200,
sizeof (edid_dtd_1600x1200));- /* monitor range */
- memcpy_far(seg, &(info->desc[1].mrld), get_global_seg(), &edid_range_limit,
sizeof(edid_range_limit));- /* serial */
- for (i = 0; i < 5; i++) {
SET_FARVAR(seg, info->desc[2].mtxtd.header[i], 0);- }
- SET_FARVAR(seg, info->desc[2].mtxtd.header[3], 0xFF);
- for (i = 0; i < 10; i++) {
SET_FARVAR(seg, info->desc[2].mtxtd.text[i], i+0x30);- }
- SET_FARVAR(seg, info->desc[2].mtxtd.text[10], 0x0A);
- SET_FARVAR(seg, info->desc[2].mtxtd.text[11], 0x20);
- SET_FARVAR(seg, info->desc[2].mtxtd.text[12], 0x20);
- /* monitor name */
- for (i = 0; i < 5; i++) {
SET_FARVAR(seg, info->desc[3].mtxtd.header[i], 0);- }
- SET_FARVAR(seg, info->desc[3].mtxtd.header[3], 0xFC);
- memcpy_far(seg, info->desc[3].mtxtd.text, get_global_seg(), vgabios_name, 12);
- SET_FARVAR(seg, info->desc[3].mtxtd.text[12], 0x0A);
- /* ext */
- SET_FARVAR(seg, info->extensions, next);
- /* checksum */
- u8 sum = -checksum_far(get_global_seg(), info, sizeof(info));
- SET_FARVAR(seg, info->checksum, sum);
- return 0;
+}
+int bochs_read_edid(u16 unit, u16 block, u16 seg, void *data) +{
- if (unit != 0)
return -1;- switch (block) {
- case 0:
return bochs_read_edid_block0(unit, block, seg, data, 0);- default:
return -1;- }
+}
The patch looks okay to me.
Out of curiousity, though, why not populate the edid block at init? Something like:
struct edid_info BochsEDID VAR16;
void bochs_setup_edid(void) { ... }
int bochs_read_edid(u16 unit, u16 block, u16 seg, void *data) { if (unit != 0 || block != 0) return -1;
memcpy_far(seg, data, get_global_seg(), &BochsEDID, sizeof(BochsEDID)); return 0; }
-Kevin