Skip to content

Commit

Permalink
alpha/drm: Cleanup Alpha support in DRM generic code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jay Estabrook authored and Dave Airlie committed Jun 13, 2011
1 parent 96bf8bd commit 82ba3fe
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/drm_bufs.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
kfree(map);
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
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/drm_vm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 82ba3fe

Please sign in to comment.