qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge xf86-video-nv 2.1.6

Browse Source
This commit is contained in:
matthieu 2008-01-12 16:33:31 +00:00
parent e63dd002ce
commit 02cf527c77
5 changed files with 12 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MODULES
View File

@ -1,4 +1,4 @@
# $OpenBSD: MODULES,v 1.16 2008/01/06 15:29:22 matthieu Exp $
# $OpenBSD: MODULES,v 1.17 2008/01/12 16:33:31 matthieu Exp $
#
# X.Org maintained modules
#
@ -145,7 +145,7 @@ driver/xf86-video-mga 1.4.6.1 7.2
driver/xf86-video-neomagic 1.1.1 7.1
driver/xf86-video-newport 0.2.1 7.2RC1
driver/xf86-video-nsc 2.8.3 7.3 needs-update
driver/xf86-video-nv 2.1.5 7.3+
driver/xf86-video-nv 2.1.6 7.3+
driver/xf86-video-radeonhd 1.1.0 7.3+
driver/xf86-video-rendition 4.1.3 7.2RC4
driver/xf86-video-s3 0.5.0 7.2RC3

20
driver/xf86-video-nv/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for xf86-video-nv 2.1.5.
# Generated by GNU Autoconf 2.59 for xf86-video-nv 2.1.6.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-video-nv'
PACKAGE_TARNAME='xf86-video-nv'
PACKAGE_VERSION='2.1.5'
PACKAGE_STRING='xf86-video-nv 2.1.5'
PACKAGE_VERSION='2.1.6'
PACKAGE_STRING='xf86-video-nv 2.1.6'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@ -974,7 +974,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures xf86-video-nv 2.1.5 to adapt to many kinds of systems.
\`configure' configures xf86-video-nv 2.1.6 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1040,7 +1040,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of xf86-video-nv 2.1.5:";;
short | recursive ) echo "Configuration of xf86-video-nv 2.1.6:";;
esac
cat <<\_ACEOF
@ -1195,7 +1195,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
xf86-video-nv configure 2.1.5
xf86-video-nv configure 2.1.6
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1209,7 +1209,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by xf86-video-nv $as_me 2.1.5, which was
It was created by xf86-video-nv $as_me 2.1.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1857,7 +1857,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-video-nv'
VERSION='2.1.5'
VERSION='2.1.6'
cat >>confdefs.h <<_ACEOF
@ -20914,7 +20914,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by xf86-video-nv $as_me 2.1.5, which was
This file was extended by xf86-video-nv $as_me 2.1.6, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -20977,7 +20977,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
xf86-video-nv config.status 2.1.5
xf86-video-nv config.status 2.1.6
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

2
driver/xf86-video-nv/src/Makefile.in
View File

@ -253,11 +253,9 @@ nv_sources = \
nv_include.h \
nv_local.h \
nv_proto.h \
nvreg.h \
nv_setup.c \
nv_shadow.c \
nv_type.h \
nvvga.h \
nv_video.c \
nv_xaa.c

195
driver/xf86-video-nv/src/nvreg.h
View File

@ -1,195 +0,0 @@
/*
* Copyright 1996-1997 David J. McKay
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* DAVID J. MCKAY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef __NVREG_H_
#define __NVREG_H_
/* Little macro to construct bitmask for contiguous ranges of bits */
#define BITMASK(t,b) (((unsigned)(1U << (((t)-(b)+1)))-1) << (b))
#define MASKEXPAND(mask) BITMASK(1?mask,0?mask)
/* Macro to set specific bitfields (mask has to be a macro x:y) ! */
#define SetBF(mask,value) ((value) << (0?mask))
#define GetBF(var,mask) (((unsigned)((var) & MASKEXPAND(mask))) >> (0?mask) )
#define MaskAndSetBF(var,mask,value) (var)=(((var)&(~MASKEXPAND(mask)) \
| SetBF(mask,value)))
#define DEVICE_BASE(device) (0?NV##_##device)
#define DEVICE_SIZE(device) ((1?NV##_##device) - DEVICE_BASE(device)+1)
/* This is where we will have to have conditional compilation */
#define DEVICE_ACCESS(device,reg) \
nv##device##Port[((NV_##device##_##reg)-DEVICE_BASE(device))/4]
#define DEVICE_WRITE(device,reg,value) DEVICE_ACCESS(device,reg)=(value)
#define DEVICE_READ(device,reg) DEVICE_ACCESS(device,reg)
#define DEVICE_PRINT(device,reg) \
ErrorF("NV_"#device"_"#reg"=#%08lx\n",DEVICE_ACCESS(device,reg))
#define DEVICE_DEF(device,mask,value) \
SetBF(NV_##device##_##mask,NV_##device##_##mask##_##value)
#define DEVICE_VALUE(device,mask,value) SetBF(NV_##device##_##mask,value)
#define DEVICE_MASK(device,mask) MASKEXPAND(NV_##device##_##mask)
#define PDAC_Write(reg,value) DEVICE_WRITE(PDAC,reg,value)
#define PDAC_Read(reg) DEVICE_READ(PDAC,reg)
#define PDAC_Print(reg) DEVICE_PRINT(PDAC,reg)
#define PDAC_Def(mask,value) DEVICE_DEF(PDAC,mask,value)
#define PDAC_Val(mask,value) DEVICE_VALUE(PDAC,mask,value)
#define PDAC_Mask(mask) DEVICE_MASK(PDAC,mask)
#define PFB_Write(reg,value) DEVICE_WRITE(PFB,reg,value)
#define PFB_Read(reg) DEVICE_READ(PFB,reg)
#define PFB_Print(reg) DEVICE_PRINT(PFB,reg)
#define PFB_Def(mask,value) DEVICE_DEF(PFB,mask,value)
#define PFB_Val(mask,value) DEVICE_VALUE(PFB,mask,value)
#define PFB_Mask(mask) DEVICE_MASK(PFB,mask)
#define PRM_Write(reg,value) DEVICE_WRITE(PRM,reg,value)
#define PRM_Read(reg) DEVICE_READ(PRM,reg)
#define PRM_Print(reg) DEVICE_PRINT(PRM,reg)
#define PRM_Def(mask,value) DEVICE_DEF(PRM,mask,value)
#define PRM_Val(mask,value) DEVICE_VALUE(PRM,mask,value)
#define PRM_Mask(mask) DEVICE_MASK(PRM,mask)
#define PGRAPH_Write(reg,value) DEVICE_WRITE(PGRAPH,reg,value)
#define PGRAPH_Read(reg) DEVICE_READ(PGRAPH,reg)
#define PGRAPH_Print(reg) DEVICE_PRINT(PGRAPH,reg)
#define PGRAPH_Def(mask,value) DEVICE_DEF(PGRAPH,mask,value)
#define PGRAPH_Val(mask,value) DEVICE_VALUE(PGRAPH,mask,value)
#define PGRAPH_Mask(mask) DEVICE_MASK(PGRAPH,mask)
#define PDMA_Write(reg,value) DEVICE_WRITE(PDMA,reg,value)
#define PDMA_Read(reg) DEVICE_READ(PDMA,reg)
#define PDMA_Print(reg) DEVICE_PRINT(PDMA,reg)
#define PDMA_Def(mask,value) DEVICE_DEF(PDMA,mask,value)
#define PDMA_Val(mask,value) DEVICE_VALUE(PDMA,mask,value)
#define PDMA_Mask(mask) DEVICE_MASK(PDMA,mask)
#define PTIMER_Write(reg,value) DEVICE_WRITE(PTIMER,reg,value)
#define PTIMER_Read(reg) DEVICE_READ(PTIMER,reg)
#define PTIMER_Print(reg) DEVICE_PRINT(PTIMER,reg)
#define PTIMER_Def(mask,value) DEVICE_DEF(PTIMER,mask,value)
#define PTIMER_Val(mask,value) DEVICE_VALUE(PTIEMR,mask,value)
#define PTIMER_Mask(mask) DEVICE_MASK(PTIMER,mask)
#define PEXTDEV_Write(reg,value) DEVICE_WRITE(PEXTDEV,reg,value)
#define PEXTDEV_Read(reg) DEVICE_READ(PEXTDEV,reg)
#define PEXTDEV_Print(reg) DEVICE_PRINT(PEXTDEV,reg)
#define PEXTDEV_Def(mask,value) DEVICE_DEF(PEXTDEV,mask,value)
#define PEXTDEV_Val(mask,value) DEVICE_VALUE(PEXTDEV,mask,value)
#define PEXTDEV_Mask(mask) DEVICE_MASK(PEXTDEV,mask)
#define PFIFO_Write(reg,value) DEVICE_WRITE(PFIFO,reg,value)
#define PFIFO_Read(reg) DEVICE_READ(PFIFO,reg)
#define PFIFO_Print(reg) DEVICE_PRINT(PFIFO,reg)
#define PFIFO_Def(mask,value) DEVICE_DEF(PFIFO,mask,value)
#define PFIFO_Val(mask,value) DEVICE_VALUE(PFIFO,mask,value)
#define PFIFO_Mask(mask) DEVICE_MASK(PFIFO,mask)
#define PRAM_Write(reg,value) DEVICE_WRITE(PRAM,reg,value)
#define PRAM_Read(reg) DEVICE_READ(PRAM,reg)
#define PRAM_Print(reg) DEVICE_PRINT(PRAM,reg)
#define PRAM_Def(mask,value) DEVICE_DEF(PRAM,mask,value)
#define PRAM_Val(mask,value) DEVICE_VALUE(PRAM,mask,value)
#define PRAM_Mask(mask) DEVICE_MASK(PRAM,mask)
#define PRAMFC_Write(reg,value) DEVICE_WRITE(PRAMFC,reg,value)
#define PRAMFC_Read(reg) DEVICE_READ(PRAMFC,reg)
#define PRAMFC_Print(reg) DEVICE_PRINT(PRAMFC,reg)
#define PRAMFC_Def(mask,value) DEVICE_DEF(PRAMFC,mask,value)
#define PRAMFC_Val(mask,value) DEVICE_VALUE(PRAMFC,mask,value)
#define PRAMFC_Mask(mask) DEVICE_MASK(PRAMFC,mask)
#define PMC_Write(reg,value) DEVICE_WRITE(PMC,reg,value)
#define PMC_Read(reg) DEVICE_READ(PMC,reg)
#define PMC_Print(reg) DEVICE_PRINT(PMC,reg)
#define PMC_Def(mask,value) DEVICE_DEF(PMC,mask,value)
#define PMC_Val(mask,value) DEVICE_VALUE(PMC,mask,value)
#define PMC_Mask(mask) DEVICE_MASK(PMC,mask)
#define PMC_Write(reg,value) DEVICE_WRITE(PMC,reg,value)
#define PMC_Read(reg) DEVICE_READ(PMC,reg)
#define PMC_Print(reg) DEVICE_PRINT(PMC,reg)
#define PMC_Def(mask,value) DEVICE_DEF(PMC,mask,value)
#define PMC_Val(mask,value) DEVICE_VALUE(PMC,mask,value)
#define PMC_Mask(mask) DEVICE_MASK(PMC,mask)
#define PBUS_Write(reg,value) DEVICE_WRITE(PBUS,reg,value)
#define PBUS_Read(reg) DEVICE_READ(PBUS,reg)
#define PBUS_Print(reg) DEVICE_PRINT(PBUS,reg)
#define PBUS_Def(mask,value) DEVICE_DEF(PBUS,mask,value)
#define PBUS_Val(mask,value) DEVICE_VALUE(PBUS,mask,value)
#define PBUS_Mask(mask) DEVICE_MASK(PBUS,mask)
#define PRAMDAC_Write(reg,value) DEVICE_WRITE(PRAMDAC,reg,value)
#define PRAMDAC_Read(reg) DEVICE_READ(PRAMDAC,reg)
#define PRAMDAC_Print(reg) DEVICE_PRINT(PRAMDAC,reg)
#define PRAMDAC_Def(mask,value) DEVICE_DEF(PRAMDAC,mask,value)
#define PRAMDAC_Val(mask,value) DEVICE_VALUE(PRAMDAC,mask,value)
#define PRAMDAC_Mask(mask) DEVICE_MASK(PRAMDAC,mask)
#define PDAC_ReadExt(reg) \
((PDAC_Write(INDEX_LO,(NV_PDAC_EXT_##reg) & 0xff)),\
(PDAC_Write(INDEX_HI,((NV_PDAC_EXT_##reg) >> 8) & 0xff)),\
(PDAC_Read(INDEX_DATA)))
#define PDAC_WriteExt(reg,value)\
((PDAC_Write(INDEX_LO,(NV_PDAC_EXT_##reg) & 0xff)),\
(PDAC_Write(INDEX_HI,((NV_PDAC_EXT_##reg) >> 8) & 0xff)),\
(PDAC_Write(INDEX_DATA,(value))))
#define PCRTC_Def(mask,value) DEVICE_DEF(PCRTC,mask,value)
#define PCRTC_Val(mask,value) DEVICE_VALUE(PCRTC,mask,value)
#define PCRTC_Mask(mask) DEVICE_MASK(PCRTC,mask)
/* These are the variables which actually point at the register blocks */
extern volatile unsigned *nvPDACPort; /* Points to the DAC */
extern volatile unsigned *nvPFBPort; /* Points to the Frame buffer */
extern volatile unsigned *nvPRMPort; /* Points to real mode stuff */
extern volatile unsigned *nvPGRAPHPort; /* Graphics unit */
extern volatile unsigned *nvPDMAPort; /* DMA engine */
extern volatile unsigned *nvPFIFOPort; /* FIFO registers */
extern volatile unsigned *nvPTIMERPort; /* TIMER registers */
extern volatile unsigned *nvPEXTDEVPort; /* EXTDEV registers */
extern volatile unsigned *nvPRAMPort; /* Priviliged RAM registers */
extern volatile unsigned *nvPRAMFCPort; /* Priviliged RAM (Fifo) */
extern volatile unsigned *nvPRAMHTPort; /* Priviliged RAM (hash) */
extern volatile unsigned *nvPMCPort; /* Priviliged RAM (hash) */
extern volatile unsigned *nvCHAN0Port; /* User channel 0 */
extern volatile unsigned *nvPRAMDACPort; /* Points to the RAMDAC */
extern volatile unsigned *nvPRAMINPort; /* Privileges instance memory */
extern volatile unsigned *nvPBUSPort; /* Priviled Bus */
extern volatile unsigned *nvPNVMPort; /* Priviled Bus */
extern volatile unsigned *dumb; /* FrameBuffer - hack!!!! */
typedef enum {NV1,NV3,NV4,NV10,NumNVChips} NVChipType;
NVChipType GetChipType(void);
#endif /* __NVREG_H_ */

80
driver/xf86-video-nv/src/nvvga.h
View File

@ -1,80 +0,0 @@
/*
* Copyright 1996-1997 David J. McKay
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
* and/or sell copies of the Software, and to permit persons to whom the
* Software is furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
* DAVID J. MCKAY BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
* WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
* OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
#ifndef __NVVGA_H__
#define __NVVGA_H__
#include "riva_hw.h"
#define PALETTE_SIZE 256
#define NV_PDAC_CURSOR_SIZE 32
#define NV_PDAC_CURSOR_PLANE_SIZE (NV_PDAC_CURSOR_SIZE*4)
/* This is the structure for the NV1. It is not a VGA based core */
typedef struct {
unsigned char Nparam, Mparam, Oparam, Pparam;
unsigned char NparamMPLL, MparamMPLL, OparamMPLL, PparamMPLL;
unsigned char dacConfReg0;
unsigned char dacConfReg1;
unsigned char dacRgbPalCtrl;
unsigned long confReg0;
unsigned long green0; /* DPMS and sync polarity control */
unsigned long memoryTrace;
unsigned long startAddr; /* Where to start reading out from the buffer */
/* All the following registers control the display */
unsigned long prmConfig0; /* Controls if text mode on or off */
unsigned long horFrontPorch; /* Front porch in pixels */
unsigned long horSyncWidth; /* Sync Width in pixels */
unsigned long horBackPorch; /* horizontal back porch in in pixels */
unsigned long horDispWidth; /* Horizontal display width in pixels */
unsigned long verFrontPorch; /* Vertical front porch in lines */
unsigned long verSyncWidth; /* Vertical sync width in lines */
unsigned long verBackPorch; /* Vertical back porch in lines */
unsigned long verDispWidth; /* Vertical display width in lines */
/* Hardware cursor registers */
unsigned char cursorCtrl;
unsigned char xHi,xLo,yHi,yLo;
unsigned char colour1[3]; /* RGB values for cursor planes */
unsigned char colour2[3];
unsigned char colour3[3];
unsigned char plane0[NV_PDAC_CURSOR_PLANE_SIZE];
unsigned char plane1[NV_PDAC_CURSOR_PLANE_SIZE];
unsigned char palette[PALETTE_SIZE][3];
}NV1Registers;
/*
* Driver data structures.
*/
typedef struct {
/* vgaHWRec std; good old IBM VGA */
int vgaValid; /* is the above state valid?? */
NVChipType type; /* What the union holds */
union {
NV1Registers nv1;
RIVA_HW_STATE RivaState;
}regs;
} vgaNVRec, *vgaNVPtr;
#endif /* __NVVGA_H__ */