diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-07-12 11:28:58 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-07-12 11:28:58 +1000 |
| commit | c91dfdf329f946c8cc581f079359092629cf73dc (patch) | |
| tree | 26f2abbee7a2ab96ab4f68d79ed168b78d0643f1 /src/nv_type.h | |
| parent | e6a16710033d189aa5d6b2e3b4a75f2dd9d05a5d (diff) | |
| parent | 4cbd3a1d9dfe6d51648de36ce7ae3d02c920374e (diff) | |
| download | xorg-driver-xf86-video-nouveau-c91dfdf329f946c8cc581f079359092629cf73dc.tar.gz | |
Merge branch 'randr-1.2' into nv50-branchnv50-branch
Conflicts:
src/nv_driver.c
Diffstat (limited to 'src/nv_type.h')
| -rw-r--r-- | src/nv_type.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/nv_type.h b/src/nv_type.h index 73a326f..79575dd 100644 --- a/src/nv_type.h +++ b/src/nv_type.h @@ -193,14 +193,16 @@ typedef struct _NVRec { unsigned long VRAMSize; /* AGP physical address */ unsigned long AGPPhysical; - /* Accesible AGP size */ + /* Accessible AGP size */ unsigned long AGPSize; + /* PCI buffer virtual address */ + unsigned long SGPhysical; NVAllocRec * FB; NVAllocRec * Cursor; NVAllocRec * CLUT; /* NV50 only */ NVAllocRec * ScratchBuffer; - NVAllocRec * AGPScratch; + NVAllocRec * GARTScratch; Bool NoAccel; Bool HWCursor; |