On Fri, Oct 30, 2015 at 03:20:54PM +0100, Maxime Ripard wrote:
> The Allwinner A10 and subsequent SoCs share the same display pipeline, with
> variations in the number of controllers (1 or 2), or the presence or not of
> some output (HDMI, TV, VGA) or not.
>
> This hardware supports 4 layers and 32 sprites, even though we only support
> one primary layer for now.
>
> Signed-off-by: Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
Quickly (well, very quickly because jetlag and between travels) read
through this. Looks good overall, bunch of comments below.
Cheers, Daniel
> ---
> drivers/gpu/drm/Kconfig | 2 +
> drivers/gpu/drm/Makefile | 3 +-
> drivers/gpu/drm/sun4i/Kconfig | 14 +
> drivers/gpu/drm/sun4i/Makefile | 8 +
> drivers/gpu/drm/sun4i/sun4i_backend.c | 271 +++++++++++++++++
> drivers/gpu/drm/sun4i/sun4i_backend.h | 159 ++++++++++
> drivers/gpu/drm/sun4i/sun4i_crtc.c | 117 ++++++++
> drivers/gpu/drm/sun4i/sun4i_crtc.h | 31 ++
> drivers/gpu/drm/sun4i/sun4i_drv.c | 281 ++++++++++++++++++
> drivers/gpu/drm/sun4i/sun4i_drv.h | 30 ++
> drivers/gpu/drm/sun4i/sun4i_framebuffer.c | 54 ++++
> drivers/gpu/drm/sun4i/sun4i_framebuffer.h | 19 ++
> drivers/gpu/drm/sun4i/sun4i_layer.c | 111 +++++++
> drivers/gpu/drm/sun4i/sun4i_layer.h | 30 ++
> drivers/gpu/drm/sun4i/sun4i_tcon.c | 478 ++++++++++++++++++++++++++++++
> drivers/gpu/drm/sun4i/sun4i_tcon.h | 182 ++++++++++++
> 16 files changed, 1789 insertions(+), 1 deletion(-)
> create mode 100644 drivers/gpu/drm/sun4i/Kconfig
> create mode 100644 drivers/gpu/drm/sun4i/Makefile
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_backend.c
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_backend.h
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_crtc.c
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_crtc.h
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_drv.c
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_drv.h
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_framebuffer.c
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_framebuffer.h
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_layer.c
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_layer.h
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_tcon.c
> create mode 100644 drivers/gpu/drm/sun4i/sun4i_tcon.h
>
> diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
> index 1a0a8df2eed8..ecf93fafa33c 100644
> --- a/drivers/gpu/drm/Kconfig
> +++ b/drivers/gpu/drm/Kconfig
> @@ -239,6 +239,8 @@ source "drivers/gpu/drm/rcar-du/Kconfig"
>
> source "drivers/gpu/drm/shmobile/Kconfig"
>
> +source "drivers/gpu/drm/sun4i/Kconfig"
> +
> source "drivers/gpu/drm/omapdrm/Kconfig"
>
> source "drivers/gpu/drm/tilcdc/Kconfig"
> diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
> index 45e7719846b1..2e5f547db672 100644
> --- a/drivers/gpu/drm/Makefile
> +++ b/drivers/gpu/drm/Makefile
> @@ -1,4 +1,4 @@
> -#
> +
> # Makefile for the drm device driver. This driver provides support for the
> # Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
>
> @@ -58,6 +58,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
> obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
> obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
> obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
> +obj-$(CONFIG_DRM_SUN4I) += sun4i/
> obj-$(CONFIG_DRM_OMAP) += omapdrm/
> obj-y += tilcdc/
> obj-$(CONFIG_DRM_QXL) += qxl/
> diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
> new file mode 100644
> index 000000000000..99510e64e91a
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/Kconfig
> @@ -0,0 +1,14 @@
> +config DRM_SUN4I
> + tristate "DRM Support for Allwinner A10 Display Engine"
> + depends on DRM && ARM
> + depends on ARCH_SUNXI || COMPILE_TEST
> + select DRM_GEM_CMA_HELPER
> + select DRM_KMS_HELPER
> + select DRM_KMS_CMA_HELPER
> + select DRM_PANEL
> + select REGMAP_MMIO
> + select VIDEOMODE_HELPERS
> + help
> + Choose this option if you have an Allwinner SoC with a
> + Display Engine. If M is selected the module will be called
> + sun4i-drm.
> diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile
> new file mode 100644
> index 000000000000..bc2df12beb42
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/Makefile
> @@ -0,0 +1,8 @@
> +sun4i-drm-y += sun4i_backend.o
> +sun4i-drm-y += sun4i_crtc.o
> +sun4i-drm-y += sun4i_drv.o
> +sun4i-drm-y += sun4i_framebuffer.o
> +sun4i-drm-y += sun4i_layer.o
> +sun4i-drm-y += sun4i_tcon.o
> +
> +obj-$(CONFIG_DRM_SUN4I) += sun4i-drm.o
> diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.c b/drivers/gpu/drm/sun4i/sun4i_backend.c
> new file mode 100644
> index 000000000000..74eac55f1244
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_backend.c
> @@ -0,0 +1,271 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#include <drm/drmP.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_gem_cma_helper.h>
> +#include <drm/drm_plane_helper.h>
> +
> +#include "sun4i_backend.h"
> +#include "sun4i_drv.h"
> +
> +static u32 sunxi_rgb2yuv_coef[12] = {
> + 0x00000107, 0x00000204, 0x00000064, 0x00000108,
> + 0x00003f69, 0x00003ed6, 0x000001c1, 0x00000808,
> + 0x000001c1, 0x00003e88, 0x00003fb8, 0x00000808
> +};
> +
> +void sun4i_backend_apply_color_correction(struct sun4i_backend *backend)
> +{
> + int i;
> +
> + /* Set color correction */
> + regmap_write(backend->regs, SUN4I_BACKEND_OCCTL_REG,
> + SUN4I_BACKEND_OCCTL_ENABLE);
> +
> + for (i = 0; i < 12; i++)
> + regmap_write(backend->regs, SUN4I_BACKEND_OCRCOEF_REG(i),
> + sunxi_rgb2yuv_coef[i]);
> +}
> +
> +void sun4i_backend_commit(struct sun4i_backend *backend)
> +{
> + DRM_DEBUG_DRIVER("Committing changes\n");
> +
> + regmap_write(backend->regs, SUN4I_BACKEND_REGBUFFCTL_REG,
> + SUN4I_BACKEND_REGBUFFCTL_AUTOLOAD_DIS |
> + SUN4I_BACKEND_REGBUFFCTL_LOADCTL);
> +}
> +
> +void sun4i_backend_layer_enable(struct sun4i_backend *backend,
> + int layer, bool enable)
> +{
> + u32 val;
> +
> + DRM_DEBUG_DRIVER("Enabling layer %d\n", layer);
> +
> + if (enable)
> + val = SUN4I_BACKEND_MODCTL_LAY_EN(layer);
> + else
> + val = 0;
> +
> + regmap_update_bits(backend->regs, SUN4I_BACKEND_MODCTL_REG,
> + SUN4I_BACKEND_MODCTL_LAY_EN(layer), val);
> +}
> +
> +static int sun4i_backend_drm_format_to_layer(u32 format, u32 *mode)
> +{
> + switch (format) {
> + case DRM_FORMAT_XRGB8888:
> + *mode = SUN4I_BACKEND_LAY_FBFMT_XRGB8888;
> + break;
> +
> + case DRM_FORMAT_RGB888:
> + *mode = SUN4I_BACKEND_LAY_FBFMT_RGB888;
> + break;
> +
> + default:
> + return -EINVAL;
> + }
> +
> + return 0;
> +}
> +
> +int sun4i_backend_update_layer_coord(struct sun4i_backend *backend,
> + int layer, struct drm_plane *plane)
> +{
> + struct drm_plane_state *state = plane->state;
> + struct drm_framebuffer *fb = state->fb;
> +
> + DRM_DEBUG_DRIVER("Updating layer %d\n", layer);
> +
> + if (plane->type == DRM_PLANE_TYPE_PRIMARY) {
> + DRM_DEBUG_DRIVER("Primary layer, updating global size W: %u H: %u\n",
> + state->crtc_w, state->crtc_h);
> + regmap_write(backend->regs, SUN4I_BACKEND_DISSIZE_REG,
> + SUN4I_BACKEND_DISSIZE(state->crtc_w,
> + state->crtc_h));
> + }
> +
> + /* Set the line width */
> + DRM_DEBUG_DRIVER("Layer line width: %d bits\n", fb->pitches[0] * 8);
> + regmap_write(backend->regs, SUN4I_BACKEND_LAYLINEWIDTH_REG(layer),
> + fb->pitches[0] * 8);
> +
> + /* Set height and width */
> + DRM_DEBUG_DRIVER("Layer size W: %u H: %u\n",
> + state->crtc_w, state->crtc_h);
> + regmap_write(backend->regs, SUN4I_BACKEND_LAYSIZE_REG(layer),
> + SUN4I_BACKEND_LAYSIZE(state->crtc_w,
> + state->crtc_h));
> +
> + /* Set base coordinates */
> + DRM_DEBUG_DRIVER("Layer coordinates X: %d Y: %d\n",
> + state->crtc_x, state->crtc_y);
> + regmap_write(backend->regs, SUN4I_BACKEND_LAYCOOR_REG(layer),
> + SUN4I_BACKEND_LAYCOOR(state->crtc_x,
> + state->crtc_y));
> +
> + return 0;
> +}
> +
> +int sun4i_backend_update_layer_formats(struct sun4i_backend *backend,
> + int layer, struct drm_plane *plane)
> +{
> + struct drm_plane_state *state = plane->state;
> + struct drm_framebuffer *fb = state->fb;
> + bool interlaced = false;
> + u32 val;
> + int ret;
> +
> + if (plane->state->crtc)
> + interlaced = plane->state->crtc->state->adjusted_mode.flags
> + & DRM_MODE_FLAG_INTERLACE;
> +
> + regmap_update_bits(backend->regs, SUN4I_BACKEND_MODCTL_REG,
> + SUN4I_BACKEND_MODCTL_ITLMOD_EN,
> + interlaced ? SUN4I_BACKEND_MODCTL_ITLMOD_EN : 0);
> +
> + DRM_DEBUG_DRIVER("Switching display backend interlaced mode %s\n",
> + interlaced ? "on" : "off");
> +
> + ret = sun4i_backend_drm_format_to_layer(fb->pixel_format, &val);
> + if (ret) {
> + DRM_DEBUG_DRIVER("Invalid format\n");
> + return val;
> + }
> +
> + regmap_update_bits(backend->regs, SUN4I_BACKEND_ATTCTL_REG1(layer),
> + SUN4I_BACKEND_ATTCTL_REG1_LAY_FBFMT, val);
> +
> + return 0;
> +}
> +
> +int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend,
> + int layer, struct drm_plane *plane)
> +{
> + struct drm_plane_state *state = plane->state;
> + struct drm_framebuffer *fb = state->fb;
> + struct drm_gem_cma_object *gem;
> + u32 lo_paddr, hi_paddr;
> + dma_addr_t paddr;
> + int bpp;
> +
> + /* Get the physical address of the buffer in memory */
> + gem = drm_fb_cma_get_gem_obj(fb, 0);
> +
> + DRM_DEBUG_DRIVER("Using GEM @ 0x%x\n", gem->paddr);
> +
> + /* Compute the start of the displayed memory */
> + bpp = drm_format_plane_cpp(fb->pixel_format, 0);
> + paddr = gem->paddr + fb->offsets[0];
> + paddr += state->src_x * bpp;
> + paddr += state->src_y * fb->pitches[0];
> +
> + DRM_DEBUG_DRIVER("Setting buffer address to 0x%x\n", paddr);
> +
> + /* Write the 32 lower bits of the address (in bits) */
> + lo_paddr = paddr << 3;
> + DRM_DEBUG_DRIVER("Setting address lower bits to 0x%x\n", lo_paddr);
> + regmap_write(backend->regs, SUN4I_BACKEND_LAYFB_L32ADD_REG(layer),
> + lo_paddr);
> +
> + /* And the upper bits */
> + hi_paddr = paddr >> 29;
> + DRM_DEBUG_DRIVER("Setting address high bits to 0x%x\n", hi_paddr);
> + regmap_update_bits(backend->regs, SUN4I_BACKEND_LAYFB_H4ADD_REG,
> + SUN4I_BACKEND_LAYFB_H4ADD_MSK(layer),
> + SUN4I_BACKEND_LAYFB_H4ADD(layer, hi_paddr));
> +
> + return 0;
> +}
> +
> +static struct regmap_config sun4i_backend_regmap_config = {
> + .reg_bits = 32,
> + .val_bits = 32,
> + .reg_stride = 4,
> + .max_register = 0x5800,
> + .name = "backend",
> +};
> +
> +struct sun4i_backend *sun4i_backend_init(struct drm_device *drm)
> +{
> + struct sun4i_backend *backend;
> + struct resource *res;
> + void __iomem *regs;
> + int i;
> +
> + backend = devm_kzalloc(drm->dev, sizeof(*backend), GFP_KERNEL);
> + if (!backend)
> + return ERR_PTR(-ENOMEM);
> +
> + res = platform_get_resource_byname(to_platform_device(drm->dev),
> + IORESOURCE_MEM, "backend0");
> + regs = devm_ioremap_resource(drm->dev, res);
> + if (IS_ERR(regs)) {
> + dev_err(drm->dev, "Couldn't map the backend0 registers\n");
> + return ERR_CAST(regs);
> + }
> +
> + backend->regs = devm_regmap_init_mmio(drm->dev, regs,
> + &sun4i_backend_regmap_config);
> + if (IS_ERR(backend->regs)) {
> + dev_err(drm->dev, "Couldn't create the backend0 regmap\n");
> + return ERR_CAST(backend->regs);
> + }
> +
> + backend->bus_clk = devm_clk_get(drm->dev, "backend0-bus");
> + if (IS_ERR(backend->bus_clk)) {
> + dev_err(drm->dev, "Couldn't get the backend bus clock\n");
> + return ERR_CAST(backend->bus_clk);
> + }
> + clk_prepare_enable(backend->bus_clk);
> +
> + backend->mod_clk = devm_clk_get(drm->dev, "backend0-mod");
> + if (IS_ERR(backend->mod_clk)) {
> + dev_err(drm->dev, "Couldn't get the backend module clock\n");
> + return ERR_CAST(backend->mod_clk);
> + }
> + clk_prepare_enable(backend->mod_clk);
> +
> + backend->ram_clk = devm_clk_get(drm->dev, "backend0-ram");
> + if (IS_ERR(backend->ram_clk)) {
> + dev_err(drm->dev, "Couldn't get the backend RAM clock\n");
> + return ERR_CAST(backend->ram_clk);
> + }
> + clk_prepare_enable(backend->ram_clk);
> +
> + /* Reset the registers */
> + for (i = 0x800; i < 0x1000; i += 4)
> + regmap_write(backend->regs, i, 0);
> +
> + /* Disable registers autoloading */
> + regmap_write(backend->regs, SUN4I_BACKEND_REGBUFFCTL_REG,
> + SUN4I_BACKEND_REGBUFFCTL_AUTOLOAD_DIS);
> +
> + /* Enable the backend */
> + regmap_write(backend->regs, SUN4I_BACKEND_MODCTL_REG,
> + SUN4I_BACKEND_MODCTL_DEBE_EN |
> + SUN4I_BACKEND_MODCTL_START_CTL);
> +
> + return backend;
> +}
> +
> +void sun4i_backend_free(struct sun4i_backend *backend)
> +{
> + clk_disable_unprepare(backend->ram_clk);
> + clk_disable_unprepare(backend->mod_clk);
> + clk_disable_unprepare(backend->bus_clk);
> +}
> diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.h b/drivers/gpu/drm/sun4i/sun4i_backend.h
> new file mode 100644
> index 000000000000..8b3dca39d089
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_backend.h
> @@ -0,0 +1,159 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#ifndef _SUN4I_BACKEND_H_
> +#define _SUN4I_BACKEND_H_
> +
> +#include <linux/clk.h>
> +#include <linux/regmap.h>
> +
> +#define SUN4I_BACKEND_MODCTL_REG 0x800
> +#define SUN4I_BACKEND_MODCTL_LINE_SEL BIT(29)
> +#define SUN4I_BACKEND_MODCTL_ITLMOD_EN BIT(28)
> +#define SUN4I_BACKEND_MODCTL_OUT_SEL GENMASK(22, 20)
> +#define SUN4I_BACKEND_MODCTL_OUT_LCD (0 << 20)
> +#define SUN4I_BACKEND_MODCTL_OUT_FE0 (6 << 20)
> +#define SUN4I_BACKEND_MODCTL_OUT_FE1 (7 << 20)
> +#define SUN4I_BACKEND_MODCTL_HWC_EN BIT(16)
> +#define SUN4I_BACKEND_MODCTL_LAY_EN(l) BIT(8 + l)
> +#define SUN4I_BACKEND_MODCTL_OCSC_EN BIT(5)
> +#define SUN4I_BACKEND_MODCTL_DFLK_EN BIT(4)
> +#define SUN4I_BACKEND_MODCTL_DLP_START_CTL BIT(2)
> +#define SUN4I_BACKEND_MODCTL_START_CTL BIT(1)
> +#define SUN4I_BACKEND_MODCTL_DEBE_EN BIT(0)
> +
> +#define SUN4I_BACKEND_BACKCOLOR_REG 0x804
> +#define SUN4I_BACKEND_BACKCOLOR(r, g, b) (((r) << 16) | ((g) << 8) | (b))
> +
> +#define SUN4I_BACKEND_DISSIZE_REG 0x808
> +#define SUN4I_BACKEND_DISSIZE(w, h) (((((h) - 1) & 0xffff) << 16) | \
> + (((w) - 1) & 0xffff))
> +
> +#define SUN4I_BACKEND_LAYSIZE_REG(l) (0x810 + (0x4 * (l)))
> +#define SUN4I_BACKEND_LAYSIZE(w, h) (((((h) - 1) & 0x1fff) << 16) | \
> + (((w) - 1) & 0x1fff))
> +
> +#define SUN4I_BACKEND_LAYCOOR_REG(l) (0x820 + (0x4 * (l)))
> +#define SUN4I_BACKEND_LAYCOOR(x, y) ((((u32)(y) & 0xffff) << 16) | \
> + ((u32)(x) & 0xffff))
> +
> +#define SUN4I_BACKEND_LAYLINEWIDTH_REG(l) (0x840 + (0x4 * (l)))
> +
> +#define SUN4I_BACKEND_LAYFB_L32ADD_REG(l) (0x850 + (0x4 * (l)))
> +
> +#define SUN4I_BACKEND_LAYFB_H4ADD_REG 0x860
> +#define SUN4I_BACKEND_LAYFB_H4ADD_MSK(l) GENMASK(3 + ((l) * 8), 0)
> +#define SUN4I_BACKEND_LAYFB_H4ADD(l, val) ((val) << ((l) * 8))
> +
> +#define SUN4I_BACKEND_REGBUFFCTL_REG 0x870
> +#define SUN4I_BACKEND_REGBUFFCTL_AUTOLOAD_DIS BIT(1)
> +#define SUN4I_BACKEND_REGBUFFCTL_LOADCTL BIT(0)
> +
> +#define SUN4I_BACKEND_CKMAX_REG 0x880
> +#define SUN4I_BACKEND_CKMIN_REG 0x884
> +#define SUN4I_BACKEND_CKCFG_REG 0x888
> +#define SUN4I_BACKEND_ATTCTL_REG0(l) (0x890 + (0x4 * (l)))
> +
> +#define SUN4I_BACKEND_ATTCTL_REG1(l) (0x8a0 + (0x4 * (l)))
> +#define SUN4I_BACKEND_ATTCTL_REG1_LAY_HSCAFCT GENMASK(15, 14)
> +#define SUN4I_BACKEND_ATTCTL_REG1_LAY_WSCAFCT GENMASK(13, 12)
> +#define SUN4I_BACKEND_ATTCTL_REG1_LAY_FBFMT GENMASK(11, 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_1BPP (0 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_2BPP (1 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_4BPP (2 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_8BPP (3 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_RGB655 (4 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_RGB565 (5 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_RGB556 (6 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_ARGB1555 (7 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_RGBA5551 (8 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_XRGB8888 (9 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_ARGB8888 (10 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_RGB888 (11 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_ARGB4444 (12 << 8)
> +#define SUN4I_BACKEND_LAY_FBFMT_RGBA4444 (13 << 8)
> +
> +#define SUN4I_BACKEND_DLCDPCTL_REG 0x8b0
> +#define SUN4I_BACKEND_DLCDPFRMBUF_ADDRCTL_REG 0x8b4
> +#define SUN4I_BACKEND_DLCDPCOOR_REG0 0x8b8
> +#define SUN4I_BACKEND_DLCDPCOOR_REG1 0x8bc
> +
> +#define SUN4I_BACKEND_INT_EN_REG 0x8c0
> +#define SUN4I_BACKEND_INT_FLAG_REG 0x8c4
> +#define SUN4I_BACKEND_REG_LOAD_FINISHED BIT(1)
> +
> +#define SUN4I_BACKEND_HWCCTL_REG 0x8d8
> +#define SUN4I_BACKEND_HWCFBCTL_REG 0x8e0
> +#define SUN4I_BACKEND_WBCTL_REG 0x8f0
> +#define SUN4I_BACKEND_WBADD_REG 0x8f4
> +#define SUN4I_BACKEND_WBLINEWIDTH_REG 0x8f8
> +#define SUN4I_BACKEND_SPREN_REG 0x900
> +#define SUN4I_BACKEND_SPRFMTCTL_REG 0x908
> +#define SUN4I_BACKEND_SPRALPHACTL_REG 0x90c
> +#define SUN4I_BACKEND_IYUVCTL_REG 0x920
> +#define SUN4I_BACKEND_IYUVADD_REG(c) (0x930 + (0x4 * (c)))
> +#define SUN4I_BACKEND_IYUVLINEWITDTH_REG(c) (0x940 + (0x4 * (c)))
> +#define SUN4I_BACKEND_YGCOEF_REG(c) (0x950 + (0x4 * (c)))
> +#define SUN4I_BACKEND_YGCONS_REG 0x95c
> +#define SUN4I_BACKEND_URCOEF_REG(c) (0x960 + (0x4 * (c)))
> +#define SUN4I_BACKEND_URCONS_REG 0x96c
> +#define SUN4I_BACKEND_VBCOEF_REG(c) (0x970 + (0x4 * (c)))
> +#define SUN4I_BACKEND_VBCONS_REG 0x97c
> +#define SUN4I_BACKEND_KSCTL_REG 0x980
> +#define SUN4I_BACKEND_KSBKCOLOR_REG 0x984
> +#define SUN4I_BACKEND_KSFSTLINEWIDTH_REG 0x988
> +#define SUN4I_BACKEND_KSVSCAFCT_REG 0x98c
> +#define SUN4I_BACKEND_KSHSCACOEF_REG(x) (0x9a0 + (0x4 * (x)))
> +#define SUN4I_BACKEND_OCCTL_REG 0x9c0
> +#define SUN4I_BACKEND_OCCTL_ENABLE BIT(0)
> +
> +#define SUN4I_BACKEND_OCRCOEF_REG(x) (0x9d0 + (0x4 * (x)))
> +#define SUN4I_BACKEND_OCRCONS_REG 0x9dc
> +#define SUN4I_BACKEND_OCGCOEF_REG(x) (0x9e0 + (0x4 * (x)))
> +#define SUN4I_BACKEND_OCGCONS_REG 0x9ec
> +#define SUN4I_BACKEND_OCBCOEF_REG(x) (0x9f0 + (0x4 * (x)))
> +#define SUN4I_BACKEND_OCBCONS_REG 0x9fc
> +#define SUN4I_BACKEND_SPRCOORCTL_REG(s) (0xa00 + (0x4 * (s)))
> +#define SUN4I_BACKEND_SPRATTCTL_REG(s) (0xb00 + (0x4 * (s)))
> +#define SUN4I_BACKEND_SPRADD_REG(s) (0xc00 + (0x4 * (s)))
> +#define SUN4I_BACKEND_SPRLINEWIDTH_REG(s) (0xd00 + (0x4 * (s)))
> +
> +#define SUN4I_BACKEND_SPRPALTAB_OFF 0x4000
> +#define SUN4I_BACKEND_GAMMATAB_OFF 0x4400
> +#define SUN4I_BACKEND_HWCPATTERN_OFF 0x4800
> +#define SUN4I_BACKEND_HWCCOLORTAB_OFF 0x4c00
> +#define SUN4I_BACKEND_PIPE_OFF(p) (0x5000 + (0x400 * (p)))
> +
> +struct sun4i_backend {
> + struct regmap *regs;
> +
> + struct clk *bus_clk;
> + struct clk *mod_clk;
> + struct clk *ram_clk;
> +};
> +
> +void sun4i_backend_apply_color_correction(struct sun4i_backend *backend);
> +void sun4i_backend_commit(struct sun4i_backend *backend);
> +
> +void sun4i_backend_layer_enable(struct sun4i_backend *backend,
> + int layer, bool enable);
> +int sun4i_backend_update_layer_coord(struct sun4i_backend *backend,
> + int layer, struct drm_plane *plane);
> +int sun4i_backend_update_layer_formats(struct sun4i_backend *backend,
> + int layer, struct drm_plane *plane);
> +int sun4i_backend_update_layer_buffer(struct sun4i_backend *backend,
> + int layer, struct drm_plane *plane);
> +
> +struct sun4i_backend *sun4i_backend_init(struct drm_device *drm);
> +void sun4i_backend_free(struct sun4i_backend *backend);
> +
> +#endif /* _SUN4I_BACKEND_H_ */
> diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.c b/drivers/gpu/drm/sun4i/sun4i_crtc.c
> new file mode 100644
> index 000000000000..ec4045fc31ee
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.c
> @@ -0,0 +1,117 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#include <drm/drmP.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_modes.h>
> +
> +#include <linux/clk-provider.h>
> +#include <linux/ioport.h>
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +#include <linux/regmap.h>
> +
> +#include <video/videomode.h>
> +
> +#include "sun4i_crtc.h"
> +#include "sun4i_drv.h"
> +#include "sun4i_tcon.h"
> +
> +static void sun4i_crtc_atomic_begin(struct drm_crtc *crtc,
> + struct drm_crtc_state *old_state)
> +{
> + struct drm_pending_vblank_event *event = crtc->state->event;
> + struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
> + struct drm_device *dev = crtc->dev;
> + unsigned long flags;
> +
> + if (event) {
> + WARN_ON(drm_crtc_vblank_get(crtc) != 0);
> +
> + spin_lock_irqsave(&dev->event_lock, flags);
> + scrtc->event = event;
> + spin_unlock_irqrestore(&dev->event_lock, flags);
> + }
> +}
> +
> +static void sun4i_crtc_disable(struct drm_crtc *crtc)
> +{
> + struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
> + struct sun4i_drv *drv = scrtc->drv;
> +
> + DRM_DEBUG_DRIVER("Disabling the CRTC\n");
> +
> + if (!scrtc->enabled)
> + return;
Please don't do this - the atomic state should always reflect the true hw
state (fix that up with either hw state readout or reset in the ->reset
callbacks), and the atomic helpers guarantee that they'll never call you
when not needed. If you don't trust them do a WARN_ON at least, but no
early silent returns.
Personally I'd just rip it out, it's too much trouble. And for debugging
the atomic helpers already trace it all (or at least should).
> +
> + sun4i_tcon_disable(drv->tcon);
> +
> + scrtc->enabled = false;
> +}
> +
> +static void sun4i_crtc_enable(struct drm_crtc *crtc)
> +{
> + struct sun4i_crtc *scrtc = drm_crtc_to_sun4i_crtc(crtc);
> + struct sun4i_drv *drv = scrtc->drv;
> +
> + DRM_DEBUG_DRIVER("Enabling the CRTC\n");
> +
> + if (scrtc->enabled)
> + return;
> +
> + sun4i_tcon_enable(drv->tcon);
> +
> + scrtc->enabled = true;
> +}
> +
> +static const struct drm_crtc_helper_funcs sun4i_crtc_helper_funcs = {
> + .atomic_begin = sun4i_crtc_atomic_begin,
> + .disable = sun4i_crtc_disable,
> + .enable = sun4i_crtc_enable,
> +};
> +
> +static const struct drm_crtc_funcs sun4i_crtc_funcs = {
> + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
> + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
> + .destroy = drm_crtc_cleanup,
> + .page_flip = drm_atomic_helper_page_flip,
> + .reset = drm_atomic_helper_crtc_reset,
> + .set_config = drm_atomic_helper_set_config,
> +};
> +
> +struct sun4i_crtc *sun4i_crtc_init(struct drm_device *drm)
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> + struct sun4i_crtc *scrtc;
> + int ret;
> +
> + scrtc = devm_kzalloc(drm->dev, sizeof(*scrtc), GFP_KERNEL);
> + if (!scrtc)
> + return NULL;
> + scrtc->drv = drv;
> +
> + ret = drm_crtc_init_with_planes(drm, &scrtc->crtc,
> + drv->primary,
> + NULL,
> + &sun4i_crtc_funcs);
> + if (ret) {
> + dev_err(drm->dev, "Couldn't init DRM CRTC\n");
> + return NULL;
> + }
> +
> + drm_crtc_helper_add(&scrtc->crtc, &sun4i_crtc_helper_funcs);
> + drm_crtc_vblank_reset(&scrtc->crtc);
> +
> + return scrtc;
> +}
> diff --git a/drivers/gpu/drm/sun4i/sun4i_crtc.h b/drivers/gpu/drm/sun4i/sun4i_crtc.h
> new file mode 100644
> index 000000000000..6c6b989c1b60
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_crtc.h
> @@ -0,0 +1,31 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#ifndef _SUN4I_CRTC_H_
> +#define _SUN4I_CRTC_H_
> +
> +struct sun4i_crtc {
> + struct drm_crtc crtc;
> + struct drm_pending_vblank_event *event;
> +
> + bool enabled;
> + struct sun4i_drv *drv;
> +};
> +
> +static inline struct sun4i_crtc *drm_crtc_to_sun4i_crtc(struct drm_crtc *crtc)
> +{
> + return container_of(crtc, struct sun4i_crtc, crtc);
> +}
> +
> +struct sun4i_crtc *sun4i_crtc_init(struct drm_device *drm);
> +
> +#endif /* _SUN4I_CRTC_H_ */
> diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c
> new file mode 100644
> index 000000000000..fc26f3903f52
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c
> @@ -0,0 +1,281 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#include <drm/drmP.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_gem_cma_helper.h>
> +
> +#include "sun4i_backend.h"
> +#include "sun4i_crtc.h"
> +#include "sun4i_drv.h"
> +#include "sun4i_framebuffer.h"
> +#include "sun4i_layer.h"
> +#include "sun4i_tcon.h"
> +
> +static void sun4i_drv_preclose(struct drm_device *drm,
> + struct drm_file *file_priv)
> +{
> +}
> +
> +static void sun4i_drv_lastclose(struct drm_device *drm)
> +{
> +}
> +
> +static int sun4i_drv_connector_plug_all(struct drm_device *drm)
Laurent Pinchart has this as a rfc patch for drm core, please coordinate
with him and rebase on top of his patches.
> +{
> + struct drm_connector *connector, *failed;
> + int ret;
> +
> + mutex_lock(&drm->mode_config.mutex);
> + list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
> + ret = drm_connector_register(connector);
> + if (ret) {
> + failed = connector;
> + goto err;
> + }
> + }
> + mutex_unlock(&drm->mode_config.mutex);
> + return 0;
> +
> +err:
> + list_for_each_entry(connector, &drm->mode_config.connector_list, head) {
> + if (failed == connector)
> + break;
> +
> + drm_connector_unregister(connector);
> + }
> + mutex_unlock(&drm->mode_config.mutex);
> +
> + return ret;
> +}
> +
> +static int sun4i_drv_enable_vblank(struct drm_device *drm, int pipe)
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> + struct sun4i_tcon *tcon = drv->tcon;
> +
> + DRM_DEBUG_DRIVER("Enabling VBLANK on pipe %d\n", pipe);
> +
> + sun4i_tcon_enable_vblank(tcon, true);
> +
> + return 0;
atomic helpers rely on enable_vblank failing correctly when the pipe is
off and vlbanks will never happen. You probably need a correct error code
here that checks crtc->state->active (well not that directly but something
derived from it, since the pointer chase would be racy).
I know it's a bit a mess since we don't have kms-native vblank driver
hooks yet and really the drm core should get this right for you. It'll
happen eventually, but drm_irq.c is a bit moldy ;-)
> +}
> +
> +static void sun4i_drv_disable_vblank(struct drm_device *drm, int pipe)
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> + struct sun4i_tcon *tcon = drv->tcon;
> +
> + DRM_DEBUG_DRIVER("Disabling VBLANK on pipe %d\n", pipe);
> +
> + sun4i_tcon_enable_vblank(tcon, false);
> +}
> +
> +static int sun4i_drv_load(struct drm_device *drm, unsigned long flags)
load/unload callbacks are depracated since fundamentally racy, and we
can't fix that due to the pile of legacy dri1 drivers. Please use
drm_dev_alloc/register/unregister/unref functions instead, with the
load/unload code placed in between to avoid races with userspace seeing
the device/driver (e.g. in sysfs) while it's in a partially defunct state.
Relevant kerneldoc has the details, at least in linux-next.
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> + int ret;
> +
> + drv = devm_kzalloc(drm->dev, sizeof(*drv), GFP_KERNEL);
> + if (!drv)
> + return -ENOMEM;
> +
> + drm->dev_private = drv;
> +
> + drm_vblank_init(drm, 1);
> + drm_mode_config_init(drm);
> +
> + /* Prepare the backend */
> + drv->backend = sun4i_backend_init(drm);
> + if (IS_ERR(drv->backend)) {
> + dev_err(drm->dev, "Couldn't initialise our backend\n");
> + return PTR_ERR(drv->backend);
> + }
> +
> + /* Prepare the TCON */
> + drv->tcon = sun4i_tcon_init(drm);
> + if (!drv->tcon) {
> + dev_err(drm->dev, "Couldn't initialise our TCON\n");
> + ret = -EINVAL;
> + goto err_free_backend;
> + }
> +
> + /* Create our layers */
> + drv->layers = sun4i_layers_init(drm);
> + if (!drv->layers) {
> + dev_err(drm->dev, "Couldn't create the planes\n");
> + ret = -EINVAL;
> + goto err_free_tcon;
> + }
> +
> + /* Create our CRTC */
> + drv->crtc = sun4i_crtc_init(drm);
> + if (!drv->crtc) {
> + dev_err(drm->dev, "Couldn't create the CRTC\n");
> + ret = -EINVAL;
> + goto err_free_layers;
> + }
> +
> + /* Create our outputs */
> +
> + /* Create our framebuffer */
> + drv->fbdev = sun4i_framebuffer_init(drm);
> + if (IS_ERR(drv->fbdev)) {
> + dev_err(drm->dev, "Couldn't create our framebuffer\n");
> + ret = PTR_ERR(drv->fbdev);
> + goto err_free_crtc;
> + }
> +
> + /* Enable connectors polling */
> + drm_kms_helper_poll_init(drm);
> +
> + return 0;
> +
> +err_free_crtc:
> +err_free_layers:
> +err_free_tcon:
> + sun4i_tcon_free(drv->tcon);
> +err_free_backend:
> + sun4i_backend_free(drv->backend);
> +
> + return ret;
> +}
> +
> +static int sun4i_drv_unload(struct drm_device *drm)
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> +
> + drm_kms_helper_poll_fini(drm);
> + sun4i_framebuffer_free(drm);
> + sun4i_tcon_free(drv->tcon);
> + sun4i_backend_free(drv->backend);
> + drm_vblank_cleanup(drm);
> +
> + return 0;
> +}
> +
> +static const struct file_operations sun4i_drv_fops = {
> + .owner = THIS_MODULE,
> + .open = drm_open,
> + .release = drm_release,
> + .unlocked_ioctl = drm_ioctl,
> +#ifdef CONFIG_COMPAT
> + .compat_ioctl = drm_compat_ioctl,
> +#endif
> + .poll = drm_poll,
> + .read = drm_read,
> + .llseek = no_llseek,
> + .mmap = drm_gem_cma_mmap,
> +};
> +
> +static struct drm_driver sun4i_drv_driver = {
> + .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME,
> +
> + /* Generic Operations */
> + .load = sun4i_drv_load,
> + .unload = sun4i_drv_unload,
> + .preclose = sun4i_drv_preclose,
> + .lastclose = sun4i_drv_lastclose,
> + .fops = &sun4i_drv_fops,
> + .name = "sun4i-drm",
> + .desc = "Allwinner sun4i Display Engine",
> + .date = "20150629",
> + .major = 1,
> + .minor = 0,
> +
> + /* GEM Operations */
> + .gem_free_object = drm_gem_cma_free_object,
> + .gem_vm_ops = &drm_gem_cma_vm_ops,
> +
> + /* PRIME Operations */
> + .prime_handle_to_fd = drm_gem_prime_handle_to_fd,
> + .prime_fd_to_handle = drm_gem_prime_fd_to_handle,
> + .gem_prime_import = drm_gem_prime_import,
> + .gem_prime_export = drm_gem_prime_export,
> + .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table,
> + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table,
> + .gem_prime_vmap = drm_gem_cma_prime_vmap,
> + .gem_prime_vunmap = drm_gem_cma_prime_vunmap,
> + .gem_prime_mmap = drm_gem_cma_prime_mmap,
> +
> + /* Frame Buffer Operations */
> + .dumb_create = drm_gem_cma_dumb_create,
> + .dumb_map_offset = drm_gem_cma_dumb_map_offset,
> + .dumb_destroy = drm_gem_dumb_destroy,
> +
> + /* VBlank Operations */
> + .get_vblank_counter = drm_vblank_count,
> + .enable_vblank = sun4i_drv_enable_vblank,
> + .disable_vblank = sun4i_drv_disable_vblank,
> +};
> +
> +static int sun4i_drv_probe(struct platform_device *pdev)
> +{
> + struct drm_device *drm;
> + int ret;
> +
> + drm = drm_dev_alloc(&sun4i_drv_driver, &pdev->dev);
> + if (!drm)
> + return -ENOMEM;
> +
> + ret = drm_dev_set_unique(drm, dev_name(drm->dev));
> + if (ret)
> + goto free_drm;
> +
> + ret = drm_dev_register(drm, 0);
> + if (ret)
> + goto free_drm;
> +
> + ret = sun4i_drv_connector_plug_all(drm);
> + if (ret)
> + goto unregister_drm;
> +
> + return 0;
> +
> +unregister_drm:
> + drm_dev_unregister(drm);
> +free_drm:
> + drm_dev_unref(drm);
> + return ret;
> +}
> +
> +static int sun4i_drv_remove(struct platform_device *pdev)
> +{
> + struct drm_device *drm = platform_get_drvdata(pdev);
> +
> + drm_dev_unregister(drm);
> + drm_dev_unref(drm);
> +
> + return 0;
> +}
> +
> +static const struct of_device_id sun4i_drv_of_table[] = {
> + { .compatible = "allwinner,sun5i-a13-display-engine" },
> + { }
> +};
> +MODULE_DEVICE_TABLE(of, sun4i_drv_of_table);
> +
> +static struct platform_driver sun4i_drv_platform_driver = {
> + .probe = sun4i_drv_probe,
> + .remove = sun4i_drv_remove,
> + .driver = {
> + .name = "sun4i-drm",
> + .of_match_table = sun4i_drv_of_table,
> + },
> +};
> +module_platform_driver(sun4i_drv_platform_driver);
> +
> +MODULE_AUTHOR("Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>");
> +MODULE_AUTHOR("Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>");
> +MODULE_DESCRIPTION("Allwinner A10 Display Engine DRM/KMS Driver");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.h b/drivers/gpu/drm/sun4i/sun4i_drv.h
> new file mode 100644
> index 000000000000..9a897914b85d
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_drv.h
> @@ -0,0 +1,30 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#ifndef _SUN4I_DRV_H_
> +#define _SUN4I_DRV_H_
> +
> +#include <linux/clk.h>
> +#include <linux/regmap.h>
> +
> +struct sun4i_drv {
> + struct sun4i_backend *backend;
> + struct sun4i_crtc *crtc;
> + struct sun4i_tcon *tcon;
> +
> + struct drm_plane *primary;
> + struct drm_fbdev_cma *fbdev;
> +
> + struct sun4i_layer *layers;
> +};
> +
> +#endif /* _SUN4I_DRV_H_ */
> diff --git a/drivers/gpu/drm/sun4i/sun4i_framebuffer.c b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
> new file mode 100644
> index 000000000000..68072b8cddab
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_framebuffer.c
> @@ -0,0 +1,54 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#include <drm/drm_fb_cma_helper.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drmP.h>
> +
> +#include "sun4i_drv.h"
> +
> +static void sun4i_de_output_poll_changed(struct drm_device *drm)
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> +
> + if (drv->fbdev)
> + drm_fbdev_cma_hotplug_event(drv->fbdev);
> +}
> +
> +static const struct drm_mode_config_funcs sun4i_de_mode_config_funcs = {
> + .output_poll_changed = sun4i_de_output_poll_changed,
> + .atomic_check = drm_atomic_helper_check,
> + .atomic_commit = drm_atomic_helper_commit,
> + .fb_create = drm_fb_cma_create,
> +};
> +
> +struct drm_fbdev_cma *sun4i_framebuffer_init(struct drm_device *drm)
> +{
> + drm_mode_config_reset(drm);
> +
> + drm->mode_config.max_width = 8192;
> + drm->mode_config.max_height = 8192;
> +
> + drm->mode_config.funcs = &sun4i_de_mode_config_funcs;
> +
> + return drm_fbdev_cma_init(drm, 32,
> + drm->mode_config.num_crtc,
> + drm->mode_config.num_connector);
> +}
> +
> +void sun4i_framebuffer_free(struct drm_device *drm)
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> +
> + drm_fbdev_cma_fini(drv->fbdev);
> + drm_mode_config_cleanup(drm);
> +}
> diff --git a/drivers/gpu/drm/sun4i/sun4i_framebuffer.h b/drivers/gpu/drm/sun4i/sun4i_framebuffer.h
> new file mode 100644
> index 000000000000..3afd65252ee0
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_framebuffer.h
> @@ -0,0 +1,19 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#ifndef _SUN4I_FRAMEBUFFER_H_
> +#define _SUN4I_FRAMEBUFFER_H_
> +
> +struct drm_fbdev_cma *sun4i_framebuffer_init(struct drm_device *drm);
> +void sun4i_framebuffer_free(struct drm_device *drm);
> +
> +#endif /* _SUN4I_FRAMEBUFFER_H_ */
> diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.c b/drivers/gpu/drm/sun4i/sun4i_layer.c
> new file mode 100644
> index 000000000000..c23ee7638ed8
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_layer.c
> @@ -0,0 +1,111 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_plane_helper.h>
> +#include <drm/drmP.h>
> +
> +#include "sun4i_backend.h"
> +#include "sun4i_drv.h"
> +#include "sun4i_layer.h"
> +
> +static int sun4i_backend_layer_atomic_check(struct drm_plane *plane,
> + struct drm_plane_state *state)
> +{
> + return 0;
> +}
> +
> +static void sun4i_backend_layer_atomic_disable(struct drm_plane *plane,
> + struct drm_plane_state *old_state)
> +{
> + struct sun4i_layer *layer = plane_to_sun4i_layer(plane);
> + struct sun4i_drv *drv = layer->drv;
> + struct sun4i_backend *backend = drv->backend;
> +
> + sun4i_backend_layer_enable(backend, layer->id, false);
> + sun4i_backend_commit(backend);
> +}
> +
> +static void sun4i_backend_layer_atomic_update(struct drm_plane *plane,
> + struct drm_plane_state *old_state)
> +{
> + struct sun4i_layer *layer = plane_to_sun4i_layer(plane);
> + struct sun4i_drv *drv = layer->drv;
> + struct sun4i_backend *backend = drv->backend;
> +
> + sun4i_backend_update_layer_coord(backend, layer->id, plane);
> + sun4i_backend_update_layer_formats(backend, layer->id, plane);
> + sun4i_backend_update_layer_buffer(backend, layer->id, plane);
> + sun4i_backend_layer_enable(backend, layer->id, true);
> + sun4i_backend_commit(backend);
Not idea how exactly your hw works, but the call to sun4i_backend_commit
probably should be in the crtc->atomic_flush function, to make sure that
plane updates across multiple planes are indeed atomic.
> +}
> +
> +static struct drm_plane_helper_funcs sun4i_backend_layer_helper_funcs = {
> + .atomic_check = sun4i_backend_layer_atomic_check,
> + .atomic_disable = sun4i_backend_layer_atomic_disable,
> + .atomic_update = sun4i_backend_layer_atomic_update,
> +};
> +
> +static const struct drm_plane_funcs sun4i_backend_layer_funcs = {
> + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state,
> + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,
> + .destroy = drm_plane_cleanup,
> + .disable_plane = drm_atomic_helper_disable_plane,
> + .reset = drm_atomic_helper_plane_reset,
> + .update_plane = drm_atomic_helper_update_plane,
> +};
> +
> +static const uint32_t sun4i_backend_layer_formats[] = {
> + DRM_FORMAT_XRGB8888,
> + DRM_FORMAT_RGB888,
> +};
> +
> +static struct sun4i_layer *sun4i_layer_init_one(struct drm_device *drm,
> + enum drm_plane_type type)
> +{
> + struct sun4i_layer *layer;
> + int ret;
> +
> + layer = devm_kzalloc(drm->dev, sizeof(*layer), GFP_KERNEL);
> + if (!layer)
> + return ERR_PTR(-ENOMEM);
> +
> + ret = drm_universal_plane_init(drm, &layer->plane, 0,
> + &sun4i_backend_layer_funcs,
> + sun4i_backend_layer_formats,
> + ARRAY_SIZE(sun4i_backend_layer_formats),
> + type);
> + if (ret) {
> + dev_err(drm->dev, "Couldn't initialize layer\n");
> + return ERR_PTR(ret);
> + }
> +
> + drm_plane_helper_add(&layer->plane,
> + &sun4i_backend_layer_helper_funcs);
> +
> + return layer;
> +}
> +
> +struct sun4i_layer *sun4i_layers_init(struct drm_device *drm)
> +{
> + struct sun4i_drv *drv = drm->dev_private;
> + struct sun4i_layer *layers;
> +
> + /* TODO: Fix the number of layers */
> + layers = sun4i_layer_init_one(drm, DRM_PLANE_TYPE_PRIMARY);
> + layers->drv = drv;
> +
> + drv->primary = &layers->plane;
> +
> + return layers;
> +}
> diff --git a/drivers/gpu/drm/sun4i/sun4i_layer.h b/drivers/gpu/drm/sun4i/sun4i_layer.h
> new file mode 100644
> index 000000000000..e90972969a03
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_layer.h
> @@ -0,0 +1,30 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#ifndef _SUN4I_LAYER_H_
> +#define _SUN4I_LAYER_H_
> +
> +struct sun4i_layer {
> + struct drm_plane plane;
> + struct sun4i_drv *drv;
> + int id;
> +};
> +
> +static inline struct sun4i_layer *
> +plane_to_sun4i_layer(struct drm_plane *plane)
> +{
> + return container_of(plane, struct sun4i_layer, plane);
> +}
> +
> +struct sun4i_layer *sun4i_layers_init(struct drm_device *drm);
> +
> +#endif /* _SUN4I_LAYER_H_ */
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c
> new file mode 100644
> index 000000000000..bd68bcea6c04
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c
> @@ -0,0 +1,478 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#include <drm/drmP.h>
> +#include <drm/drm_atomic_helper.h>
> +#include <drm/drm_crtc.h>
> +#include <drm/drm_crtc_helper.h>
> +#include <drm/drm_modes.h>
> +
> +#include <linux/clk-provider.h>
> +#include <linux/ioport.h>
> +#include <linux/of_address.h>
> +#include <linux/of_irq.h>
> +#include <linux/regmap.h>
> +
> +#include "sun4i_crtc.h"
> +#include "sun4i_drv.h"
> +#include "sun4i_tcon.h"
> +
> +void sun4i_tcon_disable(struct sun4i_tcon *tcon)
> +{
> + if (!tcon->enabled)
> + return;
Same comments here about uncessary state tracking, please add at least a
WARN_ON to catch brokeness in higher levels.
> +
> + DRM_DEBUG_DRIVER("Disabling TCON\n");
> +
> + /* Disable the TCON */
> + regmap_update_bits(tcon->regs, SUN4I_TCON_GCTL_REG,
> + SUN4I_TCON_GCTL_TCON_ENABLE, 0);
> +
> + tcon->enabled = false;
> +}
> +
> +void sun4i_tcon_enable(struct sun4i_tcon *tcon)
> +{
> + if (tcon->enabled)
> + return;
> +
> + DRM_DEBUG_DRIVER("Enabling TCON\n");
> +
> + /* Enable the TCON */
> + regmap_update_bits(tcon->regs, SUN4I_TCON_GCTL_REG,
> + SUN4I_TCON_GCTL_TCON_ENABLE,
> + SUN4I_TCON_GCTL_TCON_ENABLE);
> +
> + tcon->enabled = true;
> +}
> +
> +static void sun4i_tcon_finish_page_flip(struct drm_device *dev,
> + struct sun4i_crtc *scrtc)
> +{
> + unsigned long flags;
> +
> + spin_lock_irqsave(&dev->event_lock, flags);
> + if (scrtc->event) {
> + drm_send_vblank_event(dev, 0, scrtc->event);
> + drm_vblank_put(dev, 0);
> + scrtc->event = NULL;
> + }
> + spin_unlock_irqrestore(&dev->event_lock, flags);
> +}
> +
> +static irqreturn_t sun4i_tcon_handler(int irq, void *private)
> +{
> + struct drm_device *drm = private;
> + struct sun4i_drv *drv = drm->dev_private;
> + struct sun4i_tcon *tcon = drv->tcon;
> + struct sun4i_crtc *scrtc = drv->crtc;
> + unsigned int status;
> +
> + regmap_read(tcon->regs, SUN4I_TCON_GINT0_REG, &status);
> +
> + if (!(status & (SUN4I_TCON_GINT0_VBLANK_INT(0) |
> + SUN4I_TCON_GINT0_VBLANK_INT(1))))
> + return IRQ_NONE;
> +
> + drm_handle_vblank(scrtc->crtc.dev, 0);
> + sun4i_tcon_finish_page_flip(drm, scrtc);
> +
> + /* Acknowledge the interrupt */
> + regmap_write(tcon->regs, SUN4I_TCON_GINT0_REG,
> + status);
> +
> + return IRQ_HANDLED;
> +}
> +
> +static int sun4i_tcon_create_pixel_clock(struct drm_device *drm,
> + struct sun4i_tcon *tcon,
> + struct device_node *np)
> +{
> + const char *pixel_clk_name;
> + const char *sclk_name;
> + struct clk_divider *div;
> + struct clk_gate *gate;
> +
> + sclk_name = __clk_get_name(tcon->sclk0);
> + of_property_read_string_index(np, "clock-output-names", 0,
> + &pixel_clk_name);
> +
> + div = devm_kzalloc(drm->dev, sizeof(*div), GFP_KERNEL);
> + if (!div)
> + return -ENOMEM;
> +
> + div->regmap = tcon->regs;
> + div->offset = SUN4I_TCON0_DCLK_REG;
> + div->shift = SUN4I_TCON0_DCLK_DIV_SHIFT;
> + div->width = SUN4I_TCON0_DCLK_DIV_WIDTH;
> + div->flags = CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO;
> +
> + gate = devm_kzalloc(drm->dev, sizeof(*gate), GFP_KERNEL);
> + if (!gate)
> + return -ENOMEM;
> +
> + gate->regmap = tcon->regs;
> + gate->offset = SUN4I_TCON0_DCLK_REG;
> + gate->bit_idx = SUN4I_TCON0_DCLK_GATE_BIT;
> +
> + tcon->dclk = clk_register_composite(drm->dev, pixel_clk_name,
> + &sclk_name, 1,
> + NULL, NULL,
> + &div->hw, &clk_divider_ops,
> + &gate->hw, &clk_gate_ops,
> + CLK_USE_REGMAP);
> +
> + return 0;
> +}
> +
> +static int sun4i_tcon_init_clocks(struct drm_device *drm,
> + struct sun4i_tcon *tcon,
> + struct device_node *np)
> +{
> + tcon->clk = of_clk_get_by_name(np, "ahb");
> + if (IS_ERR(tcon->clk)) {
> + dev_err(drm->dev, "Couldn't get the TCON bus clock\n");
> + return PTR_ERR(tcon->clk);
> + }
> + clk_prepare_enable(tcon->clk);
> +
> + tcon->sclk0 = of_clk_get_by_name(np, "tcon-ch0");
> + if (IS_ERR(tcon->sclk0)) {
> + dev_err(drm->dev, "Couldn't get the TCON bus clock\n");
> + return PTR_ERR(tcon->sclk0);
> + }
> +
> + tcon->sclk1 = of_clk_get_by_name(np, "tcon-ch1");
> + if (IS_ERR(tcon->sclk1)) {
> + dev_err(drm->dev, "Couldn't get the TCON bus clock\n");
> + return PTR_ERR(tcon->sclk1);
> + }
> +
> + return sun4i_tcon_create_pixel_clock(drm, tcon, np);
> +}
> +
> +static void sun4i_tcon_free_clocks(struct sun4i_tcon *tcon)
> +{
> + clk_unregister(tcon->dclk);
> + clk_put(tcon->sclk1);
> + clk_put(tcon->sclk0);
> + clk_disable_unprepare(tcon->clk);
> + clk_put(tcon->clk);
> +}
> +
> +static int sun4i_tcon_init_irq(struct drm_device *drm,
> + struct sun4i_tcon *tcon,
> + struct device_node *np)
> +{
> + int irq, ret;
> +
> + irq = of_irq_get(np, 0);
> + if (irq < 0) {
> + dev_err(drm->dev, "Couldn't retrieve the TCON interrupt\n");
> + return irq;
> + }
> +
> + ret = devm_request_irq(drm->dev, irq, sun4i_tcon_handler, 0,
> + dev_name(drm->dev), tcon);
> + if (ret) {
> + dev_err(drm->dev, "Couldn't request the IRQ\n");
> + return ret;
> + }
> +
> + return 0;
> +}
> +
> +static struct regmap_config sun4i_tcon_regmap_config = {
> + .reg_bits = 32,
> + .val_bits = 32,
> + .reg_stride = 4,
> + .max_register = 0x800,
> + .name = "tcon",
> +};
> +
> +static int sun4i_tcon_init_regmap(struct drm_device *drm,
> + struct sun4i_tcon *tcon,
> + struct device_node *np)
> +{
> + struct resource res;
> + void __iomem *regs;
> + int ret;
> +
> + ret = of_address_to_resource(np, 0, &res);
> + regs = devm_ioremap_resource(drm->dev, &res);
> + if (IS_ERR(regs)) {
> + dev_err(drm->dev, "Couldn't map the TCON registers\n");
> + return PTR_ERR(regs);
> + }
> +
> + tcon->regs = devm_regmap_init_mmio(drm->dev, regs,
> + &sun4i_tcon_regmap_config);
> + if (IS_ERR(tcon->regs)) {
> + dev_err(drm->dev, "Couldn't create the TCON regmap\n");
> + return PTR_ERR(tcon->regs);
> + }
> +
> + /* Make sure the TCON is disabled and all IRQs are off */
> + regmap_write(tcon->regs, SUN4I_TCON_GCTL_REG, 0);
> + regmap_write(tcon->regs, SUN4I_TCON_GINT0_REG, 0);
> + regmap_write(tcon->regs, SUN4I_TCON_GINT1_REG, 0);
> +
> + /* Disable IO lines and set them to tristate */
> + regmap_write(tcon->regs, SUN4I_TCON0_IO_TRI_REG, ~0);
> + regmap_write(tcon->regs, SUN4I_TCON1_IO_TRI_REG, ~0);
> +
> + return 0;
> +}
> +
> +struct sun4i_tcon *sun4i_tcon_init(struct drm_device *drm)
> +{
> + struct sun4i_de *de = drm->dev_private;
> + struct sun4i_tcon *tcon;
> + struct device_node *np;
> + int ret = 0;
> +
> + tcon = devm_kzalloc(drm->dev, sizeof(*tcon), GFP_KERNEL);
> + if (!tcon)
> + return NULL;
> + tcon->de = de;
> +
> + np = of_parse_phandle(drm->dev->of_node, "allwinner,tcon", 0);
> + if (!np) {
> + dev_err(drm->dev, "Couldn't find the tcon node\n");
> + return NULL;
> + }
> +
> + ret = sun4i_tcon_init_regmap(drm, tcon, np);
> + if (ret) {
> + dev_err(drm->dev, "Couldn't init our TCON regmap\n");
> + goto err_node_put;
> + }
> +
> + ret = sun4i_tcon_init_clocks(drm, tcon, np);
> + if (ret) {
> + dev_err(drm->dev, "Couldn't init our TCON clocks\n");
> + goto err_free_regmap;
> + }
> +
> + ret = sun4i_tcon_init_irq(drm, tcon, np);
> + if (ret) {
> + dev_err(drm->dev, "Couldn't init our TCON interrupts\n");
> + goto err_free_clocks;
> + }
> +
> + return tcon;
> +
> +err_free_clocks:
> + sun4i_tcon_free_clocks(tcon);
> +err_free_regmap:
> +err_node_put:
> + of_node_put(np);
> + return NULL;
> +}
> +
> +void sun4i_tcon_free(struct sun4i_tcon *tcon)
> +{
> + sun4i_tcon_free_clocks(tcon);
> +}
> +
> +void sun4i_tcon_disable_channel(struct sun4i_tcon *tcon, int channel)
> +{
> + /* Disable the TCON's channel */
> + if (channel == 0) {
> + regmap_update_bits(tcon->regs, SUN4I_TCON0_CTL_REG,
> + SUN4I_TCON0_CTL_TCON_ENABLE, 0);
> + clk_disable_unprepare(tcon->dclk);
> + } else if (channel == 1) {
> + regmap_update_bits(tcon->regs, SUN4I_TCON1_CTL_REG,
> + SUN4I_TCON1_CTL_TCON_ENABLE, 0);
> + clk_disable_unprepare(tcon->sclk1);
> + }
> +}
> +
> +void sun4i_tcon_enable_channel(struct sun4i_tcon *tcon, int channel)
> +{
> + /* Enable the TCON's channel */
> + if (channel == 0) {
> + regmap_update_bits(tcon->regs, SUN4I_TCON0_CTL_REG,
> + SUN4I_TCON0_CTL_TCON_ENABLE,
> + SUN4I_TCON0_CTL_TCON_ENABLE);
> + clk_prepare_enable(tcon->dclk);
> + } else if (channel == 1) {
> + regmap_update_bits(tcon->regs, SUN4I_TCON1_CTL_REG,
> + SUN4I_TCON1_CTL_TCON_ENABLE,
> + SUN4I_TCON1_CTL_TCON_ENABLE);
> + clk_prepare_enable(tcon->sclk1);
> + }
> +}
> +
> +void sun4i_tcon_enable_vblank(struct sun4i_tcon *tcon, bool enable)
> +{
> + u32 mask, val = 0;
> +
> + DRM_DEBUG_DRIVER("%sabling VBLANK interrupt\n", enable ? "En" : "Dis");
> +
> + mask = SUN4I_TCON_GINT0_VBLANK_ENABLE(0) |
> + SUN4I_TCON_GINT0_VBLANK_ENABLE(1);
> +
> + if (enable)
> + val = mask;
> +
> + regmap_update_bits(tcon->regs, SUN4I_TCON_GINT0_REG, mask, val);
> +}
> +
> +static int sun4i_tcon_get_clk_delay(struct drm_display_mode *mode,
> + int channel)
> +{
> + int delay = mode->vtotal - mode->vdisplay;
> +
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> + delay /= 2;
> +
> + if (channel == 1)
> + delay -= 2;
> +
> + delay = min(delay, 30);
> +
> + DRM_DEBUG_DRIVER("TCON %d clock delay %u\n", channel, delay);
> +
> + return delay;
> +}
> +
> +void sun4i_tcon0_mode_set(struct sun4i_tcon *tcon,
> + struct drm_display_mode *mode)
> +{
> + unsigned int bp, hsync, vsync;
> + u8 clk_delay;
> + u32 val;
> +
> + /* Adjust clock delay */
> + clk_delay = sun4i_tcon_get_clk_delay(mode, 1);
> + regmap_update_bits(tcon->regs, SUN4I_TCON0_CTL_REG,
> + SUN4I_TCON0_CTL_CLK_DELAY_MASK,
> + SUN4I_TCON0_CTL_CLK_DELAY(clk_delay));
> +
> + /* Set the resolution */
> + regmap_write(tcon->regs, SUN4I_TCON0_BASIC0_REG,
> + SUN4I_TCON0_BASIC0_X(mode->crtc_hdisplay) |
> + SUN4I_TCON0_BASIC0_Y(mode->crtc_vdisplay));
> +
> + /* Set horizontal display timings */
> + bp = mode->crtc_htotal - mode->crtc_hsync_end;
> + DRM_DEBUG_DRIVER("Setting horizontal total %d, backporch %d\n",
> + mode->crtc_htotal, bp);
> + regmap_write(tcon->regs, SUN4I_TCON0_BASIC1_REG,
> + SUN4I_TCON0_BASIC1_H_TOTAL(mode->crtc_htotal) |
> + SUN4I_TCON0_BASIC1_H_BACKPORCH(bp));
> +
> + /* Set vertical display timings */
> + bp = mode->crtc_vtotal - mode->crtc_vsync_end;
> + DRM_DEBUG_DRIVER("Setting vertical total %d, backporch %d\n",
> + mode->crtc_vtotal, bp);
> + regmap_write(tcon->regs, SUN4I_TCON0_BASIC2_REG,
> + SUN4I_TCON0_BASIC2_V_TOTAL(mode->crtc_vtotal) |
> + SUN4I_TCON0_BASIC2_V_BACKPORCH(bp));
> +
> + /* Set Hsync and Vsync length */
> + hsync = mode->crtc_hsync_end - mode->crtc_hsync_start;
> + vsync = mode->crtc_vsync_end - mode->crtc_vsync_start;
> + DRM_DEBUG_DRIVER("Setting HSYNC %d, VSYNC %d\n", hsync, vsync);
> + regmap_write(tcon->regs, SUN4I_TCON0_BASIC3_REG,
> + SUN4I_TCON0_BASIC3_V_SYNC(vsync) |
> + SUN4I_TCON0_BASIC3_H_SYNC(hsync));
> +
> + /* TODO: Fix pixel clock phase shift */
> + val = SUN4I_TCON0_IO_POL_DCLK_PHASE(1);
> +
> + /* Setup the polarity of the various signals */
> + if (!(mode->flags & DRM_MODE_FLAG_PHSYNC))
> + val |= SUN4I_TCON0_IO_POL_HSYNC_POSITIVE;
> +
> + if (!(mode->flags & DRM_MODE_FLAG_PVSYNC))
> + val |= SUN4I_TCON0_IO_POL_VSYNC_POSITIVE;
> +
> + /* Map output pins to channel 0 */
> + regmap_update_bits(tcon->regs, SUN4I_TCON_GCTL_REG,
> + SUN4I_TCON_GCTL_IOMAP_MASK,
> + SUN4I_TCON_GCTL_IOMAP_TCON0);
> +
> + regmap_write(tcon->regs, SUN4I_TCON0_IO_POL_REG, val);
> +
> + /* Enable the output on the pins */
> + regmap_write(tcon->regs, SUN4I_TCON0_IO_TRI_REG, 0);
> +}
> +
> +void sun4i_tcon1_mode_set(struct sun4i_tcon *tcon,
> + struct drm_display_mode *mode)
> +{
> + unsigned int bp, hsync, vsync;
> + u8 clk_delay;
> + u32 val;
> +
> + /* Adjust clock delay */
> + clk_delay = sun4i_tcon_get_clk_delay(mode, 1);
> + regmap_update_bits(tcon->regs, SUN4I_TCON1_CTL_REG,
> + SUN4I_TCON1_CTL_CLK_DELAY_MASK,
> + SUN4I_TCON1_CTL_CLK_DELAY(clk_delay));
> +
> + /* Set interlaced mode */
> + if (mode->flags & DRM_MODE_FLAG_INTERLACE)
> + val = SUN4I_TCON1_CTL_INTERLACE_ENABLE;
> + else
> + val = 0;
> + regmap_update_bits(tcon->regs, SUN4I_TCON1_CTL_REG,
> + SUN4I_TCON1_CTL_INTERLACE_ENABLE,
> + val);
> +
> + /* Set the input resolution */
> + regmap_write(tcon->regs, SUN4I_TCON1_BASIC0_REG,
> + SUN4I_TCON1_BASIC0_X(mode->crtc_hdisplay) |
> + SUN4I_TCON1_BASIC0_Y(mode->crtc_vdisplay));
> +
> + /* Set the upscaling resolution */
> + regmap_write(tcon->regs, SUN4I_TCON1_BASIC1_REG,
> + SUN4I_TCON1_BASIC1_X(mode->crtc_hdisplay) |
> + SUN4I_TCON1_BASIC1_Y(mode->crtc_vdisplay));
> +
> + /* Set the output resolution */
> + regmap_write(tcon->regs, SUN4I_TCON1_BASIC2_REG,
> + SUN4I_TCON1_BASIC2_X(mode->crtc_hdisplay) |
> + SUN4I_TCON1_BASIC2_Y(mode->crtc_vdisplay));
> +
> + /* Set horizontal display timings */
> + bp = mode->crtc_htotal - mode->crtc_hsync_end;
> + DRM_DEBUG_DRIVER("Setting horizontal total %d, backporch %d\n",
> + mode->htotal, bp);
> + regmap_write(tcon->regs, SUN4I_TCON1_BASIC3_REG,
> + SUN4I_TCON1_BASIC3_H_TOTAL(mode->crtc_htotal) |
> + SUN4I_TCON1_BASIC3_H_BACKPORCH(bp));
> +
> + /* Set vertical display timings */
> + bp = mode->crtc_vtotal - mode->crtc_vsync_end;
> + DRM_DEBUG_DRIVER("Setting vertical total %d, backporch %d\n",
> + mode->vtotal, bp);
> + regmap_write(tcon->regs, SUN4I_TCON1_BASIC4_REG,
> + SUN4I_TCON1_BASIC4_V_TOTAL(mode->vtotal) |
> + SUN4I_TCON1_BASIC4_V_BACKPORCH(bp));
> +
> + /* Set Hsync and Vsync length */
> + hsync = mode->crtc_hsync_end - mode->crtc_hsync_start;
> + vsync = mode->crtc_vsync_end - mode->crtc_vsync_start;
> + DRM_DEBUG_DRIVER("Setting HSYNC %d, VSYNC %d\n", hsync, vsync);
> + regmap_write(tcon->regs, SUN4I_TCON1_BASIC5_REG,
> + SUN4I_TCON1_BASIC5_V_SYNC(vsync) |
> + SUN4I_TCON1_BASIC5_H_SYNC(hsync));
> +
> + /* Map output pins to channel 1 */
> + regmap_update_bits(tcon->regs, SUN4I_TCON_GCTL_REG,
> + SUN4I_TCON_GCTL_IOMAP_MASK,
> + SUN4I_TCON_GCTL_IOMAP_TCON1);
> +}
> diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h
> new file mode 100644
> index 000000000000..4faf9d2d3df2
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h
> @@ -0,0 +1,182 @@
> +/*
> + * Copyright (C) 2015 Free Electrons
> + * Copyright (C) 2015 NextThing Co
> + *
> + * Boris Brezillon <boris.brezillon@xxxxxxxxxxxxxxxxxx>
> + * Maxime Ripard <maxime.ripard@xxxxxxxxxxxxxxxxxx>
> + *
> + * 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.
> + */
> +
> +#ifndef __SUN4I_TCON_H__
> +#define __SUN4I_TCON_H__
> +
> +#include <drm/drm_crtc.h>
> +
> +#include <linux/kernel.h>
> +
> +#define SUN4I_TCON_GCTL_REG 0x0
> +#define SUN4I_TCON_GCTL_TCON_ENABLE BIT(31)
> +#define SUN4I_TCON_GCTL_IOMAP_MASK BIT(0)
> +#define SUN4I_TCON_GCTL_IOMAP_TCON1 (1 << 0)
> +#define SUN4I_TCON_GCTL_IOMAP_TCON0 (0 << 0)
> +
> +#define SUN4I_TCON_GINT0_REG 0x4
> +#define SUN4I_TCON_GINT0_VBLANK_ENABLE(pipe) BIT(31 - (pipe))
> +#define SUN4I_TCON_GINT0_VBLANK_INT(pipe) BIT(15 - (pipe))
> +
> +#define SUN4I_TCON_GINT1_REG 0x8
> +#define SUN4I_TCON_FRM_CTL_REG 0x10
> +
> +#define SUN4I_TCON0_CTL_REG 0x40
> +#define SUN4I_TCON0_CTL_TCON_ENABLE BIT(31)
> +#define SUN4I_TCON0_CTL_CLK_DELAY_MASK GENMASK(8, 4)
> +#define SUN4I_TCON0_CTL_CLK_DELAY(delay) ((delay << 4) & SUN4I_TCON0_CTL_CLK_DELAY_MASK)
> +
> +#define SUN4I_TCON0_DCLK_REG 0x44
> +#define SUN4I_TCON0_DCLK_GATE_BIT (31)
> +#define SUN4I_TCON0_DCLK_DIV_SHIFT (0)
> +#define SUN4I_TCON0_DCLK_DIV_WIDTH (7)
> +
> +#define SUN4I_TCON0_BASIC0_REG 0x48
> +#define SUN4I_TCON0_BASIC0_X(width) ((((width) - 1) & 0x7ff) << 16)
> +#define SUN4I_TCON0_BASIC0_Y(height) ((((height) - 1) & 0x7ff) << 0)
> +
> +#define SUN4I_TCON0_BASIC1_REG 0x4c
> +#define SUN4I_TCON0_BASIC1_H_TOTAL(total) (((total) - 1) << 16)
> +#define SUN4I_TCON0_BASIC1_H_BACKPORCH(bp) (((bp) - 1) << 0)
> +
> +#define SUN4I_TCON0_BASIC2_REG 0x50
> +#define SUN4I_TCON0_BASIC2_V_TOTAL(total) (((total) * 2) << 16)
> +#define SUN4I_TCON0_BASIC2_V_BACKPORCH(bp) (((bp) - 1) << 0)
> +
> +#define SUN4I_TCON0_BASIC3_REG 0x54
> +#define SUN4I_TCON0_BASIC3_H_SYNC(width) ((((width) - 1) & 0x3ff) << 16)
> +#define SUN4I_TCON0_BASIC3_V_SYNC(height) ((((height) - 1) & 0x3ff) << 0)
> +
> +#define SUN4I_TCON0_HV_IF_REG 0x58
> +#define SUN4I_TCON0_CPU_IF_REG 0x60
> +#define SUN4I_TCON0_CPU_WR_REG 0x64
> +#define SUN4I_TCON0_CPU_RD0_REG 0x68
> +#define SUN4I_TCON0_CPU_RDA_REG 0x6c
> +#define SUN4I_TCON0_TTL0_REG 0x70
> +#define SUN4I_TCON0_TTL1_REG 0x74
> +#define SUN4I_TCON0_TTL2_REG 0x78
> +#define SUN4I_TCON0_TTL3_REG 0x7c
> +#define SUN4I_TCON0_TTL4_REG 0x80
> +#define SUN4I_TCON0_LVDS_IF_REG 0x84
> +#define SUN4I_TCON0_IO_POL_REG 0x88
> +#define SUN4I_TCON0_IO_POL_DCLK_PHASE(phase) ((phase & 3) << 28)
> +#define SUN4I_TCON0_IO_POL_HSYNC_POSITIVE BIT(25)
> +#define SUN4I_TCON0_IO_POL_VSYNC_POSITIVE BIT(24)
> +
> +#define SUN4I_TCON0_IO_TRI_REG 0x8c
> +#define SUN4I_TCON0_IO_TRI_HSYNC_DISABLE BIT(25)
> +#define SUN4I_TCON0_IO_TRI_VSYNC_DISABLE BIT(24)
> +#define SUN4I_TCON0_IO_TRI_DATA_PINS_DISABLE(pins) GENMASK(pins, 0)
> +
> +#define SUN4I_TCON1_CTL_REG 0x90
> +#define SUN4I_TCON1_CTL_TCON_ENABLE BIT(31)
> +#define SUN4I_TCON1_CTL_INTERLACE_ENABLE BIT(20)
> +#define SUN4I_TCON1_CTL_CLK_DELAY_MASK GENMASK(8, 4)
> +#define SUN4I_TCON1_CTL_CLK_DELAY(delay) ((delay << 4) & SUN4I_TCON1_CTL_CLK_DELAY_MASK)
> +
> +#define SUN4I_TCON1_BASIC0_REG 0x94
> +#define SUN4I_TCON1_BASIC0_X(width) ((((width) - 1) & 0x7ff) << 16)
> +#define SUN4I_TCON1_BASIC0_Y(height) ((((height) - 1) & 0x7ff) << 0)
> +
> +#define SUN4I_TCON1_BASIC1_REG 0x98
> +#define SUN4I_TCON1_BASIC1_X(width) ((((width) - 1) & 0x7ff) << 16)
> +#define SUN4I_TCON1_BASIC1_Y(height) ((((height) - 1) & 0x7ff) << 0)
> +
> +#define SUN4I_TCON1_BASIC2_REG 0x9c
> +#define SUN4I_TCON1_BASIC2_X(width) ((((width) - 1) & 0x7ff) << 16)
> +#define SUN4I_TCON1_BASIC2_Y(height) ((((height) - 1) & 0x7ff) << 0)
> +
> +#define SUN4I_TCON1_BASIC3_REG 0xa0
> +#define SUN4I_TCON1_BASIC3_H_TOTAL(total) (((total) - 1) << 16)
> +#define SUN4I_TCON1_BASIC3_H_BACKPORCH(bp) (((bp) - 1) << 0)
> +
> +#define SUN4I_TCON1_BASIC4_REG 0xa4
> +#define SUN4I_TCON1_BASIC4_V_TOTAL(total) ((total) << 16)
> +#define SUN4I_TCON1_BASIC4_V_BACKPORCH(bp) (((bp) - 1) << 0)
> +
> +#define SUN4I_TCON1_BASIC5_REG 0xa8
> +#define SUN4I_TCON1_BASIC5_H_SYNC(width) ((((width) - 1) & 0x3ff) << 16)
> +#define SUN4I_TCON1_BASIC5_V_SYNC(height) ((((height) - 1) & 0x3ff) << 0)
> +
> +#define SUN4I_TCON1_IO_POL_REG 0xf0
> +#define SUN4I_TCON1_IO_TRI_REG 0xf4
> +#define SUN4I_TCON_CEU_CTL_REG 0x100
> +#define SUN4I_TCON_CEU_MUL_RR_REG 0x110
> +#define SUN4I_TCON_CEU_MUL_RG_REG 0x114
> +#define SUN4I_TCON_CEU_MUL_RB_REG 0x118
> +#define SUN4I_TCON_CEU_ADD_RC_REG 0x11c
> +#define SUN4I_TCON_CEU_MUL_GR_REG 0x120
> +#define SUN4I_TCON_CEU_MUL_GG_REG 0x124
> +#define SUN4I_TCON_CEU_MUL_GB_REG 0x128
> +#define SUN4I_TCON_CEU_ADD_GC_REG 0x12c
> +#define SUN4I_TCON_CEU_MUL_BR_REG 0x130
> +#define SUN4I_TCON_CEU_MUL_BG_REG 0x134
> +#define SUN4I_TCON_CEU_MUL_BB_REG 0x138
> +#define SUN4I_TCON_CEU_ADD_BC_REG 0x13c
> +#define SUN4I_TCON_CEU_RANGE_R_REG 0x140
> +#define SUN4I_TCON_CEU_RANGE_G_REG 0x144
> +#define SUN4I_TCON_CEU_RANGE_B_REG 0x148
> +#define SUN4I_TCON1_FILL_CTL_REG 0x300
> +#define SUN4I_TCON1_FILL_BEG0_REG 0x304
> +#define SUN4I_TCON1_FILL_END0_REG 0x308
> +#define SUN4I_TCON1_FILL_DATA0_REG 0x30c
> +#define SUN4I_TCON1_FILL_BEG1_REG 0x310
> +#define SUN4I_TCON1_FILL_END1_REG 0x314
> +#define SUN4I_TCON1_FILL_DATA1_REG 0x318
> +#define SUN4I_TCON1_FILL_BEG2_REG 0x31c
> +#define SUN4I_TCON1_FILL_END2_REG 0x320
> +#define SUN4I_TCON1_FILL_DATA2_REG 0x324
> +#define SUN4I_TCON1_GAMMA_TABLE_REG 0x400
> +
> +#define SUN4I_TCON_MAX_CHANNELS 2
> +
> +struct sun4i_tcon {
> + struct sun4i_de *de;
> +
> + struct regmap *regs;
> +
> + /* Main bus clock */
> + struct clk *clk;
> +
> + /* Clocks for the TCON channels */
> + struct clk *sclk0;
> + struct clk *sclk1;
> +
> + /* Pixel clock */
> + struct clk *dclk;
> +
> + bool enabled;
> +};
> +
> +struct sun4i_tcon *sun4i_tcon_init(struct drm_device *drm);
> +void sun4i_tcon_free(struct sun4i_tcon *tcon);
> +
> +/* Global Control */
> +void sun4i_tcon_disable(struct sun4i_tcon *tcon);
> +void sun4i_tcon_enable(struct sun4i_tcon *tcon);
> +
> +/* Channel Control */
> +void sun4i_tcon_disable_channel(struct sun4i_tcon *tcon, int channel);
> +void sun4i_tcon_enable_channel(struct sun4i_tcon *tcon, int channel);
> +
> +void sun4i_tcon_enable_vblank(struct sun4i_tcon *tcon, bool enable);
> +
> +/* Mode Related Controls */
> +void sun4i_tcon_switch_interlace(struct sun4i_tcon *tcon,
> + bool enable);
> +void sun4i_tcon0_mode_set(struct sun4i_tcon *tcon,
> + struct drm_display_mode *mode);
> +void sun4i_tcon1_mode_set(struct sun4i_tcon *tcon,
> + struct drm_display_mode *mode);
> +
> +#endif /* __SUN4I_TCON_H__ */
> --
> 2.6.2
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
