diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 20:21:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-25 20:21:43 -0700 |
| commit | 82b6c3af0482c167fb3bb51375589e6d9c5c67a4 (patch) | |
| tree | 4ee4ed76faadb309b499187ea7ae797db69abfd3 /drivers/char/drm/savage_bci.c | |
| parent | 9f4c7ac227423eb4a514ce0bbd3a884a26541e63 (diff) | |
| parent | 85abb3f95010b277a6efbc9b8031a7854af87e10 (diff) | |
Merge branch 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-patches' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6:
drm: ioremap balanced with iounmap for drivers/char/drm
drm: fix error returns, sysfs error handling
fix return code in error case.
drm: mga: set dev_priv_size
drm: savage: dev->agp_buffer_map is not initialized for AGP DMA on savages
drm: radeon: only allow specific type-3 packetss through verifier
Diffstat (limited to 'drivers/char/drm/savage_bci.c')
| -rw-r--r-- | drivers/char/drm/savage_bci.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/savage_bci.c b/drivers/char/drm/savage_bci.c index 59c7520bf9a2..a9a84f88df5e 100644 --- a/drivers/char/drm/savage_bci.c +++ b/drivers/char/drm/savage_bci.c @@ -728,6 +728,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) { |