Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

sh: LCDC dcache flush for deferred io

Browse source 
Since writenotify on uncached vmas is unsupported in 2.6.31,
live with cached framebuffer memory in the deferred io
case for now and flush the dcache before forcing refresh.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Magnus damm <damm@igel.co.jp>
This commit is contained in:
Paul Mundt 2009-07-01 06:50:31 +00:00
parent 34e19ada99
commit 1c6a307a54
1 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
drivers/video/sh_mobile_lcdcfb.c
View file

@ -17,6 +17,7 @@
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/vmalloc.h>
#include <video/sh_mobile_lcdc.h> #include <video/sh_mobile_lcdc.h>
#include <asm/atomic.h> #include <asm/atomic.h>
@ -33,6 +34,7 @@ struct sh_mobile_lcdc_chan {
struct fb_info info; struct fb_info info;
dma_addr_t dma_handle; dma_addr_t dma_handle;
struct fb_deferred_io defio; struct fb_deferred_io defio;
struct scatterlist *sglist;
unsigned long frame_end; unsigned long frame_end;
wait_queue_head_t frame_end_wait; wait_queue_head_t frame_end_wait;
}; };
@ -206,16 +208,38 @@ static void sh_mobile_lcdc_clk_on(struct sh_mobile_lcdc_priv *priv) {}
static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) {} static void sh_mobile_lcdc_clk_off(struct sh_mobile_lcdc_priv *priv) {}
#endif #endif
static int sh_mobile_lcdc_sginit(struct fb_info *info,
struct list_head *pagelist)
{
struct sh_mobile_lcdc_chan *ch = info->par;
unsigned int nr_pages_max = info->fix.smem_len >> PAGE_SHIFT;
struct page *page;
int nr_pages = 0;
sg_init_table(ch->sglist, nr_pages_max);
list_for_each_entry(page, pagelist, lru)
sg_set_page(&ch->sglist[nr_pages++], page, PAGE_SIZE, 0);
return nr_pages;
}
static void sh_mobile_lcdc_deferred_io(struct fb_info *info, static void sh_mobile_lcdc_deferred_io(struct fb_info *info,
struct list_head *pagelist) struct list_head *pagelist)
{ {
struct sh_mobile_lcdc_chan *ch = info->par; struct sh_mobile_lcdc_chan *ch = info->par;
unsigned int nr_pages;
/* enable clocks before accessing hardware */ /* enable clocks before accessing hardware */
sh_mobile_lcdc_clk_on(ch->lcdc); sh_mobile_lcdc_clk_on(ch->lcdc);
nr_pages = sh_mobile_lcdc_sginit(info, pagelist);
dma_map_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
/* trigger panel update */ /* trigger panel update */
lcdc_write_chan(ch, LDSM2R, 1); lcdc_write_chan(ch, LDSM2R, 1);
dma_unmap_sg(info->dev, ch->sglist, nr_pages, DMA_TO_DEVICE);
} }
static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info) static void sh_mobile_lcdc_deferred_io_touch(struct fb_info *info)
@ -846,21 +870,31 @@ static int __init sh_mobile_lcdc_probe(struct platform_device *pdev)
} }
for (i = 0; i < j; i++) { for (i = 0; i < j; i++) {
error = register_framebuffer(&priv->ch[i].info); struct sh_mobile_lcdc_chan *ch = priv->ch + i;
info = &ch->info;
if (info->fbdefio) {
priv->ch->sglist = vmalloc(sizeof(struct scatterlist) *
info->fix.smem_len >> PAGE_SHIFT);
if (!priv->ch->sglist) {
dev_err(&pdev->dev, "cannot allocate sglist\n");
goto err1;
}
}
error = register_framebuffer(info);
if (error < 0) if (error < 0)
goto err1; goto err1;
}
for (i = 0; i < j; i++) {
info = &priv->ch[i].info;
dev_info(info->dev, dev_info(info->dev,
"registered %s/%s as %dx%d %dbpp.\n", "registered %s/%s as %dx%d %dbpp.\n",
pdev->name, pdev->name,
(priv->ch[i].cfg.chan == LCDC_CHAN_MAINLCD) ? (ch->cfg.chan == LCDC_CHAN_MAINLCD) ?
"mainlcd" : "sublcd", "mainlcd" : "sublcd",
(int) priv->ch[i].cfg.lcd_cfg.xres, (int) ch->cfg.lcd_cfg.xres,
(int) priv->ch[i].cfg.lcd_cfg.yres, (int) ch->cfg.lcd_cfg.yres,
priv->ch[i].cfg.bpp); ch->cfg.bpp);
/* deferred io mode: disable clock to save power */ /* deferred io mode: disable clock to save power */
if (info->fbdefio) if (info->fbdefio)
@ -892,6 +926,9 @@ static int sh_mobile_lcdc_remove(struct platform_device *pdev)
if (!info->device) if (!info->device)
continue; continue;
if (priv->ch[i].sglist)
vfree(priv->ch[i].sglist);
dma_free_coherent(&pdev->dev, info->fix.smem_len, dma_free_coherent(&pdev->dev, info->fix.smem_len,
info->screen_base, priv->ch[i].dma_handle); info->screen_base, priv->ch[i].dma_handle);
fb_dealloc_cmap(&info->cmap); fb_dealloc_cmap(&info->cmap);