diff options
| author | Ben Skeggs <darktama@nisroch.keine.ath.cx> | 2007-06-10 03:05:05 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-06-29 14:28:39 +1000 |
| commit | 5e4a0f42f243cd5fbc8718660d78705e8c70808f (patch) | |
| tree | 512fc0d7f3bd21177869b0dfbecb5e577f8a8d57 /src/mesa/drivers/dri/nouveau/nouveau_context.h | |
| parent | 17e81bda6ed1d2cc4e5c0fad895030911b4fa53c (diff) | |
nouveau: match drm changes (0.0.7)
Diffstat (limited to 'src/mesa/drivers/dri/nouveau/nouveau_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/nouveau/nouveau_context.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h index 53f3393676..10d2ed6e17 100644 --- a/src/mesa/drivers/dri/nouveau/nouveau_context.h +++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h @@ -99,19 +99,22 @@ typedef struct nouveau_context { /* The read-only regs */ volatile unsigned char* mmio; + /* The per-channel notifier block */ + volatile void *notifier_block; + /* Physical addresses of AGP/VRAM apertures */ uint64_t vram_phys; uint64_t vram_size; - uint64_t agp_phys; - uint64_t agp_size; + uint64_t gart_phys; + uint64_t gart_size; /* Channel synchronisation */ - nouveau_notifier *syncNotifier; + drm_nouveau_notifier_alloc_t *syncNotifier; /* ARB_occlusion_query / EXT_timer_query */ GLuint query_object_max; GLboolean * query_alloc; - nouveau_notifier *queryNotifier; + drm_nouveau_notifier_alloc_t *queryNotifier; /* Additional hw-specific functions */ nouveau_hw_func hw_func; |