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

Commit bcf559e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 

* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
  drm/radeon: fixup issue with radeon and PAT support.
parents 732b7206 242e3df8

drivers/gpu/drm/drm_memory.c

+5 −0
Original line number Diff line number Diff line
@@ -167,6 +167,11 @@ void drm_core_ioremap(struct drm_map *map, struct drm_device *dev) 
}

EXPORT_SYMBOL(drm_core_ioremap);



void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev)

{

	map->handle = ioremap_wc(map->offset, map->size);

}

EXPORT_SYMBOL(drm_core_ioremap_wc);

void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev)

{

	if (!map->handle || !map->size)

drivers/gpu/drm/radeon/radeon_cp.c

+1 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,7 @@ static int radeon_do_init_cp(struct drm_device * dev, drm_radeon_init_t * init) 
			dev_priv->gart_info.mapping.size =

			    dev_priv->gart_info.table_size;



			drm_core_ioremap(&dev_priv->gart_info.mapping, dev);

			drm_core_ioremap_wc(&dev_priv->gart_info.mapping, dev);

			dev_priv->gart_info.addr =

			    dev_priv->gart_info.mapping.handle;

include/drm/drmP.h

+1 −0
Original line number Diff line number Diff line
@@ -1089,6 +1089,7 @@ extern int drm_mm_remove_space_from_tail(struct drm_mm *mm, unsigned long size); 
extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size);



extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev);

extern void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev);

extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev);



static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,