| Message ID | 1378380696-13446-2-git-send-email-sachin.kamat@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Applied. Thanks, Inki Dae 2013/9/5 Sachin Kamat <sachin.kamat@linaro.org> > Silences the following warnings: > drivers/gpu/drm/exynos/exynos_drm_fbdev.c:102:40: warning: > incorrect type in assignment (different address spaces) > drivers/gpu/drm/exynos/exynos_drm_fbdev.c:102:40: > expected void [noderef] <asn:2>*kvaddr > drivers/gpu/drm/exynos/exynos_drm_fbdev.c:102:40: got void * > drivers/gpu/drm/exynos/exynos_drm_fbdev.c:107:48: warning: > incorrect type in assignment (different address spaces) > drivers/gpu/drm/exynos/exynos_drm_fbdev.c:107:48: > expected void [noderef] <asn:2>*kvaddr > drivers/gpu/drm/exynos/exynos_drm_fbdev.c:107:48: got void * > > Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> > --- > drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > index 78e868b..e7c2f2d 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > @@ -99,12 +99,13 @@ static int exynos_drm_fbdev_update(struct > drm_fb_helper *helper, > if (is_drm_iommu_supported(dev)) { > unsigned int nr_pages = buffer->size >> PAGE_SHIFT; > > - buffer->kvaddr = vmap(buffer->pages, nr_pages, > VM_MAP, > + buffer->kvaddr = (void __iomem *) > vmap(buffer->pages, > + nr_pages, VM_MAP, > pgprot_writecombine(PAGE_KERNEL)); > } else { > phys_addr_t dma_addr = buffer->dma_addr; > if (dma_addr) > - buffer->kvaddr = phys_to_virt(dma_addr); > + buffer->kvaddr = (void __iomem > *)phys_to_virt(dma_addr); > else > buffer->kvaddr = (void __iomem *)NULL; > } > -- > 1.7.9.5 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel >
diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 78e868b..e7c2f2d 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -99,12 +99,13 @@ static int exynos_drm_fbdev_update(struct drm_fb_helper *helper, if (is_drm_iommu_supported(dev)) { unsigned int nr_pages = buffer->size >> PAGE_SHIFT; - buffer->kvaddr = vmap(buffer->pages, nr_pages, VM_MAP, + buffer->kvaddr = (void __iomem *) vmap(buffer->pages, + nr_pages, VM_MAP, pgprot_writecombine(PAGE_KERNEL)); } else { phys_addr_t dma_addr = buffer->dma_addr; if (dma_addr) - buffer->kvaddr = phys_to_virt(dma_addr); + buffer->kvaddr = (void __iomem *)phys_to_virt(dma_addr); else buffer->kvaddr = (void __iomem *)NULL; }
Silences the following warnings: drivers/gpu/drm/exynos/exynos_drm_fbdev.c:102:40: warning: incorrect type in assignment (different address spaces) drivers/gpu/drm/exynos/exynos_drm_fbdev.c:102:40: expected void [noderef] <asn:2>*kvaddr drivers/gpu/drm/exynos/exynos_drm_fbdev.c:102:40: got void * drivers/gpu/drm/exynos/exynos_drm_fbdev.c:107:48: warning: incorrect type in assignment (different address spaces) drivers/gpu/drm/exynos/exynos_drm_fbdev.c:107:48: expected void [noderef] <asn:2>*kvaddr drivers/gpu/drm/exynos/exynos_drm_fbdev.c:107:48: got void * Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)