Re: [PATCH 1/5] video: add atmel lcdc frambuffer support

[Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>]

On 12:34 Sat 22 Sep     , Sascha Hauer wrote:
> On Fri, Sep 21, 2012 at 02:55:29PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > This IP is present on the at91sam9 until the sam9g45, on the sam9x5 we use a
> > new IP.
> > 
> > This driver is based on the linux one.
> > 
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
> > ---
> >  arch/arm/mach-at91/include/mach/atmel_lcdc.h |  209 +++++++++++
> >  arch/arm/mach-at91/include/mach/board.h      |    4 +
> >  drivers/video/Kconfig                        |    4 +
> >  drivers/video/Makefile                       |    1 +
> >  drivers/video/atmel_lcdfb.c                  |  477 ++++++++++++++++++++++++++
> >  5 files changed, 695 insertions(+)
> >  create mode 100644 arch/arm/mach-at91/include/mach/atmel_lcdc.h
> >  create mode 100644 drivers/video/atmel_lcdfb.c
> > 
> > diff --git a/arch/arm/mach-at91/include/mach/atmel_lcdc.h b/arch/arm/mach-at91/include/mach/atmel_lcdc.h
> 
> The register definitions should be besides the driver, not in mach.
> 
> > diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
> > new file mode 100644
> > index 0000000..8659836
> > --- /dev/null
> > +++ b/drivers/video/atmel_lcdfb.c
> > @@ -0,0 +1,477 @@
> > +/*
> > + * Driver for AT91/AT32 LCD Controller
> > + *
> > + * Copyright (C) 2007 Atmel Corporation
> > + *
> > + * See file CREDITS for list of people who contributed to this
> > + * project.
> > + *
> > + * This program is free software; you can redistribute it and/or
> > + * modify it under the terms of the GNU General Public License as
> > + * published by the Free Software Foundation; either version 2 of
> > + * the License, or (at your option) any later version.
> > + *
> > + * This program is distributed in the hope that it will be useful,
> > + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
> > + * GNU General Public License for more details.
> > + *
> > + * You should have received a copy of the GNU General Public License
> > + * along with this program; if not, write to the Free Software
> > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
> > + * MA 02111-1307 USA
> > + */
> > +
> > +#include <common.h>
> > +#include <io.h>
> > +#include <init.h>
> > +#include <linux/clk.h>
> > +#include <fb.h>
> > +#include <mach/atmel_lcdc.h>
> > +#include <mach/hardware.h>
> > +#include <mach/io.h>
> > +#include <mach/cpu.h>
> > +#include <errno.h>
> > +#include <linux/err.h>
> > +#include <malloc.h>
> > +#include <asm/mmu.h>
> > +
> > +#define lcdc_readl(sinfo, reg)		__raw_readl((sinfo)->mmio+(reg))
> > +#define lcdc_writel(sinfo, reg, val)	__raw_writel((val), (sinfo)->mmio+(reg))
> > +
> > +/* configurable parameters */
> > +#define ATMEL_LCDC_CVAL_DEFAULT		0xc8
> > +#define ATMEL_LCDC_DMA_BURST_LEN	8	/* words */
> > +#define ATMEL_LCDC_FIFO_SIZE		512	/* words */
> > +
> > +static void atmel_lcdfb_start_clock(struct atmel_lcdfb_info *sinfo)
> > +{
> > +	clk_enable(sinfo->bus_clk);
> > +	clk_enable(sinfo->lcdc_clk);
> > +}
> > +
> > +static void atmel_lcdfb_stop_clock(struct atmel_lcdfb_info *sinfo)
> > +{
> > +	clk_disable(sinfo->bus_clk);
> > +	clk_disable(sinfo->lcdc_clk);
> > +}
> > +
> > +static unsigned long compute_hozval(unsigned long xres, unsigned long lcdcon2)
> > +{
> > +	unsigned long value;
> > +
> > +	if (!(cpu_is_at91sam9261() || cpu_is_at91sam9g10()
> > +		|| cpu_is_at32ap7000()))
> > +		return xres;
> > +
> > +	value = xres;
> > +	if ((lcdcon2 & ATMEL_LCDC_DISTYPE) != ATMEL_LCDC_DISTYPE_TFT) {
> > +		/* STN display */
> > +		if ((lcdcon2 & ATMEL_LCDC_DISTYPE) == ATMEL_LCDC_DISTYPE_STNCOLOR)
> > +			value *= 3;
> > +
> > +		if ( (lcdcon2 & ATMEL_LCDC_IFWIDTH) == ATMEL_LCDC_IFWIDTH_4
> > +		   || ( (lcdcon2 & ATMEL_LCDC_IFWIDTH) == ATMEL_LCDC_IFWIDTH_8
> > +		      && (lcdcon2 & ATMEL_LCDC_SCANMOD) == ATMEL_LCDC_SCANMOD_DUAL ))
> > +			value = DIV_ROUND_UP(value, 4);
> > +		else
> > +			value = DIV_ROUND_UP(value, 8);
> > +	}
> > +
> > +	return value;
> > +}
> > +
> > +static void atmel_lcdfb_stop_nowait(struct atmel_lcdfb_info *sinfo)
> > +{
> > +	/* Turn off the LCD controller and the DMA controller */
> > +	lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
> > +			sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET);
> > +
> > +	/* Wait for the LCDC core to become idle */
> > +	while (lcdc_readl(sinfo, ATMEL_LCDC_PWRCON) & ATMEL_LCDC_BUSY)
> > +		mdelay(10);
> > +
> > +	lcdc_writel(sinfo, ATMEL_LCDC_DMACON, 0);
> > +}
> > +
> > +static void atmel_lcdfb_stop(struct atmel_lcdfb_info *sinfo)
> > +{
> > +	atmel_lcdfb_stop_nowait(sinfo);
> > +
> > +	/* Wait for DMA engine to become idle... */
> > +	while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
> > +		mdelay(10);
> > +}
> > +
> > +static void atmel_lcdfb_start(struct atmel_lcdfb_info *sinfo)
> > +{
> > +	lcdc_writel(sinfo, ATMEL_LCDC_DMACON, sinfo->default_dmacon);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_PWRCON,
> > +		(sinfo->guard_time << ATMEL_LCDC_GUARDT_OFFSET)
> > +		| ATMEL_LCDC_PWR);
> > +}
> > +
> > +/**
> > + * @param fb_info Framebuffer information
> > + */
> > +static void atmel_lcdc_enable_controller(struct fb_info *fb_info)
> > +{
> > +	struct atmel_lcdfb_info *sinfo = fb_info->priv;
> > +
> > +	if (sinfo->atmel_lcdfb_power_control)
> > +		sinfo->atmel_lcdfb_power_control(1);
> > +}
> > +
> > +/**
> > + * @param fb_info Framebuffer information
> > + */
> > +static void atmel_lcdc_disable_controller(struct fb_info *fb_info)
> > +{
> > +	struct atmel_lcdfb_info *sinfo = fb_info->priv;
> > +
> > +	if (sinfo->atmel_lcdfb_power_control)
> > +		sinfo->atmel_lcdfb_power_control(0);
> > +}
> > +
> > +static void atmel_lcdfb_update_dma(struct fb_info *info)
> > +{
> > +	struct atmel_lcdfb_info *sinfo = info->priv;
> > +	unsigned long dma_addr;
> > +
> > +	dma_addr = (unsigned long)info->screen_base;
> > +
> > +	dma_addr &= ~3UL;
> > +
> > +	/* Set framebuffer DMA base address and pixel offset */
> > +	lcdc_writel(sinfo, ATMEL_LCDC_DMABADDR1, dma_addr);
> > +}
> > +
> > +static void atmel_lcdfb_set_par(struct fb_info *info)
> > +{
> > +	struct atmel_lcdfb_info *sinfo = info->priv;
> > +	struct fb_videomode *mode = info->mode;
> > +	unsigned long clk_value_khz;
> > +	unsigned long value;
> > +	unsigned long pix_factor = 2;
> > +	unsigned long hozval_linesz;
> > +
> > +	atmel_lcdfb_stop(sinfo);
> > +
> > +	/* Re-initialize the DMA engine... */
> > +	dev_dbg(&info->dev, "  * update DMA engine\n");
> > +	atmel_lcdfb_update_dma(info);
> > +
> > +	/* ...set frame size and burst length = 8 words (?) */
> > +	value = (mode->yres * mode->xres * info->bits_per_pixel) / 32;
> > +	value |= ((ATMEL_LCDC_DMA_BURST_LEN - 1) << ATMEL_LCDC_BLENGTH_OFFSET);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_DMAFRMCFG, value);
> > +
> > +	/* Now, the LCDC core... */
> > +
> > +	/* Set pixel clock */
> > +	if (cpu_is_at91sam9g45() && !cpu_is_at91sam9g45es())
> > +		pix_factor = 1;
> > +
> > +	clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
> > +
> > +	value = DIV_ROUND_UP(clk_value_khz, PICOS2KHZ(mode->pixclock));
> > +
> > +	if (value < pix_factor) {
> > +		dev_notice(&info->dev, "Bypassing pixel clock divider\n");
> > +		lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, ATMEL_LCDC_BYPASS);
> > +	} else {
> > +		value = (value / pix_factor) - 1;
> > +		dev_dbg(&info->dev, "  * programming CLKVAL = 0x%08lx\n",
> > +				value);
> > +		lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1,
> > +				value << ATMEL_LCDC_CLKVAL_OFFSET);
> > +		mode->pixclock =
> > +			KHZ2PICOS(clk_value_khz / (pix_factor * (value + 1)));
> > +		dev_dbg(&info->dev, "  updated pixclk:     %lu KHz\n",
> > +					PICOS2KHZ(mode->pixclock));
> > +	}
> > +
> > +	/* Initialize control register 2 */
> > +	value = sinfo->default_lcdcon2;
> > +
> > +	if (!(mode->sync & FB_SYNC_HOR_HIGH_ACT))
> > +		value |= ATMEL_LCDC_INVLINE_INVERTED;
> > +	if (!(mode->sync & FB_SYNC_VERT_HIGH_ACT))
> > +		value |= ATMEL_LCDC_INVFRAME_INVERTED;
> > +
> > +	switch (info->bits_per_pixel) {
> > +		case 1:	value |= ATMEL_LCDC_PIXELSIZE_1; break;
> > +		case 2: value |= ATMEL_LCDC_PIXELSIZE_2; break;
> > +		case 4: value |= ATMEL_LCDC_PIXELSIZE_4; break;
> > +		case 8: value |= ATMEL_LCDC_PIXELSIZE_8; break;
> > +		case 15: /* fall through */
> > +		case 16: value |= ATMEL_LCDC_PIXELSIZE_16; break;
> > +		case 24: value |= ATMEL_LCDC_PIXELSIZE_24; break;
> > +		case 32: value |= ATMEL_LCDC_PIXELSIZE_32; break;
> > +		default: BUG(); break;
> > +	}
> > +	dev_dbg(&info->dev, "  * LCDCON2 = %08lx\n", value);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_LCDCON2, value);
> > +
> > +	/* Vertical timing */
> > +	value = (mode->vsync_len - 1) << ATMEL_LCDC_VPW_OFFSET;
> > +	value |= mode->upper_margin << ATMEL_LCDC_VBP_OFFSET;
> > +	value |= mode->lower_margin;
> > +	dev_dbg(&info->dev, "  * LCDTIM1 = %08lx\n", value);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_TIM1, value);
> > +
> > +	/* Horizontal timing */
> > +	value = (mode->right_margin - 1) << ATMEL_LCDC_HFP_OFFSET;
> > +	value |= (mode->hsync_len - 1) << ATMEL_LCDC_HPW_OFFSET;
> > +	value |= (mode->left_margin - 1);
> > +	dev_dbg(&info->dev, "  * LCDTIM2 = %08lx\n", value);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_TIM2, value);
> > +
> > +	/* Horizontal value (aka line size) */
> > +	hozval_linesz = compute_hozval(mode->xres,
> > +					lcdc_readl(sinfo, ATMEL_LCDC_LCDCON2));
> > +
> > +	/* Display size */
> > +	value = (hozval_linesz - 1) << ATMEL_LCDC_HOZVAL_OFFSET;
> > +	value |= mode->yres - 1;
> > +	dev_dbg(&info->dev, "  * LCDFRMCFG = %08lx\n", value);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_LCDFRMCFG, value);
> > +
> > +	/* FIFO Threshold: Use formula from data sheet */
> > +	value = ATMEL_LCDC_FIFO_SIZE - (2 * ATMEL_LCDC_DMA_BURST_LEN + 3);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_FIFO, value);
> > +
> > +	/* Toggle LCD_MODE every frame */
> > +	lcdc_writel(sinfo, ATMEL_LCDC_MVAL, 0);
> > +
> > +	/* Disable all interrupts */
> > +	lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
> > +
> > +	/* Enable FIFO & DMA errors */
> > +	lcdc_writel(sinfo, ATMEL_LCDC_IER, ATMEL_LCDC_UFLWI | ATMEL_LCDC_OWRI | ATMEL_LCDC_MERI);
> > +
> > +	/* ...wait for DMA engine to become idle... */
> > +	while (lcdc_readl(sinfo, ATMEL_LCDC_DMACON) & ATMEL_LCDC_DMABUSY)
> > +		mdelay(10);
> > +
> > +	atmel_lcdfb_start(sinfo);
> > +
> > +	dev_dbg(&info->dev, "  * DONE\n");
> > +}
> > +
> > +static int atmel_lcdfb_check_var(struct fb_info *info)
> > +{
> > +	struct device_d *dev = &info->dev;
> > +	struct atmel_lcdfb_info *sinfo = info->priv;
> > +	struct fb_videomode *mode = info->mode;
> > +	unsigned long clk_value_khz;
> > +
> > +	clk_value_khz = clk_get_rate(sinfo->lcdc_clk) / 1000;
> > +
> > +	dev_dbg(dev, "%s:\n", __func__);
> > +
> > +	if (!(mode->pixclock && info->bits_per_pixel)) {
> > +		dev_err(dev, "needed value not specified\n");
> > +		return -EINVAL;
> > +	}
> > +
> > +	dev_dbg(dev, "  resolution: %ux%u\n", mode->xres, mode->yres);
> > +	dev_dbg(dev, "  pixclk:     %lu KHz\n", PICOS2KHZ(mode->pixclock));
> > +	dev_dbg(dev, "  bpp:        %u\n", info->bits_per_pixel);
> > +	dev_dbg(dev, "  clk:        %lu KHz\n", clk_value_khz);
> > +
> > +	if (PICOS2KHZ(mode->pixclock) > clk_value_khz) {
> > +		dev_err(dev, "%lu KHz pixel clock is too fast\n", PICOS2KHZ(mode->pixclock));
> > +		return -EINVAL;
> > +	}
> > +
> > +	/* Saturate vertical and horizontal timings at maximum values */
> > +	mode->vsync_len = min_t(u32, mode->vsync_len,
> > +			(ATMEL_LCDC_VPW >> ATMEL_LCDC_VPW_OFFSET) + 1);
> > +	mode->upper_margin = min_t(u32, mode->upper_margin,
> > +			ATMEL_LCDC_VBP >> ATMEL_LCDC_VBP_OFFSET);
> > +	mode->lower_margin = min_t(u32, mode->lower_margin,
> > +			ATMEL_LCDC_VFP);
> > +	mode->right_margin = min_t(u32, mode->right_margin,
> > +			(ATMEL_LCDC_HFP >> ATMEL_LCDC_HFP_OFFSET) + 1);
> > +	mode->hsync_len = min_t(u32, mode->hsync_len,
> > +			(ATMEL_LCDC_HPW >> ATMEL_LCDC_HPW_OFFSET) + 1);
> > +	mode->left_margin = min_t(u32, mode->left_margin,
> > +			ATMEL_LCDC_HBP + 1);
> > +
> > +	/* Some parameters can't be zero */
> > +	mode->vsync_len = max_t(u32, mode->vsync_len, 1);
> > +	mode->right_margin = max_t(u32, mode->right_margin, 1);
> > +	mode->hsync_len = max_t(u32, mode->hsync_len, 1);
> > +	mode->left_margin = max_t(u32, mode->left_margin, 1);
> > +
> > +	switch (info->bits_per_pixel) {
> > +	case 1:
> > +	case 2:
> > +	case 4:
> > +	case 8:
> > +		info->red.offset = info->green.offset = info->blue.offset = 0;
> > +		info->red.length = info->green.length = info->blue.length
> > +			= info->bits_per_pixel;
> > +		break;
> > +	case 16:
> > +		if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
> > +			/* RGB:565 mode */
> > +			info->red.offset = 11;
> > +			info->blue.offset = 0;
> > +		} else {
> > +			/* BGR:565 mode */
> > +			info->red.offset = 0;
> > +			info->blue.offset = 11;
> > +		}
> > +		info->green.offset = 5;
> > +		info->green.length = 6;
> > +		info->red.length = info->blue.length = 5;
> > +		break;
> > +	case 32:
> > +		info->transp.offset = 24;
> > +		info->transp.length = 8;
> > +		/* fall through */
> > +	case 24:
> > +		if (sinfo->lcd_wiring_mode == ATMEL_LCDC_WIRING_RGB) {
> > +			/* RGB:888 mode */
> > +			info->red.offset = 16;
> > +			info->blue.offset = 0;
> > +		} else {
> > +			/* BGR:888 mode */
> > +			info->red.offset = 0;
> > +			info->blue.offset = 16;
> > +		}
> > +		info->green.offset = 8;
> > +		info->red.length = info->green.length = info->blue.length = 8;
> > +		break;
> > +	default:
> > +		dev_err(dev, "color depth %d not supported\n",
> > +					info->bits_per_pixel);
> > +		return -EINVAL;
> > +	}
> > +
> > +	return 0;
> > +}
> > +
> > +static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
> > +{
> > +	struct fb_info *info = &sinfo->info;
> > +	struct fb_videomode *mode = info->mode;
> > +	unsigned int smem_len;
> > +
> > +	free(info->screen_base);
> > +
> > +	smem_len = (mode->xres * mode->yres
> > +		    * ((info->bits_per_pixel + 7) / 8));
> > +	smem_len = max(smem_len, sinfo->smem_len);
> > +
> > +	info->screen_base = dma_alloc_coherent(smem_len);
> > +
> > +	if (!info->screen_base)
> > +		return -ENOMEM;
> > +
> > +	memset(info->screen_base, 0, smem_len);
> > +
> > +	return 0;
> > +}
> > +
> > +/**
> > + * Prepare the video hardware for a specified video mode
> > + * @param fb_info Framebuffer information
> > + * @param mode The video mode description to initialize
> > + * @return 0 on success
> > + */
> > +static int atmel_lcdc_activate_var(struct fb_info *info)
> > +{
> > +	struct atmel_lcdfb_info *sinfo = info->priv;
> > +	unsigned long value;
> > +	int ret;
> > +
> > +	ret = atmel_lcdfb_alloc_video_memory(sinfo);
> > +	if (ret)
> > +		return ret;
> > +
> > +	atmel_lcdfb_set_par(info);
> > +
> > +	/* Set contrast */
> > +	value = ATMEL_LCDC_PS_DIV8 |
> > +		ATMEL_LCDC_POL_POSITIVE |
> > +		ATMEL_LCDC_ENA_PWMENABLE;
> > +	lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, value);
> > +	lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, ATMEL_LCDC_CVAL_DEFAULT);
> > +
> > +	return atmel_lcdfb_check_var(info);
> > +}
> > +
> > +/*
> > + * There is only one video hardware instance available.
> > + * It makes no sense to dynamically allocate this data
> > + */
> > +static struct fb_ops atmel_lcdc_ops = {
> > +	.fb_activate_var = atmel_lcdc_activate_var,
> > +	.fb_enable = atmel_lcdc_enable_controller,
> > +	.fb_disable = atmel_lcdc_disable_controller,
> > +};
> > +
> > +static int atmel_lcdc_probe(struct device_d *hw_dev)
> > +{
> > +	struct atmel_lcdfb_info *sinfo = hw_dev->platform_data;
> > +	int ret = 0;
> > +	struct fb_info *info;
> > +
> > +	if (!sinfo)
> > +		return -ENODEV;
> > +
> > +	sinfo->mmio = dev_request_mem_region(hw_dev, 0);
> > +
> > +	/* just init */
> > +	info = &sinfo->info;
> 
> No. Separate your platform data from the driver private data.
> 
> > +	info->priv = sinfo;
> > +	info->fbops = &atmel_lcdc_ops,	
> 
> Trailing whitespace
> 
> > +	info->mode = &info->mode_list[0];
> > +	info->xres = info->mode->xres;
> > +	info->yres = info->mode->yres;
> > +	info->bits_per_pixel = sinfo->default_bpp;
> > +
> > +	/* Enable LCDC Clocks */
> > +	sinfo->bus_clk = clk_get(hw_dev, "hck1");
> > +	if (IS_ERR(sinfo->bus_clk)) {
> > +		ret = PTR_ERR(sinfo->bus_clk);
> > +		goto err;
> > +	}
> > +	sinfo->lcdc_clk = clk_get(hw_dev, "lcdc_clk");
> > +	if (IS_ERR(sinfo->lcdc_clk)) {
> > +		ret = PTR_ERR(sinfo->lcdc_clk);
> > +		goto put_bus_clk;
> > +	}
> > +
> > +	atmel_lcdfb_start_clock(sinfo);
> 
> This should be in .fb_enable.
need the clock always enable

Best Regards,
J.

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox