From: Ville Syrjälä <[email protected]> The gem object keeps a single void *addr that holds either a page_address() pointer for page backed objects, or an ioremap_wc() mapping for linear ones. Sparse complains about the address space mismatches when the ioremap_wc() result is stored in it, when it is passed to iounmap(), and when it is assigned to screen_base.
Splitting the pointer in two would be a lot of churn for little gain, so just cast around the __iomem annotation at those three places. The casts are consistent with how the pointer is used: iounmap() is only called for linear objects, and the fbdev framebuffer is always a linear object mapped through armada_gem_map_object(). No functional change. Cc: Russell King <[email protected]> Signed-off-by: Ville Syrjälä <[email protected]> --- drivers/gpu/drm/armada/armada_fbdev.c | 2 +- drivers/gpu/drm/armada/armada_gem.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/armada/armada_fbdev.c b/drivers/gpu/drm/armada/armada_fbdev.c index f35afec2125f..073d7883d988 100644 --- a/drivers/gpu/drm/armada/armada_fbdev.c +++ b/drivers/gpu/drm/armada/armada_fbdev.c @@ -95,7 +95,7 @@ int armada_fbdev_driver_fbdev_probe(struct drm_fb_helper *fbh, info->fix.smem_start = obj->phys_addr; info->fix.smem_len = obj->obj.size; info->screen_size = obj->obj.size; - info->screen_base = ptr; + info->screen_base = (void __iomem __force *)ptr; fbh->funcs = &armada_fbdev_helper_funcs; fbh->fb = &dfb->fb; diff --git a/drivers/gpu/drm/armada/armada_gem.c b/drivers/gpu/drm/armada/armada_gem.c index 8a8f4da6f44f..3503f633a8b2 100644 --- a/drivers/gpu/drm/armada/armada_gem.c +++ b/drivers/gpu/drm/armada/armada_gem.c @@ -61,7 +61,7 @@ void armada_gem_free_object(struct drm_gem_object *obj) mutex_unlock(&priv->linear_lock); kfree(dobj->linear); if (dobj->addr) - iounmap(dobj->addr); + iounmap((void __iomem __force *)dobj->addr); } if (dobj->obj.import_attach) { @@ -183,7 +183,8 @@ armada_gem_map_object(struct drm_device *dev, struct armada_gem_object *dobj) { /* only linear objects need to be ioremap'd */ if (!dobj->addr && dobj->linear) - dobj->addr = ioremap_wc(dobj->phys_addr, dobj->obj.size); + dobj->addr = (void __force *)ioremap_wc(dobj->phys_addr, + dobj->obj.size); return dobj->addr; } -- 2.56.0
