diff options
Diffstat (limited to 'xorg-server/hw/xfree86/ddc/print_edid.c')
| -rw-r--r-- | xorg-server/hw/xfree86/ddc/print_edid.c | 644 |
1 files changed, 341 insertions, 303 deletions
diff --git a/xorg-server/hw/xfree86/ddc/print_edid.c b/xorg-server/hw/xfree86/ddc/print_edid.c index 1faae1e33..4f983f934 100644 --- a/xorg-server/hw/xfree86/ddc/print_edid.c +++ b/xorg-server/hw/xfree86/ddc/print_edid.c @@ -36,24 +36,24 @@ #include "xf86_OSproc.h" #include "xf86DDC.h" #include "edid.h" - + #define EDID_WIDTH 16 - + static void print_vendor(int scrnIndex, struct vendor *c) { xf86DrvMsg(scrnIndex, X_INFO, "Manufacturer: %s Model: %x Serial#: %u\n", - (char *)&c->name, c->prod_id, c->serial); + (char *) &c->name, c->prod_id, c->serial); xf86DrvMsg(scrnIndex, X_INFO, "Year: %u Week: %u\n", c->year, c->week); } static void print_version(int scrnIndex, struct edid_version *c) { - xf86DrvMsg(scrnIndex,X_INFO,"EDID Version: %u.%u\n",c->version, - c->revision); + xf86DrvMsg(scrnIndex, X_INFO, "EDID Version: %u.%u\n", c->version, + c->revision); } - + static const char *digital_interfaces[] = { "undefined", "DVI", @@ -64,212 +64,241 @@ static const char *digital_interfaces[] = { "unknown" }; -static void +static void print_input_features(int scrnIndex, struct disp_features *c, - struct edid_version *v) + struct edid_version *v) { if (DIGITAL(c->input_type)) { - xf86DrvMsg(scrnIndex, X_INFO, "Digital Display Input\n"); - if (v->revision == 2 || v->revision == 3) { - if (DFP1(c->input_dfp)) - xf86DrvMsg(scrnIndex, X_INFO, "DFP 1.x compatible TMDS\n"); - } else if (v->revision >= 4) { - int interface = c->input_interface; - int bpc = c->input_bpc; - if (interface > 6) - interface = 6; /* unknown */ - if (bpc == 0 || bpc == 7) - xf86DrvMsg(scrnIndex, X_INFO, "Undefined color depth\n"); - else - xf86DrvMsg(scrnIndex, X_INFO, "%d bits per channel\n", - bpc * 2 + 4); - xf86DrvMsg(scrnIndex, X_INFO, "Digital interface is %s\n", - digital_interfaces[interface]); - } - } else { - xf86DrvMsg(scrnIndex,X_INFO,"Analog Display Input, "); - xf86ErrorF("Input Voltage Level: "); - switch (c->input_voltage){ - case V070: - xf86ErrorF("0.700/0.300 V\n"); - break; - case V071: - xf86ErrorF("0.714/0.286 V\n"); - break; - case V100: - xf86ErrorF("1.000/0.400 V\n"); - break; - case V007: + xf86DrvMsg(scrnIndex, X_INFO, "Digital Display Input\n"); + if (v->revision == 2 || v->revision == 3) { + if (DFP1(c->input_dfp)) + xf86DrvMsg(scrnIndex, X_INFO, "DFP 1.x compatible TMDS\n"); + } + else if (v->revision >= 4) { + int interface = c->input_interface; + int bpc = c->input_bpc; + + if (interface > 6) + interface = 6; /* unknown */ + if (bpc == 0 || bpc == 7) + xf86DrvMsg(scrnIndex, X_INFO, "Undefined color depth\n"); + else + xf86DrvMsg(scrnIndex, X_INFO, "%d bits per channel\n", + bpc * 2 + 4); + xf86DrvMsg(scrnIndex, X_INFO, "Digital interface is %s\n", + digital_interfaces[interface]); + } + } + else { + xf86DrvMsg(scrnIndex, X_INFO, "Analog Display Input, "); + xf86ErrorF("Input Voltage Level: "); + switch (c->input_voltage) { + case V070: + xf86ErrorF("0.700/0.300 V\n"); + break; + case V071: + xf86ErrorF("0.714/0.286 V\n"); + break; + case V100: + xf86ErrorF("1.000/0.400 V\n"); + break; + case V007: xf86ErrorF("0.700/0.700 V\n"); - break; - default: - xf86ErrorF("undefined\n"); - } - if (SIG_SETUP(c->input_setup)) - xf86DrvMsg(scrnIndex,X_INFO,"Signal levels configurable\n"); - xf86DrvMsg(scrnIndex,X_INFO,"Sync:"); - if (SEP_SYNC(c->input_sync)) - xf86ErrorF(" Separate"); - if (COMP_SYNC(c->input_sync)) - xf86ErrorF(" Composite"); - if (SYNC_O_GREEN(c->input_sync)) - xf86ErrorF(" SyncOnGreen"); - if (SYNC_SERR(c->input_sync)) - xf86ErrorF("Serration on. " - "V.Sync Pulse req. if CompSync or SyncOnGreen\n"); - else xf86ErrorF("\n"); + break; + default: + xf86ErrorF("undefined\n"); + } + if (SIG_SETUP(c->input_setup)) + xf86DrvMsg(scrnIndex, X_INFO, "Signal levels configurable\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Sync:"); + if (SEP_SYNC(c->input_sync)) + xf86ErrorF(" Separate"); + if (COMP_SYNC(c->input_sync)) + xf86ErrorF(" Composite"); + if (SYNC_O_GREEN(c->input_sync)) + xf86ErrorF(" SyncOnGreen"); + if (SYNC_SERR(c->input_sync)) + xf86ErrorF("Serration on. " + "V.Sync Pulse req. if CompSync or SyncOnGreen\n"); + else + xf86ErrorF("\n"); } } - -static void + +static void print_dpms_features(int scrnIndex, struct disp_features *c, - struct edid_version *v) + struct edid_version *v) { - if (c->dpms) { - xf86DrvMsg(scrnIndex,X_INFO,"DPMS capabilities:"); - if (DPMS_STANDBY(c->dpms)) xf86ErrorF(" StandBy"); - if (DPMS_SUSPEND(c->dpms)) xf86ErrorF(" Suspend"); - if (DPMS_OFF(c->dpms)) xf86ErrorF(" Off"); - } else - xf86DrvMsg(scrnIndex,X_INFO,"No DPMS capabilities specified"); - if (!c->input_type) { /* analog */ - switch (c->display_type){ - case DISP_MONO: - xf86ErrorF("; Monochorome/GrayScale Display\n"); - break; - case DISP_RGB: - xf86ErrorF("; RGB/Color Display\n"); - break; - case DISP_MULTCOLOR: - xf86ErrorF("; Non RGB Multicolor Display\n"); - break; - default: - xf86ErrorF("\n"); - break; - } - } else { - int enc = c->display_type; - xf86ErrorF("\n"); - xf86DrvMsg(scrnIndex, X_INFO, "Supported color encodings: " - "RGB 4:4:4 %s%s\n", - enc & DISP_YCRCB444 ? "YCrCb 4:4:4 " : "", - enc & DISP_YCRCB422 ? "YCrCb 4:2:2" : ""); + if (c->dpms) { + xf86DrvMsg(scrnIndex, X_INFO, "DPMS capabilities:"); + if (DPMS_STANDBY(c->dpms)) + xf86ErrorF(" StandBy"); + if (DPMS_SUSPEND(c->dpms)) + xf86ErrorF(" Suspend"); + if (DPMS_OFF(c->dpms)) + xf86ErrorF(" Off"); + } + else + xf86DrvMsg(scrnIndex, X_INFO, "No DPMS capabilities specified"); + if (!c->input_type) { /* analog */ + switch (c->display_type) { + case DISP_MONO: + xf86ErrorF("; Monochorome/GrayScale Display\n"); + break; + case DISP_RGB: + xf86ErrorF("; RGB/Color Display\n"); + break; + case DISP_MULTCOLOR: + xf86ErrorF("; Non RGB Multicolor Display\n"); + break; + default: + xf86ErrorF("\n"); + break; + } + } + else { + int enc = c->display_type; + + xf86ErrorF("\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Supported color encodings: " + "RGB 4:4:4 %s%s\n", + enc & DISP_YCRCB444 ? "YCrCb 4:4:4 " : "", + enc & DISP_YCRCB422 ? "YCrCb 4:2:2" : ""); } if (STD_COLOR_SPACE(c->msc)) - xf86DrvMsg(scrnIndex,X_INFO, - "Default color space is primary color space\n"); + xf86DrvMsg(scrnIndex, X_INFO, + "Default color space is primary color space\n"); if (PREFERRED_TIMING_MODE(c->msc) || v->revision >= 4) { - xf86DrvMsg(scrnIndex, X_INFO, - "First detailed timing is preferred mode\n"); - if (v->revision >= 4) - xf86DrvMsg(scrnIndex, X_INFO, - "Preferred mode is native pixel format and refresh rate\n"); - } else if (v->revision == 3) { - xf86DrvMsg(scrnIndex,X_INFO, - "First detailed timing not preferred " - "mode in violation of standard!\n"); + xf86DrvMsg(scrnIndex, X_INFO, + "First detailed timing is preferred mode\n"); + if (v->revision >= 4) + xf86DrvMsg(scrnIndex, X_INFO, + "Preferred mode is native pixel format and refresh rate\n"); + } + else if (v->revision == 3) { + xf86DrvMsg(scrnIndex, X_INFO, + "First detailed timing not preferred " + "mode in violation of standard!\n"); } if (v->revision >= 4) { - if (GFT_SUPPORTED(c->msc)) { - xf86DrvMsg(scrnIndex, X_INFO, "Display is continuous-frequency\n"); - } - } else { - if (GFT_SUPPORTED(c->msc)) - xf86DrvMsg(scrnIndex, X_INFO, "GTF timings supported\n"); + if (GFT_SUPPORTED(c->msc)) { + xf86DrvMsg(scrnIndex, X_INFO, "Display is continuous-frequency\n"); + } + } + else { + if (GFT_SUPPORTED(c->msc)) + xf86DrvMsg(scrnIndex, X_INFO, "GTF timings supported\n"); } } - -static void + +static void print_whitepoint(int scrnIndex, struct disp_features *disp) { - xf86DrvMsg(scrnIndex,X_INFO,"redX: %.3f redY: %.3f ", - disp->redx,disp->redy); - xf86ErrorF("greenX: %.3f greenY: %.3f\n", - disp->greenx,disp->greeny); - xf86DrvMsg(scrnIndex,X_INFO,"blueX: %.3f blueY: %.3f ", - disp->bluex,disp->bluey); - xf86ErrorF("whiteX: %.3f whiteY: %.3f\n", - disp->whitex,disp->whitey); + xf86DrvMsg(scrnIndex, X_INFO, "redX: %.3f redY: %.3f ", + disp->redx, disp->redy); + xf86ErrorF("greenX: %.3f greenY: %.3f\n", disp->greenx, disp->greeny); + xf86DrvMsg(scrnIndex, X_INFO, "blueX: %.3f blueY: %.3f ", + disp->bluex, disp->bluey); + xf86ErrorF("whiteX: %.3f whiteY: %.3f\n", disp->whitex, disp->whitey); } static void -print_display(int scrnIndex, struct disp_features *disp, - struct edid_version *v) +print_display(int scrnIndex, struct disp_features *disp, struct edid_version *v) { print_input_features(scrnIndex, disp, v); if (disp->hsize && disp->vsize) { - xf86DrvMsg(scrnIndex, X_INFO, "Max Image Size [cm]: "); - xf86ErrorF("horiz.: %i ", disp->hsize); - xf86ErrorF("vert.: %i\n", disp->vsize); - } else if (v->revision >= 4 && (disp->hsize || disp->vsize)) { - if (disp->hsize) - xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (landscape)\n", - (disp->hsize + 99) / 100.0); - if (disp->vsize) - xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (portrait)\n", - 100.0 / (float)(disp->vsize + 99)); - - } else { - xf86DrvMsg(scrnIndex, X_INFO, "Indeterminate output size\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Max Image Size [cm]: "); + xf86ErrorF("horiz.: %i ", disp->hsize); + xf86ErrorF("vert.: %i\n", disp->vsize); + } + else if (v->revision >= 4 && (disp->hsize || disp->vsize)) { + if (disp->hsize) + xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (landscape)\n", + (disp->hsize + 99) / 100.0); + if (disp->vsize) + xf86DrvMsg(scrnIndex, X_INFO, "Aspect ratio: %.2f (portrait)\n", + 100.0 / (float) (disp->vsize + 99)); + + } + else { + xf86DrvMsg(scrnIndex, X_INFO, "Indeterminate output size\n"); } if (!disp->gamma && v->revision >= 1.4) - xf86DrvMsg(scrnIndex, X_INFO, "Gamma defined in extension block\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Gamma defined in extension block\n"); else - xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma); + xf86DrvMsg(scrnIndex, X_INFO, "Gamma: %.2f\n", disp->gamma); print_dpms_features(scrnIndex, disp, v); print_whitepoint(scrnIndex, disp); } -static void +static void print_established_timings(int scrnIndex, struct established_timings *t) { unsigned char c; if (t->t1 || t->t2 || t->t_manu) - xf86DrvMsg(scrnIndex,X_INFO,"Supported established timings:\n"); - c=t->t1; - if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"720x400@70Hz\n"); - if (c&0x40) xf86DrvMsg(scrnIndex,X_INFO,"720x400@88Hz\n"); - if (c&0x20) xf86DrvMsg(scrnIndex,X_INFO,"640x480@60Hz\n"); - if (c&0x10) xf86DrvMsg(scrnIndex,X_INFO,"640x480@67Hz\n"); - if (c&0x08) xf86DrvMsg(scrnIndex,X_INFO,"640x480@72Hz\n"); - if (c&0x04) xf86DrvMsg(scrnIndex,X_INFO,"640x480@75Hz\n"); - if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"800x600@56Hz\n"); - if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"800x600@60Hz\n"); - c=t->t2; - if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"800x600@72Hz\n"); - if (c&0x40) xf86DrvMsg(scrnIndex,X_INFO,"800x600@75Hz\n"); - if (c&0x20) xf86DrvMsg(scrnIndex,X_INFO,"832x624@75Hz\n"); - if (c&0x10) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@87Hz (interlaced)\n"); - if (c&0x08) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@60Hz\n"); - if (c&0x04) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@70Hz\n"); - if (c&0x02) xf86DrvMsg(scrnIndex,X_INFO,"1024x768@75Hz\n"); - if (c&0x01) xf86DrvMsg(scrnIndex,X_INFO,"1280x1024@75Hz\n"); - c=t->t_manu; - if (c&0x80) xf86DrvMsg(scrnIndex,X_INFO,"1152x864@75Hz\n"); - xf86DrvMsg(scrnIndex,X_INFO,"Manufacturer's mask: %X\n",c&0x7F); + xf86DrvMsg(scrnIndex, X_INFO, "Supported established timings:\n"); + c = t->t1; + if (c & 0x80) + xf86DrvMsg(scrnIndex, X_INFO, "720x400@70Hz\n"); + if (c & 0x40) + xf86DrvMsg(scrnIndex, X_INFO, "720x400@88Hz\n"); + if (c & 0x20) + xf86DrvMsg(scrnIndex, X_INFO, "640x480@60Hz\n"); + if (c & 0x10) + xf86DrvMsg(scrnIndex, X_INFO, "640x480@67Hz\n"); + if (c & 0x08) + xf86DrvMsg(scrnIndex, X_INFO, "640x480@72Hz\n"); + if (c & 0x04) + xf86DrvMsg(scrnIndex, X_INFO, "640x480@75Hz\n"); + if (c & 0x02) + xf86DrvMsg(scrnIndex, X_INFO, "800x600@56Hz\n"); + if (c & 0x01) + xf86DrvMsg(scrnIndex, X_INFO, "800x600@60Hz\n"); + c = t->t2; + if (c & 0x80) + xf86DrvMsg(scrnIndex, X_INFO, "800x600@72Hz\n"); + if (c & 0x40) + xf86DrvMsg(scrnIndex, X_INFO, "800x600@75Hz\n"); + if (c & 0x20) + xf86DrvMsg(scrnIndex, X_INFO, "832x624@75Hz\n"); + if (c & 0x10) + xf86DrvMsg(scrnIndex, X_INFO, "1024x768@87Hz (interlaced)\n"); + if (c & 0x08) + xf86DrvMsg(scrnIndex, X_INFO, "1024x768@60Hz\n"); + if (c & 0x04) + xf86DrvMsg(scrnIndex, X_INFO, "1024x768@70Hz\n"); + if (c & 0x02) + xf86DrvMsg(scrnIndex, X_INFO, "1024x768@75Hz\n"); + if (c & 0x01) + xf86DrvMsg(scrnIndex, X_INFO, "1280x1024@75Hz\n"); + c = t->t_manu; + if (c & 0x80) + xf86DrvMsg(scrnIndex, X_INFO, "1152x864@75Hz\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Manufacturer's mask: %X\n", c & 0x7F); } - + static void print_std_timings(int scrnIndex, struct std_timings *t) { int i; char done = 0; - for (i=0;i<STD_TIMINGS;i++) { - if (t[i].hsize > 256) { /* sanity check */ - if (!done) { - xf86DrvMsg(scrnIndex,X_INFO,"Supported standard timings:\n"); - done = 1; - } - xf86DrvMsg(scrnIndex,X_INFO, - "#%i: hsize: %i vsize %i refresh: %i vid: %i\n", - i, t[i].hsize, t[i].vsize, t[i].refresh, t[i].id); - } + + for (i = 0; i < STD_TIMINGS; i++) { + if (t[i].hsize > 256) { /* sanity check */ + if (!done) { + xf86DrvMsg(scrnIndex, X_INFO, "Supported standard timings:\n"); + done = 1; + } + xf86DrvMsg(scrnIndex, X_INFO, + "#%i: hsize: %i vsize %i refresh: %i vid: %i\n", + i, t[i].hsize, t[i].vsize, t[i].refresh, t[i].id); + } } } @@ -279,15 +308,17 @@ print_cvt_timings(int si, struct cvt_timings *t) int i; for (i = 0; i < 4; i++) { - if (t[i].height) { - xf86DrvMsg(si, X_INFO, "%dx%d @ %s%s%s%s%s Hz\n", - t[i].width, t[i].height, - t[i].rates & 0x10 ? "50," : "", - t[i].rates & 0x08 ? "60," : "", - t[i].rates & 0x04 ? "75," : "", - t[i].rates & 0x02 ? "85," : "", - t[i].rates & 0x01 ? "60RB" : ""); - } else break; + if (t[i].height) { + xf86DrvMsg(si, X_INFO, "%dx%d @ %s%s%s%s%s Hz\n", + t[i].width, t[i].height, + t[i].rates & 0x10 ? "50," : "", + t[i].rates & 0x08 ? "60," : "", + t[i].rates & 0x04 ? "75," : "", + t[i].rates & 0x02 ? "85," : "", + t[i].rates & 0x01 ? "60RB" : ""); + } + else + break; } } @@ -296,166 +327,174 @@ print_detailed_timings(int scrnIndex, struct detailed_timings *t) { if (t->clock > 15000000) { /* sanity check */ - xf86DrvMsg(scrnIndex,X_INFO,"Supported detailed timing:\n"); - xf86DrvMsg(scrnIndex,X_INFO,"clock: %.1f MHz ",t->clock/1000000.0); - xf86ErrorF("Image Size: %i x %i mm\n",t->h_size,t->v_size); - xf86DrvMsg(scrnIndex,X_INFO, - "h_active: %i h_sync: %i h_sync_end %i h_blank_end %i ", - t->h_active, t->h_sync_off + t->h_active, - t->h_sync_off + t->h_sync_width + t->h_active, - t->h_active + t->h_blanking); - xf86ErrorF("h_border: %i\n",t->h_border); - xf86DrvMsg(scrnIndex,X_INFO, - "v_active: %i v_sync: %i v_sync_end %i v_blanking: %i ", - t->v_active, t->v_sync_off + t->v_active, - t->v_sync_off + t->v_sync_width + t->v_active, - t->v_active + t->v_blanking); - xf86ErrorF("v_border: %i\n",t->v_border); - if (IS_STEREO(t->stereo)) { - xf86DrvMsg(scrnIndex,X_INFO,"Stereo: "); - if (IS_RIGHT_STEREO(t->stereo)) { - if (!t->stereo_1) - xf86ErrorF("right channel on sync\n"); - else - xf86ErrorF("left channel on sync\n"); - } else if (IS_LEFT_STEREO(t->stereo)) { - if (!t->stereo_1) - xf86ErrorF("right channel on even line\n"); - else - xf86ErrorF("left channel on evel line\n"); - } - if (IS_4WAY_STEREO(t->stereo)) { - if (!t->stereo_1) - xf86ErrorF("4-way interleaved\n"); - else - xf86ErrorF("side-by-side interleaved"); - } - } + xf86DrvMsg(scrnIndex, X_INFO, "Supported detailed timing:\n"); + xf86DrvMsg(scrnIndex, X_INFO, "clock: %.1f MHz ", + t->clock / 1000000.0); + xf86ErrorF("Image Size: %i x %i mm\n", t->h_size, t->v_size); + xf86DrvMsg(scrnIndex, X_INFO, + "h_active: %i h_sync: %i h_sync_end %i h_blank_end %i ", + t->h_active, t->h_sync_off + t->h_active, + t->h_sync_off + t->h_sync_width + t->h_active, + t->h_active + t->h_blanking); + xf86ErrorF("h_border: %i\n", t->h_border); + xf86DrvMsg(scrnIndex, X_INFO, + "v_active: %i v_sync: %i v_sync_end %i v_blanking: %i ", + t->v_active, t->v_sync_off + t->v_active, + t->v_sync_off + t->v_sync_width + t->v_active, + t->v_active + t->v_blanking); + xf86ErrorF("v_border: %i\n", t->v_border); + if (IS_STEREO(t->stereo)) { + xf86DrvMsg(scrnIndex, X_INFO, "Stereo: "); + if (IS_RIGHT_STEREO(t->stereo)) { + if (!t->stereo_1) + xf86ErrorF("right channel on sync\n"); + else + xf86ErrorF("left channel on sync\n"); + } + else if (IS_LEFT_STEREO(t->stereo)) { + if (!t->stereo_1) + xf86ErrorF("right channel on even line\n"); + else + xf86ErrorF("left channel on evel line\n"); + } + if (IS_4WAY_STEREO(t->stereo)) { + if (!t->stereo_1) + xf86ErrorF("4-way interleaved\n"); + else + xf86ErrorF("side-by-side interleaved"); + } + } } } /* This function handle all detailed patchs, * including EDID and EDID-extension */ -struct det_print_parameter{ - xf86MonPtr m; - int index; - ddc_quirk_t quirks; +struct det_print_parameter { + xf86MonPtr m; + int index; + ddc_quirk_t quirks; }; static void -handle_detailed_print(struct detailed_monitor_section *det_mon, - void *data) +handle_detailed_print(struct detailed_monitor_section *det_mon, void *data) { int j, scrnIndex; struct det_print_parameter *p; - p = (struct det_print_parameter *)data; + p = (struct det_print_parameter *) data; scrnIndex = p->m->scrnIndex; - xf86DetTimingApplyQuirks(det_mon,p->quirks, - p->m->features.hsize, - p->m->features.vsize); + xf86DetTimingApplyQuirks(det_mon, p->quirks, + p->m->features.hsize, p->m->features.vsize); switch (det_mon->type) { case DT: - print_detailed_timings(scrnIndex,&det_mon->section.d_timings); + print_detailed_timings(scrnIndex, &det_mon->section.d_timings); break; case DS_SERIAL: - xf86DrvMsg(scrnIndex,X_INFO,"Serial No: %s\n",det_mon->section.serial); + xf86DrvMsg(scrnIndex, X_INFO, "Serial No: %s\n", + det_mon->section.serial); break; case DS_ASCII_STR: - xf86DrvMsg(scrnIndex,X_INFO," %s\n",det_mon->section.ascii_data); + xf86DrvMsg(scrnIndex, X_INFO, " %s\n", det_mon->section.ascii_data); break; case DS_NAME: - xf86DrvMsg(scrnIndex,X_INFO,"Monitor name: %s\n",det_mon->section.name); + xf86DrvMsg(scrnIndex, X_INFO, "Monitor name: %s\n", + det_mon->section.name); break; case DS_RANGES: { struct monitor_ranges *r = &det_mon->section.ranges; - xf86DrvMsg(scrnIndex,X_INFO, + + xf86DrvMsg(scrnIndex, X_INFO, "Ranges: V min: %i V max: %i Hz, H min: %i H max: %i kHz,", r->min_v, r->max_v, r->min_h, r->max_h); if (r->max_clock_khz != 0) { xf86ErrorF(" PixClock max %i kHz\n", r->max_clock_khz); - if (r->maxwidth) - xf86DrvMsg(scrnIndex, X_INFO, "Maximum pixel width: %d\n", - r->maxwidth); - xf86DrvMsg(scrnIndex, X_INFO, "Supported aspect ratios:"); - if (r->supported_aspect & SUPPORTED_ASPECT_4_3) - xf86ErrorF(" 4:3%s", - r->preferred_aspect == PREFERRED_ASPECT_4_3?"*":""); - if (r->supported_aspect & SUPPORTED_ASPECT_16_9) - xf86ErrorF(" 16:9%s", - r->preferred_aspect == PREFERRED_ASPECT_16_9?"*":""); - if (r->supported_aspect & SUPPORTED_ASPECT_16_10) - xf86ErrorF(" 16:10%s", - r->preferred_aspect == PREFERRED_ASPECT_16_10?"*":""); - if (r->supported_aspect & SUPPORTED_ASPECT_5_4) - xf86ErrorF(" 5:4%s", - r->preferred_aspect == PREFERRED_ASPECT_5_4?"*":""); - if (r->supported_aspect & SUPPORTED_ASPECT_15_9) - xf86ErrorF(" 15:9%s", - r->preferred_aspect == PREFERRED_ASPECT_15_9?"*":""); - xf86ErrorF("\n"); - xf86DrvMsg(scrnIndex, X_INFO, "Supported blankings:"); - if (r->supported_blanking & CVT_STANDARD) - xf86ErrorF(" standard"); - if (r->supported_blanking & CVT_REDUCED) - xf86ErrorF(" reduced"); - xf86ErrorF("\n"); - xf86DrvMsg(scrnIndex, X_INFO, "Supported scalings:"); - if (r->supported_scaling & SCALING_HSHRINK) - xf86ErrorF(" hshrink"); - if (r->supported_scaling & SCALING_HSTRETCH) - xf86ErrorF(" hstretch"); - if (r->supported_scaling & SCALING_VSHRINK) - xf86ErrorF(" vshrink"); - if (r->supported_scaling & SCALING_VSTRETCH) - xf86ErrorF(" vstretch"); - xf86ErrorF("\n"); - if (r->preferred_refresh) - xf86DrvMsg(scrnIndex, X_INFO, "Preferred refresh rate: %d\n", - r->preferred_refresh); - else - xf86DrvMsg(scrnIndex, X_INFO, "Buggy monitor, no preferred " - "refresh rate given\n"); - } else if (r->max_clock != 0) { - xf86ErrorF(" PixClock max %i MHz\n", r->max_clock); - } else { - xf86ErrorF("\n"); + if (r->maxwidth) + xf86DrvMsg(scrnIndex, X_INFO, "Maximum pixel width: %d\n", + r->maxwidth); + xf86DrvMsg(scrnIndex, X_INFO, "Supported aspect ratios:"); + if (r->supported_aspect & SUPPORTED_ASPECT_4_3) + xf86ErrorF(" 4:3%s", + r->preferred_aspect == + PREFERRED_ASPECT_4_3 ? "*" : ""); + if (r->supported_aspect & SUPPORTED_ASPECT_16_9) + xf86ErrorF(" 16:9%s", + r->preferred_aspect == + PREFERRED_ASPECT_16_9 ? "*" : ""); + if (r->supported_aspect & SUPPORTED_ASPECT_16_10) + xf86ErrorF(" 16:10%s", + r->preferred_aspect == + PREFERRED_ASPECT_16_10 ? "*" : ""); + if (r->supported_aspect & SUPPORTED_ASPECT_5_4) + xf86ErrorF(" 5:4%s", + r->preferred_aspect == + PREFERRED_ASPECT_5_4 ? "*" : ""); + if (r->supported_aspect & SUPPORTED_ASPECT_15_9) + xf86ErrorF(" 15:9%s", + r->preferred_aspect == + PREFERRED_ASPECT_15_9 ? "*" : ""); + xf86ErrorF("\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Supported blankings:"); + if (r->supported_blanking & CVT_STANDARD) + xf86ErrorF(" standard"); + if (r->supported_blanking & CVT_REDUCED) + xf86ErrorF(" reduced"); + xf86ErrorF("\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Supported scalings:"); + if (r->supported_scaling & SCALING_HSHRINK) + xf86ErrorF(" hshrink"); + if (r->supported_scaling & SCALING_HSTRETCH) + xf86ErrorF(" hstretch"); + if (r->supported_scaling & SCALING_VSHRINK) + xf86ErrorF(" vshrink"); + if (r->supported_scaling & SCALING_VSTRETCH) + xf86ErrorF(" vstretch"); + xf86ErrorF("\n"); + if (r->preferred_refresh) + xf86DrvMsg(scrnIndex, X_INFO, "Preferred refresh rate: %d\n", + r->preferred_refresh); + else + xf86DrvMsg(scrnIndex, X_INFO, "Buggy monitor, no preferred " + "refresh rate given\n"); + } + else if (r->max_clock != 0) { + xf86ErrorF(" PixClock max %i MHz\n", r->max_clock); + } + else { + xf86ErrorF("\n"); } if (r->gtf_2nd_f > 0) - xf86DrvMsg(scrnIndex,X_INFO," 2nd GTF parameters: f: %i kHz " + xf86DrvMsg(scrnIndex, X_INFO, " 2nd GTF parameters: f: %i kHz " "c: %i m: %i k %i j %i\n", r->gtf_2nd_f, - r->gtf_2nd_c, r->gtf_2nd_m, r->gtf_2nd_k, - r->gtf_2nd_j); + r->gtf_2nd_c, r->gtf_2nd_m, r->gtf_2nd_k, r->gtf_2nd_j); break; } case DS_STD_TIMINGS: - for (j = 0; j<5; j++) - xf86DrvMsg(scrnIndex,X_INFO, - "#%i: hsize: %i vsize %i refresh: %i " - "vid: %i\n",p->index ,det_mon->section.std_t[j].hsize, - det_mon->section.std_t[j].vsize, - det_mon->section.std_t[j].refresh, - det_mon->section.std_t[j].id); + for (j = 0; j < 5; j++) + xf86DrvMsg(scrnIndex, X_INFO, + "#%i: hsize: %i vsize %i refresh: %i " + "vid: %i\n", p->index, det_mon->section.std_t[j].hsize, + det_mon->section.std_t[j].vsize, + det_mon->section.std_t[j].refresh, + det_mon->section.std_t[j].id); break; case DS_WHITE_P: - for (j = 0; j<2; j++) - if (det_mon->section.wp[j].index != 0) - xf86DrvMsg(scrnIndex,X_INFO, - "White point %i: whiteX: %f, whiteY: %f; gamma: %f\n", - det_mon->section.wp[j].index,det_mon->section.wp[j].white_x, - det_mon->section.wp[j].white_y, - det_mon->section.wp[j].white_gamma); + for (j = 0; j < 2; j++) + if (det_mon->section.wp[j].index != 0) + xf86DrvMsg(scrnIndex, X_INFO, + "White point %i: whiteX: %f, whiteY: %f; gamma: %f\n", + det_mon->section.wp[j].index, + det_mon->section.wp[j].white_x, + det_mon->section.wp[j].white_y, + det_mon->section.wp[j].white_gamma); break; case DS_CMD: - xf86DrvMsg(scrnIndex, X_INFO, - "Color management data: (not decoded)\n"); + xf86DrvMsg(scrnIndex, X_INFO, "Color management data: (not decoded)\n"); break; case DS_CVT: - xf86DrvMsg(scrnIndex, X_INFO, - "CVT 3-byte-code modes:\n"); + xf86DrvMsg(scrnIndex, X_INFO, "CVT 3-byte-code modes:\n"); print_cvt_timings(scrnIndex, det_mon->section.cvt); break; case DS_EST_III: @@ -479,8 +518,8 @@ static void print_number_sections(int scrnIndex, int num) { if (num) - xf86DrvMsg(scrnIndex,X_INFO,"Number of EDID sections to follow: %i\n", - num); + xf86DrvMsg(scrnIndex, X_INFO, "Number of EDID sections to follow: %i\n", + num); } xf86MonPtr @@ -490,7 +529,8 @@ xf86PrintEDID(xf86MonPtr m) char buf[EDID_WIDTH * 2 + 1]; struct det_print_parameter p; - if (!m) return NULL; + if (!m) + return NULL; print_vendor(m->scrnIndex, &m->vendor); print_version(m->scrnIndex, &m->ver); @@ -500,9 +540,7 @@ xf86PrintEDID(xf86MonPtr m) p.m = m; p.index = 0; p.quirks = xf86DDCDetectQuirks(m->scrnIndex, m, FALSE); - xf86ForEachDetailedBlock(m, - handle_detailed_print , - &p); + xf86ForEachDetailedBlock(m, handle_detailed_print, &p); print_number_sections(m->scrnIndex, m->no_sections); /* extension block section stuff */ @@ -511,13 +549,13 @@ xf86PrintEDID(xf86MonPtr m) n = 128; if (m->flags & EDID_COMPLETE_RAWDATA) - n += m->no_sections * 128; + n += m->no_sections * 128; for (i = 0; i < n; i += j) { - for (j = 0; j < EDID_WIDTH; ++j) { - sprintf(&buf[j * 2], "%02x", m->rawData[i + j]); - } - xf86DrvMsg(m->scrnIndex, X_INFO, "\t%s\n", buf); + for (j = 0; j < EDID_WIDTH; ++j) { + sprintf(&buf[j * 2], "%02x", m->rawData[i + j]); + } + xf86DrvMsg(m->scrnIndex, X_INFO, "\t%s\n", buf); } return m; |