Re: [PATCH v4] fbdev: sh_mobile_lcdc: use dma_mmap_coherent
flat view
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Date: 2012-08-16 12:16:21
Also in:
lkml
Hi Eiraku-san, On Thursday 16 August 2012 19:13:20 Hideki EIRAKU wrote:
fb_mmap() implemented in fbmem.c uses smem_start as the physical address of the frame buffer. In the sh_mobile_lcdc driver, the smem_start is a dma_addr_t that is not a physical address when IOMMU is enabled. dma_mmap_coherent() maps the address correctly. Signed-off-by: Hideki EIRAKU <redacted>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> I will push the patch to v3.7 through my tree.
quoted hunk ↗ jump to hunk
--- drivers/video/sh_mobile_lcdcfb.c | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-)diff --git a/drivers/video/sh_mobile_lcdcfb.cb/drivers/video/sh_mobile_lcdcfb.c index 699487c..bccfd7e 100644--- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c@@ -1614,6 +1614,15 @@ static int sh_mobile_lcdc_overlay_blank(int blank,struct fb_info *info) return 1; } +static int +sh_mobile_lcdc_overlay_mmap(struct fb_info *info, struct vm_area_struct *vma) +{ + struct sh_mobile_lcdc_overlay *ovl = info->par; + + return dma_mmap_coherent(ovl->channel->lcdc->dev, vma, ovl->fb_mem, + ovl->dma_handle, ovl->fb_size); +} + static struct fb_ops sh_mobile_lcdc_overlay_ops = { .owner = THIS_MODULE, .fb_read = fb_sys_read,@@ -1626,6 +1635,7 @@ static struct fb_ops sh_mobile_lcdc_overlay_ops = { .fb_ioctl = sh_mobile_lcdc_overlay_ioctl, .fb_check_var = sh_mobile_lcdc_overlay_check_var, .fb_set_par = sh_mobile_lcdc_overlay_set_par, + .fb_mmap = sh_mobile_lcdc_overlay_mmap, }; static void@@ -2093,6 +2103,15 @@ static int sh_mobile_lcdc_blank(int blank, structfb_info *info) return 0; } +static int +sh_mobile_lcdc_mmap(struct fb_info *info, struct vm_area_struct *vma) +{ + struct sh_mobile_lcdc_chan *ch = info->par; + + return dma_mmap_coherent(ch->lcdc->dev, vma, ch->fb_mem, + ch->dma_handle, ch->fb_size); +} + static struct fb_ops sh_mobile_lcdc_ops = { .owner = THIS_MODULE, .fb_setcolreg = sh_mobile_lcdc_setcolreg,@@ -2108,6 +2127,7 @@ static struct fb_ops sh_mobile_lcdc_ops = { .fb_release = sh_mobile_lcdc_release, .fb_check_var = sh_mobile_lcdc_check_var, .fb_set_par = sh_mobile_lcdc_set_par, + .fb_mmap = sh_mobile_lcdc_mmap, }; static void
-- Regards, Laurent Pinchart