Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82ba3fef authored Jun 09, 2011 by Jay Estabrook Committed by Dave Airlie Jun 14, 2011

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>

parent 96bf8bd1

drivers/gpu/drm/drm_bufs.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -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

drivers/gpu/drm/drm_vm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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