From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752160AbcAPPLz (ORCPT ); Sat, 16 Jan 2016 10:11:55 -0500 Received: from plaes.org ([188.166.43.21]:43311 "EHLO plaes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751265AbcAPPLw (ORCPT ); Sat, 16 Jan 2016 10:11:52 -0500 Message-ID: <1452957104.12419.12.camel@plaes.org> Subject: Re: [linux-sunxi] [PATCH v2 16/26] drm: Add Allwinner A10 Display Engine support From: Priit Laes To: maxime.ripard@free-electrons.com, Mike Turquette , Stephen Boyd , David Airlie , Thierry Reding , Philipp Zabel Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-sunxi@googlegroups.com, Laurent Pinchart , Chen-Yu Tsai , Hans de Goede , Alexander Kaplan , Boris Brezillon , Wynter Woods , Thomas Petazzoni , Rob Clark , Daniel Vetter Date: Sat, 16 Jan 2016 17:11:44 +0200 In-Reply-To: <1452785109-6172-17-git-send-email-maxime.ripard@free-electrons.com> References: <1452785109-6172-1-git-send-email-maxime.ripard@free-electrons.com> <1452785109-6172-17-git-send-email-maxime.ripard@free-electrons.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.19.3 Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2016-01-14 at 16:24 +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. >  > Add a driver with a limited set of features for now, and we will hopefully > support all of them eventually >  [..] > diff --git a/drivers/gpu/drm/sun4i/sun4i_backend.h > b/drivers/gpu/drm/sun4i/sun4i_backend.h > new file mode 100644 > index 000000000000..60f6a200fa73 > --- /dev/null > +++ b/drivers/gpu/drm/sun4i/sun4i_backend.h > @@ -0,0 +1,160 @@ > +/* > + * Copyright (C) 2015 Free Electrons > + * Copyright (C) 2015 NextThing Co > + * > + * Maxime Ripard > + * > + * 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 > +#include > + > +#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) ((v > al) << ((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_REG0_LAY_PIPESEL_MASK BIT(15) > +#define SUN4I_BACKEND_ATTCTL_REG0_LAY_PIPESEL(x) ((x) > << 15) > +#define SUN4I_BACKEND_ATTCTL_REG0_LAY_PRISEL_MASK GENMASK(11, > 10) > +#define SUN4I_BACKEND_ATTCTL_REG0_LAY_PRISEL(x) > ((x) << 10) > + > +#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(1 > 1, 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))) WITDTH ? This isn't used anyway... > +#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); > + > +#endif /* _SUN4I_BACKEND_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..cc7dedc5d256 > --- /dev/null > +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c > @@ -0,0 +1,325 @@ > +/* > + * Copyright (C) 2015 Free Electrons > + * Copyright (C) 2015 NextThing Co > + * > + * Maxime Ripard > + * > + * 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 > +#include > + > +#include > +#include > +#include > +#include > + > +#include "sun4i_crtc.h" > +#include "sun4i_drv.h" > +#include "sun4i_framebuffer.h" > +#include "sun4i_layer.h" > +#include "sun4i_tcon.h" [...] > +static struct drm_driver sun4i_drv_driver = { > + .driver_features = DRIVER_GEM | DRIVER_MODESET | > DRIVER_PRIME | DRIVER_ATOMIC, > + > + /* Generic Operations */ > + .fops = &sun4i_drv_fops, > + .name = "sun4i-drm", > + .desc = "Allwinner sun4i Display > Engine", > + .date = "20150629", 2016something ? > + .major = 1, > + .minor = 0, > + > + /* GEM Operations */ > + .dumb_create = drm_gem_cma_dumb_create, > + .dumb_destroy = drm_gem_dumb_destroy, > + .dumb_map_offset = drm_gem_cma_dumb_map_offset, > + .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 */ > + > + /* VBlank Operations */ > + .get_vblank_counter = drm_vblank_count, > + .enable_vblank = sun4i_drv_enable_vblank, > + .disable_vblank = sun4i_drv_disable_vblank, > +}; > + [...] > 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 > + * > + * 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 > +#include > +#include > + > +#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; Shouldn't these be 1920 x 1080 as per A10 User manual? > + > + 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); > +} [...] Päikest, Priit Laes :)