Hi Dave,
Today's linux-next merge of the drm tree got a conflict in
drivers/gpu/drm/drm_memory.c between commit
9b8d5a124f133fe9a75397d20b874844a2e3d7e9 ("drm/radeon: fix ioremap
conflict with AGP mappings") from Linus' tree and commit
b16d90f80a3707fff2d13627076362272a466849 ("drm: Split drm_map and
drm_local_map") from the drm tree.
Just a context change. I fixed it up (see below) and can carry the fix
for a while.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/gpu/drm/drm_memory.c
index bcc869b,1132d16..0000000
--- a/drivers/gpu/drm/drm_memory.c
+++ b/drivers/gpu/drm/drm_memory.c
@@@ -169,17 -169,12 +169,17 @@@ void drm_core_ioremap(struct drm_local_
}
EXPORT_SYMBOL(drm_core_ioremap);
- void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev)
+ void drm_core_ioremap_wc(struct drm_local_map *map, struct drm_device *dev)
{
- map->handle = ioremap_wc(map->offset, map->size);
+ if (drm_core_has_AGP(dev) &&
+ dev->agp && dev->agp->cant_use_aperture && map->type == _DRM_AGP)
+ map->handle = agp_remap(map->offset, map->size, dev);
+ else
+ 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)
+ void drm_core_ioremapfree(struct drm_local_map *map, struct drm_device *dev)
{
if (!map->handle || !map->size)
return;
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
