diff options
| author | Jay Estabrook <jay.estabrook@gmail.com> | 2011-06-10 02:18:39 +0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-06-14 03:31:37 +0400 |
| commit | 82ba3fef67829813d0ed4c45231235084a07f081 (patch) | |
| tree | 686f80dfafde96c75badac21c3f066d26a79af7f | |
| parent | 96bf8bd1c953c3b9d89eac9f13dfdbf5e580060f (diff) | |
| download | linux-82ba3fef67829813d0ed4c45231235084a07f081.tar.xz | |
alpha/drm: Cleanup Alpha support in DRM generic code
Remove an obsolete Alpha adjustment, and modify another,
to go with the current Alpha architecture support.
Signed-off-by: Jay Estabrook <jay.estabrook@gmail.com>
Tested-by: Matt Turner <mattst88@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/drm_bufs.c | 3 | ||||
| -rw-r--r-- | drivers/gpu/drm/drm_vm.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c index 3e257a50bf56..e1bd713d91a2 100644 --- a/drivers/gpu/drm/drm_bufs.c +++ b/drivers/gpu/drm/drm_bufs.c @@ -183,9 +183,6 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset, return -EINVAL; } #endif -#ifdef __alpha__ - map->offset += dev->hose->mem_space->start; -#endif /* Some drivers preinitialize some maps, without the X Server * needing to be aware of it. Therefore, we just return success * when the server tries to create a duplicate map. diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c index 2c3fcbdfd8ff..5db96d45fc71 100644 --- a/drivers/gpu/drm/drm_vm.c +++ b/drivers/gpu/drm/drm_vm.c @@ -526,7 +526,7 @@ static int drm_mmap_dma(struct file *filp, struct vm_area_struct *vma) static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev) { #ifdef __alpha__ - return dev->hose->dense_mem_base - dev->hose->mem_space->start; + return dev->hose->dense_mem_base; #else return 0; #endif |