diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-11-06 08:03:18 +1100 |
| commit | 1e90b7ee8cefff59b70e285557aa7920dea77e81 (patch) | |
| tree | 2132e5dcee9e5ef9693742100953063cd6423b3a /shared-core/savage_bci.c | |
| parent | 0c34d0f31a691bb649ed69f19e93fc1a723aa1d4 (diff) | |
| parent | 7b6cd95bb6c41653aed78952da0a461bd4791413 (diff) | |
Merge branch 'master' into nouveau-1
Conflicts:
linux-core/Makefile.kernel
Diffstat (limited to 'shared-core/savage_bci.c')
| -rw-r--r-- | shared-core/savage_bci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared-core/savage_bci.c b/shared-core/savage_bci.c index 20fea40f..01121b92 100644 --- a/shared-core/savage_bci.c +++ b/shared-core/savage_bci.c @@ -725,6 +725,7 @@ static int savage_do_init_bci(drm_device_t *dev, drm_savage_init_t *init) dev_priv->status = NULL; } if (dev_priv->dma_type == SAVAGE_DMA_AGP && init->buffers_offset) { + dev->agp_buffer_token = init->buffers_offset; dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset); if (!dev->agp_buffer_map) { |