diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-08-05 22:11:22 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-08-05 22:11:22 +1000 |
| commit | d1f2b55ad2c11f46e30547a9f7754e99b478348e (patch) | |
| tree | cabf9060c4f6cb419c7ed7fdcbcc6b6a91a83ac1 /drivers/char/drm/i810_dma.c | |
| parent | c73681e77b40697d16ada777adf2c6dc4db05917 (diff) | |
| download | kernel_goldelico_gta04-d1f2b55ad2c11f46e30547a9f7754e99b478348e.zip kernel_goldelico_gta04-d1f2b55ad2c11f46e30547a9f7754e99b478348e.tar.gz kernel_goldelico_gta04-d1f2b55ad2c11f46e30547a9f7754e99b478348e.tar.bz2 | |
drm: updated DRM map patch for 32/64 bit systems
I basically combined Paul's patches with additions that I had made
for PCI scatter gather.
I also tried more carefully to avoid problems with the same token
assigned multiple times while trying to use the base address in the
token if possible to gain as much backward compatibility as possible
for broken DRI clients.
From: Paul Mackerras <paulus@samba.org> and Egbert Eich <eich@suse.de>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/char/drm/i810_dma.c')
| -rw-r--r-- | drivers/char/drm/i810_dma.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/drm/i810_dma.c b/drivers/char/drm/i810_dma.c index 0a9ac1f..f9fd5ab 100644 --- a/drivers/char/drm/i810_dma.c +++ b/drivers/char/drm/i810_dma.c @@ -351,6 +351,7 @@ static int i810_dma_initialize(drm_device_t *dev, DRM_ERROR("can not find mmio map!\n"); return -EINVAL; } + dev->agp_buffer_token = init->buffers_offset; dev->agp_buffer_map = drm_core_findmap(dev, init->buffers_offset); if (!dev->agp_buffer_map) { dev->dev_private = (void *)dev_priv; |