Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[xsrc/trunk]: xsrc/external/mit merge mga 2.0.0 and r128 6.12.0 drivers.
details: https://anonhg.NetBSD.org/xsrc/rev/cca115268723
branches: trunk
changeset: 10036:cca115268723
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Dec 30 06:46:48 2018 +0000
description:
merge mga 2.0.0 and r128 6.12.0 drivers.
diffstat:
external/mit/xf86-video-mga/dist/README | 25 -
external/mit/xf86-video-mga/dist/README_HALLIB | 209 --
external/mit/xf86-video-mga/dist/src/binding.h | 222 --
external/mit/xf86-video-mga/dist/src/client.h | 28 -
external/mit/xf86-video-mga/dist/src/mga_bios.c | 1 -
external/mit/xf86-video-mga/dist/src/mga_dac3026.c | 8 +-
external/mit/xf86-video-mga/dist/src/mga_dacG.c | 94 +-
external/mit/xf86-video-mga/dist/src/mga_dga.c | 8 +-
external/mit/xf86-video-mga/dist/src/mga_dri.c | 241 +--
external/mit/xf86-video-mga/dist/src/mga_driver.c | 124 +-
external/mit/xf86-video-mga/dist/src/mga_exa.c | 20 +-
external/mit/xf86-video-mga/dist/src/mga_g450pll.c | 10 +-
external/mit/xf86-video-mga/dist/src/mga_halmod.c | 41 -
external/mit/xf86-video-mga/dist/src/mga_merge.c | 2 +
external/mit/xf86-video-mga/dist/src/mga_storm.c | 32 +-
external/mit/xf86-video-mga/dist/src/mga_video.c | 37 +-
external/mit/xf86-video-r128/dist/src/r128.h | 63 +-
external/mit/xf86-video-r128/dist/src/r128_driver.c | 1613 +++++-------------
external/mit/xf86-video-r128/dist/src/r128_exa.c | 68 +-
external/mit/xf86-video-r128/dist/src/r128_output.c | 111 +-
20 files changed, 818 insertions(+), 2139 deletions(-)
diffs (truncated from 4291 to 300 lines):
diff -r 2dcabf33d31d -r cca115268723 external/mit/xf86-video-mga/dist/README
--- a/external/mit/xf86-video-mga/dist/README Sun Dec 30 06:05:30 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-xf86-video-mga - Matrox video driver for the Xorg X server
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-mga
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-mga
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff -r 2dcabf33d31d -r cca115268723 external/mit/xf86-video-mga/dist/README_HALLIB
--- a/external/mit/xf86-video-mga/dist/README_HALLIB Sun Dec 30 06:05:30 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,209 +0,0 @@
-HAL Documentation
-
-This documentation provides preliminary explaination of the HAL library, a
-more detailed version of this document is in the process of being written
-and will be released with future driver builds.
-
-------------------------------------------------------------
-MGAOpenLibrary
-
-Description: Link Client functions with HAL Librery
-
-Input:
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-LPBARDHANDLElpClient: Pointer to the client stucture
-
-ulClientSize: Size of the client structure
-
-Error:
-return 0 on success
-
--------------------------------------------------------------
-MGAGetHardwareInfo
-
-Description:
-
-Fills MGAWINFO structure.
-
-struct {
-ULONG UlCapsFirstOutput;
-ULONG ulCapsSecondOutput;
-ULONG ulVideoMemory;
-} FAR *LPMGAHWINFO;
-
-#define MGAHWINFOCAPS_CRTC1_DIGITAL (1L << 1)
-#define MGAHWINFOCAPS_CRTC1_TV (1L << 2)
-#define MGAHWINFOCAPS_CRTC2_ANALOG (1L << 3)
-#define MGAHWINFOCAPS_CRTC2_DIGITAL (1L << 4)
-#define MGAHWINFOCAPS_CRTC2_TV (1L << 5)
-#define MGAHWINFOCAPS_OUTPUT_VGA (1L << 6)
-#define MGAHWINFOCAPS_CRTC2 (MGAHWINFOCAPS_CRTC2_ANALOG | MGAHWINFOCAPS_CRTC2_DIGITAL | MGAHWINFOCAPS_CRTC2_TV)
-#define MGAHWINFOCAPS_OUTPUT_ANALOG (MGAHWINFOCAPS_CRTC1_ANALOG | MGAHWINFOCAPS_CRTC2_ANALOG)
-#define MGAHWINFOCAPS_OUTPUT_DIGITAL (MGAHWINFOCAPS_CRTC1_DIGITAL | MGAHWINFOCAPS_CRTC2_DIGITAL)
-#define MGAHWINFOCAPS_OUTPUT_TV (MGAHWINFOCAPS_CRTC1_TV | MGAHWINFOCAPS_CRTC2_TV)
-
-example:
-
-if (pMga->pMgaHwInfo->ulCapsSecondOutput & MGAHWINFOCAPS_OUTPUT_TV )
-{
- ErrorF("TV detected\n");
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TV detected\n ");
-}
-if (pMga->pMgaHwInfo->ulCapsSecondOutput & MGAHWINFOCAPS_OUTPUT_DIGITAL)
-{
- xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Digital Screen detected\n ");
-}
-
-Inputs:
-
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-LPMGAHWINFO pMgaHwInfo: Handle to the board structure containing all
-the information about the specific Board.
-
-Error:
-Returns 0 on success
-------------------------------------------------------------
-MGAValidateMode
-
-Description:
-
-Validates the mode given by client.
-
-Here are the different options for pMgaModeInfo->flOutput:
-
-MGAMODEINFO_FORCE_PITCH
-MGAMODEINFO_FORCE_DISPLAYORG
-MGAMODEINFO_SECOND_CRTC
-MGAMODEINFO_ANALOG1
-MGAMODEINFO_ANALOG2
-MGAMODEINFO_DIGITAL1
-MGAMODEINFO_DIGITAL2
-MGAMODEINFO_TV
-
-These options can be combined together to set different combinations.
-Example:
-
-/*The second crtc outputs to a digital screen*/
-pMgaModeInfo->flOutput= MGAMODEINFO_DIGITAL2 | MGAMODEINFO_SECOND_CRTC
-| MGAMODEINFO_FORCE_PITCH | MGAMODEINFO_FORCE_DISPLAYORG;
-
-- or -
-
-/*The second crtc outputs to an analog screen*/
-pMgaModeInfo-> flOutput = MGAMODEINFO_ANALOG2| MGAMODEINFO_SECOND_CRTC
-| MGAMODEINFO_FORCE_PITCH | MGAMODEINFO_FORCE_DISPLAYORG;
-
-- or -
-
-/*The second crtc outputs to a tv*/
-pMga->pMgaModeInfo->flOutput = MGAMODEINFO_TV | MGAMODEINFO_SECOND_CRTC | MGAMODEINFO_FORCE_PITCH | MGAMODEINFO_FORCE_DISPLAYORG;
-
-Inputs:
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-LPMGAMODEINFO pMgaModeInfo: Pointer to structure containing information about a specific display mode. (You need to fill the structure except the video parameters part which will be filled by the
function).
-
-Error:
-Returns 0 on success
-
--------------------------------------------------------------
-MGASetMode
-
-Description:
-
-Initializes the board.
-
-Here are the different options for pMgaModeInfo->flOutput:
-
-MGAMODEINFO_FORCE_PITCH
-MGAMODEINFO_FORCE_DISPLAYORG
-MGAMODEINFO_SECOND_CRTC
-MGAMODEINFO_ANALOG1
-MGAMODEINFO_ANALOG2
-MGAMODEINFO_DIGITAL1
-MGAMODEINFO_DIGITAL2
-MGAMODEINFO_TV
-
-These options can be combined together to set different combinations.
-Example:
-
-/*The second crtc outputs to a digital screen*/
-pMgaModeInfo->flOutput= MGAMODEINFO_DIGITAL2 | MGAMODEINFO_SECOND_CRTC
-| MGAMODEINFO_FORCE_PITCH | MGAMODEINFO_FORCE_DISPLAYORG;
-
-- or -
-
-/*The second crtc outputs to an analog screen*/
-pMgaModeInfo-> flOutput = MGAMODEINFO_ANALOG2| MGAMODEINFO_SECOND_CRTC
-| MGAMODEINFO_FORCE_PITCH | MGAMODEINFO_FORCE_DISPLAYORG;
-
-- or -
-
-/*The second crtc outputs to a tv*/
-pMga->pMgaModeInfo->flOutput = MGAMODEINFO_TV | MGAMODEINFO_SECOND_CRTC | MGAMODEINFO_FORCE_PITCH | MGAMODEINFO_FORCE_DISPLAYORG;
-
-Inputs:
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-LPMGAMODEINFO pMgaModeInfo: Pointer to structure containing information about a specific display mode. (You need to fill the structure except the video parameters part which will be filled by the
function).
-
-Error:
-Returns 0 on success
-
-------------------------------------------------------------
-
-MGASetVgaMode
-
-Description:
-
-Switchs the VGA mode
-
-Inputs:
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-Error:
-Returns 0 on success
-
-------------------------------------------------------------
-
-MGARestoreVgaState
-
-Description:
-
-Restores the VGA State
-
-Inputs:
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-Error:
-Returns 0 on success
-
-------------------------------------------------------------
-
-MGASaveVgaState
-
-Description:
-
-Saves the VGA state
-
-Inputs:
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-Error:
-Returns 0 on success
-
-------------------------------------------------------------
-
-MGACloseLibrary
-
-Description:
-
-Closes the library
-
-Inputs:
-LPBOARDHANDLE pBoard: Handle to the board structure containing all the information about the board.
-
-Error:
-Returns 0 on success
diff -r 2dcabf33d31d -r cca115268723 external/mit/xf86-video-mga/dist/src/binding.h
--- a/external/mit/xf86-video-mga/dist/src/binding.h Sun Dec 30 06:05:30 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,222 +0,0 @@
-/**************************************************************************************
-
- @doc MGA MGA_STRUCT
-
- @module MGA Structures | Structure of The MGA Layer
- @normal Copyright © 1997, Matrox Graphics Inc.
-
- All Rights Reserved.
-
- @head3 MGA Structures |
- @index struct | MGA_STRUCT
-
- @end
-
-***************************************************************************************/
-
-#ifndef _BINDING
-#define _BINDING
-
-#ifndef _INTERNALBINDING
-
-#define BINDING_NOERROR 0x00000000
-#define BINDING_ERROR 0x90000000
-#define FAR
-#define DECL
-
-typedef void VOID;
-typedef void FAR *LPVOID;
-typedef void FAR *LPBOARDHANDLE;
-
-typedef long LONG;
-typedef unsigned long ULONG;
-typedef unsigned long FLONG;
-typedef unsigned long FAR *LPULONG;
-
-typedef char CHAR;
-typedef unsigned char UCHAR;
-typedef unsigned char FAR*LPUCHAR;
-
-#endif /* _INTERNALBINDING */
-
-/***************************************************************************************************
- MGAHWINFO STRUCTURE
- ***************************************************************************************************
- @struct MGAHWINFO | Public MGA Board Information
- @field OUT ULONG | ulCapsFirstOutput | Capabilities of firts output
- @flag Bit 0 | Analog output supported on primary CRTC
- @flag Bit 1 | Digital output supported on primary CRTC
- @flag Bit 2 | TV output supported on primary CRTC
- @flag Bit 3 | Analog output supported on second CRTC
- @flag Bit 4 | Digital output supported on second CRTC
- @flag Bit 5 | TV output supported on second CRTC
- @flag Bit 6 | VGA output supported
- @field OUT ULONG | ulCapsSecondOutput | Capabilities of second output
Home |
Main Index |
Thread Index |
Old Index