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/drm_proc.c | |
| parent | c73681e77b40697d16ada777adf2c6dc4db05917 (diff) | |
| download | op-kernel-dev-d1f2b55ad2c11f46e30547a9f7754e99b478348e.zip op-kernel-dev-d1f2b55ad2c11f46e30547a9f7754e99b478348e.tar.gz | |
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/drm_proc.c')
| -rw-r--r-- | drivers/char/drm/drm_proc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/drm/drm_proc.c b/drivers/char/drm/drm_proc.c index f4154cc..32d2bb9 100644 --- a/drivers/char/drm/drm_proc.c +++ b/drivers/char/drm/drm_proc.c @@ -235,13 +235,13 @@ static int drm__vm_info(char *buf, char **start, off_t offset, int request, type = "??"; else type = types[map->type]; - DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08lx ", + DRM_PROC_PRINT("%4d 0x%08lx 0x%08lx %4.4s 0x%02x 0x%08x ", i, map->offset, map->size, type, map->flags, - (unsigned long)map->handle); + r_list->user_token); if (map->mtrr < 0) { DRM_PROC_PRINT("none\n"); } else { |
