Author: branden Date: 2004-01-12 15:22:15 -0500 (Mon, 12 Jan 2004) New Revision: 897
Added: branches/4.3.0/sid/debian/patches/047_mga_manpage_updates.diff Modified: branches/4.3.0/sid/debian/TODO Log: Restore patch #016 from trunk that was lost. Modified: branches/4.3.0/sid/debian/TODO =================================================================== --- branches/4.3.0/sid/debian/TODO 2004-01-12 19:54:30 UTC (rev 896) +++ branches/4.3.0/sid/debian/TODO 2004-01-12 20:22:15 UTC (rev 897) @@ -62,7 +62,7 @@ 013_wacom_wait_longer_for_input.diff merged renamed and expanded to 036_wacom_usb_tablet_update patch 014_document_grab_key_sequences.diff upstream 015_lbxproxy_segfault_fix.diff upstream -016_mga_manpage_updates.diff NOT PORTED +016_mga_manpage_updates.diff merged renamed to 047_mga_manpage_updates 017_xrandr_manpage_fixups.diff merged 041_fix_Xlib_depend_target.diff 018_r128_dri_lines_points_fix.diff irrelevant 019_r128_xv_byteswap_yuy2_uyvy_fix.diff upstream Copied: branches/4.3.0/sid/debian/patches/047_mga_manpage_updates.diff (from rev 896, trunk/debian/patches/016_mga_manpage_updates.diff) =================================================================== --- trunk/debian/patches/016_mga_manpage_updates.diff 2004-01-12 19:54:30 UTC (rev 896) +++ branches/4.3.0/sid/debian/patches/047_mga_manpage_updates.diff 2004-01-12 20:22:15 UTC (rev 897) @@ -0,0 +1,180 @@ +$Id$ + +This patch by Branden Robinson. + +Not submitted upstream yet. + +--- xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man.orig 2003-01-25 21:17:28.000000000 -0500 ++++ xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man 2004-01-12 15:18:29.000000000 -0500 +@@ -1,7 +1,7 @@ +-.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.6 2003/01/26 02:17:28 dawes Exp $ ++.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/mga/mga.man,v 1.6 2003/01/26 02:17:28 dawes Exp $ + .\" shorthand for double quote that works everywhere. + .ds q \N'34' +-.TH MGA __drivermansuffix__ __vendorversion__ ++.TH mga __drivermansuffix__ __vendorversion__ + .SH NAME + mga \- Matrox video driver + .SH SYNOPSIS +@@ -13,57 +13,61 @@ + .B EndSection + .fi + .SH DESCRIPTION +-.B mga ++.B mga + is an XFree86 driver for Matrox video cards. The driver is fully +-accelerated, and provides support for the following framebuffer depths: +-8, 15, 16, 24, and an 8+24 overlay mode. All +-visual types are supported for depth 8, and both TrueColor and DirectColor +-visuals are supported for the other depths except 8+24 mode which supports +-PseudoColor, GrayScale and TrueColor. Multi-card configurations +-are supported. XVideo is supported on G200 and newer systems, with ++accelerated, and provides support for the following framebuffer depths: 8, ++15, 16, 24, and an 8+24 overlay mode. All visual types are supported for ++depth 8, and both TrueColor and DirectColor visuals are supported for the ++other depths except 8+24 mode which supports PseudoColor, GrayScale and ++TrueColor. Multi\-card configurations are supported. XVideo is supported ++on G200 and newer systems, with + either + .B TexturedVideo +-or video overlay. The second head of dual-head cards is supported for +-the G450 and G550. Support for the second head on G400 cards requires +-a binary-only "mga_hal" module that is available from Matrox +-<http://www.matrox.com>, and may be on the CD supplied with the card. +-That module also provides various other enhancements, +-and may be necessary to use the DVI (digital) output on the G550 +-(and other cards). +-.SH SUPPORTED HARDWARE ++or video overlay. The second head of dual\-head cards is supported for the ++G450 and G550. Support for the second head on G400 cards requires a ++binary\-only "mga_hal" module that is available from Matrox ++<http://www.matrox.com>, and may be on the CD supplied with the card. That ++module also provides various other enhancements, and may be necessary to ++use the DVI (digital) output on the G550 (and other cards). ++.SH "SUPPORTED HARDWARE" + The + .B mga +-driver supports PCI and AGP video cards based on the following Matrox chips: +-.TP 12 ++driver supports PCI and AGP video cards based on the following Matrox ++chips. They are listed in approximate chronological order of production ++(with the most recent chipsets listed last), so consult this list when you ++are unsure whether your card is meant when references are made to \(oqG200 ++and later\(cq chips, for example. ++.TP + .B MGA2064W +-Millennium (original) +-.TP 12 ++Millennium \fI(original)\fP ++.TP + .B MGA1064SG + Mystique +-.TP 12 ++.TP + .B MGA2164W + Millennium II +-.TP 12 ++.TP + .B G100 +-.TP 12 ++Productiva G100 ++.TP + .B G200 + Millennium G200 and Mystique G200 +-.TP 12 ++.TP + .B G400 +-.TP 12 +-.B G450 +-.TP 12 ++Millenium G400, Millenium G400 MAX, Millenium G450, and Marvel G450 eTV ++.TP + .B G550 +-.SH CONFIGURATION DETAILS ++Millenium G550 and Millenium G550 Dual DVI ++.SH "CONFIGURATION DETAILS" + Please refer to XF86Config(__filemansuffix__) for general configuration + details. This section only covers configuration details specific to this + driver. + .PP +-The driver auto-detects the chipset type, but the following ++The driver auto\-detects the chipset type, but the following + .B ChipSet + names may optionally be specified in the config file + .B \*qDevice\*q +-section, and will override the auto-detection: ++section, and will override the auto\-detection: + .PP + .RS 4 + "mga2064w", "mga1064sg", "mga2164w", "mga2164w agp", "mgag100", "mgag200", +@@ -72,7 +76,7 @@ + .PP + The G450 is Chipset "mgag400" with ChipRev 0x80. + .PP +-The driver will auto-detect the amount of video memory present for all ++The driver will auto\-detect the amount of video memory present for all + chips except the Millennium II. In the Millennium II case it defaults + to 4096\ kBytes. When using a Millennium II, the actual amount of video + memory should be specified with a +@@ -95,11 +99,12 @@ + .TP + .BI "Option \*qMGASDRAM\*q \*q" boolean \*q + Specify whether G100, G200 or G400 cards have SDRAM. The driver attempts to +-auto-detect this based on the card's PCI subsystem ID. This option may +-be used to override that auto-detection. The mga driver is not able to +-auto-detect the presence of of SDRAM on secondary heads in multihead configurations +-so this option will often need to be specified in multihead configurations. +-Default: auto-detected. ++auto\-detect this based on the card's PCI subsystem ID. This option may ++be used to override that auto\-detection. The ++.B mga ++driver is not able to auto\-detect the presence of of SDRAM on secondary ++heads in multihead configurations so this option will often need to be ++specified in multihead configurations. Default: auto\-detected. + .TP + .BI "Option \*qNoAccel\*q \*q" boolean \*q + Disable or enable acceleration. Default: acceleration is enabled. +@@ -109,13 +114,13 @@ + loaded when available and when using hardware that it supports. + .TP + .BI "Option \*qOverclockMem\*q" +-Set clocks to values used by some commercial X-Servers (G100, G200 and G400 ++Set clocks to values used by some commercial X servers (G100, G200 and G400 + only). Default: off. + .TP + .BI "Option \*qOverlay\*q" + Enable 8+24 overlay mode. Only appropriate for depth 24. +-.RB ( Note: +-the G100 is unaccelerated in the 8+24 overlay mode due to a missing ++.RB ( Note: ++the G100 is unaccelerated in the 8+24 overlay mode due to a missing + hardware feature.) Default: off. + .TP + .BI "Option \*qPciRetry\*q \*q" boolean \*q +@@ -135,7 +140,7 @@ + Default: off. + .TP + .BI "Option \*qUseFBDev\*q \*q" boolean \*q +-Enable or disable use of on OS-specific fb interface (and is not supported ++Enable or disable use of on OS\-specific fb interface (and is not supported + on all OSs). See fbdevhw(__drivermansuffix__) for further information. + Default: off. + .TP +@@ -144,12 +149,13 @@ + Default: undefined. + .TP + .BI "Option \*qTexturedVideo\*q \*q" boolean \*q +-This has XvImage support use the texture engine rather than the video overlay. +-This option is only supported by the G200 and G400, and only in 16 and 32 +-bits per pixel. ++This has XvImage support use the texture engine rather than the video ++overlay. This option is only supported by G200 and later chips, and only ++at 16 and 32 bits per pixel. + Default: off. + .SH "SEE ALSO" +-XFree86(1), XF86Config(__filemansuffix__), xf86config(1), Xserver(1), X(__miscmansuffix__) ++XFree86(__mansuffix__), XF86Config(__filemansuffix__), ++xf86config(__mansuffix__), Xserver(__mansuffix__1), X(__miscmansuffix__) + .SH AUTHORS + Authors include: Radoslaw Kapitan, Mark Vojkovich, and also David Dawes, Guy + Desbief, Dirk Hohndel, Doug Merritt, Andrew E. Mileski, Andrew van der Stock, Property changes on: branches/4.3.0/sid/debian/patches/047_mga_manpage_updates.diff ___________________________________________________________________ Name: svn:keywords + Id
