~ubuntu-branches/ubuntu/raring/xserver-xorg-video-nouveau/raring

Viewing changes to src/nvreg.h

Committer: Bazaar Package Importer
Author(s): Christopher James Halse Rogers
Date: 2009-07-08 08:31:59 UTC
mfrom: (1.1.6 upstream)
Revision ID: james.westby@ubuntu.com-20090708083159-43u08h03oku0d1h1

Tags: 1:0.0.10~git+20090708+ef3a386-0ubuntu1

* New upstream snapshot
+ Too many git commits to usefully list in changelog. Lots of fixes,
especially for nv5x and nv6x chips.

files added:
src/nouveau_ms.h

src/nouveau_wfb.c

files removed:
src/nv_dac.c

src/nv_hw.c

src/nv_pcicompat.h

files modified:
aclocal.m4

config.guess

config.sub

configure

configure.ac

debian/changelog

ltmain.sh

man/nouveau.man

snapshot-date

src/Makefile.am

src/Makefile.in

src/drmmode_display.c

src/nouveau_bios.h

src/nouveau_calc.c

src/nouveau_crtc.h

src/nouveau_dri2.c

src/nouveau_exa.c

src/nouveau_hw.c

src/nouveau_hw.h

src/nouveau_local.h

src/nouveau_xv.c

src/nv04_xv_ovl.c

src/nv10_xv_ovl.c

src/nv30_exa.c

src/nv30_xv_tex.c

src/nv40_exa.c

src/nv40_xv_tex.c

src/nv50_connector.c

src/nv50_crtc.c

src/nv50_exa.c

src/nv50_output.c

src/nv50_randr.c

src/nv50_sor.c

src/nv50_texture.h

src/nv50_xv.c

src/nv_bios.c

src/nv_const.h

src/nv_crtc.c

src/nv_cursor.c

src/nv_dma.c

src/nv_dri.c

src/nv_driver.c

src/nv_i2c.c

src/nv_include.h

src/nv_output.c

src/nv_proto.h

src/nv_setup.c

src/nv_type.h

src/nvreg.h

Show diffs side-by-side

added added

removed removed

src/nvreg.h

195

# define NV_CIO_AR_PLANE_INDEX 0x12

196

# define NV_CIO_AR_HPP_INDEX 0x13

197

# define NV_CIO_AR_CSEL_INDEX 0x14

198

#define NV_PRMCIO_INP0 0x006013c2

198

199

#define NV_PRMCIO_CRX__COLOR 0x006013d4

199

200

#define NV_PRMCIO_CR__COLOR 0x006013d5

200

201

/* Standard VGA CRTC registers */

257

258

# define NV_CIO_CR_ARX_INDEX 0x26 /* attribute index -- ro copy of 0x60.3c0 */

258

259

# define NV_CIO_CRE_CHIP_ID_INDEX 0x27 /* chip revision */

259

260

# define NV_CIO_CRE_PIXEL_INDEX 0x28

261

# define NV_CIO_CRE_PIXEL_FORMAT 1:0

260

262

# define NV_CIO_CRE_HEB__INDEX 0x2d /* horizontal extra bits? */

261

263

# define NV_CIO_CRE_HEB_HDT_8 0:0

262

264

# define NV_CIO_CRE_HEB_HDE_8 1:1

297

299

# define NV_CIO_CRE_54 0x54 /* `fp_vtiming' according to Haiku */

298

300

# define NV_CIO_CRE_57 0x57 /* index reg for cr58 */

299

301

# define NV_CIO_CRE_58 0x58 /* data reg for cr57 */

300

# define NV_CIO_CRE_59 0x59

302

# define NV_CIO_CRE_59 0x59 /* related to on/off-chip-ness of digital outputs */

301

303

# define NV_CIO_CRE_5B 0x5B /* newer colour saturation reg */

302

304

# define NV_CIO_CRE_85 0x85

303

305

# define NV_CIO_CRE_86 0x86

339

341

# define NV_RAMDAC_580_VPLL2_ACTIVE (1 << 28)

340

342

341

343

#define NV_PRAMDAC_GENERAL_CONTROL 0x00680600

344

# define NV_PRAMDAC_GENERAL_CONTROL_PIXMIX_ON (3 << 4)

345

# define NV_PRAMDAC_GENERAL_CONTROL_VGA_STATE_SEL (1 << 8)

346

# define NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL (1 << 12)

347

# define NV_PRAMDAC_GENERAL_CONTROL_TERMINATION_75OHM (2 << 16)

348

# define NV_PRAMDAC_GENERAL_CONTROL_BPC_8BITS (1 << 20)

349

# define NV_PRAMDAC_GENERAL_CONTROL_PIPE_LONG (2 << 28)

342

350

#define NV_PRAMDAC_TEST_CONTROL 0x00680608

343

351

# define NV_PRAMDAC_TEST_CONTROL_TP_INS_EN_ASSERTED (1 << 12)

344

352

# define NV_PRAMDAC_TEST_CONTROL_PWRDWN_DAC_OFF (1 << 16)

Older »