* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller
@ 2020-11-14 6:50 kernel test robot
0 siblings, 0 replies; 15+ messages in thread
From: kernel test robot @ 2020-11-14 6:50 UTC (permalink / raw)
To: kbuild
[-- Attachment #1: Type: text/plain, Size: 9613 bytes --]
CC: kbuild-all(a)lists.01.org
In-Reply-To: <20201102155308.142691-3-paul.kocialkowski@bootlin.com>
References: <20201102155308.142691-3-paul.kocialkowski@bootlin.com>
TO: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
TO: dri-devel(a)lists.freedesktop.org
TO: devicetree(a)vger.kernel.org
TO: linux-kernel(a)vger.kernel.org
CC: David Airlie <airlied@linux.ie>
CC: Daniel Vetter <daniel@ffwll.ch>
CC: Rob Herring <robh+dt@kernel.org>
CC: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
CC: Maxime Ripard <mripard@kernel.org>
CC: Thomas Zimmermann <tzimmermann@suse.de>
CC: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Hi Paul,
I love your patch! Perhaps something to improve:
[auto build test WARNING on drm-exynos/exynos-drm-next]
[also build test WARNING on tegra-drm/drm/tegra/for-next drm-tip/drm-tip linus/master v5.10-rc3 next-20201113]
[cannot apply to drm-intel/for-linux-next drm/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Paul-Kocialkowski/drm-LogiCVC-display-controller-support/20201102-235352
base: https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git exynos-drm-next
:::::: branch date: 12 days ago
:::::: commit date: 12 days ago
config: x86_64-randconfig-m001-20201114 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
smatch warnings:
drivers/gpu/drm/logicvc/logicvc_layer.c:312 logicvc_layer_buffer_find_setup() warn: impossible condition '(hoffset > (((((1))) << (16)) - 1)) => (0-u16max > u16max)'
vim +312 drivers/gpu/drm/logicvc/logicvc_layer.c
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 249
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 250 int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 251 struct logicvc_layer *layer,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 252 struct drm_plane_state *state,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 253 struct logicvc_layer_buffer_setup *setup)
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 254 {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 255 struct drm_device *drm_dev = &logicvc->drm_dev;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 256 struct drm_framebuffer *fb = state->fb;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 257 /* All the supported formats have a single data plane. */
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 258 u32 layer_bytespp = fb->format->cpp[0];
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 259 u32 layer_stride = layer_bytespp * logicvc->config.row_stride;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 260 u32 base_offset = layer->config.base_offset * layer_stride;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 261 u32 buffer_offset = layer->config.buffer_offset * layer_stride;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 262 u8 buffer_sel = 0;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 263 u16 voffset = 0;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 264 u16 hoffset = 0;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 265 phys_addr_t fb_addr;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 266 u32 fb_offset;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 267 u32 gap;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 268
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 269 if (!logicvc->reserved_mem_base) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 270 drm_err(drm_dev, "No reserved memory base was registered!\n");
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 271 return -ENOMEM;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 272 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 273
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 274 fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0);
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 275 if (fb_addr < logicvc->reserved_mem_base) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 276 drm_err(drm_dev,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 277 "Framebuffer memory below reserved memory base!\n");
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 278 return -EINVAL;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 279 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 280
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 281 fb_offset = (u32) (fb_addr - logicvc->reserved_mem_base);
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 282
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 283 if (fb_offset < base_offset) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 284 drm_err(drm_dev,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 285 "Framebuffer offset below layer base offset!\n");
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 286 return -EINVAL;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 287 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 288
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 289 gap = fb_offset - base_offset;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 290
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 291 /* Use the possible video buffers selection. */
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 292 if (gap && buffer_offset) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 293 buffer_sel = gap / buffer_offset;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 294 if (buffer_sel > LOGICVC_BUFFER_SEL_MAX)
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 295 buffer_sel = LOGICVC_BUFFER_SEL_MAX;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 296
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 297 gap -= buffer_sel * buffer_offset;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 298 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 299
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 300 /* Use the vertical offset. */
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 301 if (gap && layer_stride && logicvc->config.layers_configurable) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 302 voffset = gap / layer_stride;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 303 if (voffset > LOGICVC_LAYER_VOFFSET_MAX)
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 304 voffset = LOGICVC_LAYER_VOFFSET_MAX;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 305
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 306 gap -= voffset * layer_stride;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 307 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 308
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 309 /* Use the horizontal offset. */
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 310 if (gap && layer_bytespp && logicvc->config.layers_configurable) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 311 hoffset = gap / layer_bytespp;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 @312 if (hoffset > LOGICVC_DIMENSIONS_MAX)
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 313 hoffset = LOGICVC_DIMENSIONS_MAX;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 314
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 315 gap -= hoffset * layer_bytespp;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 316 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 317
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 318 if (gap) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 319 drm_err(drm_dev,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 320 "Unable to find layer %d buffer setup for 0x%x byte gap\n",
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 321 layer->index, fb_offset - base_offset);
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 322 return -EINVAL;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 323 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 324
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 325 DRM_DEBUG_DRIVER("Found layer %d buffer setup for 0x%x byte gap:\n",
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 326 layer->index, fb_offset - base_offset);
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 327
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 328 DRM_DEBUG_DRIVER("- buffer_sel = 0x%x chunks of 0x%x bytes\n",
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 329 buffer_sel, buffer_offset);
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 330 DRM_DEBUG_DRIVER("- voffset = 0x%x chunks of 0x%x bytes\n", voffset,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 331 layer_stride);
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 332 DRM_DEBUG_DRIVER("- hoffset = 0x%x chunks of 0x%x bytes\n", hoffset,
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 333 layer_bytespp);
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 334
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 335 if (setup) {
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 336 setup->buffer_sel = buffer_sel;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 337 setup->voffset = voffset;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 338 setup->hoffset = hoffset;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 339 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 340
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 341 return 0;
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 342 }
a88f67f141f33b2 Paul Kocialkowski 2020-11-02 343
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 27764 bytes --]
^ permalink raw reply [flat|nested] 15+ messages in thread* [PATCH v7 0/3] drm: LogiCVC display controller support @ 2020-11-02 15:53 Paul Kocialkowski 2020-11-02 15:53 ` Paul Kocialkowski 0 siblings, 1 reply; 15+ messages in thread From: Paul Kocialkowski @ 2020-11-02 15:53 UTC (permalink / raw) To: dri-devel, devicetree, linux-kernel Cc: David Airlie, Daniel Vetter, Rob Herring, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Paul Kocialkowski, Thomas Petazzoni This series introduces support for the LogiCVC display controller. The controller is a bit unusual since it is usually loaded as programmable logic on Xilinx FPGAs or Zynq-7000 SoCs. More details are presented on the main commit for the driver. More information about the controller is available on the dedicated web page: https://www.logicbricks.com/Products/logiCVC-ML.aspx Note that this driver has rather simple connector management, which was not converted to drm_panel_bridge to keep the ability to enable the panel at first vblank but also to support DVI. Changes since v6: - Updated to the latest DRM internal API changes; - Used an enum to index dt properties instead of the name string. Changes since v5: - Subclass DRM device and use devm_drm_dev_alloc for allocation; - Removed call to drm_mode_config_cleanup (done automatically with devm); - Some related code cleanups; - Bring back not-for-merge patch adding colorkey support. Changes since v4: - Updated to internal DRM API changes (rebased on drm-misc-next); - Added Kconfig dependency on OF; - Added MAINTAINERS entry; - Used drm_err and dev_err instead of DRM_ERROR where possible; - Various cosmetic changes. Changes since v3: - Rebased on latest drm-misc; - Improved event lock wrapping; - Added collect tag; - Added color-key support patch (not for merge, for reference only). Changes since v2: - Fixed and slightly improved dt schema. Changes since v1: - Switched dt bindings documentation to dt schema; - Described more possible dt parameters; - Added support for the lvds-3bit interface; - Added support for grabbing syscon regmap from parent node; - Removed layers count property and count layers child nodes instead. Cheers! Paul Kocialkowski (3): dt-bindings: display: Document the Xylon LogiCVC display controller drm: Add support for the LogiCVC display controller NOTFORMERGE: drm/logicvc: Add plane colorkey support .../display/xylon,logicvc-display.yaml | 313 ++++++++ MAINTAINERS | 6 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/logicvc/Kconfig | 9 + drivers/gpu/drm/logicvc/Makefile | 4 + drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++ drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++ drivers/gpu/drm/logicvc/logicvc_drm.h | 67 ++ drivers/gpu/drm/logicvc/logicvc_interface.c | 224 ++++++ drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + drivers/gpu/drm/logicvc/logicvc_layer.c | 750 ++++++++++++++++++ drivers/gpu/drm/logicvc/logicvc_layer.h | 71 ++ drivers/gpu/drm/logicvc/logicvc_mode.c | 101 +++ drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++ drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ drivers/gpu/drm/logicvc/logicvc_regs.h | 88 ++ 19 files changed, 2694 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/xylon,logicvc-display.yaml create mode 100644 drivers/gpu/drm/logicvc/Kconfig create mode 100644 drivers/gpu/drm/logicvc/Makefile create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h -- 2.28.0 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v7 2/3] drm: Add support for the LogiCVC display controller 2020-11-02 15:53 [PATCH v7 0/3] drm: LogiCVC display controller support Paul Kocialkowski @ 2020-11-02 15:53 ` Paul Kocialkowski 0 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-11-02 15:53 UTC (permalink / raw) To: dri-devel, devicetree, linux-kernel Cc: David Airlie, Daniel Vetter, Rob Herring, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Paul Kocialkowski, Thomas Petazzoni Introduces a driver for the LogiCVC display controller, a programmable logic controller optimized for use in Xilinx Zynq-7000 SoCs and other Xilinx FPGAs. The controller is mostly configured at logic synthesis time so only a subset of configuration is left for the driver to handle. The following features are implemented and tested: - LVDS 4-bit interface; - RGB565 pixel formats; - Multiple layers and hardware composition; - Layer-wide alpha mode; The following features are implemented but untested: - Other RGB pixel formats; - Layer framebuffer configuration for version 4; - Lowest-layer used as background color; - Per-pixel alpha mode. The following features are not implemented: - YUV pixel formats; - DVI, LVDS 3-bit, ITU656 and camera link interfaces; - External parallel input for layer; - Color-keying; - LUT-based alpha modes. Additional implementation-specific notes: - Panels are only enabled after the first page flip to avoid flashing a white screen. - Depth used in context of the LogiCVC driver only counts color components to match the definition of the synthesis parameters. Support is implemented for both version 3 and 4 of the controller. With version 3, framebuffers are stored in a dedicated contiguous memory area, with a base address hardcoded for each layer. This requires using a dedicated CMA pool registered at the base address and tweaking a few offset-related registers to try to use any buffer allocated from the pool. This is done on a best-effort basis to have the hardware cope with the DRM framebuffer allocation model and there is no guarantee that each buffer allocated by GEM CMA can be used for any layer. In particular, buffers allocated below the base address for a layer are guaranteed not to be configurable for that layer. See the implementation of logicvc_layer_buffer_find_setup for specifics. Version 4 allows configuring each buffer address directly, which guarantees that any buffer can be configured. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Reviewed-by: Maxime Ripard <mripard@kernel.org> --- MAINTAINERS | 6 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/logicvc/Kconfig | 9 + drivers/gpu/drm/logicvc/Makefile | 4 + drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ 18 files changed, 2236 insertions(+) create mode 100644 drivers/gpu/drm/logicvc/Kconfig create mode 100644 drivers/gpu/drm/logicvc/Makefile create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h diff --git a/MAINTAINERS b/MAINTAINERS index 71e29dc0ab9d..9c4c5edef0ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete F: drivers/gpu/drm/i810/ F: include/uapi/drm/i810_drm.h +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> +T: git git://anongit.freedesktop.org/drm/drm-misc +S: Supported +F: drivers/gpu/drm/logicvc/ + DRM DRIVER FOR LVDS PANELS M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> L: dri-devel@lists.freedesktop.org diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 64376dd298ed..7b280056207f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -352,6 +352,8 @@ source "drivers/gpu/drm/arc/Kconfig" source "drivers/gpu/drm/hisilicon/Kconfig" +source "drivers/gpu/drm/logicvc/Kconfig" + source "drivers/gpu/drm/mediatek/Kconfig" source "drivers/gpu/drm/zte/Kconfig" diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 81569009f884..29fbb7cd9570 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -102,6 +102,7 @@ obj-$(CONFIG_DRM_STM) += stm/ obj-$(CONFIG_DRM_STI) += sti/ obj-y += imx/ obj-$(CONFIG_DRM_INGENIC) += ingenic/ +obj-$(CONFIG_DRM_LOGICVC) += logicvc/ obj-$(CONFIG_DRM_MEDIATEK) += mediatek/ obj-$(CONFIG_DRM_MESON) += meson/ obj-y += i2c/ diff --git a/drivers/gpu/drm/logicvc/Kconfig b/drivers/gpu/drm/logicvc/Kconfig new file mode 100644 index 000000000000..300b2be07385 --- /dev/null +++ b/drivers/gpu/drm/logicvc/Kconfig @@ -0,0 +1,9 @@ +config DRM_LOGICVC + tristate "LogiCVC DRM" + depends on DRM + depends on OF || COMPILE_TEST + select DRM_KMS_HELPER + select DRM_KMS_CMA_HELPER + select DRM_GEM_CMA_HELPER + help + DRM display driver for the logiCVC programmable logic block from Xylon diff --git a/drivers/gpu/drm/logicvc/Makefile b/drivers/gpu/drm/logicvc/Makefile new file mode 100644 index 000000000000..c09531fbd6ad --- /dev/null +++ b/drivers/gpu/drm/logicvc/Makefile @@ -0,0 +1,4 @@ +logicvc-drm-y += logicvc_crtc.o logicvc_drm.o logicvc_interface.o \ + logicvc_layer.o logicvc_mode.o logicvc_of.o + +obj-$(CONFIG_DRM_LOGICVC) += logicvc-drm.o diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.c b/drivers/gpu/drm/logicvc/logicvc_crtc.c new file mode 100644 index 000000000000..75e6a47a7724 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.c @@ -0,0 +1,277 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/types.h> +#include <linux/workqueue.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_drv.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_layer.h" +#include "logicvc_regs.h" + +#define logicvc_crtc(c) \ + container_of(c, struct logicvc_crtc, drm_crtc) + +static int logicvc_crtc_atomic_check(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct drm_crtc_state *crtc_state = + drm_atomic_get_new_crtc_state(state, drm_crtc); + struct drm_display_mode *mode = &crtc_state->adjusted_mode; + + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + return -EINVAL; + + return 0; +} + +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); + struct drm_crtc_state *crtc_state = + drm_atomic_get_old_crtc_state(state, drm_crtc); + struct drm_device *drm_dev = drm_crtc->dev; + unsigned long flags; + + /* Register pending event, only if vblank is already on. */ + if (drm_crtc->state->event && crtc_state->active) { + spin_lock_irqsave(&drm_dev->event_lock, flags); + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); + + crtc->event = drm_crtc->state->event; + drm_crtc->state->event = NULL; + + spin_unlock_irqrestore(&drm_dev->event_lock, flags); + } +} + +static void logicvc_crtc_atomic_enable(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; + struct drm_crtc_state *crtc_state = + drm_atomic_get_old_crtc_state(state, drm_crtc); + struct drm_device *drm_dev = drm_crtc->dev; + unsigned int hact, hfp, hsl, hbp; + unsigned int vact, vfp, vsl, vbp; + unsigned long flags; + u32 ctrl; + + /* Timings */ + + hact = mode->hdisplay; + hfp = mode->hsync_start - mode->hdisplay; + hsl = mode->hsync_end - mode->hsync_start; + hbp = mode->htotal - mode->hsync_end; + + vact = mode->vdisplay; + vfp = mode->vsync_start - mode->vdisplay; + vsl = mode->vsync_end - mode->vsync_start; + vbp = mode->vtotal - mode->vsync_end; + + regmap_write(logicvc->regmap, LOGICVC_HSYNC_FRONT_PORCH_REG, hfp - 1); + regmap_write(logicvc->regmap, LOGICVC_HSYNC_REG, hsl - 1); + regmap_write(logicvc->regmap, LOGICVC_HSYNC_BACK_PORCH_REG, hbp - 1); + regmap_write(logicvc->regmap, LOGICVC_HRES_REG, hact - 1); + + regmap_write(logicvc->regmap, LOGICVC_VSYNC_FRONT_PORCH_REG, vfp - 1); + regmap_write(logicvc->regmap, LOGICVC_VSYNC_REG, vsl - 1); + regmap_write(logicvc->regmap, LOGICVC_VSYNC_BACK_PORCH_REG, vbp - 1); + regmap_write(logicvc->regmap, LOGICVC_VRES_REG, vact - 1); + + /* Signals */ + + ctrl = LOGICVC_CTRL_HSYNC_ENABLE | LOGICVC_CTRL_VSYNC_ENABLE | + LOGICVC_CTRL_DE_ENABLE; + + if (mode->flags & DRM_MODE_FLAG_NHSYNC) + ctrl |= LOGICVC_CTRL_HSYNC_INVERT; + + if (mode->flags & DRM_MODE_FLAG_NVSYNC) + ctrl |= LOGICVC_CTRL_VSYNC_INVERT; + + if (logicvc->interface) { + struct drm_connector *connector = + &logicvc->interface->drm_connector; + struct drm_display_info *display_info = + &connector->display_info; + + if (display_info->bus_flags & DRM_BUS_FLAG_DE_LOW) + ctrl |= LOGICVC_CTRL_DE_INVERT; + + if (display_info->bus_flags & + DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) + ctrl |= LOGICVC_CTRL_CLOCK_INVERT; + } + + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, + LOGICVC_CTRL_HSYNC_ENABLE | + LOGICVC_CTRL_HSYNC_INVERT | + LOGICVC_CTRL_VSYNC_ENABLE | + LOGICVC_CTRL_VSYNC_INVERT | + LOGICVC_CTRL_DE_ENABLE | + LOGICVC_CTRL_DE_INVERT | + LOGICVC_CTRL_PIXEL_INVERT | + LOGICVC_CTRL_CLOCK_INVERT, ctrl); + + /* Generate internal state reset. */ + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); + + drm_crtc_vblank_on(drm_crtc); + + /* Register our event after vblank is enabled. */ + if (drm_crtc->state->event && !crtc_state->active) { + spin_lock_irqsave(&drm_dev->event_lock, flags); + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); + + crtc->event = drm_crtc->state->event; + drm_crtc->state->event = NULL; + spin_unlock_irqrestore(&drm_dev->event_lock, flags); + } +} + +static void logicvc_crtc_atomic_disable(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + struct drm_device *drm_dev = drm_crtc->dev; + + drm_crtc_vblank_off(drm_crtc); + + /* Disable and clear CRTC bits. */ + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, + LOGICVC_CTRL_HSYNC_ENABLE | + LOGICVC_CTRL_HSYNC_INVERT | + LOGICVC_CTRL_VSYNC_ENABLE | + LOGICVC_CTRL_VSYNC_INVERT | + LOGICVC_CTRL_DE_ENABLE | + LOGICVC_CTRL_DE_INVERT | + LOGICVC_CTRL_PIXEL_INVERT | + LOGICVC_CTRL_CLOCK_INVERT, 0); + + /* Generate internal state reset. */ + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); + + /* Consume leftover event since vblank is now disabled. */ + if (drm_crtc->state->event && !drm_crtc->state->active) { + spin_lock_irq(&drm_dev->event_lock); + + drm_crtc_send_vblank_event(drm_crtc, drm_crtc->state->event); + drm_crtc->state->event = NULL; + spin_unlock_irq(&drm_dev->event_lock); + } +} + +static const struct drm_crtc_helper_funcs logicvc_crtc_helper_funcs = { + .atomic_check = logicvc_crtc_atomic_check, + .atomic_begin = logicvc_crtc_atomic_begin, + .atomic_enable = logicvc_crtc_atomic_enable, + .atomic_disable = logicvc_crtc_atomic_disable, +}; + +static int logicvc_crtc_enable_vblank(struct drm_crtc *drm_crtc) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + + /* Clear any pending V_SYNC interrupt. */ + regmap_write_bits(logicvc->regmap, LOGICVC_INT_STAT_REG, + LOGICVC_INT_STAT_V_SYNC, LOGICVC_INT_STAT_V_SYNC); + + /* Unmask V_SYNC interrupt. */ + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, + LOGICVC_INT_MASK_V_SYNC, 0); + + return 0; +} + +static void logicvc_crtc_disable_vblank(struct drm_crtc *drm_crtc) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + + /* Mask V_SYNC interrupt. */ + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, + LOGICVC_INT_MASK_V_SYNC, LOGICVC_INT_MASK_V_SYNC); +} + +static const struct drm_crtc_funcs logicvc_crtc_funcs = { + .reset = drm_atomic_helper_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = logicvc_crtc_enable_vblank, + .disable_vblank = logicvc_crtc_disable_vblank, +}; + +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct logicvc_crtc *crtc = logicvc->crtc; + unsigned long flags; + + if (!crtc) + return; + + drm_crtc_handle_vblank(&crtc->drm_crtc); + + if (crtc->event) { + spin_lock_irqsave(&drm_dev->event_lock, flags); + drm_crtc_send_vblank_event(&crtc->drm_crtc, crtc->event); + drm_crtc_vblank_put(&crtc->drm_crtc); + crtc->event = NULL; + spin_unlock_irqrestore(&drm_dev->event_lock, flags); + } +} + +int logicvc_crtc_init(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + struct logicvc_crtc *crtc; + struct logicvc_layer *layer_primary; + int ret; + + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); + if (!crtc) + return -ENOMEM; + + layer_primary = logicvc_layer_get_primary(logicvc); + if (!layer_primary) { + DRM_ERROR("Failed to get primary layer\n"); + return -EINVAL; + } + + ret = drm_crtc_init_with_planes(drm_dev, &crtc->drm_crtc, + &layer_primary->drm_plane, NULL, + &logicvc_crtc_funcs, NULL); + if (ret) { + DRM_ERROR("Failed to initalize CRTC\n"); + return ret; + } + + drm_crtc_helper_add(&crtc->drm_crtc, &logicvc_crtc_helper_funcs); + + crtc->drm_crtc.port = of_graph_get_port_by_id(of_node, 1); + + logicvc->crtc = crtc; + + return 0; +} diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.h b/drivers/gpu/drm/logicvc/logicvc_crtc.h new file mode 100644 index 000000000000..6a1291c37704 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_CRTC_H_ +#define _LOGICVC_CRTC_H_ + +struct drm_pending_vblank_event; +struct logicvc_drm; + +struct logicvc_crtc { + struct drm_crtc drm_crtc; + struct drm_pending_vblank_event *event; +}; + +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc); +int logicvc_crtc_init(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.c b/drivers/gpu/drm/logicvc/logicvc_drm.c new file mode 100644 index 000000000000..b73e92fb2026 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_drm.c @@ -0,0 +1,472 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/clk.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of_reserved_mem.h> +#include <linux/regmap.h> +#include <linux/types.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_print.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_mode.h" +#include "logicvc_layer.h" +#include "logicvc_of.h" +#include "logicvc_regs.h" + +DEFINE_DRM_GEM_CMA_FOPS(logicvc_drm_fops); + +static int logicvc_drm_gem_cma_dumb_create(struct drm_file *file_priv, + struct drm_device *drm_dev, + struct drm_mode_create_dumb *args) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); + + /* Stride is always fixed to its configuration value. */ + args->pitch = logicvc->config.row_stride * DIV_ROUND_UP(args->bpp, 8); + + return drm_gem_cma_dumb_create_internal(file_priv, drm_dev, args); +} + +static struct drm_driver logicvc_drm_driver = { + .driver_features = DRIVER_GEM | DRIVER_MODESET | + DRIVER_ATOMIC, + + .fops = &logicvc_drm_fops, + .name = "logicvc-drm", + .desc = "Xylon LogiCVC DRM driver", + .date = "20200403", + .major = 1, + .minor = 0, + + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(logicvc_drm_gem_cma_dumb_create), +}; + +static struct regmap_config logicvc_drm_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .name = "logicvc-drm", +}; + +static irqreturn_t logicvc_drm_irq_handler(int irq, void *data) +{ + struct logicvc_drm *logicvc = data; + irqreturn_t ret = IRQ_NONE; + u32 stat = 0; + + /* Get pending interrupt sources. */ + regmap_read(logicvc->regmap, LOGICVC_INT_STAT_REG, &stat); + + /* Clear all pending interrupt sources. */ + regmap_write(logicvc->regmap, LOGICVC_INT_STAT_REG, stat); + + if (stat & LOGICVC_INT_STAT_V_SYNC) { + logicvc_crtc_vblank_handler(logicvc); + ret = IRQ_HANDLED; + } + + return ret; +} + +static int logicvc_drm_config_parse(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + struct logicvc_drm_config *config = &logicvc->config; + struct device_node *layers_node; + int ret; + + logicvc_of_property_parse_bool(of_node, LOGICVC_OF_PROPERTY_DITHERING, + &config->dithering); + logicvc_of_property_parse_bool(of_node, + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, + &config->background_layer); + logicvc_of_property_parse_bool(of_node, + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, + &config->layers_configurable); + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE, + &config->display_interface); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, + &config->display_colorspace); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, + &config->display_depth); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_ROW_STRIDE, + &config->row_stride); + if (ret) + return ret; + + layers_node = of_get_child_by_name(of_node, "layers"); + if (!layers_node) { + DRM_ERROR("Missing non-optional layers node\n"); + return -EINVAL; + } + + config->layers_count = of_get_child_count(layers_node); + if (!config->layers_count) { + DRM_ERROR("Missing a non-optional layers children node\n"); + return -EINVAL; + } + + return 0; +} + +static void logicvc_version_print(struct logicvc_drm *logicvc) +{ + u32 version; + + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); + + DRM_INFO("LogiCVC version %d.%02d.%c\n", + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + + 'a'); +} + +static int logicvc_clocks_prepare(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + + struct { + struct clk **clk; + char *name; + bool optional; + } clocks_map[] = { + { + .clk = &logicvc->vclk, + .name = "vclk", + .optional = false, + }, + { + .clk = &logicvc->vclk2, + .name = "vclk2", + .optional = true, + }, + { + .clk = &logicvc->lvdsclk, + .name = "lvdsclk", + .optional = true, + }, + { + .clk = &logicvc->lvdsclkn, + .name = "lvdsclkn", + .optional = true, + }, + }; + unsigned int i; + int ret; + + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { + struct clk *clk; + + clk = devm_clk_get(dev, clocks_map[i].name); + if (IS_ERR(clk)) { + if (PTR_ERR(clk) == -ENOENT && clocks_map[i].optional) + continue; + + DRM_ERROR("Missing non-optional clock %s\n", + clocks_map[i].name); + + ret = PTR_ERR(clk); + goto error; + } + + ret = clk_prepare_enable(clk); + if (ret) { + DRM_ERROR("Failed to prepare and enable clock %s\n", + clocks_map[i].name); + goto error; + } + + *clocks_map[i].clk = clk; + } + + return 0; + +error: + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { + if (!*clocks_map[i].clk) + continue; + + clk_disable_unprepare(*clocks_map[i].clk); + *clocks_map[i].clk = NULL; + } + + return ret; +} + +static int logicvc_clocks_unprepare(struct logicvc_drm *logicvc) +{ + struct clk **clocks[] = { + &logicvc->vclk, + &logicvc->vclk2, + &logicvc->lvdsclk, + &logicvc->lvdsclkn, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(clocks); i++) { + if (!*clocks[i]) + continue; + + clk_disable_unprepare(*clocks[i]); + *clocks[i] = NULL; + } + + return 0; +} + +static int logicvc_drm_probe(struct platform_device *pdev) +{ + struct device_node *of_node = pdev->dev.of_node; + struct device_node *reserved_mem_node; + struct reserved_mem *reserved_mem = NULL; + const struct logicvc_drm_caps *caps; + struct logicvc_drm *logicvc; + struct device *dev = &pdev->dev; + struct drm_device *drm_dev; + struct regmap *regmap; + struct resource res; + void __iomem *base; + int irq; + int ret; + + caps = of_device_get_match_data(dev); + if (!caps) + return -EINVAL; + + ret = of_reserved_mem_device_init(dev); + if (ret && ret != -ENODEV) { + dev_err(dev, "Failed to init memory region\n"); + goto error_early; + } + + reserved_mem_node = of_parse_phandle(of_node, "memory-region", 0); + if (reserved_mem_node) { + reserved_mem = of_reserved_mem_lookup(reserved_mem_node); + of_node_put(reserved_mem_node); + } + + /* Get regmap from syscon first if available. */ + regmap = syscon_regmap_lookup_by_phandle(of_node, "xylon,syscon"); + + /* Then get regmap from parent if available. */ + if (IS_ERR(regmap) && of_node->parent) + regmap = syscon_node_to_regmap(of_node->parent); + + /* Register our own regmap otherwise. */ + if (IS_ERR(regmap)) { + ret = of_address_to_resource(of_node, 0, &res); + if (ret) { + dev_err(dev, "Failed to get resource from address\n"); + goto error_reserved_mem; + } + + base = devm_ioremap_resource(dev, &res); + if (IS_ERR(base)) { + dev_err(dev, "Failed to map I/O base\n"); + ret = PTR_ERR(base); + goto error_reserved_mem; + } + + logicvc_drm_regmap_config.max_register = resource_size(&res) - + 4; + + regmap = devm_regmap_init_mmio(dev, base, + &logicvc_drm_regmap_config); + if (IS_ERR(regmap)) { + dev_err(dev, "Failed to create regmap for I/O\n"); + ret = PTR_ERR(regmap); + goto error_reserved_mem; + } + } + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ\n"); + ret = -ENODEV; + goto error_reserved_mem; + } + + logicvc = devm_drm_dev_alloc(dev, &logicvc_drm_driver, + struct logicvc_drm, drm_dev); + if (IS_ERR(logicvc)) { + ret = PTR_ERR(logicvc); + goto error_reserved_mem; + } + + platform_set_drvdata(pdev, logicvc); + drm_dev = &logicvc->drm_dev; + + logicvc->caps = caps; + logicvc->regmap = regmap; + INIT_LIST_HEAD(&logicvc->layers_list); + + if (reserved_mem) + logicvc->reserved_mem_base = reserved_mem->base; + + ret = logicvc_clocks_prepare(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to prepare clocks\n"); + goto error_logicvc; + } + + ret = devm_request_irq(dev, irq, logicvc_drm_irq_handler, 0, + dev_name(dev), logicvc); + if (ret) { + drm_err(drm_dev, "Failed to request IRQ\n"); + goto error_clocks; + } + + logicvc_version_print(logicvc); + + ret = logicvc_drm_config_parse(logicvc); + if (ret && ret != -ENODEV) { + drm_err(drm_dev, "Failed to parse config\n"); + goto error_clocks; + } + + drm_mode_config_init(drm_dev); + + ret = logicvc_layers_init(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to initialize layers\n"); + goto error_clocks; + } + + ret = logicvc_crtc_init(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to initialize CRTC\n"); + goto error_clocks; + } + + logicvc_layers_attach_crtc(logicvc); + + ret = logicvc_interface_init(logicvc); + if (ret) { + if (ret != -EPROBE_DEFER) + drm_err(drm_dev, "Failed to initialize interface\n"); + + goto error_clocks; + } + + logicvc_interface_attach_crtc(logicvc); + + ret = logicvc_mode_init(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to initialize KMS\n"); + goto error_clocks; + } + + ret = drm_dev_register(drm_dev, 0); + if (ret) { + drm_err(drm_dev, "Failed to register DRM device\n"); + goto error_mode; + } + + drm_fbdev_generic_setup(drm_dev, drm_dev->mode_config.preferred_depth); + + return 0; + +error_mode: + logicvc_mode_fini(logicvc); + +error_clocks: + logicvc_clocks_unprepare(logicvc); + +error_logicvc: + drm_dev_put(drm_dev); + +error_reserved_mem: + of_reserved_mem_device_release(dev); + +error_early: + return ret; +} + +static int logicvc_drm_remove(struct platform_device *pdev) +{ + struct logicvc_drm *logicvc = platform_get_drvdata(pdev); + struct device *dev = &pdev->dev; + struct drm_device *drm_dev = &logicvc->drm_dev; + + drm_dev_unregister(drm_dev); + drm_atomic_helper_shutdown(drm_dev); + + logicvc_mode_fini(logicvc); + + logicvc_clocks_unprepare(logicvc); + + drm_dev_put(drm_dev); + + of_reserved_mem_device_release(dev); + + return 0; +} + +static const struct logicvc_drm_caps logicvc_drm_caps_3 = { + .layer_address = false, +}; + +static const struct logicvc_drm_caps logicvc_drm_caps_4 = { + .layer_address = true, +}; + +static struct of_device_id logicvc_drm_of_table[] = { + { + .compatible = "xylon,logicvc-3.02.a-display", + .data = &logicvc_drm_caps_3, + }, + { + .compatible = "xylon,logicvc-4.01.a-display", + .data = &logicvc_drm_caps_4, + }, + { }, +}; +MODULE_DEVICE_TABLE(of, logicvc_drm_of_table); + +static struct platform_driver logicvc_drm_platform_driver = { + .probe = logicvc_drm_probe, + .remove = logicvc_drm_remove, + .driver = { + .name = "logicvc-drm", + .of_match_table = logicvc_drm_of_table, + }, +}; + +module_platform_driver(logicvc_drm_platform_driver); + +MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>"); +MODULE_DESCRIPTION("Xylon LogiCVC DRM driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h new file mode 100644 index 000000000000..68bbac6c4ab9 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_drm.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_DRM_H_ +#define _LOGICVC_DRM_H_ + +#include <linux/regmap.h> +#include <linux/types.h> +#include <drm/drm_device.h> + +#define LOGICVC_DISPLAY_INTERFACE_RGB 0 +#define LOGICVC_DISPLAY_INTERFACE_ITU656 1 +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS 2 +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA 3 +#define LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS 4 +#define LOGICVC_DISPLAY_INTERFACE_DVI 5 + +#define LOGICVC_DISPLAY_COLORSPACE_RGB 0 +#define LOGICVC_DISPLAY_COLORSPACE_YUV422 1 +#define LOGICVC_DISPLAY_COLORSPACE_YUV444 2 + +#define logicvc_drm(d) \ + container_of(d, struct logicvc_drm, drm_dev) + +struct logicvc_crtc; +struct logicvc_interface; + +struct logicvc_drm_config { + u32 display_interface; + u32 display_colorspace; + u32 display_depth; + u32 row_stride; + bool dithering; + bool background_layer; + bool layers_configurable; + u32 layers_count; +}; + +struct logicvc_drm_caps { + bool layer_address; +}; + +struct logicvc_drm { + const struct logicvc_drm_caps *caps; + struct logicvc_drm_config config; + + struct drm_device drm_dev; + phys_addr_t reserved_mem_base; + struct regmap *regmap; + + struct clk *vclk; + struct clk *vclk2; + struct clk *lvdsclk; + struct clk *lvdsclkn; + + struct list_head layers_list; + struct logicvc_crtc *crtc; + struct logicvc_interface *interface; +}; + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.c b/drivers/gpu/drm/logicvc/logicvc_interface.c new file mode 100644 index 000000000000..0cfded3792d8 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_interface.c @@ -0,0 +1,224 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/types.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_encoder.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_regs.h" + +#define logicvc_interface_from_drm_encoder(c) \ + container_of(c, struct logicvc_interface, drm_encoder) +#define logicvc_interface_from_drm_connector(c) \ + container_of(c, struct logicvc_interface, drm_connector) + +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); + struct logicvc_interface *interface = + logicvc_interface_from_drm_encoder(drm_encoder); + + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, + LOGICVC_POWER_CTRL_VIDEO_ENABLE, + LOGICVC_POWER_CTRL_VIDEO_ENABLE); + + if (interface->drm_panel) { + drm_panel_prepare(interface->drm_panel); + + /* Encoder enable is too early to enable the panel and a white + * screen will be seen if the panel gets enabled before the + * first page flip is done (and no other framebuffer + * configuration remains from the boot software). */ + interface->drm_panel_enabled = false; + } +} + +static void logicvc_encoder_disable(struct drm_encoder *drm_encoder) +{ + struct logicvc_interface *interface = + logicvc_interface_from_drm_encoder(drm_encoder); + + if (interface->drm_panel) { + drm_panel_disable(interface->drm_panel); + drm_panel_unprepare(interface->drm_panel); + } +} + +static const struct drm_encoder_helper_funcs logicvc_encoder_helper_funcs = { + .enable = logicvc_encoder_enable, + .disable = logicvc_encoder_disable, +}; + +static const struct drm_encoder_funcs logicvc_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static int logicvc_connector_get_modes(struct drm_connector *drm_connector) +{ + struct logicvc_interface *interface = + logicvc_interface_from_drm_connector(drm_connector); + + if (interface->drm_panel) + return drm_panel_get_modes(interface->drm_panel, drm_connector); + else + WARN_ONCE(1, "Retrieving modes from a native connector is not implemented."); + + return 0; +} + +static const struct drm_connector_helper_funcs logicvc_connector_helper_funcs = { + .get_modes = logicvc_connector_get_modes, +}; + +static void logicvc_connector_destroy(struct drm_connector *drm_connector) +{ + drm_connector_cleanup(drm_connector); +} + +static const struct drm_connector_funcs logicvc_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = logicvc_connector_destroy, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int logicvc_interface_encoder_type(struct logicvc_drm *logicvc) +{ + switch (logicvc->config.display_interface) { + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: + return DRM_MODE_ENCODER_LVDS; + case LOGICVC_DISPLAY_INTERFACE_DVI: + return DRM_MODE_ENCODER_TMDS; + case LOGICVC_DISPLAY_INTERFACE_RGB: + return DRM_MODE_ENCODER_DPI; + default: + return DRM_MODE_ENCODER_NONE; + } +} + +static int logicvc_interface_connector_type(struct logicvc_drm *logicvc) +{ + switch (logicvc->config.display_interface) { + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: + return DRM_MODE_CONNECTOR_LVDS; + case LOGICVC_DISPLAY_INTERFACE_DVI: + return DRM_MODE_CONNECTOR_DVID; + case LOGICVC_DISPLAY_INTERFACE_RGB: + return DRM_MODE_CONNECTOR_DPI; + default: + return DRM_MODE_CONNECTOR_Unknown; + } +} + +static bool logicvc_interface_native_connector(struct logicvc_drm *logicvc) +{ + switch (logicvc->config.display_interface) { + case LOGICVC_DISPLAY_INTERFACE_DVI: + return true; + default: + return false; + } +} + +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc) +{ + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); + + logicvc->interface->drm_encoder.possible_crtcs = possible_crtcs; +} + +int logicvc_interface_init(struct logicvc_drm *logicvc) +{ + struct logicvc_interface *interface; + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + int encoder_type = logicvc_interface_encoder_type(logicvc); + int connector_type = logicvc_interface_connector_type(logicvc); + bool native_connector = logicvc_interface_native_connector(logicvc); + int ret; + + interface = devm_kzalloc(dev, sizeof(*interface), GFP_KERNEL); + if (!interface) { + ret = -ENOMEM; + goto error_early; + } + + ret = drm_of_find_panel_or_bridge(of_node, 1, 0, &interface->drm_panel, + &interface->drm_bridge); + if (ret == -EPROBE_DEFER) + goto error_early; + + ret = drm_encoder_init(drm_dev, &interface->drm_encoder, + &logicvc_encoder_funcs, encoder_type, NULL); + if (ret) { + drm_err(drm_dev, "Failed to initalize encoder\n"); + goto error_early; + } + + drm_encoder_helper_add(&interface->drm_encoder, + &logicvc_encoder_helper_funcs); + + if (native_connector || interface->drm_panel) { + ret = drm_connector_init(drm_dev, &interface->drm_connector, + &logicvc_connector_funcs, + connector_type); + if (ret) { + drm_err(drm_dev, "Failed to initalize connector\n"); + goto error_encoder; + } + + drm_connector_helper_add(&interface->drm_connector, + &logicvc_connector_helper_funcs); + + ret = drm_connector_attach_encoder(&interface->drm_connector, + &interface->drm_encoder); + if (ret) { + drm_err(drm_dev, + "Failed to attach connector to encoder\n"); + goto error_encoder; + } + } + + if (interface->drm_bridge) { + ret = drm_bridge_attach(&interface->drm_encoder, + interface->drm_bridge, NULL, 0); + if (ret) { + drm_err(drm_dev, + "Failed to attach bridge to encoder\n"); + goto error_encoder; + } + } + + logicvc->interface = interface; + + return 0; + +error_encoder: + drm_encoder_cleanup(&interface->drm_encoder); + +error_early: + return ret; +} diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.h b/drivers/gpu/drm/logicvc/logicvc_interface.h new file mode 100644 index 000000000000..fb2e9e6e04aa --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_interface.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_INTERFACE_H_ +#define _LOGICVC_INTERFACE_H_ + +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_encoder.h> +#include <drm/drm_panel.h> + +struct logicvc_drm; + +struct logicvc_interface { + struct drm_encoder drm_encoder; + struct drm_connector drm_connector; + + struct drm_panel *drm_panel; + struct drm_bridge *drm_bridge; + + bool drm_panel_enabled; +}; + +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc); +int logicvc_interface_init(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.c b/drivers/gpu/drm/logicvc/logicvc_layer.c new file mode 100644 index 000000000000..9188d45cef77 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_layer.c @@ -0,0 +1,615 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/of.h> +#include <linux/types.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_plane.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_print.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_layer.h" +#include "logicvc_of.h" +#include "logicvc_regs.h" + +#define logicvc_layer(p) \ + container_of(p, struct logicvc_layer, drm_plane) + +static uint32_t logicvc_layer_formats_rgb16[] = { + DRM_FORMAT_RGB565, + DRM_FORMAT_BGR565, + DRM_FORMAT_INVALID, +}; + +static uint32_t logicvc_layer_formats_rgb24[] = { + DRM_FORMAT_XRGB8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_INVALID, +}; + +/* What we call depth in this driver only counts color components, not alpha. + * This allows us to stay compatible with the LogiCVC bistream definitions. */ +static uint32_t logicvc_layer_formats_rgb24_alpha[] = { + DRM_FORMAT_ARGB8888, + DRM_FORMAT_ABGR8888, + DRM_FORMAT_INVALID, +}; + +static struct logicvc_layer_formats logicvc_layer_formats[] = { + { + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, + .depth = 16, + .formats = logicvc_layer_formats_rgb16, + }, + { + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, + .depth = 24, + .formats = logicvc_layer_formats_rgb24, + }, + { + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, + .depth = 24, + .alpha = true, + .formats = logicvc_layer_formats_rgb24_alpha, + }, + { } +}; + +static bool logicvc_layer_format_inverted(uint32_t format) +{ + switch (format) { + case DRM_FORMAT_BGR565: + case DRM_FORMAT_BGR888: + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_ABGR8888: + return true; + default: + return false; + } +} + +static int logicvc_plane_atomic_check(struct drm_plane *drm_plane, + struct drm_plane_state *state) +{ + struct drm_device *drm_dev = drm_plane->dev; + struct logicvc_layer *layer = logicvc_layer(drm_plane); + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); + struct drm_crtc_state *crtc_state; + int min_scale, max_scale; + bool can_position; + int ret; + + if (!state->crtc) + return 0; + + crtc_state = drm_atomic_get_existing_crtc_state(state->state, + state->crtc); + if (WARN_ON(!crtc_state)) + return -EINVAL; + + if (state->crtc_x < 0 || state->crtc_y < 0) { + drm_err(drm_dev, + "Negative on-CRTC positions are not supported.\n"); + return -EINVAL; + } + + if (!logicvc->caps->layer_address) { + ret = logicvc_layer_buffer_find_setup(logicvc, layer, state, + NULL); + if (ret) { + drm_err(drm_dev, "No viable setup for buffer found.\n"); + return ret; + } + } + + min_scale = DRM_PLANE_HELPER_NO_SCALING; + max_scale = DRM_PLANE_HELPER_NO_SCALING; + + can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && + layer->index != (logicvc->config.layers_count - 1) && + logicvc->config.layers_configurable); + + ret = drm_atomic_helper_check_plane_state(state, crtc_state, + min_scale, max_scale, + can_position, true); + if (ret) { + drm_err(drm_dev, "Invalid plane state\n\n"); + return ret; + } + + return 0; +} + +static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, + struct drm_plane_state *old_state) +{ + struct logicvc_layer *layer = logicvc_layer(drm_plane); + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + struct drm_plane_state *state = drm_plane->state; + struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; + struct drm_framebuffer *fb = state->fb; + struct logicvc_layer_buffer_setup setup = {}; + u32 index = layer->index; + u32 reg; + + /* Layer dimensions */ + + regmap_write(logicvc->regmap, LOGICVC_LAYER_WIDTH_REG(index), + state->crtc_w - 1); + regmap_write(logicvc->regmap, LOGICVC_LAYER_HEIGHT_REG(index), + state->crtc_h - 1); + + if (logicvc->caps->layer_address) { + phys_addr_t fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); + + regmap_write(logicvc->regmap, LOGICVC_LAYER_ADDRESS_REG(index), + fb_addr); + } else { + /* Rely on offsets to configure the address. */ + + logicvc_layer_buffer_find_setup(logicvc, layer, state, &setup); + + /* Layer memory offsets */ + + regmap_write(logicvc->regmap, LOGICVC_BUFFER_SEL_REG, + LOGICVC_BUFFER_SEL_VALUE(index, setup.buffer_sel)); + regmap_write(logicvc->regmap, LOGICVC_LAYER_HOFFSET_REG(index), + setup.hoffset); + regmap_write(logicvc->regmap, LOGICVC_LAYER_VOFFSET_REG(index), + setup.voffset); + } + + /* Layer position */ + + regmap_write(logicvc->regmap, LOGICVC_LAYER_HPOSITION_REG(index), + mode->hdisplay - 1 - state->crtc_x); + + /* Vertical position must be set last to sync layer register changes. */ + regmap_write(logicvc->regmap, LOGICVC_LAYER_VPOSITION_REG(index), + mode->vdisplay - 1 - state->crtc_y); + + /* Layer alpha */ + + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) { + u32 alpha_bits; + u32 alpha_max; + u32 alpha; + + switch (layer->config.depth) { + case 8: + alpha_bits = 3; + break; + case 16: + if (layer->config.colorspace == LOGICVC_LAYER_COLORSPACE_YUV) + alpha_bits = 8; + else + alpha_bits = 6; + break; + default: + alpha_bits = 8; + break; + } + + alpha_max = BIT(alpha_bits) - 1; + alpha = state->alpha * alpha_max / DRM_BLEND_ALPHA_OPAQUE; + + DRM_DEBUG_DRIVER("Setting layer %d alpha to %d/%d\n", index, + alpha, alpha_max); + + regmap_write(logicvc->regmap, LOGICVC_LAYER_ALPHA_REG(index), + alpha); + } + + /* Layer control */ + + reg = LOGICVC_LAYER_CTRL_ENABLE; + + if (logicvc_layer_format_inverted(fb->format->format)) + reg |= LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT; + + reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; + + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), reg); +} + +static void logicvc_plane_atomic_disable(struct drm_plane *drm_plane, + struct drm_plane_state *old_state) +{ + struct logicvc_layer *layer = logicvc_layer(drm_plane); + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + u32 index = layer->index; + + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), 0); +} + +static struct drm_plane_helper_funcs logicvc_plane_helper_funcs = { + .atomic_check = logicvc_plane_atomic_check, + .atomic_update = logicvc_plane_atomic_update, + .atomic_disable = logicvc_plane_atomic_disable, +}; + +static const struct drm_plane_funcs logicvc_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, + .reset = drm_atomic_helper_plane_reset, + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, +}; + +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, + struct logicvc_layer *layer, + struct drm_plane_state *state, + struct logicvc_layer_buffer_setup *setup) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct drm_framebuffer *fb = state->fb; + /* All the supported formats have a single data plane. */ + u32 layer_bytespp = fb->format->cpp[0]; + u32 layer_stride = layer_bytespp * logicvc->config.row_stride; + u32 base_offset = layer->config.base_offset * layer_stride; + u32 buffer_offset = layer->config.buffer_offset * layer_stride; + u8 buffer_sel = 0; + u16 voffset = 0; + u16 hoffset = 0; + phys_addr_t fb_addr; + u32 fb_offset; + u32 gap; + + if (!logicvc->reserved_mem_base) { + drm_err(drm_dev, "No reserved memory base was registered!\n"); + return -ENOMEM; + } + + fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); + if (fb_addr < logicvc->reserved_mem_base) { + drm_err(drm_dev, + "Framebuffer memory below reserved memory base!\n"); + return -EINVAL; + } + + fb_offset = (u32) (fb_addr - logicvc->reserved_mem_base); + + if (fb_offset < base_offset) { + drm_err(drm_dev, + "Framebuffer offset below layer base offset!\n"); + return -EINVAL; + } + + gap = fb_offset - base_offset; + + /* Use the possible video buffers selection. */ + if (gap && buffer_offset) { + buffer_sel = gap / buffer_offset; + if (buffer_sel > LOGICVC_BUFFER_SEL_MAX) + buffer_sel = LOGICVC_BUFFER_SEL_MAX; + + gap -= buffer_sel * buffer_offset; + } + + /* Use the vertical offset. */ + if (gap && layer_stride && logicvc->config.layers_configurable) { + voffset = gap / layer_stride; + if (voffset > LOGICVC_LAYER_VOFFSET_MAX) + voffset = LOGICVC_LAYER_VOFFSET_MAX; + + gap -= voffset * layer_stride; + } + + /* Use the horizontal offset. */ + if (gap && layer_bytespp && logicvc->config.layers_configurable) { + hoffset = gap / layer_bytespp; + if (hoffset > LOGICVC_DIMENSIONS_MAX) + hoffset = LOGICVC_DIMENSIONS_MAX; + + gap -= hoffset * layer_bytespp; + } + + if (gap) { + drm_err(drm_dev, + "Unable to find layer %d buffer setup for 0x%x byte gap\n", + layer->index, fb_offset - base_offset); + return -EINVAL; + } + + DRM_DEBUG_DRIVER("Found layer %d buffer setup for 0x%x byte gap:\n", + layer->index, fb_offset - base_offset); + + DRM_DEBUG_DRIVER("- buffer_sel = 0x%x chunks of 0x%x bytes\n", + buffer_sel, buffer_offset); + DRM_DEBUG_DRIVER("- voffset = 0x%x chunks of 0x%x bytes\n", voffset, + layer_stride); + DRM_DEBUG_DRIVER("- hoffset = 0x%x chunks of 0x%x bytes\n", hoffset, + layer_bytespp); + + if (setup) { + setup->buffer_sel = buffer_sel; + setup->voffset = voffset; + setup->hoffset = hoffset; + } + + return 0; +} + +static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc_layer *layer) +{ + bool alpha; + unsigned int i = 0; + + alpha = (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_PIXEL); + + while (logicvc_layer_formats[i].formats) { + if (logicvc_layer_formats[i].colorspace == layer->config.colorspace && + logicvc_layer_formats[i].depth == layer->config.depth && + logicvc_layer_formats[i].alpha == alpha) + return &logicvc_layer_formats[i]; + + i++; + } + + return NULL; +} + +static unsigned int logicvc_layer_formats_count(struct logicvc_layer_formats *formats) +{ + unsigned int count = 0; + + while (formats->formats[count] != DRM_FORMAT_INVALID) + count++; + + return count; +} + +static int logicvc_layer_config_parse(struct logicvc_drm *logicvc, + struct logicvc_layer *layer) +{ + struct device_node *of_node = layer->of_node; + struct logicvc_layer_config *config = &layer->config; + int ret; + + logicvc_of_property_parse_bool(of_node, + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, + &config->primary); + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, + &config->colorspace); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_DEPTH, + &config->depth); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, + &config->alpha_mode); + if (ret) + return ret; + + /* Memory offset is only relevant without layer address configuration. */ + if (logicvc->caps->layer_address) + return 0; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, + &config->base_offset); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, + &config->buffer_offset); + if (ret) + return ret; + + return 0; +} + +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, + u32 index) +{ + struct logicvc_layer *layer; + + list_for_each_entry(layer, &logicvc->layers_list, list) + if (layer->index == index) + return layer; + + return NULL; +} + +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, + enum drm_plane_type type) +{ + struct logicvc_layer *layer; + + list_for_each_entry(layer, &logicvc->layers_list, list) + if (layer->drm_plane.type == type) + return layer; + + return NULL; +} + +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc) +{ + return logicvc_layer_get_from_type(logicvc, DRM_PLANE_TYPE_PRIMARY); +} + +static int logicvc_layer_init(struct logicvc_drm *logicvc, + struct device_node *of_node, u32 index) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct logicvc_layer *layer = NULL; + struct logicvc_layer_formats *formats; + unsigned int formats_count; + enum drm_plane_type type; + unsigned int zpos; + int ret; + + layer = devm_kzalloc(dev, sizeof(*layer), GFP_KERNEL); + if (!layer) { + ret = -ENOMEM; + goto error; + } + + layer->of_node = of_node; + layer->index = index; + + ret = logicvc_layer_config_parse(logicvc, layer); + if (ret) { + drm_err(drm_dev, "Failed to parse config for layer #%d\n", + index); + goto error; + } + + formats = logicvc_layer_formats_lookup(layer); + if (!formats) { + drm_err(drm_dev, "Failed to lookup formats for layer #%d\n", + index); + goto error; + } + + formats_count = logicvc_layer_formats_count(formats); + + /* The final layer can be configured as a background layer. */ + if (logicvc->config.background_layer && + index == (logicvc->config.layers_count - 1)) { + /* A zero value for black is only valid for RGB, not for YUV, + * so this will need to take the format in account for YUV. */ + u32 background = 0; + + DRM_DEBUG_DRIVER("Using layer #%d as background layer\n", + index); + + regmap_write(logicvc->regmap, LOGICVC_BACKGROUND_COLOR_REG, + background); + + devm_kfree(dev, layer); + + return 0; + } + + if (layer->config.primary) + type = DRM_PLANE_TYPE_PRIMARY; + else + type = DRM_PLANE_TYPE_OVERLAY; + + ret = drm_universal_plane_init(drm_dev, &layer->drm_plane, 0, + &logicvc_plane_funcs, formats->formats, + formats_count, NULL, type, NULL); + if (ret) { + drm_err(drm_dev, "Failed to initialize layer plane\n"); + return ret; + } + + drm_plane_helper_add(&layer->drm_plane, &logicvc_plane_helper_funcs); + + zpos = logicvc->config.layers_count - index - 1; + DRM_DEBUG_DRIVER("Giving layer #%d zpos %d\n", index, zpos); + + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) + drm_plane_create_alpha_property(&layer->drm_plane); + + drm_plane_create_zpos_immutable_property(&layer->drm_plane, zpos); + + DRM_DEBUG_DRIVER("Registering layer #%d\n", index); + + layer->formats = formats; + + list_add_tail(&layer->list, &logicvc->layers_list); + + return 0; + +error: + if (layer) + devm_kfree(dev, layer); + + return ret; +} + +static void logicvc_layer_fini(struct logicvc_drm *logicvc, + struct logicvc_layer *layer) +{ + struct device *dev = logicvc->drm_dev.dev; + + list_del(&layer->list); + devm_kfree(dev, layer); +} + +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc) +{ + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); + struct logicvc_layer *layer; + + list_for_each_entry(layer, &logicvc->layers_list, list) { + if (layer->drm_plane.type != DRM_PLANE_TYPE_OVERLAY) + continue; + + layer->drm_plane.possible_crtcs = possible_crtcs; + } +} + +int logicvc_layers_init(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + struct device_node *layer_node = NULL; + struct device_node *layers_node; + struct logicvc_layer *layer; + struct logicvc_layer *next; + int ret = 0; + + layers_node = of_get_child_by_name(of_node, "layers"); + if (!layers_node) { + DRM_ERROR("No layers node found in the description\n"); + ret = -ENODEV; + goto error; + } + + for_each_child_of_node(layers_node, layer_node) { + u32 index = 0; + + if (!logicvc_of_node_is_layer(layer_node)) + continue; + + ret = of_property_read_u32(layer_node, "reg", &index); + if (ret) + continue; + + layer = logicvc_layer_get_from_index(logicvc, index); + if (layer) { + DRM_ERROR("Duplicated entry for layer #%d\n", index); + continue; + } + + ret = logicvc_layer_init(logicvc, layer_node, index); + if (ret) + goto error; + + of_node_put(layer_node); + } + + of_node_put(layers_node); + + return 0; + +error: + list_for_each_entry_safe(layer, next, &logicvc->layers_list, list) + logicvc_layer_fini(logicvc, layer); + + return ret; +} diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.h b/drivers/gpu/drm/logicvc/logicvc_layer.h new file mode 100644 index 000000000000..c5767c81f446 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_layer.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_LAYER_H_ +#define _LOGICVC_LAYER_H_ + +#include <linux/of.h> +#include <linux/types.h> +#include <drm/drm_plane.h> + +#define LOGICVC_LAYER_COLORSPACE_RGB 0 +#define LOGICVC_LAYER_COLORSPACE_YUV 1 + +#define LOGICVC_LAYER_ALPHA_LAYER 0 +#define LOGICVC_LAYER_ALPHA_PIXEL 1 + +struct logicvc_layer_buffer_setup { + u8 buffer_sel; + u16 voffset; + u16 hoffset; +}; + +struct logicvc_layer_config { + u32 colorspace; + u32 depth; + u32 alpha_mode; + u32 base_offset; + u32 buffer_offset; + bool primary; +}; + +struct logicvc_layer_formats { + u32 colorspace; + u32 depth; + bool alpha; + uint32_t *formats; +}; + +struct logicvc_layer { + struct logicvc_layer_config config; + struct logicvc_layer_formats *formats; + struct device_node *of_node; + + struct drm_plane drm_plane; + struct list_head list; + u32 index; +}; + +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, + struct logicvc_layer *layer, + struct drm_plane_state *state, + struct logicvc_layer_buffer_setup *setup); +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, + u32 index); +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, + enum drm_plane_type type); +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc); +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc); +int logicvc_layers_init(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.c b/drivers/gpu/drm/logicvc/logicvc_mode.c new file mode 100644 index 000000000000..aa8f35b64c75 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_mode.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/types.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_mode_config.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> + +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_layer.h" +#include "logicvc_mode.h" + +static void logicvc_mode_atomic_commit_tail(struct drm_atomic_state *old_state) +{ + struct drm_device *drm_dev = old_state->dev; + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); + struct logicvc_interface *interface = logicvc->interface; + + drm_atomic_helper_commit_tail(old_state); + + /* Enable the panel after the first commit, which concerns our panel + * since we only support a single interface. */ + if (interface->drm_panel && !interface->drm_panel_enabled) { + drm_panel_enable(interface->drm_panel); + interface->drm_panel_enabled = true; + } +} + +static const struct drm_mode_config_helper_funcs logicvc_mode_config_helper_funcs = { + .atomic_commit_tail = logicvc_mode_atomic_commit_tail, +}; + +static const struct drm_mode_config_funcs logicvc_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .output_poll_changed = drm_fb_helper_output_poll_changed, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +int logicvc_mode_init(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct drm_mode_config *mode_config = &drm_dev->mode_config; + struct logicvc_layer *layer_primary; + uint32_t preferred_depth; + int ret; + + ret = drm_vblank_init(drm_dev, mode_config->num_crtc); + if (ret) { + drm_err(drm_dev, "Failed to initialize vblank\n"); + return ret; + } + + layer_primary = logicvc_layer_get_primary(logicvc); + if (!layer_primary) { + drm_err(drm_dev, "Failed to get primary layer\n"); + return -EINVAL; + } + + preferred_depth = layer_primary->formats->depth; + + /* DRM counts alpha in depth, our driver doesn't. */ + if (layer_primary->formats->alpha) + preferred_depth += 8; + + mode_config->min_width = 64; + mode_config->max_width = 2048; + mode_config->min_height = 1; + mode_config->max_height = 2048; + mode_config->preferred_depth = preferred_depth; + mode_config->funcs = &logicvc_mode_config_funcs; + mode_config->helper_private = &logicvc_mode_config_helper_funcs; + + drm_mode_config_reset(drm_dev); + + drm_kms_helper_poll_init(drm_dev); + + return 0; +} + +void logicvc_mode_fini(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + + drm_kms_helper_poll_fini(drm_dev); +} diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.h b/drivers/gpu/drm/logicvc/logicvc_mode.h new file mode 100644 index 000000000000..690def1619a6 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_mode.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_MODE_H_ +#define _LOGICVC_MODE_H_ + +struct logicvc_drm; + +int logicvc_mode_init(struct logicvc_drm *logicvc); +void logicvc_mode_fini(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_of.c b/drivers/gpu/drm/logicvc/logicvc_of.c new file mode 100644 index 000000000000..a7071d2fc35f --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_of.c @@ -0,0 +1,197 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <drm/drm_print.h> + +#include "logicvc_drm.h" +#include "logicvc_layer.h" +#include "logicvc_of.h" + +static struct logicvc_of_property_sv logicvc_of_display_interface_sv[] = { + { "lvds-4bits", LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS }, + { "lvds-3bits", LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS }, + { }, +}; + +static struct logicvc_of_property_sv logicvc_of_display_colorspace_sv[] = { + { "rgb", LOGICVC_DISPLAY_COLORSPACE_RGB }, + { "yuv422", LOGICVC_DISPLAY_COLORSPACE_YUV422 }, + { "yuv444", LOGICVC_DISPLAY_COLORSPACE_YUV444 }, + { }, +}; + +static struct logicvc_of_property_sv logicvc_of_layer_colorspace_sv[] = { + { "rgb", LOGICVC_LAYER_COLORSPACE_RGB }, + { "yuv", LOGICVC_LAYER_COLORSPACE_YUV }, + { }, +}; + +static struct logicvc_of_property_sv logicvc_of_layer_alpha_mode_sv[] = { + { "layer", LOGICVC_LAYER_ALPHA_LAYER }, + { "pixel", LOGICVC_LAYER_ALPHA_PIXEL }, + { }, +}; + +static struct logicvc_of_property logicvc_of_properties[] = { + [LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE] = { + .name = "xylon,display-interface", + .sv = logicvc_of_display_interface_sv, + .range = { + LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS, + LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS, + }, + }, + [LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE] = { + .name = "xylon,display-colorspace", + .sv = logicvc_of_display_colorspace_sv, + .range = { + LOGICVC_DISPLAY_COLORSPACE_RGB, + LOGICVC_DISPLAY_COLORSPACE_YUV444, + }, + }, + [LOGICVC_OF_PROPERTY_DISPLAY_DEPTH] = { + .name = "xylon,display-depth", + .range = { 8, 24 }, + }, + [LOGICVC_OF_PROPERTY_ROW_STRIDE] = { + .name = "xylon,row-stride", + }, + [LOGICVC_OF_PROPERTY_DITHERING] = { + .name = "xylon,dithering", + .optional = true, + }, + [LOGICVC_OF_PROPERTY_BACKGROUND_LAYER] = { + .name = "xylon,background-layer", + .optional = true, + }, + [LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE] = { + .name = "xylon,layers-configurable", + .optional = true, + }, + [LOGICVC_OF_PROPERTY_LAYERS_COUNT] = { + .name = "xylon,layers-count", + }, + [LOGICVC_OF_PROPERTY_LAYER_DEPTH] = { + .name = "xylon,layer-depth", + .range = { 8, 24 }, + }, + [LOGICVC_OF_PROPERTY_LAYER_COLORSPACE] = { + .name = "xylon,layer-colorspace", + .sv = logicvc_of_layer_colorspace_sv, + .range = { + LOGICVC_LAYER_COLORSPACE_RGB, + LOGICVC_LAYER_COLORSPACE_RGB, + }, + }, + [LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE] = { + .name = "xylon,layer-alpha-mode", + .sv = logicvc_of_layer_alpha_mode_sv, + .range = { + LOGICVC_LAYER_ALPHA_LAYER, + LOGICVC_LAYER_ALPHA_PIXEL, + }, + }, + [LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET] = { + .name = "xylon,layer-base-offset", + }, + [LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET] = { + .name = "xylon,layer-buffer-offset", + }, + [LOGICVC_OF_PROPERTY_LAYER_PRIMARY] = { + .name = "xylon,layer-primary", + .optional = true, + }, +}; + +static int logicvc_of_property_sv_value(struct logicvc_of_property_sv *sv, + const char *string, u32 *value) +{ + unsigned int i = 0; + + while (sv[i].string) { + if (!strcmp(sv[i].string, string)) { + *value = sv[i].value; + return 0; + } + + i++; + } + + return -EINVAL; +} + +int logicvc_of_property_parse_u32(struct device_node *of_node, + unsigned int index, u32 *target) +{ + struct logicvc_of_property *property; + const char *string; + u32 value; + int ret; + + if (index >= LOGICVC_OF_PROPERTY_MAXIMUM) + return -EINVAL; + + property = &logicvc_of_properties[index]; + + if (!property->optional && + !of_property_read_bool(of_node, property->name)) { + DRM_ERROR("Missing non-optional OF property %s\n", + property->name); + return -ENODEV; + } + + if (property->sv) { + ret = of_property_read_string(of_node, property->name, &string); + if (ret) { + DRM_ERROR("Failed to read OF property %s\n", + property->name); + return ret; + } + + ret = logicvc_of_property_sv_value(property->sv, string, + &value); + if (ret) { + DRM_ERROR("Failed to match OF string %s\n", + property->name); + return ret; + } + } else { + ret = of_property_read_u32(of_node, property->name, &value); + if (ret) { + DRM_ERROR("Failed to read OF property %s\n", + property->name); + return ret; + } + } + + if (property->range[0] || property->range[1]) + if (value < property->range[0] || value > property->range[1]) + return -ERANGE; + + *target = value; + + return 0; +} + +void logicvc_of_property_parse_bool(struct device_node *of_node, + unsigned int index, bool *target) +{ + struct logicvc_of_property *property; + + if (index >= LOGICVC_OF_PROPERTY_MAXIMUM) { + /* Fallback. */ + *target = false; + return; + } + + property = &logicvc_of_properties[index]; + *target = of_property_read_bool(of_node, property->name); +} + +bool logicvc_of_node_is_layer(struct device_node *of_node) +{ + return !of_node_cmp(of_node->name, "layer"); +} diff --git a/drivers/gpu/drm/logicvc/logicvc_of.h b/drivers/gpu/drm/logicvc/logicvc_of.h new file mode 100644 index 000000000000..018731d411f6 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_of.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_OF_H_ +#define _LOGICVC_OF_H_ + +enum logicvc_of_property_index { + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE = 0, + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, + LOGICVC_OF_PROPERTY_ROW_STRIDE, + LOGICVC_OF_PROPERTY_DITHERING, + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, + LOGICVC_OF_PROPERTY_LAYERS_COUNT, + LOGICVC_OF_PROPERTY_LAYER_DEPTH, + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, + LOGICVC_OF_PROPERTY_MAXIMUM, +}; + +struct logicvc_of_property_sv { + const char *string; + u32 value; +}; + +struct logicvc_of_property { + char *name; + bool optional; + struct logicvc_of_property_sv *sv; + u32 range[2]; +}; + +int logicvc_of_property_parse_u32(struct device_node *of_node, + unsigned int index, u32 *target); +void logicvc_of_property_parse_bool(struct device_node *of_node, + unsigned int index, bool *target); +bool logicvc_of_node_is_layer(struct device_node *of_node); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_regs.h b/drivers/gpu/drm/logicvc/logicvc_regs.h new file mode 100644 index 000000000000..d0be5fe84856 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_regs.h @@ -0,0 +1,88 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + * + * Copyright (C) 2014 Xylon d.o.o. + * Author: Davor Joja <davor.joja@logicbricks.com> + */ + +#ifndef _LOGICVC_REGS_H_ +#define _LOGICVC_REGS_H_ + +#define LOGICVC_FIELD_GET(field, value) \ + (((value) & field##_MASK) >> field##_SHIFT) +#define LOGICVC_FIELD_SET(field, value) \ + (((value) << field##_SHIFT) & field##_MASK) + +#define LOGICVC_DIMENSIONS_MAX (BIT(16) - 1) + +#define LOGICVC_HSYNC_FRONT_PORCH_REG 0x00 +#define LOGICVC_HSYNC_REG 0x08 +#define LOGICVC_HSYNC_BACK_PORCH_REG 0x10 +#define LOGICVC_HRES_REG 0x18 +#define LOGICVC_VSYNC_FRONT_PORCH_REG 0x20 +#define LOGICVC_VSYNC_REG 0x28 +#define LOGICVC_VSYNC_BACK_PORCH_REG 0x30 +#define LOGICVC_VRES_REG 0x38 + +#define LOGICVC_CTRL_REG 0x40 +#define LOGICVC_CTRL_CLOCK_INVERT BIT(8) +#define LOGICVC_CTRL_PIXEL_INVERT BIT(7) +#define LOGICVC_CTRL_DE_INVERT BIT(5) +#define LOGICVC_CTRL_DE_ENABLE BIT(4) +#define LOGICVC_CTRL_VSYNC_INVERT BIT(3) +#define LOGICVC_CTRL_VSYNC_ENABLE BIT(2) +#define LOGICVC_CTRL_HSYNC_INVERT BIT(1) +#define LOGICVC_CTRL_HSYNC_ENABLE BIT(0) + +#define LOGICVC_DTYPE_REG 0x48 +#define LOGICVC_BACKGROUND_COLOR_REG 0x50 + +#define LOGICVC_BUFFER_SEL_REG 0x58 +#define LOGICVC_BUFFER_SEL_VALUE(i, v) \ + (BIT(10 + (i)) | ((v) << (2 * (i)))) +#define LOGICVC_BUFFER_SEL_MAX 2 + +#define LOGICVC_DOUBLE_CLUT_REG 0x60 + +#define LOGICVC_INT_STAT_REG 0x68 +#define LOGICVC_INT_STAT_V_SYNC BIT(5) + +#define LOGICVC_INT_MASK_REG 0x70 +#define LOGICVC_INT_MASK_V_SYNC BIT(5) + +#define LOGICVC_POWER_CTRL_REG 0x78 +#define LOGICVC_POWER_CTRL_BACKLIGHT_ENABLE BIT(0) +#define LOGICVC_POWER_CTRL_VDD_ENABLE BIT(1) +#define LOGICVC_POWER_CTRL_VEE_ENABLE BIT(2) +#define LOGICVC_POWER_CTRL_VIDEO_ENABLE BIT(3) + +#define LOGICVC_IP_VERSION_REG 0xf8 +#define LOGICVC_IP_VERSION_MAJOR_MASK GENMASK(16, 11) +#define LOGICVC_IP_VERSION_MAJOR_SHIFT 11 +#define LOGICVC_IP_VERSION_MINOR_MASK GENMASK(10, 5) +#define LOGICVC_IP_VERSION_MINOR_SHIFT 5 +#define LOGICVC_IP_VERSION_LEVEL_MASK GENMASK(4, 0) +#define LOGICVC_IP_VERSION_LEVEL_SHIFT 0 + +#define LOGICVC_LAYER_ADDRESS_REG(i) (0x100 + (i) * 0x80) +#define LOGICVC_LAYER_HOFFSET_REG(i) (0x100 + (i) * 0x80) + +#define LOGICVC_LAYER_VOFFSET_REG(i) (0x108 + (i) * 0x80) +#define LOGICVC_LAYER_VOFFSET_MAX 4095 + +#define LOGICVC_LAYER_HPOSITION_REG(i) (0x110 + (i) * 0x80) +#define LOGICVC_LAYER_VPOSITION_REG(i) (0x118 + (i) * 0x80) +#define LOGICVC_LAYER_WIDTH_REG(i) (0x120 + (i) * 0x80) +#define LOGICVC_LAYER_HEIGHT_REG(i) (0x128 + (i) * 0x80) +#define LOGICVC_LAYER_ALPHA_REG(i) (0x130 + (i) * 0x80) + +#define LOGICVC_LAYER_CTRL_REG(i) (0x138 + (i) * 0x80) +#define LOGICVC_LAYER_CTRL_ENABLE BIT(0) +#define LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE BIT(1) +#define LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT BIT(4) + +#define LOGICVC_LAYER_COLOR_KEY_REG(i) (0x140 + (i) * 0x80) + +#endif -- 2.28.0 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* [PATCH v7 2/3] drm: Add support for the LogiCVC display controller @ 2020-11-02 15:53 ` Paul Kocialkowski 0 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-11-02 15:53 UTC (permalink / raw) To: dri-devel, devicetree, linux-kernel Cc: David Airlie, Thomas Petazzoni, Paul Kocialkowski, Rob Herring, Thomas Zimmermann Introduces a driver for the LogiCVC display controller, a programmable logic controller optimized for use in Xilinx Zynq-7000 SoCs and other Xilinx FPGAs. The controller is mostly configured at logic synthesis time so only a subset of configuration is left for the driver to handle. The following features are implemented and tested: - LVDS 4-bit interface; - RGB565 pixel formats; - Multiple layers and hardware composition; - Layer-wide alpha mode; The following features are implemented but untested: - Other RGB pixel formats; - Layer framebuffer configuration for version 4; - Lowest-layer used as background color; - Per-pixel alpha mode. The following features are not implemented: - YUV pixel formats; - DVI, LVDS 3-bit, ITU656 and camera link interfaces; - External parallel input for layer; - Color-keying; - LUT-based alpha modes. Additional implementation-specific notes: - Panels are only enabled after the first page flip to avoid flashing a white screen. - Depth used in context of the LogiCVC driver only counts color components to match the definition of the synthesis parameters. Support is implemented for both version 3 and 4 of the controller. With version 3, framebuffers are stored in a dedicated contiguous memory area, with a base address hardcoded for each layer. This requires using a dedicated CMA pool registered at the base address and tweaking a few offset-related registers to try to use any buffer allocated from the pool. This is done on a best-effort basis to have the hardware cope with the DRM framebuffer allocation model and there is no guarantee that each buffer allocated by GEM CMA can be used for any layer. In particular, buffers allocated below the base address for a layer are guaranteed not to be configurable for that layer. See the implementation of logicvc_layer_buffer_find_setup for specifics. Version 4 allows configuring each buffer address directly, which guarantees that any buffer can be configured. Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> Reviewed-by: Maxime Ripard <mripard@kernel.org> --- MAINTAINERS | 6 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/logicvc/Kconfig | 9 + drivers/gpu/drm/logicvc/Makefile | 4 + drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ 18 files changed, 2236 insertions(+) create mode 100644 drivers/gpu/drm/logicvc/Kconfig create mode 100644 drivers/gpu/drm/logicvc/Makefile create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h diff --git a/MAINTAINERS b/MAINTAINERS index 71e29dc0ab9d..9c4c5edef0ba 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete F: drivers/gpu/drm/i810/ F: include/uapi/drm/i810_drm.h +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> +T: git git://anongit.freedesktop.org/drm/drm-misc +S: Supported +F: drivers/gpu/drm/logicvc/ + DRM DRIVER FOR LVDS PANELS M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> L: dri-devel@lists.freedesktop.org diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 64376dd298ed..7b280056207f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -352,6 +352,8 @@ source "drivers/gpu/drm/arc/Kconfig" source "drivers/gpu/drm/hisilicon/Kconfig" +source "drivers/gpu/drm/logicvc/Kconfig" + source "drivers/gpu/drm/mediatek/Kconfig" source "drivers/gpu/drm/zte/Kconfig" diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 81569009f884..29fbb7cd9570 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -102,6 +102,7 @@ obj-$(CONFIG_DRM_STM) += stm/ obj-$(CONFIG_DRM_STI) += sti/ obj-y += imx/ obj-$(CONFIG_DRM_INGENIC) += ingenic/ +obj-$(CONFIG_DRM_LOGICVC) += logicvc/ obj-$(CONFIG_DRM_MEDIATEK) += mediatek/ obj-$(CONFIG_DRM_MESON) += meson/ obj-y += i2c/ diff --git a/drivers/gpu/drm/logicvc/Kconfig b/drivers/gpu/drm/logicvc/Kconfig new file mode 100644 index 000000000000..300b2be07385 --- /dev/null +++ b/drivers/gpu/drm/logicvc/Kconfig @@ -0,0 +1,9 @@ +config DRM_LOGICVC + tristate "LogiCVC DRM" + depends on DRM + depends on OF || COMPILE_TEST + select DRM_KMS_HELPER + select DRM_KMS_CMA_HELPER + select DRM_GEM_CMA_HELPER + help + DRM display driver for the logiCVC programmable logic block from Xylon diff --git a/drivers/gpu/drm/logicvc/Makefile b/drivers/gpu/drm/logicvc/Makefile new file mode 100644 index 000000000000..c09531fbd6ad --- /dev/null +++ b/drivers/gpu/drm/logicvc/Makefile @@ -0,0 +1,4 @@ +logicvc-drm-y += logicvc_crtc.o logicvc_drm.o logicvc_interface.o \ + logicvc_layer.o logicvc_mode.o logicvc_of.o + +obj-$(CONFIG_DRM_LOGICVC) += logicvc-drm.o diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.c b/drivers/gpu/drm/logicvc/logicvc_crtc.c new file mode 100644 index 000000000000..75e6a47a7724 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.c @@ -0,0 +1,277 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/of.h> +#include <linux/of_graph.h> +#include <linux/types.h> +#include <linux/workqueue.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_drv.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_print.h> +#include <drm/drm_vblank.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_layer.h" +#include "logicvc_regs.h" + +#define logicvc_crtc(c) \ + container_of(c, struct logicvc_crtc, drm_crtc) + +static int logicvc_crtc_atomic_check(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct drm_crtc_state *crtc_state = + drm_atomic_get_new_crtc_state(state, drm_crtc); + struct drm_display_mode *mode = &crtc_state->adjusted_mode; + + if (mode->flags & DRM_MODE_FLAG_INTERLACE) + return -EINVAL; + + return 0; +} + +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); + struct drm_crtc_state *crtc_state = + drm_atomic_get_old_crtc_state(state, drm_crtc); + struct drm_device *drm_dev = drm_crtc->dev; + unsigned long flags; + + /* Register pending event, only if vblank is already on. */ + if (drm_crtc->state->event && crtc_state->active) { + spin_lock_irqsave(&drm_dev->event_lock, flags); + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); + + crtc->event = drm_crtc->state->event; + drm_crtc->state->event = NULL; + + spin_unlock_irqrestore(&drm_dev->event_lock, flags); + } +} + +static void logicvc_crtc_atomic_enable(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; + struct drm_crtc_state *crtc_state = + drm_atomic_get_old_crtc_state(state, drm_crtc); + struct drm_device *drm_dev = drm_crtc->dev; + unsigned int hact, hfp, hsl, hbp; + unsigned int vact, vfp, vsl, vbp; + unsigned long flags; + u32 ctrl; + + /* Timings */ + + hact = mode->hdisplay; + hfp = mode->hsync_start - mode->hdisplay; + hsl = mode->hsync_end - mode->hsync_start; + hbp = mode->htotal - mode->hsync_end; + + vact = mode->vdisplay; + vfp = mode->vsync_start - mode->vdisplay; + vsl = mode->vsync_end - mode->vsync_start; + vbp = mode->vtotal - mode->vsync_end; + + regmap_write(logicvc->regmap, LOGICVC_HSYNC_FRONT_PORCH_REG, hfp - 1); + regmap_write(logicvc->regmap, LOGICVC_HSYNC_REG, hsl - 1); + regmap_write(logicvc->regmap, LOGICVC_HSYNC_BACK_PORCH_REG, hbp - 1); + regmap_write(logicvc->regmap, LOGICVC_HRES_REG, hact - 1); + + regmap_write(logicvc->regmap, LOGICVC_VSYNC_FRONT_PORCH_REG, vfp - 1); + regmap_write(logicvc->regmap, LOGICVC_VSYNC_REG, vsl - 1); + regmap_write(logicvc->regmap, LOGICVC_VSYNC_BACK_PORCH_REG, vbp - 1); + regmap_write(logicvc->regmap, LOGICVC_VRES_REG, vact - 1); + + /* Signals */ + + ctrl = LOGICVC_CTRL_HSYNC_ENABLE | LOGICVC_CTRL_VSYNC_ENABLE | + LOGICVC_CTRL_DE_ENABLE; + + if (mode->flags & DRM_MODE_FLAG_NHSYNC) + ctrl |= LOGICVC_CTRL_HSYNC_INVERT; + + if (mode->flags & DRM_MODE_FLAG_NVSYNC) + ctrl |= LOGICVC_CTRL_VSYNC_INVERT; + + if (logicvc->interface) { + struct drm_connector *connector = + &logicvc->interface->drm_connector; + struct drm_display_info *display_info = + &connector->display_info; + + if (display_info->bus_flags & DRM_BUS_FLAG_DE_LOW) + ctrl |= LOGICVC_CTRL_DE_INVERT; + + if (display_info->bus_flags & + DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) + ctrl |= LOGICVC_CTRL_CLOCK_INVERT; + } + + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, + LOGICVC_CTRL_HSYNC_ENABLE | + LOGICVC_CTRL_HSYNC_INVERT | + LOGICVC_CTRL_VSYNC_ENABLE | + LOGICVC_CTRL_VSYNC_INVERT | + LOGICVC_CTRL_DE_ENABLE | + LOGICVC_CTRL_DE_INVERT | + LOGICVC_CTRL_PIXEL_INVERT | + LOGICVC_CTRL_CLOCK_INVERT, ctrl); + + /* Generate internal state reset. */ + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); + + drm_crtc_vblank_on(drm_crtc); + + /* Register our event after vblank is enabled. */ + if (drm_crtc->state->event && !crtc_state->active) { + spin_lock_irqsave(&drm_dev->event_lock, flags); + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); + + crtc->event = drm_crtc->state->event; + drm_crtc->state->event = NULL; + spin_unlock_irqrestore(&drm_dev->event_lock, flags); + } +} + +static void logicvc_crtc_atomic_disable(struct drm_crtc *drm_crtc, + struct drm_atomic_state *state) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + struct drm_device *drm_dev = drm_crtc->dev; + + drm_crtc_vblank_off(drm_crtc); + + /* Disable and clear CRTC bits. */ + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, + LOGICVC_CTRL_HSYNC_ENABLE | + LOGICVC_CTRL_HSYNC_INVERT | + LOGICVC_CTRL_VSYNC_ENABLE | + LOGICVC_CTRL_VSYNC_INVERT | + LOGICVC_CTRL_DE_ENABLE | + LOGICVC_CTRL_DE_INVERT | + LOGICVC_CTRL_PIXEL_INVERT | + LOGICVC_CTRL_CLOCK_INVERT, 0); + + /* Generate internal state reset. */ + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); + + /* Consume leftover event since vblank is now disabled. */ + if (drm_crtc->state->event && !drm_crtc->state->active) { + spin_lock_irq(&drm_dev->event_lock); + + drm_crtc_send_vblank_event(drm_crtc, drm_crtc->state->event); + drm_crtc->state->event = NULL; + spin_unlock_irq(&drm_dev->event_lock); + } +} + +static const struct drm_crtc_helper_funcs logicvc_crtc_helper_funcs = { + .atomic_check = logicvc_crtc_atomic_check, + .atomic_begin = logicvc_crtc_atomic_begin, + .atomic_enable = logicvc_crtc_atomic_enable, + .atomic_disable = logicvc_crtc_atomic_disable, +}; + +static int logicvc_crtc_enable_vblank(struct drm_crtc *drm_crtc) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + + /* Clear any pending V_SYNC interrupt. */ + regmap_write_bits(logicvc->regmap, LOGICVC_INT_STAT_REG, + LOGICVC_INT_STAT_V_SYNC, LOGICVC_INT_STAT_V_SYNC); + + /* Unmask V_SYNC interrupt. */ + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, + LOGICVC_INT_MASK_V_SYNC, 0); + + return 0; +} + +static void logicvc_crtc_disable_vblank(struct drm_crtc *drm_crtc) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); + + /* Mask V_SYNC interrupt. */ + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, + LOGICVC_INT_MASK_V_SYNC, LOGICVC_INT_MASK_V_SYNC); +} + +static const struct drm_crtc_funcs logicvc_crtc_funcs = { + .reset = drm_atomic_helper_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = logicvc_crtc_enable_vblank, + .disable_vblank = logicvc_crtc_disable_vblank, +}; + +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct logicvc_crtc *crtc = logicvc->crtc; + unsigned long flags; + + if (!crtc) + return; + + drm_crtc_handle_vblank(&crtc->drm_crtc); + + if (crtc->event) { + spin_lock_irqsave(&drm_dev->event_lock, flags); + drm_crtc_send_vblank_event(&crtc->drm_crtc, crtc->event); + drm_crtc_vblank_put(&crtc->drm_crtc); + crtc->event = NULL; + spin_unlock_irqrestore(&drm_dev->event_lock, flags); + } +} + +int logicvc_crtc_init(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + struct logicvc_crtc *crtc; + struct logicvc_layer *layer_primary; + int ret; + + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); + if (!crtc) + return -ENOMEM; + + layer_primary = logicvc_layer_get_primary(logicvc); + if (!layer_primary) { + DRM_ERROR("Failed to get primary layer\n"); + return -EINVAL; + } + + ret = drm_crtc_init_with_planes(drm_dev, &crtc->drm_crtc, + &layer_primary->drm_plane, NULL, + &logicvc_crtc_funcs, NULL); + if (ret) { + DRM_ERROR("Failed to initalize CRTC\n"); + return ret; + } + + drm_crtc_helper_add(&crtc->drm_crtc, &logicvc_crtc_helper_funcs); + + crtc->drm_crtc.port = of_graph_get_port_by_id(of_node, 1); + + logicvc->crtc = crtc; + + return 0; +} diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.h b/drivers/gpu/drm/logicvc/logicvc_crtc.h new file mode 100644 index 000000000000..6a1291c37704 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.h @@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_CRTC_H_ +#define _LOGICVC_CRTC_H_ + +struct drm_pending_vblank_event; +struct logicvc_drm; + +struct logicvc_crtc { + struct drm_crtc drm_crtc; + struct drm_pending_vblank_event *event; +}; + +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc); +int logicvc_crtc_init(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.c b/drivers/gpu/drm/logicvc/logicvc_drm.c new file mode 100644 index 000000000000..b73e92fb2026 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_drm.c @@ -0,0 +1,472 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/clk.h> +#include <linux/mfd/syscon.h> +#include <linux/module.h> +#include <linux/of.h> +#include <linux/of_address.h> +#include <linux/of_device.h> +#include <linux/of_reserved_mem.h> +#include <linux/regmap.h> +#include <linux/types.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_print.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_mode.h" +#include "logicvc_layer.h" +#include "logicvc_of.h" +#include "logicvc_regs.h" + +DEFINE_DRM_GEM_CMA_FOPS(logicvc_drm_fops); + +static int logicvc_drm_gem_cma_dumb_create(struct drm_file *file_priv, + struct drm_device *drm_dev, + struct drm_mode_create_dumb *args) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); + + /* Stride is always fixed to its configuration value. */ + args->pitch = logicvc->config.row_stride * DIV_ROUND_UP(args->bpp, 8); + + return drm_gem_cma_dumb_create_internal(file_priv, drm_dev, args); +} + +static struct drm_driver logicvc_drm_driver = { + .driver_features = DRIVER_GEM | DRIVER_MODESET | + DRIVER_ATOMIC, + + .fops = &logicvc_drm_fops, + .name = "logicvc-drm", + .desc = "Xylon LogiCVC DRM driver", + .date = "20200403", + .major = 1, + .minor = 0, + + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(logicvc_drm_gem_cma_dumb_create), +}; + +static struct regmap_config logicvc_drm_regmap_config = { + .reg_bits = 32, + .val_bits = 32, + .reg_stride = 4, + .name = "logicvc-drm", +}; + +static irqreturn_t logicvc_drm_irq_handler(int irq, void *data) +{ + struct logicvc_drm *logicvc = data; + irqreturn_t ret = IRQ_NONE; + u32 stat = 0; + + /* Get pending interrupt sources. */ + regmap_read(logicvc->regmap, LOGICVC_INT_STAT_REG, &stat); + + /* Clear all pending interrupt sources. */ + regmap_write(logicvc->regmap, LOGICVC_INT_STAT_REG, stat); + + if (stat & LOGICVC_INT_STAT_V_SYNC) { + logicvc_crtc_vblank_handler(logicvc); + ret = IRQ_HANDLED; + } + + return ret; +} + +static int logicvc_drm_config_parse(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + struct logicvc_drm_config *config = &logicvc->config; + struct device_node *layers_node; + int ret; + + logicvc_of_property_parse_bool(of_node, LOGICVC_OF_PROPERTY_DITHERING, + &config->dithering); + logicvc_of_property_parse_bool(of_node, + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, + &config->background_layer); + logicvc_of_property_parse_bool(of_node, + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, + &config->layers_configurable); + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE, + &config->display_interface); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, + &config->display_colorspace); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, + &config->display_depth); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_ROW_STRIDE, + &config->row_stride); + if (ret) + return ret; + + layers_node = of_get_child_by_name(of_node, "layers"); + if (!layers_node) { + DRM_ERROR("Missing non-optional layers node\n"); + return -EINVAL; + } + + config->layers_count = of_get_child_count(layers_node); + if (!config->layers_count) { + DRM_ERROR("Missing a non-optional layers children node\n"); + return -EINVAL; + } + + return 0; +} + +static void logicvc_version_print(struct logicvc_drm *logicvc) +{ + u32 version; + + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); + + DRM_INFO("LogiCVC version %d.%02d.%c\n", + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + + 'a'); +} + +static int logicvc_clocks_prepare(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + + struct { + struct clk **clk; + char *name; + bool optional; + } clocks_map[] = { + { + .clk = &logicvc->vclk, + .name = "vclk", + .optional = false, + }, + { + .clk = &logicvc->vclk2, + .name = "vclk2", + .optional = true, + }, + { + .clk = &logicvc->lvdsclk, + .name = "lvdsclk", + .optional = true, + }, + { + .clk = &logicvc->lvdsclkn, + .name = "lvdsclkn", + .optional = true, + }, + }; + unsigned int i; + int ret; + + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { + struct clk *clk; + + clk = devm_clk_get(dev, clocks_map[i].name); + if (IS_ERR(clk)) { + if (PTR_ERR(clk) == -ENOENT && clocks_map[i].optional) + continue; + + DRM_ERROR("Missing non-optional clock %s\n", + clocks_map[i].name); + + ret = PTR_ERR(clk); + goto error; + } + + ret = clk_prepare_enable(clk); + if (ret) { + DRM_ERROR("Failed to prepare and enable clock %s\n", + clocks_map[i].name); + goto error; + } + + *clocks_map[i].clk = clk; + } + + return 0; + +error: + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { + if (!*clocks_map[i].clk) + continue; + + clk_disable_unprepare(*clocks_map[i].clk); + *clocks_map[i].clk = NULL; + } + + return ret; +} + +static int logicvc_clocks_unprepare(struct logicvc_drm *logicvc) +{ + struct clk **clocks[] = { + &logicvc->vclk, + &logicvc->vclk2, + &logicvc->lvdsclk, + &logicvc->lvdsclkn, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(clocks); i++) { + if (!*clocks[i]) + continue; + + clk_disable_unprepare(*clocks[i]); + *clocks[i] = NULL; + } + + return 0; +} + +static int logicvc_drm_probe(struct platform_device *pdev) +{ + struct device_node *of_node = pdev->dev.of_node; + struct device_node *reserved_mem_node; + struct reserved_mem *reserved_mem = NULL; + const struct logicvc_drm_caps *caps; + struct logicvc_drm *logicvc; + struct device *dev = &pdev->dev; + struct drm_device *drm_dev; + struct regmap *regmap; + struct resource res; + void __iomem *base; + int irq; + int ret; + + caps = of_device_get_match_data(dev); + if (!caps) + return -EINVAL; + + ret = of_reserved_mem_device_init(dev); + if (ret && ret != -ENODEV) { + dev_err(dev, "Failed to init memory region\n"); + goto error_early; + } + + reserved_mem_node = of_parse_phandle(of_node, "memory-region", 0); + if (reserved_mem_node) { + reserved_mem = of_reserved_mem_lookup(reserved_mem_node); + of_node_put(reserved_mem_node); + } + + /* Get regmap from syscon first if available. */ + regmap = syscon_regmap_lookup_by_phandle(of_node, "xylon,syscon"); + + /* Then get regmap from parent if available. */ + if (IS_ERR(regmap) && of_node->parent) + regmap = syscon_node_to_regmap(of_node->parent); + + /* Register our own regmap otherwise. */ + if (IS_ERR(regmap)) { + ret = of_address_to_resource(of_node, 0, &res); + if (ret) { + dev_err(dev, "Failed to get resource from address\n"); + goto error_reserved_mem; + } + + base = devm_ioremap_resource(dev, &res); + if (IS_ERR(base)) { + dev_err(dev, "Failed to map I/O base\n"); + ret = PTR_ERR(base); + goto error_reserved_mem; + } + + logicvc_drm_regmap_config.max_register = resource_size(&res) - + 4; + + regmap = devm_regmap_init_mmio(dev, base, + &logicvc_drm_regmap_config); + if (IS_ERR(regmap)) { + dev_err(dev, "Failed to create regmap for I/O\n"); + ret = PTR_ERR(regmap); + goto error_reserved_mem; + } + } + + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(dev, "Failed to get IRQ\n"); + ret = -ENODEV; + goto error_reserved_mem; + } + + logicvc = devm_drm_dev_alloc(dev, &logicvc_drm_driver, + struct logicvc_drm, drm_dev); + if (IS_ERR(logicvc)) { + ret = PTR_ERR(logicvc); + goto error_reserved_mem; + } + + platform_set_drvdata(pdev, logicvc); + drm_dev = &logicvc->drm_dev; + + logicvc->caps = caps; + logicvc->regmap = regmap; + INIT_LIST_HEAD(&logicvc->layers_list); + + if (reserved_mem) + logicvc->reserved_mem_base = reserved_mem->base; + + ret = logicvc_clocks_prepare(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to prepare clocks\n"); + goto error_logicvc; + } + + ret = devm_request_irq(dev, irq, logicvc_drm_irq_handler, 0, + dev_name(dev), logicvc); + if (ret) { + drm_err(drm_dev, "Failed to request IRQ\n"); + goto error_clocks; + } + + logicvc_version_print(logicvc); + + ret = logicvc_drm_config_parse(logicvc); + if (ret && ret != -ENODEV) { + drm_err(drm_dev, "Failed to parse config\n"); + goto error_clocks; + } + + drm_mode_config_init(drm_dev); + + ret = logicvc_layers_init(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to initialize layers\n"); + goto error_clocks; + } + + ret = logicvc_crtc_init(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to initialize CRTC\n"); + goto error_clocks; + } + + logicvc_layers_attach_crtc(logicvc); + + ret = logicvc_interface_init(logicvc); + if (ret) { + if (ret != -EPROBE_DEFER) + drm_err(drm_dev, "Failed to initialize interface\n"); + + goto error_clocks; + } + + logicvc_interface_attach_crtc(logicvc); + + ret = logicvc_mode_init(logicvc); + if (ret) { + drm_err(drm_dev, "Failed to initialize KMS\n"); + goto error_clocks; + } + + ret = drm_dev_register(drm_dev, 0); + if (ret) { + drm_err(drm_dev, "Failed to register DRM device\n"); + goto error_mode; + } + + drm_fbdev_generic_setup(drm_dev, drm_dev->mode_config.preferred_depth); + + return 0; + +error_mode: + logicvc_mode_fini(logicvc); + +error_clocks: + logicvc_clocks_unprepare(logicvc); + +error_logicvc: + drm_dev_put(drm_dev); + +error_reserved_mem: + of_reserved_mem_device_release(dev); + +error_early: + return ret; +} + +static int logicvc_drm_remove(struct platform_device *pdev) +{ + struct logicvc_drm *logicvc = platform_get_drvdata(pdev); + struct device *dev = &pdev->dev; + struct drm_device *drm_dev = &logicvc->drm_dev; + + drm_dev_unregister(drm_dev); + drm_atomic_helper_shutdown(drm_dev); + + logicvc_mode_fini(logicvc); + + logicvc_clocks_unprepare(logicvc); + + drm_dev_put(drm_dev); + + of_reserved_mem_device_release(dev); + + return 0; +} + +static const struct logicvc_drm_caps logicvc_drm_caps_3 = { + .layer_address = false, +}; + +static const struct logicvc_drm_caps logicvc_drm_caps_4 = { + .layer_address = true, +}; + +static struct of_device_id logicvc_drm_of_table[] = { + { + .compatible = "xylon,logicvc-3.02.a-display", + .data = &logicvc_drm_caps_3, + }, + { + .compatible = "xylon,logicvc-4.01.a-display", + .data = &logicvc_drm_caps_4, + }, + { }, +}; +MODULE_DEVICE_TABLE(of, logicvc_drm_of_table); + +static struct platform_driver logicvc_drm_platform_driver = { + .probe = logicvc_drm_probe, + .remove = logicvc_drm_remove, + .driver = { + .name = "logicvc-drm", + .of_match_table = logicvc_drm_of_table, + }, +}; + +module_platform_driver(logicvc_drm_platform_driver); + +MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>"); +MODULE_DESCRIPTION("Xylon LogiCVC DRM driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h new file mode 100644 index 000000000000..68bbac6c4ab9 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_drm.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_DRM_H_ +#define _LOGICVC_DRM_H_ + +#include <linux/regmap.h> +#include <linux/types.h> +#include <drm/drm_device.h> + +#define LOGICVC_DISPLAY_INTERFACE_RGB 0 +#define LOGICVC_DISPLAY_INTERFACE_ITU656 1 +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS 2 +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA 3 +#define LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS 4 +#define LOGICVC_DISPLAY_INTERFACE_DVI 5 + +#define LOGICVC_DISPLAY_COLORSPACE_RGB 0 +#define LOGICVC_DISPLAY_COLORSPACE_YUV422 1 +#define LOGICVC_DISPLAY_COLORSPACE_YUV444 2 + +#define logicvc_drm(d) \ + container_of(d, struct logicvc_drm, drm_dev) + +struct logicvc_crtc; +struct logicvc_interface; + +struct logicvc_drm_config { + u32 display_interface; + u32 display_colorspace; + u32 display_depth; + u32 row_stride; + bool dithering; + bool background_layer; + bool layers_configurable; + u32 layers_count; +}; + +struct logicvc_drm_caps { + bool layer_address; +}; + +struct logicvc_drm { + const struct logicvc_drm_caps *caps; + struct logicvc_drm_config config; + + struct drm_device drm_dev; + phys_addr_t reserved_mem_base; + struct regmap *regmap; + + struct clk *vclk; + struct clk *vclk2; + struct clk *lvdsclk; + struct clk *lvdsclkn; + + struct list_head layers_list; + struct logicvc_crtc *crtc; + struct logicvc_interface *interface; +}; + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.c b/drivers/gpu/drm/logicvc/logicvc_interface.c new file mode 100644 index 000000000000..0cfded3792d8 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_interface.c @@ -0,0 +1,224 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/types.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_encoder.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_modeset_helper_vtables.h> +#include <drm/drm_of.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_regs.h" + +#define logicvc_interface_from_drm_encoder(c) \ + container_of(c, struct logicvc_interface, drm_encoder) +#define logicvc_interface_from_drm_connector(c) \ + container_of(c, struct logicvc_interface, drm_connector) + +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) +{ + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); + struct logicvc_interface *interface = + logicvc_interface_from_drm_encoder(drm_encoder); + + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, + LOGICVC_POWER_CTRL_VIDEO_ENABLE, + LOGICVC_POWER_CTRL_VIDEO_ENABLE); + + if (interface->drm_panel) { + drm_panel_prepare(interface->drm_panel); + + /* Encoder enable is too early to enable the panel and a white + * screen will be seen if the panel gets enabled before the + * first page flip is done (and no other framebuffer + * configuration remains from the boot software). */ + interface->drm_panel_enabled = false; + } +} + +static void logicvc_encoder_disable(struct drm_encoder *drm_encoder) +{ + struct logicvc_interface *interface = + logicvc_interface_from_drm_encoder(drm_encoder); + + if (interface->drm_panel) { + drm_panel_disable(interface->drm_panel); + drm_panel_unprepare(interface->drm_panel); + } +} + +static const struct drm_encoder_helper_funcs logicvc_encoder_helper_funcs = { + .enable = logicvc_encoder_enable, + .disable = logicvc_encoder_disable, +}; + +static const struct drm_encoder_funcs logicvc_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static int logicvc_connector_get_modes(struct drm_connector *drm_connector) +{ + struct logicvc_interface *interface = + logicvc_interface_from_drm_connector(drm_connector); + + if (interface->drm_panel) + return drm_panel_get_modes(interface->drm_panel, drm_connector); + else + WARN_ONCE(1, "Retrieving modes from a native connector is not implemented."); + + return 0; +} + +static const struct drm_connector_helper_funcs logicvc_connector_helper_funcs = { + .get_modes = logicvc_connector_get_modes, +}; + +static void logicvc_connector_destroy(struct drm_connector *drm_connector) +{ + drm_connector_cleanup(drm_connector); +} + +static const struct drm_connector_funcs logicvc_connector_funcs = { + .reset = drm_atomic_helper_connector_reset, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = logicvc_connector_destroy, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, +}; + +static int logicvc_interface_encoder_type(struct logicvc_drm *logicvc) +{ + switch (logicvc->config.display_interface) { + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: + return DRM_MODE_ENCODER_LVDS; + case LOGICVC_DISPLAY_INTERFACE_DVI: + return DRM_MODE_ENCODER_TMDS; + case LOGICVC_DISPLAY_INTERFACE_RGB: + return DRM_MODE_ENCODER_DPI; + default: + return DRM_MODE_ENCODER_NONE; + } +} + +static int logicvc_interface_connector_type(struct logicvc_drm *logicvc) +{ + switch (logicvc->config.display_interface) { + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: + return DRM_MODE_CONNECTOR_LVDS; + case LOGICVC_DISPLAY_INTERFACE_DVI: + return DRM_MODE_CONNECTOR_DVID; + case LOGICVC_DISPLAY_INTERFACE_RGB: + return DRM_MODE_CONNECTOR_DPI; + default: + return DRM_MODE_CONNECTOR_Unknown; + } +} + +static bool logicvc_interface_native_connector(struct logicvc_drm *logicvc) +{ + switch (logicvc->config.display_interface) { + case LOGICVC_DISPLAY_INTERFACE_DVI: + return true; + default: + return false; + } +} + +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc) +{ + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); + + logicvc->interface->drm_encoder.possible_crtcs = possible_crtcs; +} + +int logicvc_interface_init(struct logicvc_drm *logicvc) +{ + struct logicvc_interface *interface; + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + int encoder_type = logicvc_interface_encoder_type(logicvc); + int connector_type = logicvc_interface_connector_type(logicvc); + bool native_connector = logicvc_interface_native_connector(logicvc); + int ret; + + interface = devm_kzalloc(dev, sizeof(*interface), GFP_KERNEL); + if (!interface) { + ret = -ENOMEM; + goto error_early; + } + + ret = drm_of_find_panel_or_bridge(of_node, 1, 0, &interface->drm_panel, + &interface->drm_bridge); + if (ret == -EPROBE_DEFER) + goto error_early; + + ret = drm_encoder_init(drm_dev, &interface->drm_encoder, + &logicvc_encoder_funcs, encoder_type, NULL); + if (ret) { + drm_err(drm_dev, "Failed to initalize encoder\n"); + goto error_early; + } + + drm_encoder_helper_add(&interface->drm_encoder, + &logicvc_encoder_helper_funcs); + + if (native_connector || interface->drm_panel) { + ret = drm_connector_init(drm_dev, &interface->drm_connector, + &logicvc_connector_funcs, + connector_type); + if (ret) { + drm_err(drm_dev, "Failed to initalize connector\n"); + goto error_encoder; + } + + drm_connector_helper_add(&interface->drm_connector, + &logicvc_connector_helper_funcs); + + ret = drm_connector_attach_encoder(&interface->drm_connector, + &interface->drm_encoder); + if (ret) { + drm_err(drm_dev, + "Failed to attach connector to encoder\n"); + goto error_encoder; + } + } + + if (interface->drm_bridge) { + ret = drm_bridge_attach(&interface->drm_encoder, + interface->drm_bridge, NULL, 0); + if (ret) { + drm_err(drm_dev, + "Failed to attach bridge to encoder\n"); + goto error_encoder; + } + } + + logicvc->interface = interface; + + return 0; + +error_encoder: + drm_encoder_cleanup(&interface->drm_encoder); + +error_early: + return ret; +} diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.h b/drivers/gpu/drm/logicvc/logicvc_interface.h new file mode 100644 index 000000000000..fb2e9e6e04aa --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_interface.h @@ -0,0 +1,30 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_INTERFACE_H_ +#define _LOGICVC_INTERFACE_H_ + +#include <drm/drm_bridge.h> +#include <drm/drm_connector.h> +#include <drm/drm_encoder.h> +#include <drm/drm_panel.h> + +struct logicvc_drm; + +struct logicvc_interface { + struct drm_encoder drm_encoder; + struct drm_connector drm_connector; + + struct drm_panel *drm_panel; + struct drm_bridge *drm_bridge; + + bool drm_panel_enabled; +}; + +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc); +int logicvc_interface_init(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.c b/drivers/gpu/drm/logicvc/logicvc_layer.c new file mode 100644 index 000000000000..9188d45cef77 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_layer.c @@ -0,0 +1,615 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/of.h> +#include <linux/types.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_plane.h> +#include <drm/drm_plane_helper.h> +#include <drm/drm_print.h> + +#include "logicvc_crtc.h" +#include "logicvc_drm.h" +#include "logicvc_layer.h" +#include "logicvc_of.h" +#include "logicvc_regs.h" + +#define logicvc_layer(p) \ + container_of(p, struct logicvc_layer, drm_plane) + +static uint32_t logicvc_layer_formats_rgb16[] = { + DRM_FORMAT_RGB565, + DRM_FORMAT_BGR565, + DRM_FORMAT_INVALID, +}; + +static uint32_t logicvc_layer_formats_rgb24[] = { + DRM_FORMAT_XRGB8888, + DRM_FORMAT_XBGR8888, + DRM_FORMAT_INVALID, +}; + +/* What we call depth in this driver only counts color components, not alpha. + * This allows us to stay compatible with the LogiCVC bistream definitions. */ +static uint32_t logicvc_layer_formats_rgb24_alpha[] = { + DRM_FORMAT_ARGB8888, + DRM_FORMAT_ABGR8888, + DRM_FORMAT_INVALID, +}; + +static struct logicvc_layer_formats logicvc_layer_formats[] = { + { + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, + .depth = 16, + .formats = logicvc_layer_formats_rgb16, + }, + { + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, + .depth = 24, + .formats = logicvc_layer_formats_rgb24, + }, + { + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, + .depth = 24, + .alpha = true, + .formats = logicvc_layer_formats_rgb24_alpha, + }, + { } +}; + +static bool logicvc_layer_format_inverted(uint32_t format) +{ + switch (format) { + case DRM_FORMAT_BGR565: + case DRM_FORMAT_BGR888: + case DRM_FORMAT_XBGR8888: + case DRM_FORMAT_ABGR8888: + return true; + default: + return false; + } +} + +static int logicvc_plane_atomic_check(struct drm_plane *drm_plane, + struct drm_plane_state *state) +{ + struct drm_device *drm_dev = drm_plane->dev; + struct logicvc_layer *layer = logicvc_layer(drm_plane); + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); + struct drm_crtc_state *crtc_state; + int min_scale, max_scale; + bool can_position; + int ret; + + if (!state->crtc) + return 0; + + crtc_state = drm_atomic_get_existing_crtc_state(state->state, + state->crtc); + if (WARN_ON(!crtc_state)) + return -EINVAL; + + if (state->crtc_x < 0 || state->crtc_y < 0) { + drm_err(drm_dev, + "Negative on-CRTC positions are not supported.\n"); + return -EINVAL; + } + + if (!logicvc->caps->layer_address) { + ret = logicvc_layer_buffer_find_setup(logicvc, layer, state, + NULL); + if (ret) { + drm_err(drm_dev, "No viable setup for buffer found.\n"); + return ret; + } + } + + min_scale = DRM_PLANE_HELPER_NO_SCALING; + max_scale = DRM_PLANE_HELPER_NO_SCALING; + + can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && + layer->index != (logicvc->config.layers_count - 1) && + logicvc->config.layers_configurable); + + ret = drm_atomic_helper_check_plane_state(state, crtc_state, + min_scale, max_scale, + can_position, true); + if (ret) { + drm_err(drm_dev, "Invalid plane state\n\n"); + return ret; + } + + return 0; +} + +static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, + struct drm_plane_state *old_state) +{ + struct logicvc_layer *layer = logicvc_layer(drm_plane); + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + struct drm_plane_state *state = drm_plane->state; + struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; + struct drm_framebuffer *fb = state->fb; + struct logicvc_layer_buffer_setup setup = {}; + u32 index = layer->index; + u32 reg; + + /* Layer dimensions */ + + regmap_write(logicvc->regmap, LOGICVC_LAYER_WIDTH_REG(index), + state->crtc_w - 1); + regmap_write(logicvc->regmap, LOGICVC_LAYER_HEIGHT_REG(index), + state->crtc_h - 1); + + if (logicvc->caps->layer_address) { + phys_addr_t fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); + + regmap_write(logicvc->regmap, LOGICVC_LAYER_ADDRESS_REG(index), + fb_addr); + } else { + /* Rely on offsets to configure the address. */ + + logicvc_layer_buffer_find_setup(logicvc, layer, state, &setup); + + /* Layer memory offsets */ + + regmap_write(logicvc->regmap, LOGICVC_BUFFER_SEL_REG, + LOGICVC_BUFFER_SEL_VALUE(index, setup.buffer_sel)); + regmap_write(logicvc->regmap, LOGICVC_LAYER_HOFFSET_REG(index), + setup.hoffset); + regmap_write(logicvc->regmap, LOGICVC_LAYER_VOFFSET_REG(index), + setup.voffset); + } + + /* Layer position */ + + regmap_write(logicvc->regmap, LOGICVC_LAYER_HPOSITION_REG(index), + mode->hdisplay - 1 - state->crtc_x); + + /* Vertical position must be set last to sync layer register changes. */ + regmap_write(logicvc->regmap, LOGICVC_LAYER_VPOSITION_REG(index), + mode->vdisplay - 1 - state->crtc_y); + + /* Layer alpha */ + + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) { + u32 alpha_bits; + u32 alpha_max; + u32 alpha; + + switch (layer->config.depth) { + case 8: + alpha_bits = 3; + break; + case 16: + if (layer->config.colorspace == LOGICVC_LAYER_COLORSPACE_YUV) + alpha_bits = 8; + else + alpha_bits = 6; + break; + default: + alpha_bits = 8; + break; + } + + alpha_max = BIT(alpha_bits) - 1; + alpha = state->alpha * alpha_max / DRM_BLEND_ALPHA_OPAQUE; + + DRM_DEBUG_DRIVER("Setting layer %d alpha to %d/%d\n", index, + alpha, alpha_max); + + regmap_write(logicvc->regmap, LOGICVC_LAYER_ALPHA_REG(index), + alpha); + } + + /* Layer control */ + + reg = LOGICVC_LAYER_CTRL_ENABLE; + + if (logicvc_layer_format_inverted(fb->format->format)) + reg |= LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT; + + reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; + + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), reg); +} + +static void logicvc_plane_atomic_disable(struct drm_plane *drm_plane, + struct drm_plane_state *old_state) +{ + struct logicvc_layer *layer = logicvc_layer(drm_plane); + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); + u32 index = layer->index; + + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), 0); +} + +static struct drm_plane_helper_funcs logicvc_plane_helper_funcs = { + .atomic_check = logicvc_plane_atomic_check, + .atomic_update = logicvc_plane_atomic_update, + .atomic_disable = logicvc_plane_atomic_disable, +}; + +static const struct drm_plane_funcs logicvc_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, + .reset = drm_atomic_helper_plane_reset, + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, +}; + +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, + struct logicvc_layer *layer, + struct drm_plane_state *state, + struct logicvc_layer_buffer_setup *setup) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct drm_framebuffer *fb = state->fb; + /* All the supported formats have a single data plane. */ + u32 layer_bytespp = fb->format->cpp[0]; + u32 layer_stride = layer_bytespp * logicvc->config.row_stride; + u32 base_offset = layer->config.base_offset * layer_stride; + u32 buffer_offset = layer->config.buffer_offset * layer_stride; + u8 buffer_sel = 0; + u16 voffset = 0; + u16 hoffset = 0; + phys_addr_t fb_addr; + u32 fb_offset; + u32 gap; + + if (!logicvc->reserved_mem_base) { + drm_err(drm_dev, "No reserved memory base was registered!\n"); + return -ENOMEM; + } + + fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); + if (fb_addr < logicvc->reserved_mem_base) { + drm_err(drm_dev, + "Framebuffer memory below reserved memory base!\n"); + return -EINVAL; + } + + fb_offset = (u32) (fb_addr - logicvc->reserved_mem_base); + + if (fb_offset < base_offset) { + drm_err(drm_dev, + "Framebuffer offset below layer base offset!\n"); + return -EINVAL; + } + + gap = fb_offset - base_offset; + + /* Use the possible video buffers selection. */ + if (gap && buffer_offset) { + buffer_sel = gap / buffer_offset; + if (buffer_sel > LOGICVC_BUFFER_SEL_MAX) + buffer_sel = LOGICVC_BUFFER_SEL_MAX; + + gap -= buffer_sel * buffer_offset; + } + + /* Use the vertical offset. */ + if (gap && layer_stride && logicvc->config.layers_configurable) { + voffset = gap / layer_stride; + if (voffset > LOGICVC_LAYER_VOFFSET_MAX) + voffset = LOGICVC_LAYER_VOFFSET_MAX; + + gap -= voffset * layer_stride; + } + + /* Use the horizontal offset. */ + if (gap && layer_bytespp && logicvc->config.layers_configurable) { + hoffset = gap / layer_bytespp; + if (hoffset > LOGICVC_DIMENSIONS_MAX) + hoffset = LOGICVC_DIMENSIONS_MAX; + + gap -= hoffset * layer_bytespp; + } + + if (gap) { + drm_err(drm_dev, + "Unable to find layer %d buffer setup for 0x%x byte gap\n", + layer->index, fb_offset - base_offset); + return -EINVAL; + } + + DRM_DEBUG_DRIVER("Found layer %d buffer setup for 0x%x byte gap:\n", + layer->index, fb_offset - base_offset); + + DRM_DEBUG_DRIVER("- buffer_sel = 0x%x chunks of 0x%x bytes\n", + buffer_sel, buffer_offset); + DRM_DEBUG_DRIVER("- voffset = 0x%x chunks of 0x%x bytes\n", voffset, + layer_stride); + DRM_DEBUG_DRIVER("- hoffset = 0x%x chunks of 0x%x bytes\n", hoffset, + layer_bytespp); + + if (setup) { + setup->buffer_sel = buffer_sel; + setup->voffset = voffset; + setup->hoffset = hoffset; + } + + return 0; +} + +static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc_layer *layer) +{ + bool alpha; + unsigned int i = 0; + + alpha = (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_PIXEL); + + while (logicvc_layer_formats[i].formats) { + if (logicvc_layer_formats[i].colorspace == layer->config.colorspace && + logicvc_layer_formats[i].depth == layer->config.depth && + logicvc_layer_formats[i].alpha == alpha) + return &logicvc_layer_formats[i]; + + i++; + } + + return NULL; +} + +static unsigned int logicvc_layer_formats_count(struct logicvc_layer_formats *formats) +{ + unsigned int count = 0; + + while (formats->formats[count] != DRM_FORMAT_INVALID) + count++; + + return count; +} + +static int logicvc_layer_config_parse(struct logicvc_drm *logicvc, + struct logicvc_layer *layer) +{ + struct device_node *of_node = layer->of_node; + struct logicvc_layer_config *config = &layer->config; + int ret; + + logicvc_of_property_parse_bool(of_node, + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, + &config->primary); + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, + &config->colorspace); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_DEPTH, + &config->depth); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, + &config->alpha_mode); + if (ret) + return ret; + + /* Memory offset is only relevant without layer address configuration. */ + if (logicvc->caps->layer_address) + return 0; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, + &config->base_offset); + if (ret) + return ret; + + ret = logicvc_of_property_parse_u32(of_node, + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, + &config->buffer_offset); + if (ret) + return ret; + + return 0; +} + +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, + u32 index) +{ + struct logicvc_layer *layer; + + list_for_each_entry(layer, &logicvc->layers_list, list) + if (layer->index == index) + return layer; + + return NULL; +} + +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, + enum drm_plane_type type) +{ + struct logicvc_layer *layer; + + list_for_each_entry(layer, &logicvc->layers_list, list) + if (layer->drm_plane.type == type) + return layer; + + return NULL; +} + +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc) +{ + return logicvc_layer_get_from_type(logicvc, DRM_PLANE_TYPE_PRIMARY); +} + +static int logicvc_layer_init(struct logicvc_drm *logicvc, + struct device_node *of_node, u32 index) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct logicvc_layer *layer = NULL; + struct logicvc_layer_formats *formats; + unsigned int formats_count; + enum drm_plane_type type; + unsigned int zpos; + int ret; + + layer = devm_kzalloc(dev, sizeof(*layer), GFP_KERNEL); + if (!layer) { + ret = -ENOMEM; + goto error; + } + + layer->of_node = of_node; + layer->index = index; + + ret = logicvc_layer_config_parse(logicvc, layer); + if (ret) { + drm_err(drm_dev, "Failed to parse config for layer #%d\n", + index); + goto error; + } + + formats = logicvc_layer_formats_lookup(layer); + if (!formats) { + drm_err(drm_dev, "Failed to lookup formats for layer #%d\n", + index); + goto error; + } + + formats_count = logicvc_layer_formats_count(formats); + + /* The final layer can be configured as a background layer. */ + if (logicvc->config.background_layer && + index == (logicvc->config.layers_count - 1)) { + /* A zero value for black is only valid for RGB, not for YUV, + * so this will need to take the format in account for YUV. */ + u32 background = 0; + + DRM_DEBUG_DRIVER("Using layer #%d as background layer\n", + index); + + regmap_write(logicvc->regmap, LOGICVC_BACKGROUND_COLOR_REG, + background); + + devm_kfree(dev, layer); + + return 0; + } + + if (layer->config.primary) + type = DRM_PLANE_TYPE_PRIMARY; + else + type = DRM_PLANE_TYPE_OVERLAY; + + ret = drm_universal_plane_init(drm_dev, &layer->drm_plane, 0, + &logicvc_plane_funcs, formats->formats, + formats_count, NULL, type, NULL); + if (ret) { + drm_err(drm_dev, "Failed to initialize layer plane\n"); + return ret; + } + + drm_plane_helper_add(&layer->drm_plane, &logicvc_plane_helper_funcs); + + zpos = logicvc->config.layers_count - index - 1; + DRM_DEBUG_DRIVER("Giving layer #%d zpos %d\n", index, zpos); + + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) + drm_plane_create_alpha_property(&layer->drm_plane); + + drm_plane_create_zpos_immutable_property(&layer->drm_plane, zpos); + + DRM_DEBUG_DRIVER("Registering layer #%d\n", index); + + layer->formats = formats; + + list_add_tail(&layer->list, &logicvc->layers_list); + + return 0; + +error: + if (layer) + devm_kfree(dev, layer); + + return ret; +} + +static void logicvc_layer_fini(struct logicvc_drm *logicvc, + struct logicvc_layer *layer) +{ + struct device *dev = logicvc->drm_dev.dev; + + list_del(&layer->list); + devm_kfree(dev, layer); +} + +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc) +{ + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); + struct logicvc_layer *layer; + + list_for_each_entry(layer, &logicvc->layers_list, list) { + if (layer->drm_plane.type != DRM_PLANE_TYPE_OVERLAY) + continue; + + layer->drm_plane.possible_crtcs = possible_crtcs; + } +} + +int logicvc_layers_init(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct device *dev = drm_dev->dev; + struct device_node *of_node = dev->of_node; + struct device_node *layer_node = NULL; + struct device_node *layers_node; + struct logicvc_layer *layer; + struct logicvc_layer *next; + int ret = 0; + + layers_node = of_get_child_by_name(of_node, "layers"); + if (!layers_node) { + DRM_ERROR("No layers node found in the description\n"); + ret = -ENODEV; + goto error; + } + + for_each_child_of_node(layers_node, layer_node) { + u32 index = 0; + + if (!logicvc_of_node_is_layer(layer_node)) + continue; + + ret = of_property_read_u32(layer_node, "reg", &index); + if (ret) + continue; + + layer = logicvc_layer_get_from_index(logicvc, index); + if (layer) { + DRM_ERROR("Duplicated entry for layer #%d\n", index); + continue; + } + + ret = logicvc_layer_init(logicvc, layer_node, index); + if (ret) + goto error; + + of_node_put(layer_node); + } + + of_node_put(layers_node); + + return 0; + +error: + list_for_each_entry_safe(layer, next, &logicvc->layers_list, list) + logicvc_layer_fini(logicvc, layer); + + return ret; +} diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.h b/drivers/gpu/drm/logicvc/logicvc_layer.h new file mode 100644 index 000000000000..c5767c81f446 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_layer.h @@ -0,0 +1,64 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_LAYER_H_ +#define _LOGICVC_LAYER_H_ + +#include <linux/of.h> +#include <linux/types.h> +#include <drm/drm_plane.h> + +#define LOGICVC_LAYER_COLORSPACE_RGB 0 +#define LOGICVC_LAYER_COLORSPACE_YUV 1 + +#define LOGICVC_LAYER_ALPHA_LAYER 0 +#define LOGICVC_LAYER_ALPHA_PIXEL 1 + +struct logicvc_layer_buffer_setup { + u8 buffer_sel; + u16 voffset; + u16 hoffset; +}; + +struct logicvc_layer_config { + u32 colorspace; + u32 depth; + u32 alpha_mode; + u32 base_offset; + u32 buffer_offset; + bool primary; +}; + +struct logicvc_layer_formats { + u32 colorspace; + u32 depth; + bool alpha; + uint32_t *formats; +}; + +struct logicvc_layer { + struct logicvc_layer_config config; + struct logicvc_layer_formats *formats; + struct device_node *of_node; + + struct drm_plane drm_plane; + struct list_head list; + u32 index; +}; + +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, + struct logicvc_layer *layer, + struct drm_plane_state *state, + struct logicvc_layer_buffer_setup *setup); +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, + u32 index); +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, + enum drm_plane_type type); +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc); +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc); +int logicvc_layers_init(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.c b/drivers/gpu/drm/logicvc/logicvc_mode.c new file mode 100644 index 000000000000..aa8f35b64c75 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_mode.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <linux/types.h> + +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_drv.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> +#include <drm/drm_mode_config.h> +#include <drm/drm_panel.h> +#include <drm/drm_print.h> +#include <drm/drm_probe_helper.h> +#include <drm/drm_vblank.h> + +#include "logicvc_drm.h" +#include "logicvc_interface.h" +#include "logicvc_layer.h" +#include "logicvc_mode.h" + +static void logicvc_mode_atomic_commit_tail(struct drm_atomic_state *old_state) +{ + struct drm_device *drm_dev = old_state->dev; + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); + struct logicvc_interface *interface = logicvc->interface; + + drm_atomic_helper_commit_tail(old_state); + + /* Enable the panel after the first commit, which concerns our panel + * since we only support a single interface. */ + if (interface->drm_panel && !interface->drm_panel_enabled) { + drm_panel_enable(interface->drm_panel); + interface->drm_panel_enabled = true; + } +} + +static const struct drm_mode_config_helper_funcs logicvc_mode_config_helper_funcs = { + .atomic_commit_tail = logicvc_mode_atomic_commit_tail, +}; + +static const struct drm_mode_config_funcs logicvc_mode_config_funcs = { + .fb_create = drm_gem_fb_create, + .output_poll_changed = drm_fb_helper_output_poll_changed, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +int logicvc_mode_init(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + struct drm_mode_config *mode_config = &drm_dev->mode_config; + struct logicvc_layer *layer_primary; + uint32_t preferred_depth; + int ret; + + ret = drm_vblank_init(drm_dev, mode_config->num_crtc); + if (ret) { + drm_err(drm_dev, "Failed to initialize vblank\n"); + return ret; + } + + layer_primary = logicvc_layer_get_primary(logicvc); + if (!layer_primary) { + drm_err(drm_dev, "Failed to get primary layer\n"); + return -EINVAL; + } + + preferred_depth = layer_primary->formats->depth; + + /* DRM counts alpha in depth, our driver doesn't. */ + if (layer_primary->formats->alpha) + preferred_depth += 8; + + mode_config->min_width = 64; + mode_config->max_width = 2048; + mode_config->min_height = 1; + mode_config->max_height = 2048; + mode_config->preferred_depth = preferred_depth; + mode_config->funcs = &logicvc_mode_config_funcs; + mode_config->helper_private = &logicvc_mode_config_helper_funcs; + + drm_mode_config_reset(drm_dev); + + drm_kms_helper_poll_init(drm_dev); + + return 0; +} + +void logicvc_mode_fini(struct logicvc_drm *logicvc) +{ + struct drm_device *drm_dev = &logicvc->drm_dev; + + drm_kms_helper_poll_fini(drm_dev); +} diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.h b/drivers/gpu/drm/logicvc/logicvc_mode.h new file mode 100644 index 000000000000..690def1619a6 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_mode.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_MODE_H_ +#define _LOGICVC_MODE_H_ + +struct logicvc_drm; + +int logicvc_mode_init(struct logicvc_drm *logicvc); +void logicvc_mode_fini(struct logicvc_drm *logicvc); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_of.c b/drivers/gpu/drm/logicvc/logicvc_of.c new file mode 100644 index 000000000000..a7071d2fc35f --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_of.c @@ -0,0 +1,197 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#include <drm/drm_print.h> + +#include "logicvc_drm.h" +#include "logicvc_layer.h" +#include "logicvc_of.h" + +static struct logicvc_of_property_sv logicvc_of_display_interface_sv[] = { + { "lvds-4bits", LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS }, + { "lvds-3bits", LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS }, + { }, +}; + +static struct logicvc_of_property_sv logicvc_of_display_colorspace_sv[] = { + { "rgb", LOGICVC_DISPLAY_COLORSPACE_RGB }, + { "yuv422", LOGICVC_DISPLAY_COLORSPACE_YUV422 }, + { "yuv444", LOGICVC_DISPLAY_COLORSPACE_YUV444 }, + { }, +}; + +static struct logicvc_of_property_sv logicvc_of_layer_colorspace_sv[] = { + { "rgb", LOGICVC_LAYER_COLORSPACE_RGB }, + { "yuv", LOGICVC_LAYER_COLORSPACE_YUV }, + { }, +}; + +static struct logicvc_of_property_sv logicvc_of_layer_alpha_mode_sv[] = { + { "layer", LOGICVC_LAYER_ALPHA_LAYER }, + { "pixel", LOGICVC_LAYER_ALPHA_PIXEL }, + { }, +}; + +static struct logicvc_of_property logicvc_of_properties[] = { + [LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE] = { + .name = "xylon,display-interface", + .sv = logicvc_of_display_interface_sv, + .range = { + LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS, + LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS, + }, + }, + [LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE] = { + .name = "xylon,display-colorspace", + .sv = logicvc_of_display_colorspace_sv, + .range = { + LOGICVC_DISPLAY_COLORSPACE_RGB, + LOGICVC_DISPLAY_COLORSPACE_YUV444, + }, + }, + [LOGICVC_OF_PROPERTY_DISPLAY_DEPTH] = { + .name = "xylon,display-depth", + .range = { 8, 24 }, + }, + [LOGICVC_OF_PROPERTY_ROW_STRIDE] = { + .name = "xylon,row-stride", + }, + [LOGICVC_OF_PROPERTY_DITHERING] = { + .name = "xylon,dithering", + .optional = true, + }, + [LOGICVC_OF_PROPERTY_BACKGROUND_LAYER] = { + .name = "xylon,background-layer", + .optional = true, + }, + [LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE] = { + .name = "xylon,layers-configurable", + .optional = true, + }, + [LOGICVC_OF_PROPERTY_LAYERS_COUNT] = { + .name = "xylon,layers-count", + }, + [LOGICVC_OF_PROPERTY_LAYER_DEPTH] = { + .name = "xylon,layer-depth", + .range = { 8, 24 }, + }, + [LOGICVC_OF_PROPERTY_LAYER_COLORSPACE] = { + .name = "xylon,layer-colorspace", + .sv = logicvc_of_layer_colorspace_sv, + .range = { + LOGICVC_LAYER_COLORSPACE_RGB, + LOGICVC_LAYER_COLORSPACE_RGB, + }, + }, + [LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE] = { + .name = "xylon,layer-alpha-mode", + .sv = logicvc_of_layer_alpha_mode_sv, + .range = { + LOGICVC_LAYER_ALPHA_LAYER, + LOGICVC_LAYER_ALPHA_PIXEL, + }, + }, + [LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET] = { + .name = "xylon,layer-base-offset", + }, + [LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET] = { + .name = "xylon,layer-buffer-offset", + }, + [LOGICVC_OF_PROPERTY_LAYER_PRIMARY] = { + .name = "xylon,layer-primary", + .optional = true, + }, +}; + +static int logicvc_of_property_sv_value(struct logicvc_of_property_sv *sv, + const char *string, u32 *value) +{ + unsigned int i = 0; + + while (sv[i].string) { + if (!strcmp(sv[i].string, string)) { + *value = sv[i].value; + return 0; + } + + i++; + } + + return -EINVAL; +} + +int logicvc_of_property_parse_u32(struct device_node *of_node, + unsigned int index, u32 *target) +{ + struct logicvc_of_property *property; + const char *string; + u32 value; + int ret; + + if (index >= LOGICVC_OF_PROPERTY_MAXIMUM) + return -EINVAL; + + property = &logicvc_of_properties[index]; + + if (!property->optional && + !of_property_read_bool(of_node, property->name)) { + DRM_ERROR("Missing non-optional OF property %s\n", + property->name); + return -ENODEV; + } + + if (property->sv) { + ret = of_property_read_string(of_node, property->name, &string); + if (ret) { + DRM_ERROR("Failed to read OF property %s\n", + property->name); + return ret; + } + + ret = logicvc_of_property_sv_value(property->sv, string, + &value); + if (ret) { + DRM_ERROR("Failed to match OF string %s\n", + property->name); + return ret; + } + } else { + ret = of_property_read_u32(of_node, property->name, &value); + if (ret) { + DRM_ERROR("Failed to read OF property %s\n", + property->name); + return ret; + } + } + + if (property->range[0] || property->range[1]) + if (value < property->range[0] || value > property->range[1]) + return -ERANGE; + + *target = value; + + return 0; +} + +void logicvc_of_property_parse_bool(struct device_node *of_node, + unsigned int index, bool *target) +{ + struct logicvc_of_property *property; + + if (index >= LOGICVC_OF_PROPERTY_MAXIMUM) { + /* Fallback. */ + *target = false; + return; + } + + property = &logicvc_of_properties[index]; + *target = of_property_read_bool(of_node, property->name); +} + +bool logicvc_of_node_is_layer(struct device_node *of_node) +{ + return !of_node_cmp(of_node->name, "layer"); +} diff --git a/drivers/gpu/drm/logicvc/logicvc_of.h b/drivers/gpu/drm/logicvc/logicvc_of.h new file mode 100644 index 000000000000..018731d411f6 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_of.h @@ -0,0 +1,46 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + */ + +#ifndef _LOGICVC_OF_H_ +#define _LOGICVC_OF_H_ + +enum logicvc_of_property_index { + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE = 0, + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, + LOGICVC_OF_PROPERTY_ROW_STRIDE, + LOGICVC_OF_PROPERTY_DITHERING, + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, + LOGICVC_OF_PROPERTY_LAYERS_COUNT, + LOGICVC_OF_PROPERTY_LAYER_DEPTH, + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, + LOGICVC_OF_PROPERTY_MAXIMUM, +}; + +struct logicvc_of_property_sv { + const char *string; + u32 value; +}; + +struct logicvc_of_property { + char *name; + bool optional; + struct logicvc_of_property_sv *sv; + u32 range[2]; +}; + +int logicvc_of_property_parse_u32(struct device_node *of_node, + unsigned int index, u32 *target); +void logicvc_of_property_parse_bool(struct device_node *of_node, + unsigned int index, bool *target); +bool logicvc_of_node_is_layer(struct device_node *of_node); + +#endif diff --git a/drivers/gpu/drm/logicvc/logicvc_regs.h b/drivers/gpu/drm/logicvc/logicvc_regs.h new file mode 100644 index 000000000000..d0be5fe84856 --- /dev/null +++ b/drivers/gpu/drm/logicvc/logicvc_regs.h @@ -0,0 +1,88 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Bootlin + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> + * + * Copyright (C) 2014 Xylon d.o.o. + * Author: Davor Joja <davor.joja@logicbricks.com> + */ + +#ifndef _LOGICVC_REGS_H_ +#define _LOGICVC_REGS_H_ + +#define LOGICVC_FIELD_GET(field, value) \ + (((value) & field##_MASK) >> field##_SHIFT) +#define LOGICVC_FIELD_SET(field, value) \ + (((value) << field##_SHIFT) & field##_MASK) + +#define LOGICVC_DIMENSIONS_MAX (BIT(16) - 1) + +#define LOGICVC_HSYNC_FRONT_PORCH_REG 0x00 +#define LOGICVC_HSYNC_REG 0x08 +#define LOGICVC_HSYNC_BACK_PORCH_REG 0x10 +#define LOGICVC_HRES_REG 0x18 +#define LOGICVC_VSYNC_FRONT_PORCH_REG 0x20 +#define LOGICVC_VSYNC_REG 0x28 +#define LOGICVC_VSYNC_BACK_PORCH_REG 0x30 +#define LOGICVC_VRES_REG 0x38 + +#define LOGICVC_CTRL_REG 0x40 +#define LOGICVC_CTRL_CLOCK_INVERT BIT(8) +#define LOGICVC_CTRL_PIXEL_INVERT BIT(7) +#define LOGICVC_CTRL_DE_INVERT BIT(5) +#define LOGICVC_CTRL_DE_ENABLE BIT(4) +#define LOGICVC_CTRL_VSYNC_INVERT BIT(3) +#define LOGICVC_CTRL_VSYNC_ENABLE BIT(2) +#define LOGICVC_CTRL_HSYNC_INVERT BIT(1) +#define LOGICVC_CTRL_HSYNC_ENABLE BIT(0) + +#define LOGICVC_DTYPE_REG 0x48 +#define LOGICVC_BACKGROUND_COLOR_REG 0x50 + +#define LOGICVC_BUFFER_SEL_REG 0x58 +#define LOGICVC_BUFFER_SEL_VALUE(i, v) \ + (BIT(10 + (i)) | ((v) << (2 * (i)))) +#define LOGICVC_BUFFER_SEL_MAX 2 + +#define LOGICVC_DOUBLE_CLUT_REG 0x60 + +#define LOGICVC_INT_STAT_REG 0x68 +#define LOGICVC_INT_STAT_V_SYNC BIT(5) + +#define LOGICVC_INT_MASK_REG 0x70 +#define LOGICVC_INT_MASK_V_SYNC BIT(5) + +#define LOGICVC_POWER_CTRL_REG 0x78 +#define LOGICVC_POWER_CTRL_BACKLIGHT_ENABLE BIT(0) +#define LOGICVC_POWER_CTRL_VDD_ENABLE BIT(1) +#define LOGICVC_POWER_CTRL_VEE_ENABLE BIT(2) +#define LOGICVC_POWER_CTRL_VIDEO_ENABLE BIT(3) + +#define LOGICVC_IP_VERSION_REG 0xf8 +#define LOGICVC_IP_VERSION_MAJOR_MASK GENMASK(16, 11) +#define LOGICVC_IP_VERSION_MAJOR_SHIFT 11 +#define LOGICVC_IP_VERSION_MINOR_MASK GENMASK(10, 5) +#define LOGICVC_IP_VERSION_MINOR_SHIFT 5 +#define LOGICVC_IP_VERSION_LEVEL_MASK GENMASK(4, 0) +#define LOGICVC_IP_VERSION_LEVEL_SHIFT 0 + +#define LOGICVC_LAYER_ADDRESS_REG(i) (0x100 + (i) * 0x80) +#define LOGICVC_LAYER_HOFFSET_REG(i) (0x100 + (i) * 0x80) + +#define LOGICVC_LAYER_VOFFSET_REG(i) (0x108 + (i) * 0x80) +#define LOGICVC_LAYER_VOFFSET_MAX 4095 + +#define LOGICVC_LAYER_HPOSITION_REG(i) (0x110 + (i) * 0x80) +#define LOGICVC_LAYER_VPOSITION_REG(i) (0x118 + (i) * 0x80) +#define LOGICVC_LAYER_WIDTH_REG(i) (0x120 + (i) * 0x80) +#define LOGICVC_LAYER_HEIGHT_REG(i) (0x128 + (i) * 0x80) +#define LOGICVC_LAYER_ALPHA_REG(i) (0x130 + (i) * 0x80) + +#define LOGICVC_LAYER_CTRL_REG(i) (0x138 + (i) * 0x80) +#define LOGICVC_LAYER_CTRL_ENABLE BIT(0) +#define LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE BIT(1) +#define LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT BIT(4) + +#define LOGICVC_LAYER_COLOR_KEY_REG(i) (0x140 + (i) * 0x80) + +#endif -- 2.28.0 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller 2020-11-02 15:53 ` Paul Kocialkowski @ 2020-11-03 9:46 ` Maxime Ripard -1 siblings, 0 replies; 15+ messages in thread From: Maxime Ripard @ 2020-11-03 9:46 UTC (permalink / raw) To: Paul Kocialkowski Cc: dri-devel, devicetree, linux-kernel, David Airlie, Daniel Vetter, Rob Herring, Maarten Lankhorst, Thomas Zimmermann, Thomas Petazzoni [-- Attachment #1: Type: text/plain, Size: 63273 bytes --] On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > Introduces a driver for the LogiCVC display controller, a programmable > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > Xilinx FPGAs. The controller is mostly configured at logic synthesis > time so only a subset of configuration is left for the driver to > handle. > > The following features are implemented and tested: > - LVDS 4-bit interface; > - RGB565 pixel formats; > - Multiple layers and hardware composition; > - Layer-wide alpha mode; > > The following features are implemented but untested: > - Other RGB pixel formats; > - Layer framebuffer configuration for version 4; > - Lowest-layer used as background color; > - Per-pixel alpha mode. > > The following features are not implemented: > - YUV pixel formats; > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > - External parallel input for layer; > - Color-keying; > - LUT-based alpha modes. > > Additional implementation-specific notes: > - Panels are only enabled after the first page flip to avoid flashing a > white screen. > - Depth used in context of the LogiCVC driver only counts color components > to match the definition of the synthesis parameters. > > Support is implemented for both version 3 and 4 of the controller. > > With version 3, framebuffers are stored in a dedicated contiguous > memory area, with a base address hardcoded for each layer. This requires > using a dedicated CMA pool registered at the base address and tweaking a > few offset-related registers to try to use any buffer allocated from > the pool. This is done on a best-effort basis to have the hardware cope > with the DRM framebuffer allocation model and there is no guarantee > that each buffer allocated by GEM CMA can be used for any layer. > In particular, buffers allocated below the base address for a layer are > guaranteed not to be configurable for that layer. See the implementation of > logicvc_layer_buffer_find_setup for specifics. > > Version 4 allows configuring each buffer address directly, which > guarantees that any buffer can be configured. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > Reviewed-by: Maxime Ripard <mripard@kernel.org> There's a bunch of checkpatch issues here > --- > MAINTAINERS | 6 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/logicvc/Kconfig | 9 + > drivers/gpu/drm/logicvc/Makefile | 4 + > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > 18 files changed, 2236 insertions(+) > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > create mode 100644 drivers/gpu/drm/logicvc/Makefile > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 71e29dc0ab9d..9c4c5edef0ba 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > F: drivers/gpu/drm/i810/ > F: include/uapi/drm/i810_drm.h > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > +T: git git://anongit.freedesktop.org/drm/drm-misc > +S: Supported > +F: drivers/gpu/drm/logicvc/ > + Do you have the rights to commit in drm-misc or will you need it? > +static int logicvc_crtc_atomic_check(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_new_crtc_state(state, drm_crtc); > + struct drm_display_mode *mode = &crtc_state->adjusted_mode; > + > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > + return -EINVAL; > + > + return 0; > +} You probably want to have a mode_valid here to check for this as well, it would be weird to expose a mode that we outright reject. > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_old_crtc_state(state, drm_crtc); > + struct drm_device *drm_dev = drm_crtc->dev; > + unsigned long flags; > + > + /* Register pending event, only if vblank is already on. */ > + if (drm_crtc->state->event && crtc_state->active) { > + spin_lock_irqsave(&drm_dev->event_lock, flags); > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > + > + crtc->event = drm_crtc->state->event; > + drm_crtc->state->event = NULL; > + > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > + } > +} That's unusual to do it in atomic_begin, why do you need it? > +static void logicvc_crtc_atomic_enable(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; You should use drm_atomic_get_new_crtc_state here, we're removing the direct references of crtc->state to make it more obvious if we're using the old or new state. > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_old_crtc_state(state, drm_crtc); > + struct drm_device *drm_dev = drm_crtc->dev; > + unsigned int hact, hfp, hsl, hbp; > + unsigned int vact, vfp, vsl, vbp; > + unsigned long flags; > + u32 ctrl; > + > + /* Timings */ > + > + hact = mode->hdisplay; > + hfp = mode->hsync_start - mode->hdisplay; > + hsl = mode->hsync_end - mode->hsync_start; > + hbp = mode->htotal - mode->hsync_end; > + > + vact = mode->vdisplay; > + vfp = mode->vsync_start - mode->vdisplay; > + vsl = mode->vsync_end - mode->vsync_start; > + vbp = mode->vtotal - mode->vsync_end; > + > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_FRONT_PORCH_REG, hfp - 1); > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_REG, hsl - 1); > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_BACK_PORCH_REG, hbp - 1); > + regmap_write(logicvc->regmap, LOGICVC_HRES_REG, hact - 1); > + > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_FRONT_PORCH_REG, vfp - 1); > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_REG, vsl - 1); > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_BACK_PORCH_REG, vbp - 1); > + regmap_write(logicvc->regmap, LOGICVC_VRES_REG, vact - 1); > + > + /* Signals */ > + > + ctrl = LOGICVC_CTRL_HSYNC_ENABLE | LOGICVC_CTRL_VSYNC_ENABLE | > + LOGICVC_CTRL_DE_ENABLE; > + > + if (mode->flags & DRM_MODE_FLAG_NHSYNC) > + ctrl |= LOGICVC_CTRL_HSYNC_INVERT; > + > + if (mode->flags & DRM_MODE_FLAG_NVSYNC) > + ctrl |= LOGICVC_CTRL_VSYNC_INVERT; > + > + if (logicvc->interface) { > + struct drm_connector *connector = > + &logicvc->interface->drm_connector; > + struct drm_display_info *display_info = > + &connector->display_info; > + > + if (display_info->bus_flags & DRM_BUS_FLAG_DE_LOW) > + ctrl |= LOGICVC_CTRL_DE_INVERT; > + > + if (display_info->bus_flags & > + DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) > + ctrl |= LOGICVC_CTRL_CLOCK_INVERT; > + } > + > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > + LOGICVC_CTRL_HSYNC_ENABLE | > + LOGICVC_CTRL_HSYNC_INVERT | > + LOGICVC_CTRL_VSYNC_ENABLE | > + LOGICVC_CTRL_VSYNC_INVERT | > + LOGICVC_CTRL_DE_ENABLE | > + LOGICVC_CTRL_DE_INVERT | > + LOGICVC_CTRL_PIXEL_INVERT | > + LOGICVC_CTRL_CLOCK_INVERT, ctrl); > + > + /* Generate internal state reset. */ > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > + > + drm_crtc_vblank_on(drm_crtc); > + > + /* Register our event after vblank is enabled. */ > + if (drm_crtc->state->event && !crtc_state->active) { > + spin_lock_irqsave(&drm_dev->event_lock, flags); > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > + > + crtc->event = drm_crtc->state->event; > + drm_crtc->state->event = NULL; > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > + } Haven't you done that in atomic_begin already? > +} > + > +static void logicvc_crtc_atomic_disable(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + struct drm_device *drm_dev = drm_crtc->dev; > + > + drm_crtc_vblank_off(drm_crtc); > + > + /* Disable and clear CRTC bits. */ > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > + LOGICVC_CTRL_HSYNC_ENABLE | > + LOGICVC_CTRL_HSYNC_INVERT | > + LOGICVC_CTRL_VSYNC_ENABLE | > + LOGICVC_CTRL_VSYNC_INVERT | > + LOGICVC_CTRL_DE_ENABLE | > + LOGICVC_CTRL_DE_INVERT | > + LOGICVC_CTRL_PIXEL_INVERT | > + LOGICVC_CTRL_CLOCK_INVERT, 0); > + > + /* Generate internal state reset. */ > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > + > + /* Consume leftover event since vblank is now disabled. */ > + if (drm_crtc->state->event && !drm_crtc->state->active) { > + spin_lock_irq(&drm_dev->event_lock); > + > + drm_crtc_send_vblank_event(drm_crtc, drm_crtc->state->event); > + drm_crtc->state->event = NULL; > + spin_unlock_irq(&drm_dev->event_lock); > + } And here too. It's definitely worth explaining in the commit log and / or comments what you're trying to address. > +} > + > +static const struct drm_crtc_helper_funcs logicvc_crtc_helper_funcs = { > + .atomic_check = logicvc_crtc_atomic_check, > + .atomic_begin = logicvc_crtc_atomic_begin, > + .atomic_enable = logicvc_crtc_atomic_enable, > + .atomic_disable = logicvc_crtc_atomic_disable, > +}; > + > +static int logicvc_crtc_enable_vblank(struct drm_crtc *drm_crtc) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + > + /* Clear any pending V_SYNC interrupt. */ > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_STAT_REG, > + LOGICVC_INT_STAT_V_SYNC, LOGICVC_INT_STAT_V_SYNC); > + > + /* Unmask V_SYNC interrupt. */ > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > + LOGICVC_INT_MASK_V_SYNC, 0); > + > + return 0; > +} > + > +static void logicvc_crtc_disable_vblank(struct drm_crtc *drm_crtc) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + > + /* Mask V_SYNC interrupt. */ > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > + LOGICVC_INT_MASK_V_SYNC, LOGICVC_INT_MASK_V_SYNC); > +} > + > +static const struct drm_crtc_funcs logicvc_crtc_funcs = { > + .reset = drm_atomic_helper_crtc_reset, > + .destroy = drm_crtc_cleanup, > + .set_config = drm_atomic_helper_set_config, > + .page_flip = drm_atomic_helper_page_flip, > + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > + .enable_vblank = logicvc_crtc_enable_vblank, > + .disable_vblank = logicvc_crtc_disable_vblank, > +}; > + > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct logicvc_crtc *crtc = logicvc->crtc; > + unsigned long flags; > + > + if (!crtc) > + return; > + > + drm_crtc_handle_vblank(&crtc->drm_crtc); > + > + if (crtc->event) { > + spin_lock_irqsave(&drm_dev->event_lock, flags); > + drm_crtc_send_vblank_event(&crtc->drm_crtc, crtc->event); > + drm_crtc_vblank_put(&crtc->drm_crtc); > + crtc->event = NULL; > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > + } > +} > + > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct logicvc_crtc *crtc; > + struct logicvc_layer *layer_primary; > + int ret; > + > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > + if (!crtc) > + return -ENOMEM; > + > + layer_primary = logicvc_layer_get_primary(logicvc); > + if (!layer_primary) { > + DRM_ERROR("Failed to get primary layer\n"); > + return -EINVAL; > + } > + > + ret = drm_crtc_init_with_planes(drm_dev, &crtc->drm_crtc, > + &layer_primary->drm_plane, NULL, > + &logicvc_crtc_funcs, NULL); > + if (ret) { > + DRM_ERROR("Failed to initalize CRTC\n"); > + return ret; > + } > + > + drm_crtc_helper_add(&crtc->drm_crtc, &logicvc_crtc_helper_funcs); > + > + crtc->drm_crtc.port = of_graph_get_port_by_id(of_node, 1); > + > + logicvc->crtc = crtc; > + > + return 0; > +} > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.h b/drivers/gpu/drm/logicvc/logicvc_crtc.h > new file mode 100644 > index 000000000000..6a1291c37704 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.h > @@ -0,0 +1,21 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_CRTC_H_ > +#define _LOGICVC_CRTC_H_ > + > +struct drm_pending_vblank_event; > +struct logicvc_drm; > + > +struct logicvc_crtc { > + struct drm_crtc drm_crtc; > + struct drm_pending_vblank_event *event; > +}; > + > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc); > +int logicvc_crtc_init(struct logicvc_drm *logicvc); > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.c b/drivers/gpu/drm/logicvc/logicvc_drm.c > new file mode 100644 > index 000000000000..b73e92fb2026 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.c > @@ -0,0 +1,472 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/clk.h> > +#include <linux/mfd/syscon.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_address.h> > +#include <linux/of_device.h> > +#include <linux/of_reserved_mem.h> > +#include <linux/regmap.h> > +#include <linux/types.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_print.h> > + > +#include "logicvc_crtc.h" > +#include "logicvc_drm.h" > +#include "logicvc_interface.h" > +#include "logicvc_mode.h" > +#include "logicvc_layer.h" > +#include "logicvc_of.h" > +#include "logicvc_regs.h" > + > +DEFINE_DRM_GEM_CMA_FOPS(logicvc_drm_fops); > + > +static int logicvc_drm_gem_cma_dumb_create(struct drm_file *file_priv, > + struct drm_device *drm_dev, > + struct drm_mode_create_dumb *args) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > + > + /* Stride is always fixed to its configuration value. */ > + args->pitch = logicvc->config.row_stride * DIV_ROUND_UP(args->bpp, 8); > + > + return drm_gem_cma_dumb_create_internal(file_priv, drm_dev, args); > +} > + > +static struct drm_driver logicvc_drm_driver = { > + .driver_features = DRIVER_GEM | DRIVER_MODESET | > + DRIVER_ATOMIC, > + > + .fops = &logicvc_drm_fops, > + .name = "logicvc-drm", > + .desc = "Xylon LogiCVC DRM driver", > + .date = "20200403", > + .major = 1, > + .minor = 0, > + > + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(logicvc_drm_gem_cma_dumb_create), > +}; > + > +static struct regmap_config logicvc_drm_regmap_config = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > + .name = "logicvc-drm", > +}; > + > +static irqreturn_t logicvc_drm_irq_handler(int irq, void *data) > +{ > + struct logicvc_drm *logicvc = data; > + irqreturn_t ret = IRQ_NONE; > + u32 stat = 0; > + > + /* Get pending interrupt sources. */ > + regmap_read(logicvc->regmap, LOGICVC_INT_STAT_REG, &stat); > + > + /* Clear all pending interrupt sources. */ > + regmap_write(logicvc->regmap, LOGICVC_INT_STAT_REG, stat); > + > + if (stat & LOGICVC_INT_STAT_V_SYNC) { > + logicvc_crtc_vblank_handler(logicvc); > + ret = IRQ_HANDLED; > + } > + > + return ret; > +} > + > +static int logicvc_drm_config_parse(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct logicvc_drm_config *config = &logicvc->config; > + struct device_node *layers_node; > + int ret; > + > + logicvc_of_property_parse_bool(of_node, LOGICVC_OF_PROPERTY_DITHERING, > + &config->dithering); > + logicvc_of_property_parse_bool(of_node, > + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, > + &config->background_layer); > + logicvc_of_property_parse_bool(of_node, > + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, > + &config->layers_configurable); > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE, > + &config->display_interface); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, > + &config->display_colorspace); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, > + &config->display_depth); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_ROW_STRIDE, > + &config->row_stride); > + if (ret) > + return ret; > + > + layers_node = of_get_child_by_name(of_node, "layers"); > + if (!layers_node) { > + DRM_ERROR("Missing non-optional layers node\n"); > + return -EINVAL; > + } > + > + config->layers_count = of_get_child_count(layers_node); > + if (!config->layers_count) { > + DRM_ERROR("Missing a non-optional layers children node\n"); > + return -EINVAL; > + } > + > + return 0; > +} > + > +static void logicvc_version_print(struct logicvc_drm *logicvc) > +{ > + u32 version; > + > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > + > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > + 'a'); DRM_DEV_INFO? > +} > + > +static int logicvc_clocks_prepare(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + > + struct { > + struct clk **clk; > + char *name; > + bool optional; > + } clocks_map[] = { > + { > + .clk = &logicvc->vclk, > + .name = "vclk", > + .optional = false, > + }, > + { > + .clk = &logicvc->vclk2, > + .name = "vclk2", > + .optional = true, > + }, > + { > + .clk = &logicvc->lvdsclk, > + .name = "lvdsclk", > + .optional = true, > + }, > + { > + .clk = &logicvc->lvdsclkn, > + .name = "lvdsclkn", > + .optional = true, > + }, > + }; > + unsigned int i; > + int ret; > + > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > + struct clk *clk; > + > + clk = devm_clk_get(dev, clocks_map[i].name); > + if (IS_ERR(clk)) { > + if (PTR_ERR(clk) == -ENOENT && clocks_map[i].optional) > + continue; > + > + DRM_ERROR("Missing non-optional clock %s\n", > + clocks_map[i].name); > + > + ret = PTR_ERR(clk); > + goto error; > + } > + > + ret = clk_prepare_enable(clk); > + if (ret) { > + DRM_ERROR("Failed to prepare and enable clock %s\n", > + clocks_map[i].name); > + goto error; > + } > + > + *clocks_map[i].clk = clk; > + } > + > + return 0; > + > +error: > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > + if (!*clocks_map[i].clk) > + continue; > + > + clk_disable_unprepare(*clocks_map[i].clk); > + *clocks_map[i].clk = NULL; > + } > + > + return ret; > +} > + > +static int logicvc_clocks_unprepare(struct logicvc_drm *logicvc) > +{ > + struct clk **clocks[] = { > + &logicvc->vclk, > + &logicvc->vclk2, > + &logicvc->lvdsclk, > + &logicvc->lvdsclkn, > + }; > + unsigned int i; > + > + for (i = 0; i < ARRAY_SIZE(clocks); i++) { > + if (!*clocks[i]) > + continue; > + > + clk_disable_unprepare(*clocks[i]); > + *clocks[i] = NULL; > + } > + > + return 0; > +} > + > +static int logicvc_drm_probe(struct platform_device *pdev) > +{ > + struct device_node *of_node = pdev->dev.of_node; > + struct device_node *reserved_mem_node; > + struct reserved_mem *reserved_mem = NULL; > + const struct logicvc_drm_caps *caps; > + struct logicvc_drm *logicvc; > + struct device *dev = &pdev->dev; > + struct drm_device *drm_dev; > + struct regmap *regmap; > + struct resource res; > + void __iomem *base; > + int irq; > + int ret; > + > + caps = of_device_get_match_data(dev); > + if (!caps) > + return -EINVAL; > + > + ret = of_reserved_mem_device_init(dev); > + if (ret && ret != -ENODEV) { > + dev_err(dev, "Failed to init memory region\n"); > + goto error_early; > + } > + > + reserved_mem_node = of_parse_phandle(of_node, "memory-region", 0); > + if (reserved_mem_node) { > + reserved_mem = of_reserved_mem_lookup(reserved_mem_node); > + of_node_put(reserved_mem_node); > + } > + > + /* Get regmap from syscon first if available. */ > + regmap = syscon_regmap_lookup_by_phandle(of_node, "xylon,syscon"); > + > + /* Then get regmap from parent if available. */ > + if (IS_ERR(regmap) && of_node->parent) > + regmap = syscon_node_to_regmap(of_node->parent); > + > + /* Register our own regmap otherwise. */ > + if (IS_ERR(regmap)) { > + ret = of_address_to_resource(of_node, 0, &res); > + if (ret) { > + dev_err(dev, "Failed to get resource from address\n"); > + goto error_reserved_mem; > + } > + > + base = devm_ioremap_resource(dev, &res); > + if (IS_ERR(base)) { > + dev_err(dev, "Failed to map I/O base\n"); > + ret = PTR_ERR(base); > + goto error_reserved_mem; > + } > + > + logicvc_drm_regmap_config.max_register = resource_size(&res) - > + 4; > + > + regmap = devm_regmap_init_mmio(dev, base, > + &logicvc_drm_regmap_config); > + if (IS_ERR(regmap)) { > + dev_err(dev, "Failed to create regmap for I/O\n"); > + ret = PTR_ERR(regmap); > + goto error_reserved_mem; > + } > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + ret = -ENODEV; > + goto error_reserved_mem; > + } > + > + logicvc = devm_drm_dev_alloc(dev, &logicvc_drm_driver, > + struct logicvc_drm, drm_dev); > + if (IS_ERR(logicvc)) { > + ret = PTR_ERR(logicvc); > + goto error_reserved_mem; > + } > + > + platform_set_drvdata(pdev, logicvc); > + drm_dev = &logicvc->drm_dev; > + > + logicvc->caps = caps; > + logicvc->regmap = regmap; > + INIT_LIST_HEAD(&logicvc->layers_list); > + > + if (reserved_mem) > + logicvc->reserved_mem_base = reserved_mem->base; > + > + ret = logicvc_clocks_prepare(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to prepare clocks\n"); > + goto error_logicvc; > + } > + > + ret = devm_request_irq(dev, irq, logicvc_drm_irq_handler, 0, > + dev_name(dev), logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to request IRQ\n"); > + goto error_clocks; > + } have you considered drm_irq_install? > + > + logicvc_version_print(logicvc); > + > + ret = logicvc_drm_config_parse(logicvc); > + if (ret && ret != -ENODEV) { > + drm_err(drm_dev, "Failed to parse config\n"); > + goto error_clocks; > + } > + > + drm_mode_config_init(drm_dev); You're supposed to call drm_mode_config_cleanup when using drm_mode_config_init. You'd be better off switching to drmm_mode_config_init though. > + ret = logicvc_layers_init(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize layers\n"); > + goto error_clocks; > + } > + > + ret = logicvc_crtc_init(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize CRTC\n"); > + goto error_clocks; > + } > + > + logicvc_layers_attach_crtc(logicvc); > + > + ret = logicvc_interface_init(logicvc); > + if (ret) { > + if (ret != -EPROBE_DEFER) > + drm_err(drm_dev, "Failed to initialize interface\n"); > + > + goto error_clocks; > + } > + > + logicvc_interface_attach_crtc(logicvc); > + > + ret = logicvc_mode_init(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize KMS\n"); > + goto error_clocks; > + } > + > + ret = drm_dev_register(drm_dev, 0); > + if (ret) { > + drm_err(drm_dev, "Failed to register DRM device\n"); > + goto error_mode; > + } > + > + drm_fbdev_generic_setup(drm_dev, drm_dev->mode_config.preferred_depth); > + > + return 0; > + > +error_mode: > + logicvc_mode_fini(logicvc); > + > +error_clocks: > + logicvc_clocks_unprepare(logicvc); > + > +error_logicvc: > + drm_dev_put(drm_dev); You don't need drm_dev_put with devm_drm_dev_alloc > +error_reserved_mem: > + of_reserved_mem_device_release(dev); > + > +error_early: > + return ret; > +} > + > +static int logicvc_drm_remove(struct platform_device *pdev) > +{ > + struct logicvc_drm *logicvc = platform_get_drvdata(pdev); > + struct device *dev = &pdev->dev; > + struct drm_device *drm_dev = &logicvc->drm_dev; > + > + drm_dev_unregister(drm_dev); > + drm_atomic_helper_shutdown(drm_dev); > + > + logicvc_mode_fini(logicvc); > + > + logicvc_clocks_unprepare(logicvc); > + > + drm_dev_put(drm_dev); Ditto > + of_reserved_mem_device_release(dev); > + > + return 0; > +} > + > +static const struct logicvc_drm_caps logicvc_drm_caps_3 = { > + .layer_address = false, > +}; > + > +static const struct logicvc_drm_caps logicvc_drm_caps_4 = { > + .layer_address = true, > +}; > + > +static struct of_device_id logicvc_drm_of_table[] = { > + { > + .compatible = "xylon,logicvc-3.02.a-display", > + .data = &logicvc_drm_caps_3, > + }, > + { > + .compatible = "xylon,logicvc-4.01.a-display", > + .data = &logicvc_drm_caps_4, > + }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, logicvc_drm_of_table); > + > +static struct platform_driver logicvc_drm_platform_driver = { > + .probe = logicvc_drm_probe, > + .remove = logicvc_drm_remove, > + .driver = { > + .name = "logicvc-drm", > + .of_match_table = logicvc_drm_of_table, > + }, > +}; > + > +module_platform_driver(logicvc_drm_platform_driver); > + > +MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>"); > +MODULE_DESCRIPTION("Xylon LogiCVC DRM driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h > new file mode 100644 > index 000000000000..68bbac6c4ab9 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.h > @@ -0,0 +1,64 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_DRM_H_ > +#define _LOGICVC_DRM_H_ > + > +#include <linux/regmap.h> > +#include <linux/types.h> > +#include <drm/drm_device.h> > + > +#define LOGICVC_DISPLAY_INTERFACE_RGB 0 > +#define LOGICVC_DISPLAY_INTERFACE_ITU656 1 > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS 2 > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA 3 > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS 4 > +#define LOGICVC_DISPLAY_INTERFACE_DVI 5 > + > +#define LOGICVC_DISPLAY_COLORSPACE_RGB 0 > +#define LOGICVC_DISPLAY_COLORSPACE_YUV422 1 > +#define LOGICVC_DISPLAY_COLORSPACE_YUV444 2 > + > +#define logicvc_drm(d) \ > + container_of(d, struct logicvc_drm, drm_dev) > + > +struct logicvc_crtc; > +struct logicvc_interface; > + > +struct logicvc_drm_config { > + u32 display_interface; > + u32 display_colorspace; > + u32 display_depth; > + u32 row_stride; > + bool dithering; > + bool background_layer; > + bool layers_configurable; > + u32 layers_count; > +}; > + > +struct logicvc_drm_caps { > + bool layer_address; > +}; > + > +struct logicvc_drm { > + const struct logicvc_drm_caps *caps; > + struct logicvc_drm_config config; > + > + struct drm_device drm_dev; > + phys_addr_t reserved_mem_base; > + struct regmap *regmap; > + > + struct clk *vclk; > + struct clk *vclk2; > + struct clk *lvdsclk; > + struct clk *lvdsclkn; > + > + struct list_head layers_list; > + struct logicvc_crtc *crtc; > + struct logicvc_interface *interface; > +}; > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.c b/drivers/gpu/drm/logicvc/logicvc_interface.c > new file mode 100644 > index 000000000000..0cfded3792d8 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.c > @@ -0,0 +1,224 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/types.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > +#include <drm/drm_connector.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_encoder.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_modeset_helper_vtables.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > + > +#include "logicvc_crtc.h" > +#include "logicvc_drm.h" > +#include "logicvc_interface.h" > +#include "logicvc_regs.h" > + > +#define logicvc_interface_from_drm_encoder(c) \ > + container_of(c, struct logicvc_interface, drm_encoder) > +#define logicvc_interface_from_drm_connector(c) \ > + container_of(c, struct logicvc_interface, drm_connector) > + > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > + struct logicvc_interface *interface = > + logicvc_interface_from_drm_encoder(drm_encoder); > + > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > + > + if (interface->drm_panel) { > + drm_panel_prepare(interface->drm_panel); > + > + /* Encoder enable is too early to enable the panel and a white > + * screen will be seen if the panel gets enabled before the > + * first page flip is done (and no other framebuffer > + * configuration remains from the boot software). */ > + interface->drm_panel_enabled = false; > + } > +} That's fishy (and the similar stuff in commit_tail). Is it because you need to have the CRTC powered before the encoder? If so, you should try the commit_tail_rpm variant, it makes sure the CRTC is powered on before making a commit. > +static void logicvc_encoder_disable(struct drm_encoder *drm_encoder) > +{ > + struct logicvc_interface *interface = > + logicvc_interface_from_drm_encoder(drm_encoder); > + > + if (interface->drm_panel) { > + drm_panel_disable(interface->drm_panel); > + drm_panel_unprepare(interface->drm_panel); > + } > +} > + > +static const struct drm_encoder_helper_funcs logicvc_encoder_helper_funcs = { > + .enable = logicvc_encoder_enable, > + .disable = logicvc_encoder_disable, > +}; > + > +static const struct drm_encoder_funcs logicvc_encoder_funcs = { > + .destroy = drm_encoder_cleanup, > +}; > + > +static int logicvc_connector_get_modes(struct drm_connector *drm_connector) > +{ > + struct logicvc_interface *interface = > + logicvc_interface_from_drm_connector(drm_connector); > + > + if (interface->drm_panel) > + return drm_panel_get_modes(interface->drm_panel, drm_connector); > + else > + WARN_ONCE(1, "Retrieving modes from a native connector is not implemented."); > + > + return 0; > +} > + > +static const struct drm_connector_helper_funcs logicvc_connector_helper_funcs = { > + .get_modes = logicvc_connector_get_modes, > +}; > + > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > +{ > + drm_connector_cleanup(drm_connector); > +} I guess you don't need that intermediate function? > +static const struct drm_connector_funcs logicvc_connector_funcs = { > + .reset = drm_atomic_helper_connector_reset, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = logicvc_connector_destroy, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int logicvc_interface_encoder_type(struct logicvc_drm *logicvc) > +{ > + switch (logicvc->config.display_interface) { > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > + return DRM_MODE_ENCODER_LVDS; > + case LOGICVC_DISPLAY_INTERFACE_DVI: > + return DRM_MODE_ENCODER_TMDS; > + case LOGICVC_DISPLAY_INTERFACE_RGB: > + return DRM_MODE_ENCODER_DPI; > + default: > + return DRM_MODE_ENCODER_NONE; > + } > +} > + > +static int logicvc_interface_connector_type(struct logicvc_drm *logicvc) > +{ > + switch (logicvc->config.display_interface) { > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > + return DRM_MODE_CONNECTOR_LVDS; > + case LOGICVC_DISPLAY_INTERFACE_DVI: > + return DRM_MODE_CONNECTOR_DVID; > + case LOGICVC_DISPLAY_INTERFACE_RGB: > + return DRM_MODE_CONNECTOR_DPI; > + default: > + return DRM_MODE_CONNECTOR_Unknown; > + } > +} > + > +static bool logicvc_interface_native_connector(struct logicvc_drm *logicvc) > +{ > + switch (logicvc->config.display_interface) { > + case LOGICVC_DISPLAY_INTERFACE_DVI: > + return true; > + default: > + return false; > + } > +} > + > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc) > +{ > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > + > + logicvc->interface->drm_encoder.possible_crtcs = possible_crtcs; > +} > + > +int logicvc_interface_init(struct logicvc_drm *logicvc) > +{ > + struct logicvc_interface *interface; > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + int encoder_type = logicvc_interface_encoder_type(logicvc); > + int connector_type = logicvc_interface_connector_type(logicvc); > + bool native_connector = logicvc_interface_native_connector(logicvc); > + int ret; > + > + interface = devm_kzalloc(dev, sizeof(*interface), GFP_KERNEL); > + if (!interface) { > + ret = -ENOMEM; > + goto error_early; > + } > + > + ret = drm_of_find_panel_or_bridge(of_node, 1, 0, &interface->drm_panel, > + &interface->drm_bridge); > + if (ret == -EPROBE_DEFER) > + goto error_early; > + > + ret = drm_encoder_init(drm_dev, &interface->drm_encoder, > + &logicvc_encoder_funcs, encoder_type, NULL); > + if (ret) { > + drm_err(drm_dev, "Failed to initalize encoder\n"); > + goto error_early; > + } > + > + drm_encoder_helper_add(&interface->drm_encoder, > + &logicvc_encoder_helper_funcs); > + > + if (native_connector || interface->drm_panel) { > + ret = drm_connector_init(drm_dev, &interface->drm_connector, > + &logicvc_connector_funcs, > + connector_type); > + if (ret) { > + drm_err(drm_dev, "Failed to initalize connector\n"); > + goto error_encoder; > + } > + > + drm_connector_helper_add(&interface->drm_connector, > + &logicvc_connector_helper_funcs); > + > + ret = drm_connector_attach_encoder(&interface->drm_connector, > + &interface->drm_encoder); > + if (ret) { > + drm_err(drm_dev, > + "Failed to attach connector to encoder\n"); > + goto error_encoder; > + } > + } > + > + if (interface->drm_bridge) { > + ret = drm_bridge_attach(&interface->drm_encoder, > + interface->drm_bridge, NULL, 0); > + if (ret) { > + drm_err(drm_dev, > + "Failed to attach bridge to encoder\n"); > + goto error_encoder; > + } > + } You should consider using the bridge_or_panel API. > + logicvc->interface = interface; > + > + return 0; > + > +error_encoder: > + drm_encoder_cleanup(&interface->drm_encoder); > + > +error_early: > + return ret; > +} > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.h b/drivers/gpu/drm/logicvc/logicvc_interface.h > new file mode 100644 > index 000000000000..fb2e9e6e04aa > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.h > @@ -0,0 +1,30 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_INTERFACE_H_ > +#define _LOGICVC_INTERFACE_H_ > + > +#include <drm/drm_bridge.h> > +#include <drm/drm_connector.h> > +#include <drm/drm_encoder.h> > +#include <drm/drm_panel.h> > + > +struct logicvc_drm; > + > +struct logicvc_interface { > + struct drm_encoder drm_encoder; > + struct drm_connector drm_connector; > + > + struct drm_panel *drm_panel; > + struct drm_bridge *drm_bridge; > + > + bool drm_panel_enabled; > +}; > + > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc); > +int logicvc_interface_init(struct logicvc_drm *logicvc); > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.c b/drivers/gpu/drm/logicvc/logicvc_layer.c > new file mode 100644 > index 000000000000..9188d45cef77 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.c > @@ -0,0 +1,615 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/of.h> > +#include <linux/types.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fourcc.h> > +#include <drm/drm_plane.h> > +#include <drm/drm_plane_helper.h> > +#include <drm/drm_print.h> > + > +#include "logicvc_crtc.h" > +#include "logicvc_drm.h" > +#include "logicvc_layer.h" > +#include "logicvc_of.h" > +#include "logicvc_regs.h" > + > +#define logicvc_layer(p) \ > + container_of(p, struct logicvc_layer, drm_plane) > + > +static uint32_t logicvc_layer_formats_rgb16[] = { > + DRM_FORMAT_RGB565, > + DRM_FORMAT_BGR565, > + DRM_FORMAT_INVALID, > +}; > + > +static uint32_t logicvc_layer_formats_rgb24[] = { > + DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XBGR8888, > + DRM_FORMAT_INVALID, > +}; > + > +/* What we call depth in this driver only counts color components, not alpha. > + * This allows us to stay compatible with the LogiCVC bistream definitions. */ > +static uint32_t logicvc_layer_formats_rgb24_alpha[] = { > + DRM_FORMAT_ARGB8888, > + DRM_FORMAT_ABGR8888, > + DRM_FORMAT_INVALID, > +}; > + > +static struct logicvc_layer_formats logicvc_layer_formats[] = { > + { > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > + .depth = 16, > + .formats = logicvc_layer_formats_rgb16, > + }, > + { > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > + .depth = 24, > + .formats = logicvc_layer_formats_rgb24, > + }, > + { > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > + .depth = 24, > + .alpha = true, > + .formats = logicvc_layer_formats_rgb24_alpha, > + }, > + { } > +}; > + > +static bool logicvc_layer_format_inverted(uint32_t format) > +{ > + switch (format) { > + case DRM_FORMAT_BGR565: > + case DRM_FORMAT_BGR888: > + case DRM_FORMAT_XBGR8888: > + case DRM_FORMAT_ABGR8888: > + return true; > + default: > + return false; > + } > +} > + > +static int logicvc_plane_atomic_check(struct drm_plane *drm_plane, > + struct drm_plane_state *state) > +{ > + struct drm_device *drm_dev = drm_plane->dev; > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > + struct drm_crtc_state *crtc_state; > + int min_scale, max_scale; > + bool can_position; > + int ret; > + > + if (!state->crtc) > + return 0; > + > + crtc_state = drm_atomic_get_existing_crtc_state(state->state, > + state->crtc); > + if (WARN_ON(!crtc_state)) > + return -EINVAL; > + > + if (state->crtc_x < 0 || state->crtc_y < 0) { > + drm_err(drm_dev, > + "Negative on-CRTC positions are not supported.\n"); > + return -EINVAL; > + } > + > + if (!logicvc->caps->layer_address) { > + ret = logicvc_layer_buffer_find_setup(logicvc, layer, state, > + NULL); > + if (ret) { > + drm_err(drm_dev, "No viable setup for buffer found.\n"); > + return ret; > + } > + } > + > + min_scale = DRM_PLANE_HELPER_NO_SCALING; > + max_scale = DRM_PLANE_HELPER_NO_SCALING; > + > + can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && > + layer->index != (logicvc->config.layers_count - 1) && > + logicvc->config.layers_configurable); > + > + ret = drm_atomic_helper_check_plane_state(state, crtc_state, > + min_scale, max_scale, > + can_position, true); > + if (ret) { > + drm_err(drm_dev, "Invalid plane state\n\n"); > + return ret; > + } > + > + return 0; > +} > + > +static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, > + struct drm_plane_state *old_state) > +{ > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > + struct drm_plane_state *state = drm_plane->state; > + struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; > + struct drm_framebuffer *fb = state->fb; > + struct logicvc_layer_buffer_setup setup = {}; > + u32 index = layer->index; > + u32 reg; > + > + /* Layer dimensions */ > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_WIDTH_REG(index), > + state->crtc_w - 1); > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HEIGHT_REG(index), > + state->crtc_h - 1); > + > + if (logicvc->caps->layer_address) { > + phys_addr_t fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ADDRESS_REG(index), > + fb_addr); > + } else { > + /* Rely on offsets to configure the address. */ > + > + logicvc_layer_buffer_find_setup(logicvc, layer, state, &setup); > + > + /* Layer memory offsets */ > + > + regmap_write(logicvc->regmap, LOGICVC_BUFFER_SEL_REG, > + LOGICVC_BUFFER_SEL_VALUE(index, setup.buffer_sel)); > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HOFFSET_REG(index), > + setup.hoffset); > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VOFFSET_REG(index), > + setup.voffset); > + } > + > + /* Layer position */ > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HPOSITION_REG(index), > + mode->hdisplay - 1 - state->crtc_x); > + > + /* Vertical position must be set last to sync layer register changes. */ > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VPOSITION_REG(index), > + mode->vdisplay - 1 - state->crtc_y); > + > + /* Layer alpha */ > + > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) { > + u32 alpha_bits; > + u32 alpha_max; > + u32 alpha; > + > + switch (layer->config.depth) { > + case 8: > + alpha_bits = 3; > + break; > + case 16: > + if (layer->config.colorspace == LOGICVC_LAYER_COLORSPACE_YUV) > + alpha_bits = 8; > + else > + alpha_bits = 6; > + break; > + default: > + alpha_bits = 8; > + break; > + } > + > + alpha_max = BIT(alpha_bits) - 1; > + alpha = state->alpha * alpha_max / DRM_BLEND_ALPHA_OPAQUE; > + > + DRM_DEBUG_DRIVER("Setting layer %d alpha to %d/%d\n", index, > + alpha, alpha_max); > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ALPHA_REG(index), > + alpha); > + } > + > + /* Layer control */ > + > + reg = LOGICVC_LAYER_CTRL_ENABLE; > + > + if (logicvc_layer_format_inverted(fb->format->format)) > + reg |= LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT; > + > + reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), reg); > +} > + > +static void logicvc_plane_atomic_disable(struct drm_plane *drm_plane, > + struct drm_plane_state *old_state) > +{ > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > + u32 index = layer->index; > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), 0); > +} > + > +static struct drm_plane_helper_funcs logicvc_plane_helper_funcs = { > + .atomic_check = logicvc_plane_atomic_check, > + .atomic_update = logicvc_plane_atomic_update, > + .atomic_disable = logicvc_plane_atomic_disable, > +}; > + > +static const struct drm_plane_funcs logicvc_plane_funcs = { > + .update_plane = drm_atomic_helper_update_plane, > + .disable_plane = drm_atomic_helper_disable_plane, > + .destroy = drm_plane_cleanup, > + .reset = drm_atomic_helper_plane_reset, > + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > +}; > + > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer, > + struct drm_plane_state *state, > + struct logicvc_layer_buffer_setup *setup) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct drm_framebuffer *fb = state->fb; > + /* All the supported formats have a single data plane. */ > + u32 layer_bytespp = fb->format->cpp[0]; > + u32 layer_stride = layer_bytespp * logicvc->config.row_stride; > + u32 base_offset = layer->config.base_offset * layer_stride; > + u32 buffer_offset = layer->config.buffer_offset * layer_stride; > + u8 buffer_sel = 0; > + u16 voffset = 0; > + u16 hoffset = 0; > + phys_addr_t fb_addr; > + u32 fb_offset; > + u32 gap; > + > + if (!logicvc->reserved_mem_base) { > + drm_err(drm_dev, "No reserved memory base was registered!\n"); > + return -ENOMEM; > + } > + > + fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > + if (fb_addr < logicvc->reserved_mem_base) { > + drm_err(drm_dev, > + "Framebuffer memory below reserved memory base!\n"); > + return -EINVAL; > + } > + > + fb_offset = (u32) (fb_addr - logicvc->reserved_mem_base); > + > + if (fb_offset < base_offset) { > + drm_err(drm_dev, > + "Framebuffer offset below layer base offset!\n"); > + return -EINVAL; > + } > + > + gap = fb_offset - base_offset; > + > + /* Use the possible video buffers selection. */ > + if (gap && buffer_offset) { > + buffer_sel = gap / buffer_offset; > + if (buffer_sel > LOGICVC_BUFFER_SEL_MAX) > + buffer_sel = LOGICVC_BUFFER_SEL_MAX; > + > + gap -= buffer_sel * buffer_offset; > + } > + > + /* Use the vertical offset. */ > + if (gap && layer_stride && logicvc->config.layers_configurable) { > + voffset = gap / layer_stride; > + if (voffset > LOGICVC_LAYER_VOFFSET_MAX) > + voffset = LOGICVC_LAYER_VOFFSET_MAX; > + > + gap -= voffset * layer_stride; > + } > + > + /* Use the horizontal offset. */ > + if (gap && layer_bytespp && logicvc->config.layers_configurable) { > + hoffset = gap / layer_bytespp; > + if (hoffset > LOGICVC_DIMENSIONS_MAX) > + hoffset = LOGICVC_DIMENSIONS_MAX; > + > + gap -= hoffset * layer_bytespp; > + } > + > + if (gap) { > + drm_err(drm_dev, > + "Unable to find layer %d buffer setup for 0x%x byte gap\n", > + layer->index, fb_offset - base_offset); > + return -EINVAL; > + } > + > + DRM_DEBUG_DRIVER("Found layer %d buffer setup for 0x%x byte gap:\n", > + layer->index, fb_offset - base_offset); > + > + DRM_DEBUG_DRIVER("- buffer_sel = 0x%x chunks of 0x%x bytes\n", > + buffer_sel, buffer_offset); > + DRM_DEBUG_DRIVER("- voffset = 0x%x chunks of 0x%x bytes\n", voffset, > + layer_stride); > + DRM_DEBUG_DRIVER("- hoffset = 0x%x chunks of 0x%x bytes\n", hoffset, > + layer_bytespp); > + > + if (setup) { > + setup->buffer_sel = buffer_sel; > + setup->voffset = voffset; > + setup->hoffset = hoffset; > + } > + > + return 0; > +} > + > +static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc_layer *layer) > +{ > + bool alpha; > + unsigned int i = 0; > + > + alpha = (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_PIXEL); > + > + while (logicvc_layer_formats[i].formats) { > + if (logicvc_layer_formats[i].colorspace == layer->config.colorspace && > + logicvc_layer_formats[i].depth == layer->config.depth && > + logicvc_layer_formats[i].alpha == alpha) > + return &logicvc_layer_formats[i]; > + > + i++; > + } > + > + return NULL; > +} > + > +static unsigned int logicvc_layer_formats_count(struct logicvc_layer_formats *formats) > +{ > + unsigned int count = 0; > + > + while (formats->formats[count] != DRM_FORMAT_INVALID) > + count++; > + > + return count; > +} > + > +static int logicvc_layer_config_parse(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer) > +{ > + struct device_node *of_node = layer->of_node; > + struct logicvc_layer_config *config = &layer->config; > + int ret; > + > + logicvc_of_property_parse_bool(of_node, > + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, > + &config->primary); > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, > + &config->colorspace); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_DEPTH, > + &config->depth); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, > + &config->alpha_mode); > + if (ret) > + return ret; > + > + /* Memory offset is only relevant without layer address configuration. */ > + if (logicvc->caps->layer_address) > + return 0; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, > + &config->base_offset); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, > + &config->buffer_offset); > + if (ret) > + return ret; > + > + return 0; > +} > + > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > + u32 index) > +{ > + struct logicvc_layer *layer; > + > + list_for_each_entry(layer, &logicvc->layers_list, list) > + if (layer->index == index) > + return layer; > + > + return NULL; > +} > + > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > + enum drm_plane_type type) > +{ > + struct logicvc_layer *layer; > + > + list_for_each_entry(layer, &logicvc->layers_list, list) > + if (layer->drm_plane.type == type) > + return layer; > + > + return NULL; > +} > + > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc) > +{ > + return logicvc_layer_get_from_type(logicvc, DRM_PLANE_TYPE_PRIMARY); > +} > + > +static int logicvc_layer_init(struct logicvc_drm *logicvc, > + struct device_node *of_node, u32 index) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct logicvc_layer *layer = NULL; > + struct logicvc_layer_formats *formats; > + unsigned int formats_count; > + enum drm_plane_type type; > + unsigned int zpos; > + int ret; > + > + layer = devm_kzalloc(dev, sizeof(*layer), GFP_KERNEL); > + if (!layer) { > + ret = -ENOMEM; > + goto error; > + } > + > + layer->of_node = of_node; > + layer->index = index; > + > + ret = logicvc_layer_config_parse(logicvc, layer); > + if (ret) { > + drm_err(drm_dev, "Failed to parse config for layer #%d\n", > + index); > + goto error; > + } > + > + formats = logicvc_layer_formats_lookup(layer); > + if (!formats) { > + drm_err(drm_dev, "Failed to lookup formats for layer #%d\n", > + index); > + goto error; > + } > + > + formats_count = logicvc_layer_formats_count(formats); > + > + /* The final layer can be configured as a background layer. */ > + if (logicvc->config.background_layer && > + index == (logicvc->config.layers_count - 1)) { > + /* A zero value for black is only valid for RGB, not for YUV, > + * so this will need to take the format in account for YUV. */ > + u32 background = 0; > + > + DRM_DEBUG_DRIVER("Using layer #%d as background layer\n", > + index); > + > + regmap_write(logicvc->regmap, LOGICVC_BACKGROUND_COLOR_REG, > + background); > + > + devm_kfree(dev, layer); > + > + return 0; > + } > + > + if (layer->config.primary) > + type = DRM_PLANE_TYPE_PRIMARY; > + else > + type = DRM_PLANE_TYPE_OVERLAY; > + > + ret = drm_universal_plane_init(drm_dev, &layer->drm_plane, 0, > + &logicvc_plane_funcs, formats->formats, > + formats_count, NULL, type, NULL); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize layer plane\n"); > + return ret; > + } > + > + drm_plane_helper_add(&layer->drm_plane, &logicvc_plane_helper_funcs); > + > + zpos = logicvc->config.layers_count - index - 1; > + DRM_DEBUG_DRIVER("Giving layer #%d zpos %d\n", index, zpos); > + > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) > + drm_plane_create_alpha_property(&layer->drm_plane); > + > + drm_plane_create_zpos_immutable_property(&layer->drm_plane, zpos); > + > + DRM_DEBUG_DRIVER("Registering layer #%d\n", index); > + > + layer->formats = formats; > + > + list_add_tail(&layer->list, &logicvc->layers_list); > + > + return 0; > + > +error: > + if (layer) > + devm_kfree(dev, layer); > + > + return ret; > +} > + > +static void logicvc_layer_fini(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer) > +{ > + struct device *dev = logicvc->drm_dev.dev; > + > + list_del(&layer->list); > + devm_kfree(dev, layer); > +} > + > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc) > +{ > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > + struct logicvc_layer *layer; > + > + list_for_each_entry(layer, &logicvc->layers_list, list) { > + if (layer->drm_plane.type != DRM_PLANE_TYPE_OVERLAY) > + continue; > + > + layer->drm_plane.possible_crtcs = possible_crtcs; > + } > +} > + > +int logicvc_layers_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct device_node *layer_node = NULL; > + struct device_node *layers_node; > + struct logicvc_layer *layer; > + struct logicvc_layer *next; > + int ret = 0; > + > + layers_node = of_get_child_by_name(of_node, "layers"); > + if (!layers_node) { > + DRM_ERROR("No layers node found in the description\n"); > + ret = -ENODEV; > + goto error; > + } > + > + for_each_child_of_node(layers_node, layer_node) { > + u32 index = 0; > + > + if (!logicvc_of_node_is_layer(layer_node)) > + continue; > + > + ret = of_property_read_u32(layer_node, "reg", &index); > + if (ret) > + continue; > + > + layer = logicvc_layer_get_from_index(logicvc, index); > + if (layer) { > + DRM_ERROR("Duplicated entry for layer #%d\n", index); > + continue; > + } > + > + ret = logicvc_layer_init(logicvc, layer_node, index); > + if (ret) > + goto error; > + > + of_node_put(layer_node); > + } > + > + of_node_put(layers_node); > + > + return 0; > + > +error: > + list_for_each_entry_safe(layer, next, &logicvc->layers_list, list) > + logicvc_layer_fini(logicvc, layer); > + > + return ret; > +} > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.h b/drivers/gpu/drm/logicvc/logicvc_layer.h > new file mode 100644 > index 000000000000..c5767c81f446 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.h > @@ -0,0 +1,64 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_LAYER_H_ > +#define _LOGICVC_LAYER_H_ > + > +#include <linux/of.h> > +#include <linux/types.h> > +#include <drm/drm_plane.h> > + > +#define LOGICVC_LAYER_COLORSPACE_RGB 0 > +#define LOGICVC_LAYER_COLORSPACE_YUV 1 > + > +#define LOGICVC_LAYER_ALPHA_LAYER 0 > +#define LOGICVC_LAYER_ALPHA_PIXEL 1 > + > +struct logicvc_layer_buffer_setup { > + u8 buffer_sel; > + u16 voffset; > + u16 hoffset; > +}; > + > +struct logicvc_layer_config { > + u32 colorspace; > + u32 depth; > + u32 alpha_mode; > + u32 base_offset; > + u32 buffer_offset; > + bool primary; > +}; > + > +struct logicvc_layer_formats { > + u32 colorspace; > + u32 depth; > + bool alpha; > + uint32_t *formats; > +}; > + > +struct logicvc_layer { > + struct logicvc_layer_config config; > + struct logicvc_layer_formats *formats; > + struct device_node *of_node; > + > + struct drm_plane drm_plane; > + struct list_head list; > + u32 index; > +}; > + > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer, > + struct drm_plane_state *state, > + struct logicvc_layer_buffer_setup *setup); > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > + u32 index); > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > + enum drm_plane_type type); > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc); > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc); > +int logicvc_layers_init(struct logicvc_drm *logicvc); > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.c b/drivers/gpu/drm/logicvc/logicvc_mode.c > new file mode 100644 > index 000000000000..aa8f35b64c75 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_mode.c > @@ -0,0 +1,101 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/types.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_mode_config.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > + > +#include "logicvc_drm.h" > +#include "logicvc_interface.h" > +#include "logicvc_layer.h" > +#include "logicvc_mode.h" > + > +static void logicvc_mode_atomic_commit_tail(struct drm_atomic_state *old_state) > +{ > + struct drm_device *drm_dev = old_state->dev; > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > + struct logicvc_interface *interface = logicvc->interface; > + > + drm_atomic_helper_commit_tail(old_state); > + > + /* Enable the panel after the first commit, which concerns our panel > + * since we only support a single interface. */ > + if (interface->drm_panel && !interface->drm_panel_enabled) { > + drm_panel_enable(interface->drm_panel); > + interface->drm_panel_enabled = true; > + } > +} > + > +static const struct drm_mode_config_helper_funcs logicvc_mode_config_helper_funcs = { > + .atomic_commit_tail = logicvc_mode_atomic_commit_tail, > +}; > + > +static const struct drm_mode_config_funcs logicvc_mode_config_funcs = { > + .fb_create = drm_gem_fb_create, > + .output_poll_changed = drm_fb_helper_output_poll_changed, > + .atomic_check = drm_atomic_helper_check, > + .atomic_commit = drm_atomic_helper_commit, > +}; > + > +int logicvc_mode_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct drm_mode_config *mode_config = &drm_dev->mode_config; > + struct logicvc_layer *layer_primary; > + uint32_t preferred_depth; > + int ret; > + > + ret = drm_vblank_init(drm_dev, mode_config->num_crtc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize vblank\n"); > + return ret; > + } > + > + layer_primary = logicvc_layer_get_primary(logicvc); > + if (!layer_primary) { > + drm_err(drm_dev, "Failed to get primary layer\n"); > + return -EINVAL; > + } > + > + preferred_depth = layer_primary->formats->depth; > + > + /* DRM counts alpha in depth, our driver doesn't. */ > + if (layer_primary->formats->alpha) > + preferred_depth += 8; > + > + mode_config->min_width = 64; > + mode_config->max_width = 2048; > + mode_config->min_height = 1; > + mode_config->max_height = 2048; > + mode_config->preferred_depth = preferred_depth; > + mode_config->funcs = &logicvc_mode_config_funcs; > + mode_config->helper_private = &logicvc_mode_config_helper_funcs; > + > + drm_mode_config_reset(drm_dev); > + > + drm_kms_helper_poll_init(drm_dev); > + > + return 0; > +} > + > +void logicvc_mode_fini(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + > + drm_kms_helper_poll_fini(drm_dev); > +} You should consider using a drmm_add_action_or_reset here to simplify your error / remove path. Maxime [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller @ 2020-11-03 9:46 ` Maxime Ripard 0 siblings, 0 replies; 15+ messages in thread From: Maxime Ripard @ 2020-11-03 9:46 UTC (permalink / raw) To: Paul Kocialkowski Cc: devicetree, Thomas Petazzoni, Thomas Zimmermann, David Airlie, linux-kernel, dri-devel, Rob Herring [-- Attachment #1.1: Type: text/plain, Size: 63273 bytes --] On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > Introduces a driver for the LogiCVC display controller, a programmable > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > Xilinx FPGAs. The controller is mostly configured at logic synthesis > time so only a subset of configuration is left for the driver to > handle. > > The following features are implemented and tested: > - LVDS 4-bit interface; > - RGB565 pixel formats; > - Multiple layers and hardware composition; > - Layer-wide alpha mode; > > The following features are implemented but untested: > - Other RGB pixel formats; > - Layer framebuffer configuration for version 4; > - Lowest-layer used as background color; > - Per-pixel alpha mode. > > The following features are not implemented: > - YUV pixel formats; > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > - External parallel input for layer; > - Color-keying; > - LUT-based alpha modes. > > Additional implementation-specific notes: > - Panels are only enabled after the first page flip to avoid flashing a > white screen. > - Depth used in context of the LogiCVC driver only counts color components > to match the definition of the synthesis parameters. > > Support is implemented for both version 3 and 4 of the controller. > > With version 3, framebuffers are stored in a dedicated contiguous > memory area, with a base address hardcoded for each layer. This requires > using a dedicated CMA pool registered at the base address and tweaking a > few offset-related registers to try to use any buffer allocated from > the pool. This is done on a best-effort basis to have the hardware cope > with the DRM framebuffer allocation model and there is no guarantee > that each buffer allocated by GEM CMA can be used for any layer. > In particular, buffers allocated below the base address for a layer are > guaranteed not to be configurable for that layer. See the implementation of > logicvc_layer_buffer_find_setup for specifics. > > Version 4 allows configuring each buffer address directly, which > guarantees that any buffer can be configured. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > Reviewed-by: Maxime Ripard <mripard@kernel.org> There's a bunch of checkpatch issues here > --- > MAINTAINERS | 6 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/logicvc/Kconfig | 9 + > drivers/gpu/drm/logicvc/Makefile | 4 + > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > 18 files changed, 2236 insertions(+) > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > create mode 100644 drivers/gpu/drm/logicvc/Makefile > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 71e29dc0ab9d..9c4c5edef0ba 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > F: drivers/gpu/drm/i810/ > F: include/uapi/drm/i810_drm.h > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > +T: git git://anongit.freedesktop.org/drm/drm-misc > +S: Supported > +F: drivers/gpu/drm/logicvc/ > + Do you have the rights to commit in drm-misc or will you need it? > +static int logicvc_crtc_atomic_check(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_new_crtc_state(state, drm_crtc); > + struct drm_display_mode *mode = &crtc_state->adjusted_mode; > + > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > + return -EINVAL; > + > + return 0; > +} You probably want to have a mode_valid here to check for this as well, it would be weird to expose a mode that we outright reject. > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_old_crtc_state(state, drm_crtc); > + struct drm_device *drm_dev = drm_crtc->dev; > + unsigned long flags; > + > + /* Register pending event, only if vblank is already on. */ > + if (drm_crtc->state->event && crtc_state->active) { > + spin_lock_irqsave(&drm_dev->event_lock, flags); > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > + > + crtc->event = drm_crtc->state->event; > + drm_crtc->state->event = NULL; > + > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > + } > +} That's unusual to do it in atomic_begin, why do you need it? > +static void logicvc_crtc_atomic_enable(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; You should use drm_atomic_get_new_crtc_state here, we're removing the direct references of crtc->state to make it more obvious if we're using the old or new state. > + struct drm_crtc_state *crtc_state = > + drm_atomic_get_old_crtc_state(state, drm_crtc); > + struct drm_device *drm_dev = drm_crtc->dev; > + unsigned int hact, hfp, hsl, hbp; > + unsigned int vact, vfp, vsl, vbp; > + unsigned long flags; > + u32 ctrl; > + > + /* Timings */ > + > + hact = mode->hdisplay; > + hfp = mode->hsync_start - mode->hdisplay; > + hsl = mode->hsync_end - mode->hsync_start; > + hbp = mode->htotal - mode->hsync_end; > + > + vact = mode->vdisplay; > + vfp = mode->vsync_start - mode->vdisplay; > + vsl = mode->vsync_end - mode->vsync_start; > + vbp = mode->vtotal - mode->vsync_end; > + > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_FRONT_PORCH_REG, hfp - 1); > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_REG, hsl - 1); > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_BACK_PORCH_REG, hbp - 1); > + regmap_write(logicvc->regmap, LOGICVC_HRES_REG, hact - 1); > + > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_FRONT_PORCH_REG, vfp - 1); > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_REG, vsl - 1); > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_BACK_PORCH_REG, vbp - 1); > + regmap_write(logicvc->regmap, LOGICVC_VRES_REG, vact - 1); > + > + /* Signals */ > + > + ctrl = LOGICVC_CTRL_HSYNC_ENABLE | LOGICVC_CTRL_VSYNC_ENABLE | > + LOGICVC_CTRL_DE_ENABLE; > + > + if (mode->flags & DRM_MODE_FLAG_NHSYNC) > + ctrl |= LOGICVC_CTRL_HSYNC_INVERT; > + > + if (mode->flags & DRM_MODE_FLAG_NVSYNC) > + ctrl |= LOGICVC_CTRL_VSYNC_INVERT; > + > + if (logicvc->interface) { > + struct drm_connector *connector = > + &logicvc->interface->drm_connector; > + struct drm_display_info *display_info = > + &connector->display_info; > + > + if (display_info->bus_flags & DRM_BUS_FLAG_DE_LOW) > + ctrl |= LOGICVC_CTRL_DE_INVERT; > + > + if (display_info->bus_flags & > + DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) > + ctrl |= LOGICVC_CTRL_CLOCK_INVERT; > + } > + > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > + LOGICVC_CTRL_HSYNC_ENABLE | > + LOGICVC_CTRL_HSYNC_INVERT | > + LOGICVC_CTRL_VSYNC_ENABLE | > + LOGICVC_CTRL_VSYNC_INVERT | > + LOGICVC_CTRL_DE_ENABLE | > + LOGICVC_CTRL_DE_INVERT | > + LOGICVC_CTRL_PIXEL_INVERT | > + LOGICVC_CTRL_CLOCK_INVERT, ctrl); > + > + /* Generate internal state reset. */ > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > + > + drm_crtc_vblank_on(drm_crtc); > + > + /* Register our event after vblank is enabled. */ > + if (drm_crtc->state->event && !crtc_state->active) { > + spin_lock_irqsave(&drm_dev->event_lock, flags); > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > + > + crtc->event = drm_crtc->state->event; > + drm_crtc->state->event = NULL; > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > + } Haven't you done that in atomic_begin already? > +} > + > +static void logicvc_crtc_atomic_disable(struct drm_crtc *drm_crtc, > + struct drm_atomic_state *state) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + struct drm_device *drm_dev = drm_crtc->dev; > + > + drm_crtc_vblank_off(drm_crtc); > + > + /* Disable and clear CRTC bits. */ > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > + LOGICVC_CTRL_HSYNC_ENABLE | > + LOGICVC_CTRL_HSYNC_INVERT | > + LOGICVC_CTRL_VSYNC_ENABLE | > + LOGICVC_CTRL_VSYNC_INVERT | > + LOGICVC_CTRL_DE_ENABLE | > + LOGICVC_CTRL_DE_INVERT | > + LOGICVC_CTRL_PIXEL_INVERT | > + LOGICVC_CTRL_CLOCK_INVERT, 0); > + > + /* Generate internal state reset. */ > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > + > + /* Consume leftover event since vblank is now disabled. */ > + if (drm_crtc->state->event && !drm_crtc->state->active) { > + spin_lock_irq(&drm_dev->event_lock); > + > + drm_crtc_send_vblank_event(drm_crtc, drm_crtc->state->event); > + drm_crtc->state->event = NULL; > + spin_unlock_irq(&drm_dev->event_lock); > + } And here too. It's definitely worth explaining in the commit log and / or comments what you're trying to address. > +} > + > +static const struct drm_crtc_helper_funcs logicvc_crtc_helper_funcs = { > + .atomic_check = logicvc_crtc_atomic_check, > + .atomic_begin = logicvc_crtc_atomic_begin, > + .atomic_enable = logicvc_crtc_atomic_enable, > + .atomic_disable = logicvc_crtc_atomic_disable, > +}; > + > +static int logicvc_crtc_enable_vblank(struct drm_crtc *drm_crtc) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + > + /* Clear any pending V_SYNC interrupt. */ > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_STAT_REG, > + LOGICVC_INT_STAT_V_SYNC, LOGICVC_INT_STAT_V_SYNC); > + > + /* Unmask V_SYNC interrupt. */ > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > + LOGICVC_INT_MASK_V_SYNC, 0); > + > + return 0; > +} > + > +static void logicvc_crtc_disable_vblank(struct drm_crtc *drm_crtc) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > + > + /* Mask V_SYNC interrupt. */ > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > + LOGICVC_INT_MASK_V_SYNC, LOGICVC_INT_MASK_V_SYNC); > +} > + > +static const struct drm_crtc_funcs logicvc_crtc_funcs = { > + .reset = drm_atomic_helper_crtc_reset, > + .destroy = drm_crtc_cleanup, > + .set_config = drm_atomic_helper_set_config, > + .page_flip = drm_atomic_helper_page_flip, > + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > + .enable_vblank = logicvc_crtc_enable_vblank, > + .disable_vblank = logicvc_crtc_disable_vblank, > +}; > + > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct logicvc_crtc *crtc = logicvc->crtc; > + unsigned long flags; > + > + if (!crtc) > + return; > + > + drm_crtc_handle_vblank(&crtc->drm_crtc); > + > + if (crtc->event) { > + spin_lock_irqsave(&drm_dev->event_lock, flags); > + drm_crtc_send_vblank_event(&crtc->drm_crtc, crtc->event); > + drm_crtc_vblank_put(&crtc->drm_crtc); > + crtc->event = NULL; > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > + } > +} > + > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct logicvc_crtc *crtc; > + struct logicvc_layer *layer_primary; > + int ret; > + > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > + if (!crtc) > + return -ENOMEM; > + > + layer_primary = logicvc_layer_get_primary(logicvc); > + if (!layer_primary) { > + DRM_ERROR("Failed to get primary layer\n"); > + return -EINVAL; > + } > + > + ret = drm_crtc_init_with_planes(drm_dev, &crtc->drm_crtc, > + &layer_primary->drm_plane, NULL, > + &logicvc_crtc_funcs, NULL); > + if (ret) { > + DRM_ERROR("Failed to initalize CRTC\n"); > + return ret; > + } > + > + drm_crtc_helper_add(&crtc->drm_crtc, &logicvc_crtc_helper_funcs); > + > + crtc->drm_crtc.port = of_graph_get_port_by_id(of_node, 1); > + > + logicvc->crtc = crtc; > + > + return 0; > +} > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.h b/drivers/gpu/drm/logicvc/logicvc_crtc.h > new file mode 100644 > index 000000000000..6a1291c37704 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.h > @@ -0,0 +1,21 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_CRTC_H_ > +#define _LOGICVC_CRTC_H_ > + > +struct drm_pending_vblank_event; > +struct logicvc_drm; > + > +struct logicvc_crtc { > + struct drm_crtc drm_crtc; > + struct drm_pending_vblank_event *event; > +}; > + > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc); > +int logicvc_crtc_init(struct logicvc_drm *logicvc); > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.c b/drivers/gpu/drm/logicvc/logicvc_drm.c > new file mode 100644 > index 000000000000..b73e92fb2026 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.c > @@ -0,0 +1,472 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/clk.h> > +#include <linux/mfd/syscon.h> > +#include <linux/module.h> > +#include <linux/of.h> > +#include <linux/of_address.h> > +#include <linux/of_device.h> > +#include <linux/of_reserved_mem.h> > +#include <linux/regmap.h> > +#include <linux/types.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_print.h> > + > +#include "logicvc_crtc.h" > +#include "logicvc_drm.h" > +#include "logicvc_interface.h" > +#include "logicvc_mode.h" > +#include "logicvc_layer.h" > +#include "logicvc_of.h" > +#include "logicvc_regs.h" > + > +DEFINE_DRM_GEM_CMA_FOPS(logicvc_drm_fops); > + > +static int logicvc_drm_gem_cma_dumb_create(struct drm_file *file_priv, > + struct drm_device *drm_dev, > + struct drm_mode_create_dumb *args) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > + > + /* Stride is always fixed to its configuration value. */ > + args->pitch = logicvc->config.row_stride * DIV_ROUND_UP(args->bpp, 8); > + > + return drm_gem_cma_dumb_create_internal(file_priv, drm_dev, args); > +} > + > +static struct drm_driver logicvc_drm_driver = { > + .driver_features = DRIVER_GEM | DRIVER_MODESET | > + DRIVER_ATOMIC, > + > + .fops = &logicvc_drm_fops, > + .name = "logicvc-drm", > + .desc = "Xylon LogiCVC DRM driver", > + .date = "20200403", > + .major = 1, > + .minor = 0, > + > + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(logicvc_drm_gem_cma_dumb_create), > +}; > + > +static struct regmap_config logicvc_drm_regmap_config = { > + .reg_bits = 32, > + .val_bits = 32, > + .reg_stride = 4, > + .name = "logicvc-drm", > +}; > + > +static irqreturn_t logicvc_drm_irq_handler(int irq, void *data) > +{ > + struct logicvc_drm *logicvc = data; > + irqreturn_t ret = IRQ_NONE; > + u32 stat = 0; > + > + /* Get pending interrupt sources. */ > + regmap_read(logicvc->regmap, LOGICVC_INT_STAT_REG, &stat); > + > + /* Clear all pending interrupt sources. */ > + regmap_write(logicvc->regmap, LOGICVC_INT_STAT_REG, stat); > + > + if (stat & LOGICVC_INT_STAT_V_SYNC) { > + logicvc_crtc_vblank_handler(logicvc); > + ret = IRQ_HANDLED; > + } > + > + return ret; > +} > + > +static int logicvc_drm_config_parse(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct logicvc_drm_config *config = &logicvc->config; > + struct device_node *layers_node; > + int ret; > + > + logicvc_of_property_parse_bool(of_node, LOGICVC_OF_PROPERTY_DITHERING, > + &config->dithering); > + logicvc_of_property_parse_bool(of_node, > + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, > + &config->background_layer); > + logicvc_of_property_parse_bool(of_node, > + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, > + &config->layers_configurable); > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE, > + &config->display_interface); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, > + &config->display_colorspace); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, > + &config->display_depth); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_ROW_STRIDE, > + &config->row_stride); > + if (ret) > + return ret; > + > + layers_node = of_get_child_by_name(of_node, "layers"); > + if (!layers_node) { > + DRM_ERROR("Missing non-optional layers node\n"); > + return -EINVAL; > + } > + > + config->layers_count = of_get_child_count(layers_node); > + if (!config->layers_count) { > + DRM_ERROR("Missing a non-optional layers children node\n"); > + return -EINVAL; > + } > + > + return 0; > +} > + > +static void logicvc_version_print(struct logicvc_drm *logicvc) > +{ > + u32 version; > + > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > + > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > + 'a'); DRM_DEV_INFO? > +} > + > +static int logicvc_clocks_prepare(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + > + struct { > + struct clk **clk; > + char *name; > + bool optional; > + } clocks_map[] = { > + { > + .clk = &logicvc->vclk, > + .name = "vclk", > + .optional = false, > + }, > + { > + .clk = &logicvc->vclk2, > + .name = "vclk2", > + .optional = true, > + }, > + { > + .clk = &logicvc->lvdsclk, > + .name = "lvdsclk", > + .optional = true, > + }, > + { > + .clk = &logicvc->lvdsclkn, > + .name = "lvdsclkn", > + .optional = true, > + }, > + }; > + unsigned int i; > + int ret; > + > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > + struct clk *clk; > + > + clk = devm_clk_get(dev, clocks_map[i].name); > + if (IS_ERR(clk)) { > + if (PTR_ERR(clk) == -ENOENT && clocks_map[i].optional) > + continue; > + > + DRM_ERROR("Missing non-optional clock %s\n", > + clocks_map[i].name); > + > + ret = PTR_ERR(clk); > + goto error; > + } > + > + ret = clk_prepare_enable(clk); > + if (ret) { > + DRM_ERROR("Failed to prepare and enable clock %s\n", > + clocks_map[i].name); > + goto error; > + } > + > + *clocks_map[i].clk = clk; > + } > + > + return 0; > + > +error: > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > + if (!*clocks_map[i].clk) > + continue; > + > + clk_disable_unprepare(*clocks_map[i].clk); > + *clocks_map[i].clk = NULL; > + } > + > + return ret; > +} > + > +static int logicvc_clocks_unprepare(struct logicvc_drm *logicvc) > +{ > + struct clk **clocks[] = { > + &logicvc->vclk, > + &logicvc->vclk2, > + &logicvc->lvdsclk, > + &logicvc->lvdsclkn, > + }; > + unsigned int i; > + > + for (i = 0; i < ARRAY_SIZE(clocks); i++) { > + if (!*clocks[i]) > + continue; > + > + clk_disable_unprepare(*clocks[i]); > + *clocks[i] = NULL; > + } > + > + return 0; > +} > + > +static int logicvc_drm_probe(struct platform_device *pdev) > +{ > + struct device_node *of_node = pdev->dev.of_node; > + struct device_node *reserved_mem_node; > + struct reserved_mem *reserved_mem = NULL; > + const struct logicvc_drm_caps *caps; > + struct logicvc_drm *logicvc; > + struct device *dev = &pdev->dev; > + struct drm_device *drm_dev; > + struct regmap *regmap; > + struct resource res; > + void __iomem *base; > + int irq; > + int ret; > + > + caps = of_device_get_match_data(dev); > + if (!caps) > + return -EINVAL; > + > + ret = of_reserved_mem_device_init(dev); > + if (ret && ret != -ENODEV) { > + dev_err(dev, "Failed to init memory region\n"); > + goto error_early; > + } > + > + reserved_mem_node = of_parse_phandle(of_node, "memory-region", 0); > + if (reserved_mem_node) { > + reserved_mem = of_reserved_mem_lookup(reserved_mem_node); > + of_node_put(reserved_mem_node); > + } > + > + /* Get regmap from syscon first if available. */ > + regmap = syscon_regmap_lookup_by_phandle(of_node, "xylon,syscon"); > + > + /* Then get regmap from parent if available. */ > + if (IS_ERR(regmap) && of_node->parent) > + regmap = syscon_node_to_regmap(of_node->parent); > + > + /* Register our own regmap otherwise. */ > + if (IS_ERR(regmap)) { > + ret = of_address_to_resource(of_node, 0, &res); > + if (ret) { > + dev_err(dev, "Failed to get resource from address\n"); > + goto error_reserved_mem; > + } > + > + base = devm_ioremap_resource(dev, &res); > + if (IS_ERR(base)) { > + dev_err(dev, "Failed to map I/O base\n"); > + ret = PTR_ERR(base); > + goto error_reserved_mem; > + } > + > + logicvc_drm_regmap_config.max_register = resource_size(&res) - > + 4; > + > + regmap = devm_regmap_init_mmio(dev, base, > + &logicvc_drm_regmap_config); > + if (IS_ERR(regmap)) { > + dev_err(dev, "Failed to create regmap for I/O\n"); > + ret = PTR_ERR(regmap); > + goto error_reserved_mem; > + } > + } > + > + irq = platform_get_irq(pdev, 0); > + if (irq < 0) { > + dev_err(dev, "Failed to get IRQ\n"); > + ret = -ENODEV; > + goto error_reserved_mem; > + } > + > + logicvc = devm_drm_dev_alloc(dev, &logicvc_drm_driver, > + struct logicvc_drm, drm_dev); > + if (IS_ERR(logicvc)) { > + ret = PTR_ERR(logicvc); > + goto error_reserved_mem; > + } > + > + platform_set_drvdata(pdev, logicvc); > + drm_dev = &logicvc->drm_dev; > + > + logicvc->caps = caps; > + logicvc->regmap = regmap; > + INIT_LIST_HEAD(&logicvc->layers_list); > + > + if (reserved_mem) > + logicvc->reserved_mem_base = reserved_mem->base; > + > + ret = logicvc_clocks_prepare(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to prepare clocks\n"); > + goto error_logicvc; > + } > + > + ret = devm_request_irq(dev, irq, logicvc_drm_irq_handler, 0, > + dev_name(dev), logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to request IRQ\n"); > + goto error_clocks; > + } have you considered drm_irq_install? > + > + logicvc_version_print(logicvc); > + > + ret = logicvc_drm_config_parse(logicvc); > + if (ret && ret != -ENODEV) { > + drm_err(drm_dev, "Failed to parse config\n"); > + goto error_clocks; > + } > + > + drm_mode_config_init(drm_dev); You're supposed to call drm_mode_config_cleanup when using drm_mode_config_init. You'd be better off switching to drmm_mode_config_init though. > + ret = logicvc_layers_init(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize layers\n"); > + goto error_clocks; > + } > + > + ret = logicvc_crtc_init(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize CRTC\n"); > + goto error_clocks; > + } > + > + logicvc_layers_attach_crtc(logicvc); > + > + ret = logicvc_interface_init(logicvc); > + if (ret) { > + if (ret != -EPROBE_DEFER) > + drm_err(drm_dev, "Failed to initialize interface\n"); > + > + goto error_clocks; > + } > + > + logicvc_interface_attach_crtc(logicvc); > + > + ret = logicvc_mode_init(logicvc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize KMS\n"); > + goto error_clocks; > + } > + > + ret = drm_dev_register(drm_dev, 0); > + if (ret) { > + drm_err(drm_dev, "Failed to register DRM device\n"); > + goto error_mode; > + } > + > + drm_fbdev_generic_setup(drm_dev, drm_dev->mode_config.preferred_depth); > + > + return 0; > + > +error_mode: > + logicvc_mode_fini(logicvc); > + > +error_clocks: > + logicvc_clocks_unprepare(logicvc); > + > +error_logicvc: > + drm_dev_put(drm_dev); You don't need drm_dev_put with devm_drm_dev_alloc > +error_reserved_mem: > + of_reserved_mem_device_release(dev); > + > +error_early: > + return ret; > +} > + > +static int logicvc_drm_remove(struct platform_device *pdev) > +{ > + struct logicvc_drm *logicvc = platform_get_drvdata(pdev); > + struct device *dev = &pdev->dev; > + struct drm_device *drm_dev = &logicvc->drm_dev; > + > + drm_dev_unregister(drm_dev); > + drm_atomic_helper_shutdown(drm_dev); > + > + logicvc_mode_fini(logicvc); > + > + logicvc_clocks_unprepare(logicvc); > + > + drm_dev_put(drm_dev); Ditto > + of_reserved_mem_device_release(dev); > + > + return 0; > +} > + > +static const struct logicvc_drm_caps logicvc_drm_caps_3 = { > + .layer_address = false, > +}; > + > +static const struct logicvc_drm_caps logicvc_drm_caps_4 = { > + .layer_address = true, > +}; > + > +static struct of_device_id logicvc_drm_of_table[] = { > + { > + .compatible = "xylon,logicvc-3.02.a-display", > + .data = &logicvc_drm_caps_3, > + }, > + { > + .compatible = "xylon,logicvc-4.01.a-display", > + .data = &logicvc_drm_caps_4, > + }, > + { }, > +}; > +MODULE_DEVICE_TABLE(of, logicvc_drm_of_table); > + > +static struct platform_driver logicvc_drm_platform_driver = { > + .probe = logicvc_drm_probe, > + .remove = logicvc_drm_remove, > + .driver = { > + .name = "logicvc-drm", > + .of_match_table = logicvc_drm_of_table, > + }, > +}; > + > +module_platform_driver(logicvc_drm_platform_driver); > + > +MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>"); > +MODULE_DESCRIPTION("Xylon LogiCVC DRM driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h > new file mode 100644 > index 000000000000..68bbac6c4ab9 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.h > @@ -0,0 +1,64 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_DRM_H_ > +#define _LOGICVC_DRM_H_ > + > +#include <linux/regmap.h> > +#include <linux/types.h> > +#include <drm/drm_device.h> > + > +#define LOGICVC_DISPLAY_INTERFACE_RGB 0 > +#define LOGICVC_DISPLAY_INTERFACE_ITU656 1 > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS 2 > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA 3 > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS 4 > +#define LOGICVC_DISPLAY_INTERFACE_DVI 5 > + > +#define LOGICVC_DISPLAY_COLORSPACE_RGB 0 > +#define LOGICVC_DISPLAY_COLORSPACE_YUV422 1 > +#define LOGICVC_DISPLAY_COLORSPACE_YUV444 2 > + > +#define logicvc_drm(d) \ > + container_of(d, struct logicvc_drm, drm_dev) > + > +struct logicvc_crtc; > +struct logicvc_interface; > + > +struct logicvc_drm_config { > + u32 display_interface; > + u32 display_colorspace; > + u32 display_depth; > + u32 row_stride; > + bool dithering; > + bool background_layer; > + bool layers_configurable; > + u32 layers_count; > +}; > + > +struct logicvc_drm_caps { > + bool layer_address; > +}; > + > +struct logicvc_drm { > + const struct logicvc_drm_caps *caps; > + struct logicvc_drm_config config; > + > + struct drm_device drm_dev; > + phys_addr_t reserved_mem_base; > + struct regmap *regmap; > + > + struct clk *vclk; > + struct clk *vclk2; > + struct clk *lvdsclk; > + struct clk *lvdsclkn; > + > + struct list_head layers_list; > + struct logicvc_crtc *crtc; > + struct logicvc_interface *interface; > +}; > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.c b/drivers/gpu/drm/logicvc/logicvc_interface.c > new file mode 100644 > index 000000000000..0cfded3792d8 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.c > @@ -0,0 +1,224 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/types.h> > + > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_bridge.h> > +#include <drm/drm_connector.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_encoder.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_modeset_helper_vtables.h> > +#include <drm/drm_of.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > + > +#include "logicvc_crtc.h" > +#include "logicvc_drm.h" > +#include "logicvc_interface.h" > +#include "logicvc_regs.h" > + > +#define logicvc_interface_from_drm_encoder(c) \ > + container_of(c, struct logicvc_interface, drm_encoder) > +#define logicvc_interface_from_drm_connector(c) \ > + container_of(c, struct logicvc_interface, drm_connector) > + > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > +{ > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > + struct logicvc_interface *interface = > + logicvc_interface_from_drm_encoder(drm_encoder); > + > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > + > + if (interface->drm_panel) { > + drm_panel_prepare(interface->drm_panel); > + > + /* Encoder enable is too early to enable the panel and a white > + * screen will be seen if the panel gets enabled before the > + * first page flip is done (and no other framebuffer > + * configuration remains from the boot software). */ > + interface->drm_panel_enabled = false; > + } > +} That's fishy (and the similar stuff in commit_tail). Is it because you need to have the CRTC powered before the encoder? If so, you should try the commit_tail_rpm variant, it makes sure the CRTC is powered on before making a commit. > +static void logicvc_encoder_disable(struct drm_encoder *drm_encoder) > +{ > + struct logicvc_interface *interface = > + logicvc_interface_from_drm_encoder(drm_encoder); > + > + if (interface->drm_panel) { > + drm_panel_disable(interface->drm_panel); > + drm_panel_unprepare(interface->drm_panel); > + } > +} > + > +static const struct drm_encoder_helper_funcs logicvc_encoder_helper_funcs = { > + .enable = logicvc_encoder_enable, > + .disable = logicvc_encoder_disable, > +}; > + > +static const struct drm_encoder_funcs logicvc_encoder_funcs = { > + .destroy = drm_encoder_cleanup, > +}; > + > +static int logicvc_connector_get_modes(struct drm_connector *drm_connector) > +{ > + struct logicvc_interface *interface = > + logicvc_interface_from_drm_connector(drm_connector); > + > + if (interface->drm_panel) > + return drm_panel_get_modes(interface->drm_panel, drm_connector); > + else > + WARN_ONCE(1, "Retrieving modes from a native connector is not implemented."); > + > + return 0; > +} > + > +static const struct drm_connector_helper_funcs logicvc_connector_helper_funcs = { > + .get_modes = logicvc_connector_get_modes, > +}; > + > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > +{ > + drm_connector_cleanup(drm_connector); > +} I guess you don't need that intermediate function? > +static const struct drm_connector_funcs logicvc_connector_funcs = { > + .reset = drm_atomic_helper_connector_reset, > + .fill_modes = drm_helper_probe_single_connector_modes, > + .destroy = logicvc_connector_destroy, > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > +}; > + > +static int logicvc_interface_encoder_type(struct logicvc_drm *logicvc) > +{ > + switch (logicvc->config.display_interface) { > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > + return DRM_MODE_ENCODER_LVDS; > + case LOGICVC_DISPLAY_INTERFACE_DVI: > + return DRM_MODE_ENCODER_TMDS; > + case LOGICVC_DISPLAY_INTERFACE_RGB: > + return DRM_MODE_ENCODER_DPI; > + default: > + return DRM_MODE_ENCODER_NONE; > + } > +} > + > +static int logicvc_interface_connector_type(struct logicvc_drm *logicvc) > +{ > + switch (logicvc->config.display_interface) { > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > + return DRM_MODE_CONNECTOR_LVDS; > + case LOGICVC_DISPLAY_INTERFACE_DVI: > + return DRM_MODE_CONNECTOR_DVID; > + case LOGICVC_DISPLAY_INTERFACE_RGB: > + return DRM_MODE_CONNECTOR_DPI; > + default: > + return DRM_MODE_CONNECTOR_Unknown; > + } > +} > + > +static bool logicvc_interface_native_connector(struct logicvc_drm *logicvc) > +{ > + switch (logicvc->config.display_interface) { > + case LOGICVC_DISPLAY_INTERFACE_DVI: > + return true; > + default: > + return false; > + } > +} > + > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc) > +{ > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > + > + logicvc->interface->drm_encoder.possible_crtcs = possible_crtcs; > +} > + > +int logicvc_interface_init(struct logicvc_drm *logicvc) > +{ > + struct logicvc_interface *interface; > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + int encoder_type = logicvc_interface_encoder_type(logicvc); > + int connector_type = logicvc_interface_connector_type(logicvc); > + bool native_connector = logicvc_interface_native_connector(logicvc); > + int ret; > + > + interface = devm_kzalloc(dev, sizeof(*interface), GFP_KERNEL); > + if (!interface) { > + ret = -ENOMEM; > + goto error_early; > + } > + > + ret = drm_of_find_panel_or_bridge(of_node, 1, 0, &interface->drm_panel, > + &interface->drm_bridge); > + if (ret == -EPROBE_DEFER) > + goto error_early; > + > + ret = drm_encoder_init(drm_dev, &interface->drm_encoder, > + &logicvc_encoder_funcs, encoder_type, NULL); > + if (ret) { > + drm_err(drm_dev, "Failed to initalize encoder\n"); > + goto error_early; > + } > + > + drm_encoder_helper_add(&interface->drm_encoder, > + &logicvc_encoder_helper_funcs); > + > + if (native_connector || interface->drm_panel) { > + ret = drm_connector_init(drm_dev, &interface->drm_connector, > + &logicvc_connector_funcs, > + connector_type); > + if (ret) { > + drm_err(drm_dev, "Failed to initalize connector\n"); > + goto error_encoder; > + } > + > + drm_connector_helper_add(&interface->drm_connector, > + &logicvc_connector_helper_funcs); > + > + ret = drm_connector_attach_encoder(&interface->drm_connector, > + &interface->drm_encoder); > + if (ret) { > + drm_err(drm_dev, > + "Failed to attach connector to encoder\n"); > + goto error_encoder; > + } > + } > + > + if (interface->drm_bridge) { > + ret = drm_bridge_attach(&interface->drm_encoder, > + interface->drm_bridge, NULL, 0); > + if (ret) { > + drm_err(drm_dev, > + "Failed to attach bridge to encoder\n"); > + goto error_encoder; > + } > + } You should consider using the bridge_or_panel API. > + logicvc->interface = interface; > + > + return 0; > + > +error_encoder: > + drm_encoder_cleanup(&interface->drm_encoder); > + > +error_early: > + return ret; > +} > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.h b/drivers/gpu/drm/logicvc/logicvc_interface.h > new file mode 100644 > index 000000000000..fb2e9e6e04aa > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.h > @@ -0,0 +1,30 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_INTERFACE_H_ > +#define _LOGICVC_INTERFACE_H_ > + > +#include <drm/drm_bridge.h> > +#include <drm/drm_connector.h> > +#include <drm/drm_encoder.h> > +#include <drm/drm_panel.h> > + > +struct logicvc_drm; > + > +struct logicvc_interface { > + struct drm_encoder drm_encoder; > + struct drm_connector drm_connector; > + > + struct drm_panel *drm_panel; > + struct drm_bridge *drm_bridge; > + > + bool drm_panel_enabled; > +}; > + > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc); > +int logicvc_interface_init(struct logicvc_drm *logicvc); > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.c b/drivers/gpu/drm/logicvc/logicvc_layer.c > new file mode 100644 > index 000000000000..9188d45cef77 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.c > @@ -0,0 +1,615 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/of.h> > +#include <linux/types.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fourcc.h> > +#include <drm/drm_plane.h> > +#include <drm/drm_plane_helper.h> > +#include <drm/drm_print.h> > + > +#include "logicvc_crtc.h" > +#include "logicvc_drm.h" > +#include "logicvc_layer.h" > +#include "logicvc_of.h" > +#include "logicvc_regs.h" > + > +#define logicvc_layer(p) \ > + container_of(p, struct logicvc_layer, drm_plane) > + > +static uint32_t logicvc_layer_formats_rgb16[] = { > + DRM_FORMAT_RGB565, > + DRM_FORMAT_BGR565, > + DRM_FORMAT_INVALID, > +}; > + > +static uint32_t logicvc_layer_formats_rgb24[] = { > + DRM_FORMAT_XRGB8888, > + DRM_FORMAT_XBGR8888, > + DRM_FORMAT_INVALID, > +}; > + > +/* What we call depth in this driver only counts color components, not alpha. > + * This allows us to stay compatible with the LogiCVC bistream definitions. */ > +static uint32_t logicvc_layer_formats_rgb24_alpha[] = { > + DRM_FORMAT_ARGB8888, > + DRM_FORMAT_ABGR8888, > + DRM_FORMAT_INVALID, > +}; > + > +static struct logicvc_layer_formats logicvc_layer_formats[] = { > + { > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > + .depth = 16, > + .formats = logicvc_layer_formats_rgb16, > + }, > + { > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > + .depth = 24, > + .formats = logicvc_layer_formats_rgb24, > + }, > + { > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > + .depth = 24, > + .alpha = true, > + .formats = logicvc_layer_formats_rgb24_alpha, > + }, > + { } > +}; > + > +static bool logicvc_layer_format_inverted(uint32_t format) > +{ > + switch (format) { > + case DRM_FORMAT_BGR565: > + case DRM_FORMAT_BGR888: > + case DRM_FORMAT_XBGR8888: > + case DRM_FORMAT_ABGR8888: > + return true; > + default: > + return false; > + } > +} > + > +static int logicvc_plane_atomic_check(struct drm_plane *drm_plane, > + struct drm_plane_state *state) > +{ > + struct drm_device *drm_dev = drm_plane->dev; > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > + struct drm_crtc_state *crtc_state; > + int min_scale, max_scale; > + bool can_position; > + int ret; > + > + if (!state->crtc) > + return 0; > + > + crtc_state = drm_atomic_get_existing_crtc_state(state->state, > + state->crtc); > + if (WARN_ON(!crtc_state)) > + return -EINVAL; > + > + if (state->crtc_x < 0 || state->crtc_y < 0) { > + drm_err(drm_dev, > + "Negative on-CRTC positions are not supported.\n"); > + return -EINVAL; > + } > + > + if (!logicvc->caps->layer_address) { > + ret = logicvc_layer_buffer_find_setup(logicvc, layer, state, > + NULL); > + if (ret) { > + drm_err(drm_dev, "No viable setup for buffer found.\n"); > + return ret; > + } > + } > + > + min_scale = DRM_PLANE_HELPER_NO_SCALING; > + max_scale = DRM_PLANE_HELPER_NO_SCALING; > + > + can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && > + layer->index != (logicvc->config.layers_count - 1) && > + logicvc->config.layers_configurable); > + > + ret = drm_atomic_helper_check_plane_state(state, crtc_state, > + min_scale, max_scale, > + can_position, true); > + if (ret) { > + drm_err(drm_dev, "Invalid plane state\n\n"); > + return ret; > + } > + > + return 0; > +} > + > +static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, > + struct drm_plane_state *old_state) > +{ > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > + struct drm_plane_state *state = drm_plane->state; > + struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; > + struct drm_framebuffer *fb = state->fb; > + struct logicvc_layer_buffer_setup setup = {}; > + u32 index = layer->index; > + u32 reg; > + > + /* Layer dimensions */ > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_WIDTH_REG(index), > + state->crtc_w - 1); > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HEIGHT_REG(index), > + state->crtc_h - 1); > + > + if (logicvc->caps->layer_address) { > + phys_addr_t fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ADDRESS_REG(index), > + fb_addr); > + } else { > + /* Rely on offsets to configure the address. */ > + > + logicvc_layer_buffer_find_setup(logicvc, layer, state, &setup); > + > + /* Layer memory offsets */ > + > + regmap_write(logicvc->regmap, LOGICVC_BUFFER_SEL_REG, > + LOGICVC_BUFFER_SEL_VALUE(index, setup.buffer_sel)); > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HOFFSET_REG(index), > + setup.hoffset); > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VOFFSET_REG(index), > + setup.voffset); > + } > + > + /* Layer position */ > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HPOSITION_REG(index), > + mode->hdisplay - 1 - state->crtc_x); > + > + /* Vertical position must be set last to sync layer register changes. */ > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VPOSITION_REG(index), > + mode->vdisplay - 1 - state->crtc_y); > + > + /* Layer alpha */ > + > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) { > + u32 alpha_bits; > + u32 alpha_max; > + u32 alpha; > + > + switch (layer->config.depth) { > + case 8: > + alpha_bits = 3; > + break; > + case 16: > + if (layer->config.colorspace == LOGICVC_LAYER_COLORSPACE_YUV) > + alpha_bits = 8; > + else > + alpha_bits = 6; > + break; > + default: > + alpha_bits = 8; > + break; > + } > + > + alpha_max = BIT(alpha_bits) - 1; > + alpha = state->alpha * alpha_max / DRM_BLEND_ALPHA_OPAQUE; > + > + DRM_DEBUG_DRIVER("Setting layer %d alpha to %d/%d\n", index, > + alpha, alpha_max); > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ALPHA_REG(index), > + alpha); > + } > + > + /* Layer control */ > + > + reg = LOGICVC_LAYER_CTRL_ENABLE; > + > + if (logicvc_layer_format_inverted(fb->format->format)) > + reg |= LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT; > + > + reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), reg); > +} > + > +static void logicvc_plane_atomic_disable(struct drm_plane *drm_plane, > + struct drm_plane_state *old_state) > +{ > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > + u32 index = layer->index; > + > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), 0); > +} > + > +static struct drm_plane_helper_funcs logicvc_plane_helper_funcs = { > + .atomic_check = logicvc_plane_atomic_check, > + .atomic_update = logicvc_plane_atomic_update, > + .atomic_disable = logicvc_plane_atomic_disable, > +}; > + > +static const struct drm_plane_funcs logicvc_plane_funcs = { > + .update_plane = drm_atomic_helper_update_plane, > + .disable_plane = drm_atomic_helper_disable_plane, > + .destroy = drm_plane_cleanup, > + .reset = drm_atomic_helper_plane_reset, > + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > +}; > + > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer, > + struct drm_plane_state *state, > + struct logicvc_layer_buffer_setup *setup) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct drm_framebuffer *fb = state->fb; > + /* All the supported formats have a single data plane. */ > + u32 layer_bytespp = fb->format->cpp[0]; > + u32 layer_stride = layer_bytespp * logicvc->config.row_stride; > + u32 base_offset = layer->config.base_offset * layer_stride; > + u32 buffer_offset = layer->config.buffer_offset * layer_stride; > + u8 buffer_sel = 0; > + u16 voffset = 0; > + u16 hoffset = 0; > + phys_addr_t fb_addr; > + u32 fb_offset; > + u32 gap; > + > + if (!logicvc->reserved_mem_base) { > + drm_err(drm_dev, "No reserved memory base was registered!\n"); > + return -ENOMEM; > + } > + > + fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > + if (fb_addr < logicvc->reserved_mem_base) { > + drm_err(drm_dev, > + "Framebuffer memory below reserved memory base!\n"); > + return -EINVAL; > + } > + > + fb_offset = (u32) (fb_addr - logicvc->reserved_mem_base); > + > + if (fb_offset < base_offset) { > + drm_err(drm_dev, > + "Framebuffer offset below layer base offset!\n"); > + return -EINVAL; > + } > + > + gap = fb_offset - base_offset; > + > + /* Use the possible video buffers selection. */ > + if (gap && buffer_offset) { > + buffer_sel = gap / buffer_offset; > + if (buffer_sel > LOGICVC_BUFFER_SEL_MAX) > + buffer_sel = LOGICVC_BUFFER_SEL_MAX; > + > + gap -= buffer_sel * buffer_offset; > + } > + > + /* Use the vertical offset. */ > + if (gap && layer_stride && logicvc->config.layers_configurable) { > + voffset = gap / layer_stride; > + if (voffset > LOGICVC_LAYER_VOFFSET_MAX) > + voffset = LOGICVC_LAYER_VOFFSET_MAX; > + > + gap -= voffset * layer_stride; > + } > + > + /* Use the horizontal offset. */ > + if (gap && layer_bytespp && logicvc->config.layers_configurable) { > + hoffset = gap / layer_bytespp; > + if (hoffset > LOGICVC_DIMENSIONS_MAX) > + hoffset = LOGICVC_DIMENSIONS_MAX; > + > + gap -= hoffset * layer_bytespp; > + } > + > + if (gap) { > + drm_err(drm_dev, > + "Unable to find layer %d buffer setup for 0x%x byte gap\n", > + layer->index, fb_offset - base_offset); > + return -EINVAL; > + } > + > + DRM_DEBUG_DRIVER("Found layer %d buffer setup for 0x%x byte gap:\n", > + layer->index, fb_offset - base_offset); > + > + DRM_DEBUG_DRIVER("- buffer_sel = 0x%x chunks of 0x%x bytes\n", > + buffer_sel, buffer_offset); > + DRM_DEBUG_DRIVER("- voffset = 0x%x chunks of 0x%x bytes\n", voffset, > + layer_stride); > + DRM_DEBUG_DRIVER("- hoffset = 0x%x chunks of 0x%x bytes\n", hoffset, > + layer_bytespp); > + > + if (setup) { > + setup->buffer_sel = buffer_sel; > + setup->voffset = voffset; > + setup->hoffset = hoffset; > + } > + > + return 0; > +} > + > +static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc_layer *layer) > +{ > + bool alpha; > + unsigned int i = 0; > + > + alpha = (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_PIXEL); > + > + while (logicvc_layer_formats[i].formats) { > + if (logicvc_layer_formats[i].colorspace == layer->config.colorspace && > + logicvc_layer_formats[i].depth == layer->config.depth && > + logicvc_layer_formats[i].alpha == alpha) > + return &logicvc_layer_formats[i]; > + > + i++; > + } > + > + return NULL; > +} > + > +static unsigned int logicvc_layer_formats_count(struct logicvc_layer_formats *formats) > +{ > + unsigned int count = 0; > + > + while (formats->formats[count] != DRM_FORMAT_INVALID) > + count++; > + > + return count; > +} > + > +static int logicvc_layer_config_parse(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer) > +{ > + struct device_node *of_node = layer->of_node; > + struct logicvc_layer_config *config = &layer->config; > + int ret; > + > + logicvc_of_property_parse_bool(of_node, > + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, > + &config->primary); > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, > + &config->colorspace); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_DEPTH, > + &config->depth); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, > + &config->alpha_mode); > + if (ret) > + return ret; > + > + /* Memory offset is only relevant without layer address configuration. */ > + if (logicvc->caps->layer_address) > + return 0; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, > + &config->base_offset); > + if (ret) > + return ret; > + > + ret = logicvc_of_property_parse_u32(of_node, > + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, > + &config->buffer_offset); > + if (ret) > + return ret; > + > + return 0; > +} > + > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > + u32 index) > +{ > + struct logicvc_layer *layer; > + > + list_for_each_entry(layer, &logicvc->layers_list, list) > + if (layer->index == index) > + return layer; > + > + return NULL; > +} > + > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > + enum drm_plane_type type) > +{ > + struct logicvc_layer *layer; > + > + list_for_each_entry(layer, &logicvc->layers_list, list) > + if (layer->drm_plane.type == type) > + return layer; > + > + return NULL; > +} > + > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc) > +{ > + return logicvc_layer_get_from_type(logicvc, DRM_PLANE_TYPE_PRIMARY); > +} > + > +static int logicvc_layer_init(struct logicvc_drm *logicvc, > + struct device_node *of_node, u32 index) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct logicvc_layer *layer = NULL; > + struct logicvc_layer_formats *formats; > + unsigned int formats_count; > + enum drm_plane_type type; > + unsigned int zpos; > + int ret; > + > + layer = devm_kzalloc(dev, sizeof(*layer), GFP_KERNEL); > + if (!layer) { > + ret = -ENOMEM; > + goto error; > + } > + > + layer->of_node = of_node; > + layer->index = index; > + > + ret = logicvc_layer_config_parse(logicvc, layer); > + if (ret) { > + drm_err(drm_dev, "Failed to parse config for layer #%d\n", > + index); > + goto error; > + } > + > + formats = logicvc_layer_formats_lookup(layer); > + if (!formats) { > + drm_err(drm_dev, "Failed to lookup formats for layer #%d\n", > + index); > + goto error; > + } > + > + formats_count = logicvc_layer_formats_count(formats); > + > + /* The final layer can be configured as a background layer. */ > + if (logicvc->config.background_layer && > + index == (logicvc->config.layers_count - 1)) { > + /* A zero value for black is only valid for RGB, not for YUV, > + * so this will need to take the format in account for YUV. */ > + u32 background = 0; > + > + DRM_DEBUG_DRIVER("Using layer #%d as background layer\n", > + index); > + > + regmap_write(logicvc->regmap, LOGICVC_BACKGROUND_COLOR_REG, > + background); > + > + devm_kfree(dev, layer); > + > + return 0; > + } > + > + if (layer->config.primary) > + type = DRM_PLANE_TYPE_PRIMARY; > + else > + type = DRM_PLANE_TYPE_OVERLAY; > + > + ret = drm_universal_plane_init(drm_dev, &layer->drm_plane, 0, > + &logicvc_plane_funcs, formats->formats, > + formats_count, NULL, type, NULL); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize layer plane\n"); > + return ret; > + } > + > + drm_plane_helper_add(&layer->drm_plane, &logicvc_plane_helper_funcs); > + > + zpos = logicvc->config.layers_count - index - 1; > + DRM_DEBUG_DRIVER("Giving layer #%d zpos %d\n", index, zpos); > + > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) > + drm_plane_create_alpha_property(&layer->drm_plane); > + > + drm_plane_create_zpos_immutable_property(&layer->drm_plane, zpos); > + > + DRM_DEBUG_DRIVER("Registering layer #%d\n", index); > + > + layer->formats = formats; > + > + list_add_tail(&layer->list, &logicvc->layers_list); > + > + return 0; > + > +error: > + if (layer) > + devm_kfree(dev, layer); > + > + return ret; > +} > + > +static void logicvc_layer_fini(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer) > +{ > + struct device *dev = logicvc->drm_dev.dev; > + > + list_del(&layer->list); > + devm_kfree(dev, layer); > +} > + > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc) > +{ > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > + struct logicvc_layer *layer; > + > + list_for_each_entry(layer, &logicvc->layers_list, list) { > + if (layer->drm_plane.type != DRM_PLANE_TYPE_OVERLAY) > + continue; > + > + layer->drm_plane.possible_crtcs = possible_crtcs; > + } > +} > + > +int logicvc_layers_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct device_node *layer_node = NULL; > + struct device_node *layers_node; > + struct logicvc_layer *layer; > + struct logicvc_layer *next; > + int ret = 0; > + > + layers_node = of_get_child_by_name(of_node, "layers"); > + if (!layers_node) { > + DRM_ERROR("No layers node found in the description\n"); > + ret = -ENODEV; > + goto error; > + } > + > + for_each_child_of_node(layers_node, layer_node) { > + u32 index = 0; > + > + if (!logicvc_of_node_is_layer(layer_node)) > + continue; > + > + ret = of_property_read_u32(layer_node, "reg", &index); > + if (ret) > + continue; > + > + layer = logicvc_layer_get_from_index(logicvc, index); > + if (layer) { > + DRM_ERROR("Duplicated entry for layer #%d\n", index); > + continue; > + } > + > + ret = logicvc_layer_init(logicvc, layer_node, index); > + if (ret) > + goto error; > + > + of_node_put(layer_node); > + } > + > + of_node_put(layers_node); > + > + return 0; > + > +error: > + list_for_each_entry_safe(layer, next, &logicvc->layers_list, list) > + logicvc_layer_fini(logicvc, layer); > + > + return ret; > +} > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.h b/drivers/gpu/drm/logicvc/logicvc_layer.h > new file mode 100644 > index 000000000000..c5767c81f446 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.h > @@ -0,0 +1,64 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#ifndef _LOGICVC_LAYER_H_ > +#define _LOGICVC_LAYER_H_ > + > +#include <linux/of.h> > +#include <linux/types.h> > +#include <drm/drm_plane.h> > + > +#define LOGICVC_LAYER_COLORSPACE_RGB 0 > +#define LOGICVC_LAYER_COLORSPACE_YUV 1 > + > +#define LOGICVC_LAYER_ALPHA_LAYER 0 > +#define LOGICVC_LAYER_ALPHA_PIXEL 1 > + > +struct logicvc_layer_buffer_setup { > + u8 buffer_sel; > + u16 voffset; > + u16 hoffset; > +}; > + > +struct logicvc_layer_config { > + u32 colorspace; > + u32 depth; > + u32 alpha_mode; > + u32 base_offset; > + u32 buffer_offset; > + bool primary; > +}; > + > +struct logicvc_layer_formats { > + u32 colorspace; > + u32 depth; > + bool alpha; > + uint32_t *formats; > +}; > + > +struct logicvc_layer { > + struct logicvc_layer_config config; > + struct logicvc_layer_formats *formats; > + struct device_node *of_node; > + > + struct drm_plane drm_plane; > + struct list_head list; > + u32 index; > +}; > + > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > + struct logicvc_layer *layer, > + struct drm_plane_state *state, > + struct logicvc_layer_buffer_setup *setup); > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > + u32 index); > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > + enum drm_plane_type type); > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc); > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc); > +int logicvc_layers_init(struct logicvc_drm *logicvc); > + > +#endif > diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.c b/drivers/gpu/drm/logicvc/logicvc_mode.c > new file mode 100644 > index 000000000000..aa8f35b64c75 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_mode.c > @@ -0,0 +1,101 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + > +#include <linux/types.h> > + > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_drv.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > +#include <drm/drm_mode_config.h> > +#include <drm/drm_panel.h> > +#include <drm/drm_print.h> > +#include <drm/drm_probe_helper.h> > +#include <drm/drm_vblank.h> > + > +#include "logicvc_drm.h" > +#include "logicvc_interface.h" > +#include "logicvc_layer.h" > +#include "logicvc_mode.h" > + > +static void logicvc_mode_atomic_commit_tail(struct drm_atomic_state *old_state) > +{ > + struct drm_device *drm_dev = old_state->dev; > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > + struct logicvc_interface *interface = logicvc->interface; > + > + drm_atomic_helper_commit_tail(old_state); > + > + /* Enable the panel after the first commit, which concerns our panel > + * since we only support a single interface. */ > + if (interface->drm_panel && !interface->drm_panel_enabled) { > + drm_panel_enable(interface->drm_panel); > + interface->drm_panel_enabled = true; > + } > +} > + > +static const struct drm_mode_config_helper_funcs logicvc_mode_config_helper_funcs = { > + .atomic_commit_tail = logicvc_mode_atomic_commit_tail, > +}; > + > +static const struct drm_mode_config_funcs logicvc_mode_config_funcs = { > + .fb_create = drm_gem_fb_create, > + .output_poll_changed = drm_fb_helper_output_poll_changed, > + .atomic_check = drm_atomic_helper_check, > + .atomic_commit = drm_atomic_helper_commit, > +}; > + > +int logicvc_mode_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct drm_mode_config *mode_config = &drm_dev->mode_config; > + struct logicvc_layer *layer_primary; > + uint32_t preferred_depth; > + int ret; > + > + ret = drm_vblank_init(drm_dev, mode_config->num_crtc); > + if (ret) { > + drm_err(drm_dev, "Failed to initialize vblank\n"); > + return ret; > + } > + > + layer_primary = logicvc_layer_get_primary(logicvc); > + if (!layer_primary) { > + drm_err(drm_dev, "Failed to get primary layer\n"); > + return -EINVAL; > + } > + > + preferred_depth = layer_primary->formats->depth; > + > + /* DRM counts alpha in depth, our driver doesn't. */ > + if (layer_primary->formats->alpha) > + preferred_depth += 8; > + > + mode_config->min_width = 64; > + mode_config->max_width = 2048; > + mode_config->min_height = 1; > + mode_config->max_height = 2048; > + mode_config->preferred_depth = preferred_depth; > + mode_config->funcs = &logicvc_mode_config_funcs; > + mode_config->helper_private = &logicvc_mode_config_helper_funcs; > + > + drm_mode_config_reset(drm_dev); > + > + drm_kms_helper_poll_init(drm_dev); > + > + return 0; > +} > + > +void logicvc_mode_fini(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + > + drm_kms_helper_poll_fini(drm_dev); > +} You should consider using a drmm_add_action_or_reset here to simplify your error / remove path. Maxime [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller 2020-11-03 9:46 ` Maxime Ripard @ 2020-12-02 16:06 ` Paul Kocialkowski -1 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-12-02 16:06 UTC (permalink / raw) To: Maxime Ripard Cc: dri-devel, devicetree, linux-kernel, David Airlie, Daniel Vetter, Rob Herring, Maarten Lankhorst, Thomas Zimmermann, Thomas Petazzoni [-- Attachment #1: Type: text/plain, Size: 69845 bytes --] Hi, On Tue 03 Nov 20, 10:46, Maxime Ripard wrote: > On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > > Introduces a driver for the LogiCVC display controller, a programmable > > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > > Xilinx FPGAs. The controller is mostly configured at logic synthesis > > time so only a subset of configuration is left for the driver to > > handle. > > > > The following features are implemented and tested: > > - LVDS 4-bit interface; > > - RGB565 pixel formats; > > - Multiple layers and hardware composition; > > - Layer-wide alpha mode; > > > > The following features are implemented but untested: > > - Other RGB pixel formats; > > - Layer framebuffer configuration for version 4; > > - Lowest-layer used as background color; > > - Per-pixel alpha mode. > > > > The following features are not implemented: > > - YUV pixel formats; > > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > > - External parallel input for layer; > > - Color-keying; > > - LUT-based alpha modes. > > > > Additional implementation-specific notes: > > - Panels are only enabled after the first page flip to avoid flashing a > > white screen. > > - Depth used in context of the LogiCVC driver only counts color components > > to match the definition of the synthesis parameters. > > > > Support is implemented for both version 3 and 4 of the controller. > > > > With version 3, framebuffers are stored in a dedicated contiguous > > memory area, with a base address hardcoded for each layer. This requires > > using a dedicated CMA pool registered at the base address and tweaking a > > few offset-related registers to try to use any buffer allocated from > > the pool. This is done on a best-effort basis to have the hardware cope > > with the DRM framebuffer allocation model and there is no guarantee > > that each buffer allocated by GEM CMA can be used for any layer. > > In particular, buffers allocated below the base address for a layer are > > guaranteed not to be configurable for that layer. See the implementation of > > logicvc_layer_buffer_find_setup for specifics. > > > > Version 4 allows configuring each buffer address directly, which > > guarantees that any buffer can be configured. > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > Reviewed-by: Maxime Ripard <mripard@kernel.org> > > There's a bunch of checkpatch issues here Okay, I'll take a look! > > --- > > MAINTAINERS | 6 + > > drivers/gpu/drm/Kconfig | 2 + > > drivers/gpu/drm/Makefile | 1 + > > drivers/gpu/drm/logicvc/Kconfig | 9 + > > drivers/gpu/drm/logicvc/Makefile | 4 + > > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > > 18 files changed, 2236 insertions(+) > > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > > create mode 100644 drivers/gpu/drm/logicvc/Makefile > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 71e29dc0ab9d..9c4c5edef0ba 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > > F: drivers/gpu/drm/i810/ > > F: include/uapi/drm/i810_drm.h > > > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > +T: git git://anongit.freedesktop.org/drm/drm-misc > > +S: Supported > > +F: drivers/gpu/drm/logicvc/ > > + > > Do you have the rights to commit in drm-misc or will you need it? Yes I think I still have the right to push, but it's probably better if someone else pushes the series ;) > > +static int logicvc_crtc_atomic_check(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct drm_crtc_state *crtc_state = > > + drm_atomic_get_new_crtc_state(state, drm_crtc); > > + struct drm_display_mode *mode = &crtc_state->adjusted_mode; > > + > > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > > + return -EINVAL; > > + > > + return 0; > > +} > > You probably want to have a mode_valid here to check for this as well, > it would be weird to expose a mode that we outright reject. You're right, mode_valid looks like a more appropriate place to check this. > > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > + struct drm_crtc_state *crtc_state = > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > + struct drm_device *drm_dev = drm_crtc->dev; > > + unsigned long flags; > > + > > + /* Register pending event, only if vblank is already on. */ > > + if (drm_crtc->state->event && crtc_state->active) { > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > + > > + crtc->event = drm_crtc->state->event; > > + drm_crtc->state->event = NULL; > > + > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > + } > > +} > > That's unusual to do it in atomic_begin, why do you need it? This is to cover the case where we need to send a page flip event but the crtc is already on. In that case, neither atomic_enable nor atomic_disable will be called so we need to rely on atomic_begin to grab that event. This happens for example when a single plane is updated. The same thing is done in e.g. sun4i-drm. > > +static void logicvc_crtc_atomic_enable(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; > > You should use drm_atomic_get_new_crtc_state here, we're removing the > direct references of crtc->state to make it more obvious if we're using > the old or new state. Okay, will do! > > + struct drm_crtc_state *crtc_state = > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > + struct drm_device *drm_dev = drm_crtc->dev; > > + unsigned int hact, hfp, hsl, hbp; > > + unsigned int vact, vfp, vsl, vbp; > > + unsigned long flags; > > + u32 ctrl; > > + > > + /* Timings */ > > + > > + hact = mode->hdisplay; > > + hfp = mode->hsync_start - mode->hdisplay; > > + hsl = mode->hsync_end - mode->hsync_start; > > + hbp = mode->htotal - mode->hsync_end; > > + > > + vact = mode->vdisplay; > > + vfp = mode->vsync_start - mode->vdisplay; > > + vsl = mode->vsync_end - mode->vsync_start; > > + vbp = mode->vtotal - mode->vsync_end; > > + > > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_FRONT_PORCH_REG, hfp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_REG, hsl - 1); > > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_BACK_PORCH_REG, hbp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_HRES_REG, hact - 1); > > + > > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_FRONT_PORCH_REG, vfp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_REG, vsl - 1); > > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_BACK_PORCH_REG, vbp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_VRES_REG, vact - 1); > > + > > + /* Signals */ > > + > > + ctrl = LOGICVC_CTRL_HSYNC_ENABLE | LOGICVC_CTRL_VSYNC_ENABLE | > > + LOGICVC_CTRL_DE_ENABLE; > > + > > + if (mode->flags & DRM_MODE_FLAG_NHSYNC) > > + ctrl |= LOGICVC_CTRL_HSYNC_INVERT; > > + > > + if (mode->flags & DRM_MODE_FLAG_NVSYNC) > > + ctrl |= LOGICVC_CTRL_VSYNC_INVERT; > > + > > + if (logicvc->interface) { > > + struct drm_connector *connector = > > + &logicvc->interface->drm_connector; > > + struct drm_display_info *display_info = > > + &connector->display_info; > > + > > + if (display_info->bus_flags & DRM_BUS_FLAG_DE_LOW) > > + ctrl |= LOGICVC_CTRL_DE_INVERT; > > + > > + if (display_info->bus_flags & > > + DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) > > + ctrl |= LOGICVC_CTRL_CLOCK_INVERT; > > + } > > + > > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > > + LOGICVC_CTRL_HSYNC_ENABLE | > > + LOGICVC_CTRL_HSYNC_INVERT | > > + LOGICVC_CTRL_VSYNC_ENABLE | > > + LOGICVC_CTRL_VSYNC_INVERT | > > + LOGICVC_CTRL_DE_ENABLE | > > + LOGICVC_CTRL_DE_INVERT | > > + LOGICVC_CTRL_PIXEL_INVERT | > > + LOGICVC_CTRL_CLOCK_INVERT, ctrl); > > + > > + /* Generate internal state reset. */ > > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > > + > > + drm_crtc_vblank_on(drm_crtc); > > + > > + /* Register our event after vblank is enabled. */ > > + if (drm_crtc->state->event && !crtc_state->active) { > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > + > > + crtc->event = drm_crtc->state->event; > > + drm_crtc->state->event = NULL; > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > + } > > Haven't you done that in atomic_begin already? No, atomic_begin grabs a page flip event when the CRTC is already enabled. This will grab it when the CRTC was previously disabled and we are now enabling it. Maybe both cases could be merged into atomic_begin since it's called in both situations. > > +} > > + > > +static void logicvc_crtc_atomic_disable(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + struct drm_device *drm_dev = drm_crtc->dev; > > + > > + drm_crtc_vblank_off(drm_crtc); > > + > > + /* Disable and clear CRTC bits. */ > > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > > + LOGICVC_CTRL_HSYNC_ENABLE | > > + LOGICVC_CTRL_HSYNC_INVERT | > > + LOGICVC_CTRL_VSYNC_ENABLE | > > + LOGICVC_CTRL_VSYNC_INVERT | > > + LOGICVC_CTRL_DE_ENABLE | > > + LOGICVC_CTRL_DE_INVERT | > > + LOGICVC_CTRL_PIXEL_INVERT | > > + LOGICVC_CTRL_CLOCK_INVERT, 0); > > + > > + /* Generate internal state reset. */ > > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > > + > > + /* Consume leftover event since vblank is now disabled. */ > > + if (drm_crtc->state->event && !drm_crtc->state->active) { > > + spin_lock_irq(&drm_dev->event_lock); > > + > > + drm_crtc_send_vblank_event(drm_crtc, drm_crtc->state->event); > > + drm_crtc->state->event = NULL; > > + spin_unlock_irq(&drm_dev->event_lock); > > + } > > And here too. It's definitely worth explaining in the commit log and / > or comments what you're trying to address. Well, there are already comments there but maybe the one in atomic_begin would need more details to be explicit. In any case, the three blocks cover the three distinct cases that can happen: - page flip is requested and CRTC was already enabled - page flip is requested and CRTC is getting enabled - page flip is requested and CRTC is getting disabled > > +} > > + > > +static const struct drm_crtc_helper_funcs logicvc_crtc_helper_funcs = { > > + .atomic_check = logicvc_crtc_atomic_check, > > + .atomic_begin = logicvc_crtc_atomic_begin, > > + .atomic_enable = logicvc_crtc_atomic_enable, > > + .atomic_disable = logicvc_crtc_atomic_disable, > > +}; > > + > > +static int logicvc_crtc_enable_vblank(struct drm_crtc *drm_crtc) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + > > + /* Clear any pending V_SYNC interrupt. */ > > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_STAT_REG, > > + LOGICVC_INT_STAT_V_SYNC, LOGICVC_INT_STAT_V_SYNC); > > + > > + /* Unmask V_SYNC interrupt. */ > > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > > + LOGICVC_INT_MASK_V_SYNC, 0); > > + > > + return 0; > > +} > > + > > +static void logicvc_crtc_disable_vblank(struct drm_crtc *drm_crtc) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + > > + /* Mask V_SYNC interrupt. */ > > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > > + LOGICVC_INT_MASK_V_SYNC, LOGICVC_INT_MASK_V_SYNC); > > +} > > + > > +static const struct drm_crtc_funcs logicvc_crtc_funcs = { > > + .reset = drm_atomic_helper_crtc_reset, > > + .destroy = drm_crtc_cleanup, > > + .set_config = drm_atomic_helper_set_config, > > + .page_flip = drm_atomic_helper_page_flip, > > + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > > + .enable_vblank = logicvc_crtc_enable_vblank, > > + .disable_vblank = logicvc_crtc_disable_vblank, > > +}; > > + > > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct logicvc_crtc *crtc = logicvc->crtc; > > + unsigned long flags; > > + > > + if (!crtc) > > + return; > > + > > + drm_crtc_handle_vblank(&crtc->drm_crtc); > > + > > + if (crtc->event) { > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > + drm_crtc_send_vblank_event(&crtc->drm_crtc, crtc->event); > > + drm_crtc_vblank_put(&crtc->drm_crtc); > > + crtc->event = NULL; > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > + } > > +} > > + > > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct logicvc_crtc *crtc; > > + struct logicvc_layer *layer_primary; > > + int ret; > > + > > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > > + if (!crtc) > > + return -ENOMEM; > > + > > + layer_primary = logicvc_layer_get_primary(logicvc); > > + if (!layer_primary) { > > + DRM_ERROR("Failed to get primary layer\n"); > > + return -EINVAL; > > + } > > + > > + ret = drm_crtc_init_with_planes(drm_dev, &crtc->drm_crtc, > > + &layer_primary->drm_plane, NULL, > > + &logicvc_crtc_funcs, NULL); > > + if (ret) { > > + DRM_ERROR("Failed to initalize CRTC\n"); > > + return ret; > > + } > > + > > + drm_crtc_helper_add(&crtc->drm_crtc, &logicvc_crtc_helper_funcs); > > + > > + crtc->drm_crtc.port = of_graph_get_port_by_id(of_node, 1); > > + > > + logicvc->crtc = crtc; > > + > > + return 0; > > +} > > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.h b/drivers/gpu/drm/logicvc/logicvc_crtc.h > > new file mode 100644 > > index 000000000000..6a1291c37704 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.h > > @@ -0,0 +1,21 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_CRTC_H_ > > +#define _LOGICVC_CRTC_H_ > > + > > +struct drm_pending_vblank_event; > > +struct logicvc_drm; > > + > > +struct logicvc_crtc { > > + struct drm_crtc drm_crtc; > > + struct drm_pending_vblank_event *event; > > +}; > > + > > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc); > > +int logicvc_crtc_init(struct logicvc_drm *logicvc); > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.c b/drivers/gpu/drm/logicvc/logicvc_drm.c > > new file mode 100644 > > index 000000000000..b73e92fb2026 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.c > > @@ -0,0 +1,472 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/clk.h> > > +#include <linux/mfd/syscon.h> > > +#include <linux/module.h> > > +#include <linux/of.h> > > +#include <linux/of_address.h> > > +#include <linux/of_device.h> > > +#include <linux/of_reserved_mem.h> > > +#include <linux/regmap.h> > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_drv.h> > > +#include <drm/drm_fb_helper.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_print.h> > > + > > +#include "logicvc_crtc.h" > > +#include "logicvc_drm.h" > > +#include "logicvc_interface.h" > > +#include "logicvc_mode.h" > > +#include "logicvc_layer.h" > > +#include "logicvc_of.h" > > +#include "logicvc_regs.h" > > + > > +DEFINE_DRM_GEM_CMA_FOPS(logicvc_drm_fops); > > + > > +static int logicvc_drm_gem_cma_dumb_create(struct drm_file *file_priv, > > + struct drm_device *drm_dev, > > + struct drm_mode_create_dumb *args) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > > + > > + /* Stride is always fixed to its configuration value. */ > > + args->pitch = logicvc->config.row_stride * DIV_ROUND_UP(args->bpp, 8); > > + > > + return drm_gem_cma_dumb_create_internal(file_priv, drm_dev, args); > > +} > > + > > +static struct drm_driver logicvc_drm_driver = { > > + .driver_features = DRIVER_GEM | DRIVER_MODESET | > > + DRIVER_ATOMIC, > > + > > + .fops = &logicvc_drm_fops, > > + .name = "logicvc-drm", > > + .desc = "Xylon LogiCVC DRM driver", > > + .date = "20200403", > > + .major = 1, > > + .minor = 0, > > + > > + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(logicvc_drm_gem_cma_dumb_create), > > +}; > > + > > +static struct regmap_config logicvc_drm_regmap_config = { > > + .reg_bits = 32, > > + .val_bits = 32, > > + .reg_stride = 4, > > + .name = "logicvc-drm", > > +}; > > + > > +static irqreturn_t logicvc_drm_irq_handler(int irq, void *data) > > +{ > > + struct logicvc_drm *logicvc = data; > > + irqreturn_t ret = IRQ_NONE; > > + u32 stat = 0; > > + > > + /* Get pending interrupt sources. */ > > + regmap_read(logicvc->regmap, LOGICVC_INT_STAT_REG, &stat); > > + > > + /* Clear all pending interrupt sources. */ > > + regmap_write(logicvc->regmap, LOGICVC_INT_STAT_REG, stat); > > + > > + if (stat & LOGICVC_INT_STAT_V_SYNC) { > > + logicvc_crtc_vblank_handler(logicvc); > > + ret = IRQ_HANDLED; > > + } > > + > > + return ret; > > +} > > + > > +static int logicvc_drm_config_parse(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct logicvc_drm_config *config = &logicvc->config; > > + struct device_node *layers_node; > > + int ret; > > + > > + logicvc_of_property_parse_bool(of_node, LOGICVC_OF_PROPERTY_DITHERING, > > + &config->dithering); > > + logicvc_of_property_parse_bool(of_node, > > + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, > > + &config->background_layer); > > + logicvc_of_property_parse_bool(of_node, > > + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, > > + &config->layers_configurable); > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE, > > + &config->display_interface); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, > > + &config->display_colorspace); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, > > + &config->display_depth); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_ROW_STRIDE, > > + &config->row_stride); > > + if (ret) > > + return ret; > > + > > + layers_node = of_get_child_by_name(of_node, "layers"); > > + if (!layers_node) { > > + DRM_ERROR("Missing non-optional layers node\n"); > > + return -EINVAL; > > + } > > + > > + config->layers_count = of_get_child_count(layers_node); > > + if (!config->layers_count) { > > + DRM_ERROR("Missing a non-optional layers children node\n"); > > + return -EINVAL; > > + } > > + > > + return 0; > > +} > > + > > +static void logicvc_version_print(struct logicvc_drm *logicvc) > > +{ > > + u32 version; > > + > > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > > + > > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > > + 'a'); > > DRM_DEV_INFO? Okay but now according to Sam, "DRM_DEV_ERROR() and friends are deprecated" so I wonder which is the right one to use at this point. > > +} > > + > > +static int logicvc_clocks_prepare(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + > > + struct { > > + struct clk **clk; > > + char *name; > > + bool optional; > > + } clocks_map[] = { > > + { > > + .clk = &logicvc->vclk, > > + .name = "vclk", > > + .optional = false, > > + }, > > + { > > + .clk = &logicvc->vclk2, > > + .name = "vclk2", > > + .optional = true, > > + }, > > + { > > + .clk = &logicvc->lvdsclk, > > + .name = "lvdsclk", > > + .optional = true, > > + }, > > + { > > + .clk = &logicvc->lvdsclkn, > > + .name = "lvdsclkn", > > + .optional = true, > > + }, > > + }; > > + unsigned int i; > > + int ret; > > + > > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > > + struct clk *clk; > > + > > + clk = devm_clk_get(dev, clocks_map[i].name); > > + if (IS_ERR(clk)) { > > + if (PTR_ERR(clk) == -ENOENT && clocks_map[i].optional) > > + continue; > > + > > + DRM_ERROR("Missing non-optional clock %s\n", > > + clocks_map[i].name); > > + > > + ret = PTR_ERR(clk); > > + goto error; > > + } > > + > > + ret = clk_prepare_enable(clk); > > + if (ret) { > > + DRM_ERROR("Failed to prepare and enable clock %s\n", > > + clocks_map[i].name); > > + goto error; > > + } > > + > > + *clocks_map[i].clk = clk; > > + } > > + > > + return 0; > > + > > +error: > > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > > + if (!*clocks_map[i].clk) > > + continue; > > + > > + clk_disable_unprepare(*clocks_map[i].clk); > > + *clocks_map[i].clk = NULL; > > + } > > + > > + return ret; > > +} > > + > > +static int logicvc_clocks_unprepare(struct logicvc_drm *logicvc) > > +{ > > + struct clk **clocks[] = { > > + &logicvc->vclk, > > + &logicvc->vclk2, > > + &logicvc->lvdsclk, > > + &logicvc->lvdsclkn, > > + }; > > + unsigned int i; > > + > > + for (i = 0; i < ARRAY_SIZE(clocks); i++) { > > + if (!*clocks[i]) > > + continue; > > + > > + clk_disable_unprepare(*clocks[i]); > > + *clocks[i] = NULL; > > + } > > + > > + return 0; > > +} > > + > > +static int logicvc_drm_probe(struct platform_device *pdev) > > +{ > > + struct device_node *of_node = pdev->dev.of_node; > > + struct device_node *reserved_mem_node; > > + struct reserved_mem *reserved_mem = NULL; > > + const struct logicvc_drm_caps *caps; > > + struct logicvc_drm *logicvc; > > + struct device *dev = &pdev->dev; > > + struct drm_device *drm_dev; > > + struct regmap *regmap; > > + struct resource res; > > + void __iomem *base; > > + int irq; > > + int ret; > > + > > + caps = of_device_get_match_data(dev); > > + if (!caps) > > + return -EINVAL; > > + > > + ret = of_reserved_mem_device_init(dev); > > + if (ret && ret != -ENODEV) { > > + dev_err(dev, "Failed to init memory region\n"); > > + goto error_early; > > + } > > + > > + reserved_mem_node = of_parse_phandle(of_node, "memory-region", 0); > > + if (reserved_mem_node) { > > + reserved_mem = of_reserved_mem_lookup(reserved_mem_node); > > + of_node_put(reserved_mem_node); > > + } > > + > > + /* Get regmap from syscon first if available. */ > > + regmap = syscon_regmap_lookup_by_phandle(of_node, "xylon,syscon"); > > + > > + /* Then get regmap from parent if available. */ > > + if (IS_ERR(regmap) && of_node->parent) > > + regmap = syscon_node_to_regmap(of_node->parent); > > + > > + /* Register our own regmap otherwise. */ > > + if (IS_ERR(regmap)) { > > + ret = of_address_to_resource(of_node, 0, &res); > > + if (ret) { > > + dev_err(dev, "Failed to get resource from address\n"); > > + goto error_reserved_mem; > > + } > > + > > + base = devm_ioremap_resource(dev, &res); > > + if (IS_ERR(base)) { > > + dev_err(dev, "Failed to map I/O base\n"); > > + ret = PTR_ERR(base); > > + goto error_reserved_mem; > > + } > > + > > + logicvc_drm_regmap_config.max_register = resource_size(&res) - > > + 4; > > + > > + regmap = devm_regmap_init_mmio(dev, base, > > + &logicvc_drm_regmap_config); > > + if (IS_ERR(regmap)) { > > + dev_err(dev, "Failed to create regmap for I/O\n"); > > + ret = PTR_ERR(regmap); > > + goto error_reserved_mem; > > + } > > + } > > + > > + irq = platform_get_irq(pdev, 0); > > + if (irq < 0) { > > + dev_err(dev, "Failed to get IRQ\n"); > > + ret = -ENODEV; > > + goto error_reserved_mem; > > + } > > + > > + logicvc = devm_drm_dev_alloc(dev, &logicvc_drm_driver, > > + struct logicvc_drm, drm_dev); > > + if (IS_ERR(logicvc)) { > > + ret = PTR_ERR(logicvc); > > + goto error_reserved_mem; > > + } > > + > > + platform_set_drvdata(pdev, logicvc); > > + drm_dev = &logicvc->drm_dev; > > + > > + logicvc->caps = caps; > > + logicvc->regmap = regmap; > > + INIT_LIST_HEAD(&logicvc->layers_list); > > + > > + if (reserved_mem) > > + logicvc->reserved_mem_base = reserved_mem->base; > > + > > + ret = logicvc_clocks_prepare(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to prepare clocks\n"); > > + goto error_logicvc; > > + } > > + > > + ret = devm_request_irq(dev, irq, logicvc_drm_irq_handler, 0, > > + dev_name(dev), logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to request IRQ\n"); > > + goto error_clocks; > > + } > > have you considered drm_irq_install? I did and concluded that there is no particular advantage in using that, only unnecessary code overhead. But maybe I'm missing something here. > > + > > + logicvc_version_print(logicvc); > > + > > + ret = logicvc_drm_config_parse(logicvc); > > + if (ret && ret != -ENODEV) { > > + drm_err(drm_dev, "Failed to parse config\n"); > > + goto error_clocks; > > + } > > + > > + drm_mode_config_init(drm_dev); > > You're supposed to call drm_mode_config_cleanup when using > drm_mode_config_init. You'd be better off switching to > drmm_mode_config_init though. Okay I'll look into it. > > + ret = logicvc_layers_init(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize layers\n"); > > + goto error_clocks; > > + } > > + > > + ret = logicvc_crtc_init(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize CRTC\n"); > > + goto error_clocks; > > + } > > + > > + logicvc_layers_attach_crtc(logicvc); > > + > > + ret = logicvc_interface_init(logicvc); > > + if (ret) { > > + if (ret != -EPROBE_DEFER) > > + drm_err(drm_dev, "Failed to initialize interface\n"); > > + > > + goto error_clocks; > > + } > > + > > + logicvc_interface_attach_crtc(logicvc); > > + > > + ret = logicvc_mode_init(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize KMS\n"); > > + goto error_clocks; > > + } > > + > > + ret = drm_dev_register(drm_dev, 0); > > + if (ret) { > > + drm_err(drm_dev, "Failed to register DRM device\n"); > > + goto error_mode; > > + } > > + > > + drm_fbdev_generic_setup(drm_dev, drm_dev->mode_config.preferred_depth); > > + > > + return 0; > > + > > +error_mode: > > + logicvc_mode_fini(logicvc); > > + > > +error_clocks: > > + logicvc_clocks_unprepare(logicvc); > > + > > +error_logicvc: > > + drm_dev_put(drm_dev); > > You don't need drm_dev_put with devm_drm_dev_alloc Ah right, thanks. > > +error_reserved_mem: > > + of_reserved_mem_device_release(dev); > > + > > +error_early: > > + return ret; > > +} > > + > > +static int logicvc_drm_remove(struct platform_device *pdev) > > +{ > > + struct logicvc_drm *logicvc = platform_get_drvdata(pdev); > > + struct device *dev = &pdev->dev; > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + > > + drm_dev_unregister(drm_dev); > > + drm_atomic_helper_shutdown(drm_dev); > > + > > + logicvc_mode_fini(logicvc); > > + > > + logicvc_clocks_unprepare(logicvc); > > + > > + drm_dev_put(drm_dev); > > Ditto > > > + of_reserved_mem_device_release(dev); > > + > > + return 0; > > +} > > + > > +static const struct logicvc_drm_caps logicvc_drm_caps_3 = { > > + .layer_address = false, > > +}; > > + > > +static const struct logicvc_drm_caps logicvc_drm_caps_4 = { > > + .layer_address = true, > > +}; > > + > > +static struct of_device_id logicvc_drm_of_table[] = { > > + { > > + .compatible = "xylon,logicvc-3.02.a-display", > > + .data = &logicvc_drm_caps_3, > > + }, > > + { > > + .compatible = "xylon,logicvc-4.01.a-display", > > + .data = &logicvc_drm_caps_4, > > + }, > > + { }, > > +}; > > +MODULE_DEVICE_TABLE(of, logicvc_drm_of_table); > > + > > +static struct platform_driver logicvc_drm_platform_driver = { > > + .probe = logicvc_drm_probe, > > + .remove = logicvc_drm_remove, > > + .driver = { > > + .name = "logicvc-drm", > > + .of_match_table = logicvc_drm_of_table, > > + }, > > +}; > > + > > +module_platform_driver(logicvc_drm_platform_driver); > > + > > +MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>"); > > +MODULE_DESCRIPTION("Xylon LogiCVC DRM driver"); > > +MODULE_LICENSE("GPL"); > > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h > > new file mode 100644 > > index 000000000000..68bbac6c4ab9 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.h > > @@ -0,0 +1,64 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_DRM_H_ > > +#define _LOGICVC_DRM_H_ > > + > > +#include <linux/regmap.h> > > +#include <linux/types.h> > > +#include <drm/drm_device.h> > > + > > +#define LOGICVC_DISPLAY_INTERFACE_RGB 0 > > +#define LOGICVC_DISPLAY_INTERFACE_ITU656 1 > > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS 2 > > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA 3 > > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS 4 > > +#define LOGICVC_DISPLAY_INTERFACE_DVI 5 > > + > > +#define LOGICVC_DISPLAY_COLORSPACE_RGB 0 > > +#define LOGICVC_DISPLAY_COLORSPACE_YUV422 1 > > +#define LOGICVC_DISPLAY_COLORSPACE_YUV444 2 > > + > > +#define logicvc_drm(d) \ > > + container_of(d, struct logicvc_drm, drm_dev) > > + > > +struct logicvc_crtc; > > +struct logicvc_interface; > > + > > +struct logicvc_drm_config { > > + u32 display_interface; > > + u32 display_colorspace; > > + u32 display_depth; > > + u32 row_stride; > > + bool dithering; > > + bool background_layer; > > + bool layers_configurable; > > + u32 layers_count; > > +}; > > + > > +struct logicvc_drm_caps { > > + bool layer_address; > > +}; > > + > > +struct logicvc_drm { > > + const struct logicvc_drm_caps *caps; > > + struct logicvc_drm_config config; > > + > > + struct drm_device drm_dev; > > + phys_addr_t reserved_mem_base; > > + struct regmap *regmap; > > + > > + struct clk *vclk; > > + struct clk *vclk2; > > + struct clk *lvdsclk; > > + struct clk *lvdsclkn; > > + > > + struct list_head layers_list; > > + struct logicvc_crtc *crtc; > > + struct logicvc_interface *interface; > > +}; > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.c b/drivers/gpu/drm/logicvc/logicvc_interface.c > > new file mode 100644 > > index 000000000000..0cfded3792d8 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.c > > @@ -0,0 +1,224 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_bridge.h> > > +#include <drm/drm_connector.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_drv.h> > > +#include <drm/drm_encoder.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_modeset_helper_vtables.h> > > +#include <drm/drm_of.h> > > +#include <drm/drm_panel.h> > > +#include <drm/drm_print.h> > > +#include <drm/drm_probe_helper.h> > > + > > +#include "logicvc_crtc.h" > > +#include "logicvc_drm.h" > > +#include "logicvc_interface.h" > > +#include "logicvc_regs.h" > > + > > +#define logicvc_interface_from_drm_encoder(c) \ > > + container_of(c, struct logicvc_interface, drm_encoder) > > +#define logicvc_interface_from_drm_connector(c) \ > > + container_of(c, struct logicvc_interface, drm_connector) > > + > > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > > + struct logicvc_interface *interface = > > + logicvc_interface_from_drm_encoder(drm_encoder); > > + > > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > > + > > + if (interface->drm_panel) { > > + drm_panel_prepare(interface->drm_panel); > > + > > + /* Encoder enable is too early to enable the panel and a white > > + * screen will be seen if the panel gets enabled before the > > + * first page flip is done (and no other framebuffer > > + * configuration remains from the boot software). */ > > + interface->drm_panel_enabled = false; > > + } > > +} > > That's fishy (and the similar stuff in commit_tail). Is it because you > need to have the CRTC powered before the encoder? > > If so, you should try the commit_tail_rpm variant, it makes sure the > CRTC is powered on before making a commit. No, this is unrelated to CRTC vs encoder enable order. Instead, it's about panel enable order: I don't want to enable the panel before a buffer was flipped on the CRTC otherwise a blank/white/garbage screen will be shown. This is why this drm_panel_enabled variable is used to make sure we don't enable the panel before. This is nothing specific to my hardware, but a general concern that probably exists in every DRM driver. Nobody really seems to care about it but I've decided that I would in this driver. Now if you think this is too exotic, I don't mind removing it. > > +static void logicvc_encoder_disable(struct drm_encoder *drm_encoder) > > +{ > > + struct logicvc_interface *interface = > > + logicvc_interface_from_drm_encoder(drm_encoder); > > + > > + if (interface->drm_panel) { > > + drm_panel_disable(interface->drm_panel); > > + drm_panel_unprepare(interface->drm_panel); > > + } > > +} > > + > > +static const struct drm_encoder_helper_funcs logicvc_encoder_helper_funcs = { > > + .enable = logicvc_encoder_enable, > > + .disable = logicvc_encoder_disable, > > +}; > > + > > +static const struct drm_encoder_funcs logicvc_encoder_funcs = { > > + .destroy = drm_encoder_cleanup, > > +}; > > + > > +static int logicvc_connector_get_modes(struct drm_connector *drm_connector) > > +{ > > + struct logicvc_interface *interface = > > + logicvc_interface_from_drm_connector(drm_connector); > > + > > + if (interface->drm_panel) > > + return drm_panel_get_modes(interface->drm_panel, drm_connector); > > + else > > + WARN_ONCE(1, "Retrieving modes from a native connector is not implemented."); > > + > > + return 0; > > +} > > + > > +static const struct drm_connector_helper_funcs logicvc_connector_helper_funcs = { > > + .get_modes = logicvc_connector_get_modes, > > +}; > > + > > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > > +{ > > + drm_connector_cleanup(drm_connector); > > +} > > I guess you don't need that intermediate function? I would need to check if that call is necessary or if some implied mechanism calls it for me already. > > +static const struct drm_connector_funcs logicvc_connector_funcs = { > > + .reset = drm_atomic_helper_connector_reset, > > + .fill_modes = drm_helper_probe_single_connector_modes, > > + .destroy = logicvc_connector_destroy, > > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > +}; > > + > > +static int logicvc_interface_encoder_type(struct logicvc_drm *logicvc) > > +{ > > + switch (logicvc->config.display_interface) { > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > > + return DRM_MODE_ENCODER_LVDS; > > + case LOGICVC_DISPLAY_INTERFACE_DVI: > > + return DRM_MODE_ENCODER_TMDS; > > + case LOGICVC_DISPLAY_INTERFACE_RGB: > > + return DRM_MODE_ENCODER_DPI; > > + default: > > + return DRM_MODE_ENCODER_NONE; > > + } > > +} > > + > > +static int logicvc_interface_connector_type(struct logicvc_drm *logicvc) > > +{ > > + switch (logicvc->config.display_interface) { > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > > + return DRM_MODE_CONNECTOR_LVDS; > > + case LOGICVC_DISPLAY_INTERFACE_DVI: > > + return DRM_MODE_CONNECTOR_DVID; > > + case LOGICVC_DISPLAY_INTERFACE_RGB: > > + return DRM_MODE_CONNECTOR_DPI; > > + default: > > + return DRM_MODE_CONNECTOR_Unknown; > > + } > > +} > > + > > +static bool logicvc_interface_native_connector(struct logicvc_drm *logicvc) > > +{ > > + switch (logicvc->config.display_interface) { > > + case LOGICVC_DISPLAY_INTERFACE_DVI: > > + return true; > > + default: > > + return false; > > + } > > +} > > + > > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc) > > +{ > > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > > + > > + logicvc->interface->drm_encoder.possible_crtcs = possible_crtcs; > > +} > > + > > +int logicvc_interface_init(struct logicvc_drm *logicvc) > > +{ > > + struct logicvc_interface *interface; > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + int encoder_type = logicvc_interface_encoder_type(logicvc); > > + int connector_type = logicvc_interface_connector_type(logicvc); > > + bool native_connector = logicvc_interface_native_connector(logicvc); > > + int ret; > > + > > + interface = devm_kzalloc(dev, sizeof(*interface), GFP_KERNEL); > > + if (!interface) { > > + ret = -ENOMEM; > > + goto error_early; > > + } > > + > > + ret = drm_of_find_panel_or_bridge(of_node, 1, 0, &interface->drm_panel, > > + &interface->drm_bridge); > > + if (ret == -EPROBE_DEFER) > > + goto error_early; > > + > > + ret = drm_encoder_init(drm_dev, &interface->drm_encoder, > > + &logicvc_encoder_funcs, encoder_type, NULL); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initalize encoder\n"); > > + goto error_early; > > + } > > + > > + drm_encoder_helper_add(&interface->drm_encoder, > > + &logicvc_encoder_helper_funcs); > > + > > + if (native_connector || interface->drm_panel) { > > + ret = drm_connector_init(drm_dev, &interface->drm_connector, > > + &logicvc_connector_funcs, > > + connector_type); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initalize connector\n"); > > + goto error_encoder; > > + } > > + > > + drm_connector_helper_add(&interface->drm_connector, > > + &logicvc_connector_helper_funcs); > > + > > + ret = drm_connector_attach_encoder(&interface->drm_connector, > > + &interface->drm_encoder); > > + if (ret) { > > + drm_err(drm_dev, > > + "Failed to attach connector to encoder\n"); > > + goto error_encoder; > > + } > > + } > > + > > + if (interface->drm_bridge) { > > + ret = drm_bridge_attach(&interface->drm_encoder, > > + interface->drm_bridge, NULL, 0); > > + if (ret) { > > + drm_err(drm_dev, > > + "Failed to attach bridge to encoder\n"); > > + goto error_encoder; > > + } > > + } > > You should consider using the bridge_or_panel API. I have considered it and concluded that it's not a good fit given that the hardware can support a DVI connector. > > + logicvc->interface = interface; > > + > > + return 0; > > + > > +error_encoder: > > + drm_encoder_cleanup(&interface->drm_encoder); > > + > > +error_early: > > + return ret; > > +} > > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.h b/drivers/gpu/drm/logicvc/logicvc_interface.h > > new file mode 100644 > > index 000000000000..fb2e9e6e04aa > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.h > > @@ -0,0 +1,30 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_INTERFACE_H_ > > +#define _LOGICVC_INTERFACE_H_ > > + > > +#include <drm/drm_bridge.h> > > +#include <drm/drm_connector.h> > > +#include <drm/drm_encoder.h> > > +#include <drm/drm_panel.h> > > + > > +struct logicvc_drm; > > + > > +struct logicvc_interface { > > + struct drm_encoder drm_encoder; > > + struct drm_connector drm_connector; > > + > > + struct drm_panel *drm_panel; > > + struct drm_bridge *drm_bridge; > > + > > + bool drm_panel_enabled; > > +}; > > + > > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc); > > +int logicvc_interface_init(struct logicvc_drm *logicvc); > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.c b/drivers/gpu/drm/logicvc/logicvc_layer.c > > new file mode 100644 > > index 000000000000..9188d45cef77 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.c > > @@ -0,0 +1,615 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/of.h> > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic.h> > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_fb_cma_helper.h> > > +#include <drm/drm_fourcc.h> > > +#include <drm/drm_plane.h> > > +#include <drm/drm_plane_helper.h> > > +#include <drm/drm_print.h> > > + > > +#include "logicvc_crtc.h" > > +#include "logicvc_drm.h" > > +#include "logicvc_layer.h" > > +#include "logicvc_of.h" > > +#include "logicvc_regs.h" > > + > > +#define logicvc_layer(p) \ > > + container_of(p, struct logicvc_layer, drm_plane) > > + > > +static uint32_t logicvc_layer_formats_rgb16[] = { > > + DRM_FORMAT_RGB565, > > + DRM_FORMAT_BGR565, > > + DRM_FORMAT_INVALID, > > +}; > > + > > +static uint32_t logicvc_layer_formats_rgb24[] = { > > + DRM_FORMAT_XRGB8888, > > + DRM_FORMAT_XBGR8888, > > + DRM_FORMAT_INVALID, > > +}; > > + > > +/* What we call depth in this driver only counts color components, not alpha. > > + * This allows us to stay compatible with the LogiCVC bistream definitions. */ > > +static uint32_t logicvc_layer_formats_rgb24_alpha[] = { > > + DRM_FORMAT_ARGB8888, > > + DRM_FORMAT_ABGR8888, > > + DRM_FORMAT_INVALID, > > +}; > > + > > +static struct logicvc_layer_formats logicvc_layer_formats[] = { > > + { > > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > > + .depth = 16, > > + .formats = logicvc_layer_formats_rgb16, > > + }, > > + { > > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > > + .depth = 24, > > + .formats = logicvc_layer_formats_rgb24, > > + }, > > + { > > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > > + .depth = 24, > > + .alpha = true, > > + .formats = logicvc_layer_formats_rgb24_alpha, > > + }, > > + { } > > +}; > > + > > +static bool logicvc_layer_format_inverted(uint32_t format) > > +{ > > + switch (format) { > > + case DRM_FORMAT_BGR565: > > + case DRM_FORMAT_BGR888: > > + case DRM_FORMAT_XBGR8888: > > + case DRM_FORMAT_ABGR8888: > > + return true; > > + default: > > + return false; > > + } > > +} > > + > > +static int logicvc_plane_atomic_check(struct drm_plane *drm_plane, > > + struct drm_plane_state *state) > > +{ > > + struct drm_device *drm_dev = drm_plane->dev; > > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > > + struct drm_crtc_state *crtc_state; > > + int min_scale, max_scale; > > + bool can_position; > > + int ret; > > + > > + if (!state->crtc) > > + return 0; > > + > > + crtc_state = drm_atomic_get_existing_crtc_state(state->state, > > + state->crtc); > > + if (WARN_ON(!crtc_state)) > > + return -EINVAL; > > + > > + if (state->crtc_x < 0 || state->crtc_y < 0) { > > + drm_err(drm_dev, > > + "Negative on-CRTC positions are not supported.\n"); > > + return -EINVAL; > > + } > > + > > + if (!logicvc->caps->layer_address) { > > + ret = logicvc_layer_buffer_find_setup(logicvc, layer, state, > > + NULL); > > + if (ret) { > > + drm_err(drm_dev, "No viable setup for buffer found.\n"); > > + return ret; > > + } > > + } > > + > > + min_scale = DRM_PLANE_HELPER_NO_SCALING; > > + max_scale = DRM_PLANE_HELPER_NO_SCALING; > > + > > + can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && > > + layer->index != (logicvc->config.layers_count - 1) && > > + logicvc->config.layers_configurable); > > + > > + ret = drm_atomic_helper_check_plane_state(state, crtc_state, > > + min_scale, max_scale, > > + can_position, true); > > + if (ret) { > > + drm_err(drm_dev, "Invalid plane state\n\n"); > > + return ret; > > + } > > + > > + return 0; > > +} > > + > > +static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, > > + struct drm_plane_state *old_state) > > +{ > > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > > + struct drm_plane_state *state = drm_plane->state; > > + struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; > > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; > > + struct drm_framebuffer *fb = state->fb; > > + struct logicvc_layer_buffer_setup setup = {}; > > + u32 index = layer->index; > > + u32 reg; > > + > > + /* Layer dimensions */ > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_WIDTH_REG(index), > > + state->crtc_w - 1); > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HEIGHT_REG(index), > > + state->crtc_h - 1); > > + > > + if (logicvc->caps->layer_address) { > > + phys_addr_t fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ADDRESS_REG(index), > > + fb_addr); > > + } else { > > + /* Rely on offsets to configure the address. */ > > + > > + logicvc_layer_buffer_find_setup(logicvc, layer, state, &setup); > > + > > + /* Layer memory offsets */ > > + > > + regmap_write(logicvc->regmap, LOGICVC_BUFFER_SEL_REG, > > + LOGICVC_BUFFER_SEL_VALUE(index, setup.buffer_sel)); > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HOFFSET_REG(index), > > + setup.hoffset); > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VOFFSET_REG(index), > > + setup.voffset); > > + } > > + > > + /* Layer position */ > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HPOSITION_REG(index), > > + mode->hdisplay - 1 - state->crtc_x); > > + > > + /* Vertical position must be set last to sync layer register changes. */ > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VPOSITION_REG(index), > > + mode->vdisplay - 1 - state->crtc_y); > > + > > + /* Layer alpha */ > > + > > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) { > > + u32 alpha_bits; > > + u32 alpha_max; > > + u32 alpha; > > + > > + switch (layer->config.depth) { > > + case 8: > > + alpha_bits = 3; > > + break; > > + case 16: > > + if (layer->config.colorspace == LOGICVC_LAYER_COLORSPACE_YUV) > > + alpha_bits = 8; > > + else > > + alpha_bits = 6; > > + break; > > + default: > > + alpha_bits = 8; > > + break; > > + } > > + > > + alpha_max = BIT(alpha_bits) - 1; > > + alpha = state->alpha * alpha_max / DRM_BLEND_ALPHA_OPAQUE; > > + > > + DRM_DEBUG_DRIVER("Setting layer %d alpha to %d/%d\n", index, > > + alpha, alpha_max); > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ALPHA_REG(index), > > + alpha); > > + } > > + > > + /* Layer control */ > > + > > + reg = LOGICVC_LAYER_CTRL_ENABLE; > > + > > + if (logicvc_layer_format_inverted(fb->format->format)) > > + reg |= LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT; > > + > > + reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), reg); > > +} > > + > > +static void logicvc_plane_atomic_disable(struct drm_plane *drm_plane, > > + struct drm_plane_state *old_state) > > +{ > > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > > + u32 index = layer->index; > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), 0); > > +} > > + > > +static struct drm_plane_helper_funcs logicvc_plane_helper_funcs = { > > + .atomic_check = logicvc_plane_atomic_check, > > + .atomic_update = logicvc_plane_atomic_update, > > + .atomic_disable = logicvc_plane_atomic_disable, > > +}; > > + > > +static const struct drm_plane_funcs logicvc_plane_funcs = { > > + .update_plane = drm_atomic_helper_update_plane, > > + .disable_plane = drm_atomic_helper_disable_plane, > > + .destroy = drm_plane_cleanup, > > + .reset = drm_atomic_helper_plane_reset, > > + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > > +}; > > + > > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer, > > + struct drm_plane_state *state, > > + struct logicvc_layer_buffer_setup *setup) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct drm_framebuffer *fb = state->fb; > > + /* All the supported formats have a single data plane. */ > > + u32 layer_bytespp = fb->format->cpp[0]; > > + u32 layer_stride = layer_bytespp * logicvc->config.row_stride; > > + u32 base_offset = layer->config.base_offset * layer_stride; > > + u32 buffer_offset = layer->config.buffer_offset * layer_stride; > > + u8 buffer_sel = 0; > > + u16 voffset = 0; > > + u16 hoffset = 0; > > + phys_addr_t fb_addr; > > + u32 fb_offset; > > + u32 gap; > > + > > + if (!logicvc->reserved_mem_base) { > > + drm_err(drm_dev, "No reserved memory base was registered!\n"); > > + return -ENOMEM; > > + } > > + > > + fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > > + if (fb_addr < logicvc->reserved_mem_base) { > > + drm_err(drm_dev, > > + "Framebuffer memory below reserved memory base!\n"); > > + return -EINVAL; > > + } > > + > > + fb_offset = (u32) (fb_addr - logicvc->reserved_mem_base); > > + > > + if (fb_offset < base_offset) { > > + drm_err(drm_dev, > > + "Framebuffer offset below layer base offset!\n"); > > + return -EINVAL; > > + } > > + > > + gap = fb_offset - base_offset; > > + > > + /* Use the possible video buffers selection. */ > > + if (gap && buffer_offset) { > > + buffer_sel = gap / buffer_offset; > > + if (buffer_sel > LOGICVC_BUFFER_SEL_MAX) > > + buffer_sel = LOGICVC_BUFFER_SEL_MAX; > > + > > + gap -= buffer_sel * buffer_offset; > > + } > > + > > + /* Use the vertical offset. */ > > + if (gap && layer_stride && logicvc->config.layers_configurable) { > > + voffset = gap / layer_stride; > > + if (voffset > LOGICVC_LAYER_VOFFSET_MAX) > > + voffset = LOGICVC_LAYER_VOFFSET_MAX; > > + > > + gap -= voffset * layer_stride; > > + } > > + > > + /* Use the horizontal offset. */ > > + if (gap && layer_bytespp && logicvc->config.layers_configurable) { > > + hoffset = gap / layer_bytespp; > > + if (hoffset > LOGICVC_DIMENSIONS_MAX) > > + hoffset = LOGICVC_DIMENSIONS_MAX; > > + > > + gap -= hoffset * layer_bytespp; > > + } > > + > > + if (gap) { > > + drm_err(drm_dev, > > + "Unable to find layer %d buffer setup for 0x%x byte gap\n", > > + layer->index, fb_offset - base_offset); > > + return -EINVAL; > > + } > > + > > + DRM_DEBUG_DRIVER("Found layer %d buffer setup for 0x%x byte gap:\n", > > + layer->index, fb_offset - base_offset); > > + > > + DRM_DEBUG_DRIVER("- buffer_sel = 0x%x chunks of 0x%x bytes\n", > > + buffer_sel, buffer_offset); > > + DRM_DEBUG_DRIVER("- voffset = 0x%x chunks of 0x%x bytes\n", voffset, > > + layer_stride); > > + DRM_DEBUG_DRIVER("- hoffset = 0x%x chunks of 0x%x bytes\n", hoffset, > > + layer_bytespp); > > + > > + if (setup) { > > + setup->buffer_sel = buffer_sel; > > + setup->voffset = voffset; > > + setup->hoffset = hoffset; > > + } > > + > > + return 0; > > +} > > + > > +static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc_layer *layer) > > +{ > > + bool alpha; > > + unsigned int i = 0; > > + > > + alpha = (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_PIXEL); > > + > > + while (logicvc_layer_formats[i].formats) { > > + if (logicvc_layer_formats[i].colorspace == layer->config.colorspace && > > + logicvc_layer_formats[i].depth == layer->config.depth && > > + logicvc_layer_formats[i].alpha == alpha) > > + return &logicvc_layer_formats[i]; > > + > > + i++; > > + } > > + > > + return NULL; > > +} > > + > > +static unsigned int logicvc_layer_formats_count(struct logicvc_layer_formats *formats) > > +{ > > + unsigned int count = 0; > > + > > + while (formats->formats[count] != DRM_FORMAT_INVALID) > > + count++; > > + > > + return count; > > +} > > + > > +static int logicvc_layer_config_parse(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer) > > +{ > > + struct device_node *of_node = layer->of_node; > > + struct logicvc_layer_config *config = &layer->config; > > + int ret; > > + > > + logicvc_of_property_parse_bool(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, > > + &config->primary); > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, > > + &config->colorspace); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_DEPTH, > > + &config->depth); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, > > + &config->alpha_mode); > > + if (ret) > > + return ret; > > + > > + /* Memory offset is only relevant without layer address configuration. */ > > + if (logicvc->caps->layer_address) > > + return 0; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, > > + &config->base_offset); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, > > + &config->buffer_offset); > > + if (ret) > > + return ret; > > + > > + return 0; > > +} > > + > > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > > + u32 index) > > +{ > > + struct logicvc_layer *layer; > > + > > + list_for_each_entry(layer, &logicvc->layers_list, list) > > + if (layer->index == index) > > + return layer; > > + > > + return NULL; > > +} > > + > > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > > + enum drm_plane_type type) > > +{ > > + struct logicvc_layer *layer; > > + > > + list_for_each_entry(layer, &logicvc->layers_list, list) > > + if (layer->drm_plane.type == type) > > + return layer; > > + > > + return NULL; > > +} > > + > > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc) > > +{ > > + return logicvc_layer_get_from_type(logicvc, DRM_PLANE_TYPE_PRIMARY); > > +} > > + > > +static int logicvc_layer_init(struct logicvc_drm *logicvc, > > + struct device_node *of_node, u32 index) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct logicvc_layer *layer = NULL; > > + struct logicvc_layer_formats *formats; > > + unsigned int formats_count; > > + enum drm_plane_type type; > > + unsigned int zpos; > > + int ret; > > + > > + layer = devm_kzalloc(dev, sizeof(*layer), GFP_KERNEL); > > + if (!layer) { > > + ret = -ENOMEM; > > + goto error; > > + } > > + > > + layer->of_node = of_node; > > + layer->index = index; > > + > > + ret = logicvc_layer_config_parse(logicvc, layer); > > + if (ret) { > > + drm_err(drm_dev, "Failed to parse config for layer #%d\n", > > + index); > > + goto error; > > + } > > + > > + formats = logicvc_layer_formats_lookup(layer); > > + if (!formats) { > > + drm_err(drm_dev, "Failed to lookup formats for layer #%d\n", > > + index); > > + goto error; > > + } > > + > > + formats_count = logicvc_layer_formats_count(formats); > > + > > + /* The final layer can be configured as a background layer. */ > > + if (logicvc->config.background_layer && > > + index == (logicvc->config.layers_count - 1)) { > > + /* A zero value for black is only valid for RGB, not for YUV, > > + * so this will need to take the format in account for YUV. */ > > + u32 background = 0; > > + > > + DRM_DEBUG_DRIVER("Using layer #%d as background layer\n", > > + index); > > + > > + regmap_write(logicvc->regmap, LOGICVC_BACKGROUND_COLOR_REG, > > + background); > > + > > + devm_kfree(dev, layer); > > + > > + return 0; > > + } > > + > > + if (layer->config.primary) > > + type = DRM_PLANE_TYPE_PRIMARY; > > + else > > + type = DRM_PLANE_TYPE_OVERLAY; > > + > > + ret = drm_universal_plane_init(drm_dev, &layer->drm_plane, 0, > > + &logicvc_plane_funcs, formats->formats, > > + formats_count, NULL, type, NULL); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize layer plane\n"); > > + return ret; > > + } > > + > > + drm_plane_helper_add(&layer->drm_plane, &logicvc_plane_helper_funcs); > > + > > + zpos = logicvc->config.layers_count - index - 1; > > + DRM_DEBUG_DRIVER("Giving layer #%d zpos %d\n", index, zpos); > > + > > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) > > + drm_plane_create_alpha_property(&layer->drm_plane); > > + > > + drm_plane_create_zpos_immutable_property(&layer->drm_plane, zpos); > > + > > + DRM_DEBUG_DRIVER("Registering layer #%d\n", index); > > + > > + layer->formats = formats; > > + > > + list_add_tail(&layer->list, &logicvc->layers_list); > > + > > + return 0; > > + > > +error: > > + if (layer) > > + devm_kfree(dev, layer); > > + > > + return ret; > > +} > > + > > +static void logicvc_layer_fini(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer) > > +{ > > + struct device *dev = logicvc->drm_dev.dev; > > + > > + list_del(&layer->list); > > + devm_kfree(dev, layer); > > +} > > + > > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc) > > +{ > > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > > + struct logicvc_layer *layer; > > + > > + list_for_each_entry(layer, &logicvc->layers_list, list) { > > + if (layer->drm_plane.type != DRM_PLANE_TYPE_OVERLAY) > > + continue; > > + > > + layer->drm_plane.possible_crtcs = possible_crtcs; > > + } > > +} > > + > > +int logicvc_layers_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct device_node *layer_node = NULL; > > + struct device_node *layers_node; > > + struct logicvc_layer *layer; > > + struct logicvc_layer *next; > > + int ret = 0; > > + > > + layers_node = of_get_child_by_name(of_node, "layers"); > > + if (!layers_node) { > > + DRM_ERROR("No layers node found in the description\n"); > > + ret = -ENODEV; > > + goto error; > > + } > > + > > + for_each_child_of_node(layers_node, layer_node) { > > + u32 index = 0; > > + > > + if (!logicvc_of_node_is_layer(layer_node)) > > + continue; > > + > > + ret = of_property_read_u32(layer_node, "reg", &index); > > + if (ret) > > + continue; > > + > > + layer = logicvc_layer_get_from_index(logicvc, index); > > + if (layer) { > > + DRM_ERROR("Duplicated entry for layer #%d\n", index); > > + continue; > > + } > > + > > + ret = logicvc_layer_init(logicvc, layer_node, index); > > + if (ret) > > + goto error; > > + > > + of_node_put(layer_node); > > + } > > + > > + of_node_put(layers_node); > > + > > + return 0; > > + > > +error: > > + list_for_each_entry_safe(layer, next, &logicvc->layers_list, list) > > + logicvc_layer_fini(logicvc, layer); > > + > > + return ret; > > +} > > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.h b/drivers/gpu/drm/logicvc/logicvc_layer.h > > new file mode 100644 > > index 000000000000..c5767c81f446 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.h > > @@ -0,0 +1,64 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_LAYER_H_ > > +#define _LOGICVC_LAYER_H_ > > + > > +#include <linux/of.h> > > +#include <linux/types.h> > > +#include <drm/drm_plane.h> > > + > > +#define LOGICVC_LAYER_COLORSPACE_RGB 0 > > +#define LOGICVC_LAYER_COLORSPACE_YUV 1 > > + > > +#define LOGICVC_LAYER_ALPHA_LAYER 0 > > +#define LOGICVC_LAYER_ALPHA_PIXEL 1 > > + > > +struct logicvc_layer_buffer_setup { > > + u8 buffer_sel; > > + u16 voffset; > > + u16 hoffset; > > +}; > > + > > +struct logicvc_layer_config { > > + u32 colorspace; > > + u32 depth; > > + u32 alpha_mode; > > + u32 base_offset; > > + u32 buffer_offset; > > + bool primary; > > +}; > > + > > +struct logicvc_layer_formats { > > + u32 colorspace; > > + u32 depth; > > + bool alpha; > > + uint32_t *formats; > > +}; > > + > > +struct logicvc_layer { > > + struct logicvc_layer_config config; > > + struct logicvc_layer_formats *formats; > > + struct device_node *of_node; > > + > > + struct drm_plane drm_plane; > > + struct list_head list; > > + u32 index; > > +}; > > + > > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer, > > + struct drm_plane_state *state, > > + struct logicvc_layer_buffer_setup *setup); > > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > > + u32 index); > > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > > + enum drm_plane_type type); > > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc); > > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc); > > +int logicvc_layers_init(struct logicvc_drm *logicvc); > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.c b/drivers/gpu/drm/logicvc/logicvc_mode.c > > new file mode 100644 > > index 000000000000..aa8f35b64c75 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_mode.c > > @@ -0,0 +1,101 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic.h> > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_drv.h> > > +#include <drm/drm_fb_cma_helper.h> > > +#include <drm/drm_fb_helper.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_gem_framebuffer_helper.h> > > +#include <drm/drm_mode_config.h> > > +#include <drm/drm_panel.h> > > +#include <drm/drm_print.h> > > +#include <drm/drm_probe_helper.h> > > +#include <drm/drm_vblank.h> > > + > > +#include "logicvc_drm.h" > > +#include "logicvc_interface.h" > > +#include "logicvc_layer.h" > > +#include "logicvc_mode.h" > > + > > +static void logicvc_mode_atomic_commit_tail(struct drm_atomic_state *old_state) > > +{ > > + struct drm_device *drm_dev = old_state->dev; > > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > > + struct logicvc_interface *interface = logicvc->interface; > > + > > + drm_atomic_helper_commit_tail(old_state); > > + > > + /* Enable the panel after the first commit, which concerns our panel > > + * since we only support a single interface. */ > > + if (interface->drm_panel && !interface->drm_panel_enabled) { > > + drm_panel_enable(interface->drm_panel); > > + interface->drm_panel_enabled = true; > > + } > > +} > > + > > +static const struct drm_mode_config_helper_funcs logicvc_mode_config_helper_funcs = { > > + .atomic_commit_tail = logicvc_mode_atomic_commit_tail, > > +}; > > + > > +static const struct drm_mode_config_funcs logicvc_mode_config_funcs = { > > + .fb_create = drm_gem_fb_create, > > + .output_poll_changed = drm_fb_helper_output_poll_changed, > > + .atomic_check = drm_atomic_helper_check, > > + .atomic_commit = drm_atomic_helper_commit, > > +}; > > + > > +int logicvc_mode_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct drm_mode_config *mode_config = &drm_dev->mode_config; > > + struct logicvc_layer *layer_primary; > > + uint32_t preferred_depth; > > + int ret; > > + > > + ret = drm_vblank_init(drm_dev, mode_config->num_crtc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize vblank\n"); > > + return ret; > > + } > > + > > + layer_primary = logicvc_layer_get_primary(logicvc); > > + if (!layer_primary) { > > + drm_err(drm_dev, "Failed to get primary layer\n"); > > + return -EINVAL; > > + } > > + > > + preferred_depth = layer_primary->formats->depth; > > + > > + /* DRM counts alpha in depth, our driver doesn't. */ > > + if (layer_primary->formats->alpha) > > + preferred_depth += 8; > > + > > + mode_config->min_width = 64; > > + mode_config->max_width = 2048; > > + mode_config->min_height = 1; > > + mode_config->max_height = 2048; > > + mode_config->preferred_depth = preferred_depth; > > + mode_config->funcs = &logicvc_mode_config_funcs; > > + mode_config->helper_private = &logicvc_mode_config_helper_funcs; > > + > > + drm_mode_config_reset(drm_dev); > > + > > + drm_kms_helper_poll_init(drm_dev); > > + > > + return 0; > > +} > > + > > +void logicvc_mode_fini(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + > > + drm_kms_helper_poll_fini(drm_dev); > > +} > > You should consider using a drmm_add_action_or_reset here to simplify > your error / remove path. Thanks for the suggestion (and the review)! Cheers, Paul -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller @ 2020-12-02 16:06 ` Paul Kocialkowski 0 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-12-02 16:06 UTC (permalink / raw) To: Maxime Ripard Cc: devicetree, Thomas Petazzoni, Thomas Zimmermann, David Airlie, linux-kernel, dri-devel, Rob Herring [-- Attachment #1.1: Type: text/plain, Size: 69845 bytes --] Hi, On Tue 03 Nov 20, 10:46, Maxime Ripard wrote: > On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > > Introduces a driver for the LogiCVC display controller, a programmable > > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > > Xilinx FPGAs. The controller is mostly configured at logic synthesis > > time so only a subset of configuration is left for the driver to > > handle. > > > > The following features are implemented and tested: > > - LVDS 4-bit interface; > > - RGB565 pixel formats; > > - Multiple layers and hardware composition; > > - Layer-wide alpha mode; > > > > The following features are implemented but untested: > > - Other RGB pixel formats; > > - Layer framebuffer configuration for version 4; > > - Lowest-layer used as background color; > > - Per-pixel alpha mode. > > > > The following features are not implemented: > > - YUV pixel formats; > > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > > - External parallel input for layer; > > - Color-keying; > > - LUT-based alpha modes. > > > > Additional implementation-specific notes: > > - Panels are only enabled after the first page flip to avoid flashing a > > white screen. > > - Depth used in context of the LogiCVC driver only counts color components > > to match the definition of the synthesis parameters. > > > > Support is implemented for both version 3 and 4 of the controller. > > > > With version 3, framebuffers are stored in a dedicated contiguous > > memory area, with a base address hardcoded for each layer. This requires > > using a dedicated CMA pool registered at the base address and tweaking a > > few offset-related registers to try to use any buffer allocated from > > the pool. This is done on a best-effort basis to have the hardware cope > > with the DRM framebuffer allocation model and there is no guarantee > > that each buffer allocated by GEM CMA can be used for any layer. > > In particular, buffers allocated below the base address for a layer are > > guaranteed not to be configurable for that layer. See the implementation of > > logicvc_layer_buffer_find_setup for specifics. > > > > Version 4 allows configuring each buffer address directly, which > > guarantees that any buffer can be configured. > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > Reviewed-by: Maxime Ripard <mripard@kernel.org> > > There's a bunch of checkpatch issues here Okay, I'll take a look! > > --- > > MAINTAINERS | 6 + > > drivers/gpu/drm/Kconfig | 2 + > > drivers/gpu/drm/Makefile | 1 + > > drivers/gpu/drm/logicvc/Kconfig | 9 + > > drivers/gpu/drm/logicvc/Makefile | 4 + > > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > > 18 files changed, 2236 insertions(+) > > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > > create mode 100644 drivers/gpu/drm/logicvc/Makefile > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 71e29dc0ab9d..9c4c5edef0ba 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > > F: drivers/gpu/drm/i810/ > > F: include/uapi/drm/i810_drm.h > > > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > +T: git git://anongit.freedesktop.org/drm/drm-misc > > +S: Supported > > +F: drivers/gpu/drm/logicvc/ > > + > > Do you have the rights to commit in drm-misc or will you need it? Yes I think I still have the right to push, but it's probably better if someone else pushes the series ;) > > +static int logicvc_crtc_atomic_check(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct drm_crtc_state *crtc_state = > > + drm_atomic_get_new_crtc_state(state, drm_crtc); > > + struct drm_display_mode *mode = &crtc_state->adjusted_mode; > > + > > + if (mode->flags & DRM_MODE_FLAG_INTERLACE) > > + return -EINVAL; > > + > > + return 0; > > +} > > You probably want to have a mode_valid here to check for this as well, > it would be weird to expose a mode that we outright reject. You're right, mode_valid looks like a more appropriate place to check this. > > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > + struct drm_crtc_state *crtc_state = > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > + struct drm_device *drm_dev = drm_crtc->dev; > > + unsigned long flags; > > + > > + /* Register pending event, only if vblank is already on. */ > > + if (drm_crtc->state->event && crtc_state->active) { > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > + > > + crtc->event = drm_crtc->state->event; > > + drm_crtc->state->event = NULL; > > + > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > + } > > +} > > That's unusual to do it in atomic_begin, why do you need it? This is to cover the case where we need to send a page flip event but the crtc is already on. In that case, neither atomic_enable nor atomic_disable will be called so we need to rely on atomic_begin to grab that event. This happens for example when a single plane is updated. The same thing is done in e.g. sun4i-drm. > > +static void logicvc_crtc_atomic_enable(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; > > You should use drm_atomic_get_new_crtc_state here, we're removing the > direct references of crtc->state to make it more obvious if we're using > the old or new state. Okay, will do! > > + struct drm_crtc_state *crtc_state = > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > + struct drm_device *drm_dev = drm_crtc->dev; > > + unsigned int hact, hfp, hsl, hbp; > > + unsigned int vact, vfp, vsl, vbp; > > + unsigned long flags; > > + u32 ctrl; > > + > > + /* Timings */ > > + > > + hact = mode->hdisplay; > > + hfp = mode->hsync_start - mode->hdisplay; > > + hsl = mode->hsync_end - mode->hsync_start; > > + hbp = mode->htotal - mode->hsync_end; > > + > > + vact = mode->vdisplay; > > + vfp = mode->vsync_start - mode->vdisplay; > > + vsl = mode->vsync_end - mode->vsync_start; > > + vbp = mode->vtotal - mode->vsync_end; > > + > > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_FRONT_PORCH_REG, hfp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_REG, hsl - 1); > > + regmap_write(logicvc->regmap, LOGICVC_HSYNC_BACK_PORCH_REG, hbp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_HRES_REG, hact - 1); > > + > > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_FRONT_PORCH_REG, vfp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_REG, vsl - 1); > > + regmap_write(logicvc->regmap, LOGICVC_VSYNC_BACK_PORCH_REG, vbp - 1); > > + regmap_write(logicvc->regmap, LOGICVC_VRES_REG, vact - 1); > > + > > + /* Signals */ > > + > > + ctrl = LOGICVC_CTRL_HSYNC_ENABLE | LOGICVC_CTRL_VSYNC_ENABLE | > > + LOGICVC_CTRL_DE_ENABLE; > > + > > + if (mode->flags & DRM_MODE_FLAG_NHSYNC) > > + ctrl |= LOGICVC_CTRL_HSYNC_INVERT; > > + > > + if (mode->flags & DRM_MODE_FLAG_NVSYNC) > > + ctrl |= LOGICVC_CTRL_VSYNC_INVERT; > > + > > + if (logicvc->interface) { > > + struct drm_connector *connector = > > + &logicvc->interface->drm_connector; > > + struct drm_display_info *display_info = > > + &connector->display_info; > > + > > + if (display_info->bus_flags & DRM_BUS_FLAG_DE_LOW) > > + ctrl |= LOGICVC_CTRL_DE_INVERT; > > + > > + if (display_info->bus_flags & > > + DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) > > + ctrl |= LOGICVC_CTRL_CLOCK_INVERT; > > + } > > + > > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > > + LOGICVC_CTRL_HSYNC_ENABLE | > > + LOGICVC_CTRL_HSYNC_INVERT | > > + LOGICVC_CTRL_VSYNC_ENABLE | > > + LOGICVC_CTRL_VSYNC_INVERT | > > + LOGICVC_CTRL_DE_ENABLE | > > + LOGICVC_CTRL_DE_INVERT | > > + LOGICVC_CTRL_PIXEL_INVERT | > > + LOGICVC_CTRL_CLOCK_INVERT, ctrl); > > + > > + /* Generate internal state reset. */ > > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > > + > > + drm_crtc_vblank_on(drm_crtc); > > + > > + /* Register our event after vblank is enabled. */ > > + if (drm_crtc->state->event && !crtc_state->active) { > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > + > > + crtc->event = drm_crtc->state->event; > > + drm_crtc->state->event = NULL; > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > + } > > Haven't you done that in atomic_begin already? No, atomic_begin grabs a page flip event when the CRTC is already enabled. This will grab it when the CRTC was previously disabled and we are now enabling it. Maybe both cases could be merged into atomic_begin since it's called in both situations. > > +} > > + > > +static void logicvc_crtc_atomic_disable(struct drm_crtc *drm_crtc, > > + struct drm_atomic_state *state) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + struct drm_device *drm_dev = drm_crtc->dev; > > + > > + drm_crtc_vblank_off(drm_crtc); > > + > > + /* Disable and clear CRTC bits. */ > > + regmap_update_bits(logicvc->regmap, LOGICVC_CTRL_REG, > > + LOGICVC_CTRL_HSYNC_ENABLE | > > + LOGICVC_CTRL_HSYNC_INVERT | > > + LOGICVC_CTRL_VSYNC_ENABLE | > > + LOGICVC_CTRL_VSYNC_INVERT | > > + LOGICVC_CTRL_DE_ENABLE | > > + LOGICVC_CTRL_DE_INVERT | > > + LOGICVC_CTRL_PIXEL_INVERT | > > + LOGICVC_CTRL_CLOCK_INVERT, 0); > > + > > + /* Generate internal state reset. */ > > + regmap_write(logicvc->regmap, LOGICVC_DTYPE_REG, 0); > > + > > + /* Consume leftover event since vblank is now disabled. */ > > + if (drm_crtc->state->event && !drm_crtc->state->active) { > > + spin_lock_irq(&drm_dev->event_lock); > > + > > + drm_crtc_send_vblank_event(drm_crtc, drm_crtc->state->event); > > + drm_crtc->state->event = NULL; > > + spin_unlock_irq(&drm_dev->event_lock); > > + } > > And here too. It's definitely worth explaining in the commit log and / > or comments what you're trying to address. Well, there are already comments there but maybe the one in atomic_begin would need more details to be explicit. In any case, the three blocks cover the three distinct cases that can happen: - page flip is requested and CRTC was already enabled - page flip is requested and CRTC is getting enabled - page flip is requested and CRTC is getting disabled > > +} > > + > > +static const struct drm_crtc_helper_funcs logicvc_crtc_helper_funcs = { > > + .atomic_check = logicvc_crtc_atomic_check, > > + .atomic_begin = logicvc_crtc_atomic_begin, > > + .atomic_enable = logicvc_crtc_atomic_enable, > > + .atomic_disable = logicvc_crtc_atomic_disable, > > +}; > > + > > +static int logicvc_crtc_enable_vblank(struct drm_crtc *drm_crtc) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + > > + /* Clear any pending V_SYNC interrupt. */ > > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_STAT_REG, > > + LOGICVC_INT_STAT_V_SYNC, LOGICVC_INT_STAT_V_SYNC); > > + > > + /* Unmask V_SYNC interrupt. */ > > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > > + LOGICVC_INT_MASK_V_SYNC, 0); > > + > > + return 0; > > +} > > + > > +static void logicvc_crtc_disable_vblank(struct drm_crtc *drm_crtc) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_crtc->dev); > > + > > + /* Mask V_SYNC interrupt. */ > > + regmap_write_bits(logicvc->regmap, LOGICVC_INT_MASK_REG, > > + LOGICVC_INT_MASK_V_SYNC, LOGICVC_INT_MASK_V_SYNC); > > +} > > + > > +static const struct drm_crtc_funcs logicvc_crtc_funcs = { > > + .reset = drm_atomic_helper_crtc_reset, > > + .destroy = drm_crtc_cleanup, > > + .set_config = drm_atomic_helper_set_config, > > + .page_flip = drm_atomic_helper_page_flip, > > + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > > + .enable_vblank = logicvc_crtc_enable_vblank, > > + .disable_vblank = logicvc_crtc_disable_vblank, > > +}; > > + > > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct logicvc_crtc *crtc = logicvc->crtc; > > + unsigned long flags; > > + > > + if (!crtc) > > + return; > > + > > + drm_crtc_handle_vblank(&crtc->drm_crtc); > > + > > + if (crtc->event) { > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > + drm_crtc_send_vblank_event(&crtc->drm_crtc, crtc->event); > > + drm_crtc_vblank_put(&crtc->drm_crtc); > > + crtc->event = NULL; > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > + } > > +} > > + > > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct logicvc_crtc *crtc; > > + struct logicvc_layer *layer_primary; > > + int ret; > > + > > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > > + if (!crtc) > > + return -ENOMEM; > > + > > + layer_primary = logicvc_layer_get_primary(logicvc); > > + if (!layer_primary) { > > + DRM_ERROR("Failed to get primary layer\n"); > > + return -EINVAL; > > + } > > + > > + ret = drm_crtc_init_with_planes(drm_dev, &crtc->drm_crtc, > > + &layer_primary->drm_plane, NULL, > > + &logicvc_crtc_funcs, NULL); > > + if (ret) { > > + DRM_ERROR("Failed to initalize CRTC\n"); > > + return ret; > > + } > > + > > + drm_crtc_helper_add(&crtc->drm_crtc, &logicvc_crtc_helper_funcs); > > + > > + crtc->drm_crtc.port = of_graph_get_port_by_id(of_node, 1); > > + > > + logicvc->crtc = crtc; > > + > > + return 0; > > +} > > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.h b/drivers/gpu/drm/logicvc/logicvc_crtc.h > > new file mode 100644 > > index 000000000000..6a1291c37704 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.h > > @@ -0,0 +1,21 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_CRTC_H_ > > +#define _LOGICVC_CRTC_H_ > > + > > +struct drm_pending_vblank_event; > > +struct logicvc_drm; > > + > > +struct logicvc_crtc { > > + struct drm_crtc drm_crtc; > > + struct drm_pending_vblank_event *event; > > +}; > > + > > +void logicvc_crtc_vblank_handler(struct logicvc_drm *logicvc); > > +int logicvc_crtc_init(struct logicvc_drm *logicvc); > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.c b/drivers/gpu/drm/logicvc/logicvc_drm.c > > new file mode 100644 > > index 000000000000..b73e92fb2026 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.c > > @@ -0,0 +1,472 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/clk.h> > > +#include <linux/mfd/syscon.h> > > +#include <linux/module.h> > > +#include <linux/of.h> > > +#include <linux/of_address.h> > > +#include <linux/of_device.h> > > +#include <linux/of_reserved_mem.h> > > +#include <linux/regmap.h> > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_drv.h> > > +#include <drm/drm_fb_helper.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_print.h> > > + > > +#include "logicvc_crtc.h" > > +#include "logicvc_drm.h" > > +#include "logicvc_interface.h" > > +#include "logicvc_mode.h" > > +#include "logicvc_layer.h" > > +#include "logicvc_of.h" > > +#include "logicvc_regs.h" > > + > > +DEFINE_DRM_GEM_CMA_FOPS(logicvc_drm_fops); > > + > > +static int logicvc_drm_gem_cma_dumb_create(struct drm_file *file_priv, > > + struct drm_device *drm_dev, > > + struct drm_mode_create_dumb *args) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > > + > > + /* Stride is always fixed to its configuration value. */ > > + args->pitch = logicvc->config.row_stride * DIV_ROUND_UP(args->bpp, 8); > > + > > + return drm_gem_cma_dumb_create_internal(file_priv, drm_dev, args); > > +} > > + > > +static struct drm_driver logicvc_drm_driver = { > > + .driver_features = DRIVER_GEM | DRIVER_MODESET | > > + DRIVER_ATOMIC, > > + > > + .fops = &logicvc_drm_fops, > > + .name = "logicvc-drm", > > + .desc = "Xylon LogiCVC DRM driver", > > + .date = "20200403", > > + .major = 1, > > + .minor = 0, > > + > > + DRM_GEM_CMA_DRIVER_OPS_VMAP_WITH_DUMB_CREATE(logicvc_drm_gem_cma_dumb_create), > > +}; > > + > > +static struct regmap_config logicvc_drm_regmap_config = { > > + .reg_bits = 32, > > + .val_bits = 32, > > + .reg_stride = 4, > > + .name = "logicvc-drm", > > +}; > > + > > +static irqreturn_t logicvc_drm_irq_handler(int irq, void *data) > > +{ > > + struct logicvc_drm *logicvc = data; > > + irqreturn_t ret = IRQ_NONE; > > + u32 stat = 0; > > + > > + /* Get pending interrupt sources. */ > > + regmap_read(logicvc->regmap, LOGICVC_INT_STAT_REG, &stat); > > + > > + /* Clear all pending interrupt sources. */ > > + regmap_write(logicvc->regmap, LOGICVC_INT_STAT_REG, stat); > > + > > + if (stat & LOGICVC_INT_STAT_V_SYNC) { > > + logicvc_crtc_vblank_handler(logicvc); > > + ret = IRQ_HANDLED; > > + } > > + > > + return ret; > > +} > > + > > +static int logicvc_drm_config_parse(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct logicvc_drm_config *config = &logicvc->config; > > + struct device_node *layers_node; > > + int ret; > > + > > + logicvc_of_property_parse_bool(of_node, LOGICVC_OF_PROPERTY_DITHERING, > > + &config->dithering); > > + logicvc_of_property_parse_bool(of_node, > > + LOGICVC_OF_PROPERTY_BACKGROUND_LAYER, > > + &config->background_layer); > > + logicvc_of_property_parse_bool(of_node, > > + LOGICVC_OF_PROPERTY_LAYERS_CONFIGURABLE, > > + &config->layers_configurable); > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_DISPLAY_INTERFACE, > > + &config->display_interface); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_DISPLAY_COLORSPACE, > > + &config->display_colorspace); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_DISPLAY_DEPTH, > > + &config->display_depth); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_ROW_STRIDE, > > + &config->row_stride); > > + if (ret) > > + return ret; > > + > > + layers_node = of_get_child_by_name(of_node, "layers"); > > + if (!layers_node) { > > + DRM_ERROR("Missing non-optional layers node\n"); > > + return -EINVAL; > > + } > > + > > + config->layers_count = of_get_child_count(layers_node); > > + if (!config->layers_count) { > > + DRM_ERROR("Missing a non-optional layers children node\n"); > > + return -EINVAL; > > + } > > + > > + return 0; > > +} > > + > > +static void logicvc_version_print(struct logicvc_drm *logicvc) > > +{ > > + u32 version; > > + > > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > > + > > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > > + 'a'); > > DRM_DEV_INFO? Okay but now according to Sam, "DRM_DEV_ERROR() and friends are deprecated" so I wonder which is the right one to use at this point. > > +} > > + > > +static int logicvc_clocks_prepare(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + > > + struct { > > + struct clk **clk; > > + char *name; > > + bool optional; > > + } clocks_map[] = { > > + { > > + .clk = &logicvc->vclk, > > + .name = "vclk", > > + .optional = false, > > + }, > > + { > > + .clk = &logicvc->vclk2, > > + .name = "vclk2", > > + .optional = true, > > + }, > > + { > > + .clk = &logicvc->lvdsclk, > > + .name = "lvdsclk", > > + .optional = true, > > + }, > > + { > > + .clk = &logicvc->lvdsclkn, > > + .name = "lvdsclkn", > > + .optional = true, > > + }, > > + }; > > + unsigned int i; > > + int ret; > > + > > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > > + struct clk *clk; > > + > > + clk = devm_clk_get(dev, clocks_map[i].name); > > + if (IS_ERR(clk)) { > > + if (PTR_ERR(clk) == -ENOENT && clocks_map[i].optional) > > + continue; > > + > > + DRM_ERROR("Missing non-optional clock %s\n", > > + clocks_map[i].name); > > + > > + ret = PTR_ERR(clk); > > + goto error; > > + } > > + > > + ret = clk_prepare_enable(clk); > > + if (ret) { > > + DRM_ERROR("Failed to prepare and enable clock %s\n", > > + clocks_map[i].name); > > + goto error; > > + } > > + > > + *clocks_map[i].clk = clk; > > + } > > + > > + return 0; > > + > > +error: > > + for (i = 0; i < ARRAY_SIZE(clocks_map); i++) { > > + if (!*clocks_map[i].clk) > > + continue; > > + > > + clk_disable_unprepare(*clocks_map[i].clk); > > + *clocks_map[i].clk = NULL; > > + } > > + > > + return ret; > > +} > > + > > +static int logicvc_clocks_unprepare(struct logicvc_drm *logicvc) > > +{ > > + struct clk **clocks[] = { > > + &logicvc->vclk, > > + &logicvc->vclk2, > > + &logicvc->lvdsclk, > > + &logicvc->lvdsclkn, > > + }; > > + unsigned int i; > > + > > + for (i = 0; i < ARRAY_SIZE(clocks); i++) { > > + if (!*clocks[i]) > > + continue; > > + > > + clk_disable_unprepare(*clocks[i]); > > + *clocks[i] = NULL; > > + } > > + > > + return 0; > > +} > > + > > +static int logicvc_drm_probe(struct platform_device *pdev) > > +{ > > + struct device_node *of_node = pdev->dev.of_node; > > + struct device_node *reserved_mem_node; > > + struct reserved_mem *reserved_mem = NULL; > > + const struct logicvc_drm_caps *caps; > > + struct logicvc_drm *logicvc; > > + struct device *dev = &pdev->dev; > > + struct drm_device *drm_dev; > > + struct regmap *regmap; > > + struct resource res; > > + void __iomem *base; > > + int irq; > > + int ret; > > + > > + caps = of_device_get_match_data(dev); > > + if (!caps) > > + return -EINVAL; > > + > > + ret = of_reserved_mem_device_init(dev); > > + if (ret && ret != -ENODEV) { > > + dev_err(dev, "Failed to init memory region\n"); > > + goto error_early; > > + } > > + > > + reserved_mem_node = of_parse_phandle(of_node, "memory-region", 0); > > + if (reserved_mem_node) { > > + reserved_mem = of_reserved_mem_lookup(reserved_mem_node); > > + of_node_put(reserved_mem_node); > > + } > > + > > + /* Get regmap from syscon first if available. */ > > + regmap = syscon_regmap_lookup_by_phandle(of_node, "xylon,syscon"); > > + > > + /* Then get regmap from parent if available. */ > > + if (IS_ERR(regmap) && of_node->parent) > > + regmap = syscon_node_to_regmap(of_node->parent); > > + > > + /* Register our own regmap otherwise. */ > > + if (IS_ERR(regmap)) { > > + ret = of_address_to_resource(of_node, 0, &res); > > + if (ret) { > > + dev_err(dev, "Failed to get resource from address\n"); > > + goto error_reserved_mem; > > + } > > + > > + base = devm_ioremap_resource(dev, &res); > > + if (IS_ERR(base)) { > > + dev_err(dev, "Failed to map I/O base\n"); > > + ret = PTR_ERR(base); > > + goto error_reserved_mem; > > + } > > + > > + logicvc_drm_regmap_config.max_register = resource_size(&res) - > > + 4; > > + > > + regmap = devm_regmap_init_mmio(dev, base, > > + &logicvc_drm_regmap_config); > > + if (IS_ERR(regmap)) { > > + dev_err(dev, "Failed to create regmap for I/O\n"); > > + ret = PTR_ERR(regmap); > > + goto error_reserved_mem; > > + } > > + } > > + > > + irq = platform_get_irq(pdev, 0); > > + if (irq < 0) { > > + dev_err(dev, "Failed to get IRQ\n"); > > + ret = -ENODEV; > > + goto error_reserved_mem; > > + } > > + > > + logicvc = devm_drm_dev_alloc(dev, &logicvc_drm_driver, > > + struct logicvc_drm, drm_dev); > > + if (IS_ERR(logicvc)) { > > + ret = PTR_ERR(logicvc); > > + goto error_reserved_mem; > > + } > > + > > + platform_set_drvdata(pdev, logicvc); > > + drm_dev = &logicvc->drm_dev; > > + > > + logicvc->caps = caps; > > + logicvc->regmap = regmap; > > + INIT_LIST_HEAD(&logicvc->layers_list); > > + > > + if (reserved_mem) > > + logicvc->reserved_mem_base = reserved_mem->base; > > + > > + ret = logicvc_clocks_prepare(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to prepare clocks\n"); > > + goto error_logicvc; > > + } > > + > > + ret = devm_request_irq(dev, irq, logicvc_drm_irq_handler, 0, > > + dev_name(dev), logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to request IRQ\n"); > > + goto error_clocks; > > + } > > have you considered drm_irq_install? I did and concluded that there is no particular advantage in using that, only unnecessary code overhead. But maybe I'm missing something here. > > + > > + logicvc_version_print(logicvc); > > + > > + ret = logicvc_drm_config_parse(logicvc); > > + if (ret && ret != -ENODEV) { > > + drm_err(drm_dev, "Failed to parse config\n"); > > + goto error_clocks; > > + } > > + > > + drm_mode_config_init(drm_dev); > > You're supposed to call drm_mode_config_cleanup when using > drm_mode_config_init. You'd be better off switching to > drmm_mode_config_init though. Okay I'll look into it. > > + ret = logicvc_layers_init(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize layers\n"); > > + goto error_clocks; > > + } > > + > > + ret = logicvc_crtc_init(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize CRTC\n"); > > + goto error_clocks; > > + } > > + > > + logicvc_layers_attach_crtc(logicvc); > > + > > + ret = logicvc_interface_init(logicvc); > > + if (ret) { > > + if (ret != -EPROBE_DEFER) > > + drm_err(drm_dev, "Failed to initialize interface\n"); > > + > > + goto error_clocks; > > + } > > + > > + logicvc_interface_attach_crtc(logicvc); > > + > > + ret = logicvc_mode_init(logicvc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize KMS\n"); > > + goto error_clocks; > > + } > > + > > + ret = drm_dev_register(drm_dev, 0); > > + if (ret) { > > + drm_err(drm_dev, "Failed to register DRM device\n"); > > + goto error_mode; > > + } > > + > > + drm_fbdev_generic_setup(drm_dev, drm_dev->mode_config.preferred_depth); > > + > > + return 0; > > + > > +error_mode: > > + logicvc_mode_fini(logicvc); > > + > > +error_clocks: > > + logicvc_clocks_unprepare(logicvc); > > + > > +error_logicvc: > > + drm_dev_put(drm_dev); > > You don't need drm_dev_put with devm_drm_dev_alloc Ah right, thanks. > > +error_reserved_mem: > > + of_reserved_mem_device_release(dev); > > + > > +error_early: > > + return ret; > > +} > > + > > +static int logicvc_drm_remove(struct platform_device *pdev) > > +{ > > + struct logicvc_drm *logicvc = platform_get_drvdata(pdev); > > + struct device *dev = &pdev->dev; > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + > > + drm_dev_unregister(drm_dev); > > + drm_atomic_helper_shutdown(drm_dev); > > + > > + logicvc_mode_fini(logicvc); > > + > > + logicvc_clocks_unprepare(logicvc); > > + > > + drm_dev_put(drm_dev); > > Ditto > > > + of_reserved_mem_device_release(dev); > > + > > + return 0; > > +} > > + > > +static const struct logicvc_drm_caps logicvc_drm_caps_3 = { > > + .layer_address = false, > > +}; > > + > > +static const struct logicvc_drm_caps logicvc_drm_caps_4 = { > > + .layer_address = true, > > +}; > > + > > +static struct of_device_id logicvc_drm_of_table[] = { > > + { > > + .compatible = "xylon,logicvc-3.02.a-display", > > + .data = &logicvc_drm_caps_3, > > + }, > > + { > > + .compatible = "xylon,logicvc-4.01.a-display", > > + .data = &logicvc_drm_caps_4, > > + }, > > + { }, > > +}; > > +MODULE_DEVICE_TABLE(of, logicvc_drm_of_table); > > + > > +static struct platform_driver logicvc_drm_platform_driver = { > > + .probe = logicvc_drm_probe, > > + .remove = logicvc_drm_remove, > > + .driver = { > > + .name = "logicvc-drm", > > + .of_match_table = logicvc_drm_of_table, > > + }, > > +}; > > + > > +module_platform_driver(logicvc_drm_platform_driver); > > + > > +MODULE_AUTHOR("Paul Kocialkowski <paul.kocialkowski@bootlin.com>"); > > +MODULE_DESCRIPTION("Xylon LogiCVC DRM driver"); > > +MODULE_LICENSE("GPL"); > > diff --git a/drivers/gpu/drm/logicvc/logicvc_drm.h b/drivers/gpu/drm/logicvc/logicvc_drm.h > > new file mode 100644 > > index 000000000000..68bbac6c4ab9 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_drm.h > > @@ -0,0 +1,64 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_DRM_H_ > > +#define _LOGICVC_DRM_H_ > > + > > +#include <linux/regmap.h> > > +#include <linux/types.h> > > +#include <drm/drm_device.h> > > + > > +#define LOGICVC_DISPLAY_INTERFACE_RGB 0 > > +#define LOGICVC_DISPLAY_INTERFACE_ITU656 1 > > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS 2 > > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA 3 > > +#define LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS 4 > > +#define LOGICVC_DISPLAY_INTERFACE_DVI 5 > > + > > +#define LOGICVC_DISPLAY_COLORSPACE_RGB 0 > > +#define LOGICVC_DISPLAY_COLORSPACE_YUV422 1 > > +#define LOGICVC_DISPLAY_COLORSPACE_YUV444 2 > > + > > +#define logicvc_drm(d) \ > > + container_of(d, struct logicvc_drm, drm_dev) > > + > > +struct logicvc_crtc; > > +struct logicvc_interface; > > + > > +struct logicvc_drm_config { > > + u32 display_interface; > > + u32 display_colorspace; > > + u32 display_depth; > > + u32 row_stride; > > + bool dithering; > > + bool background_layer; > > + bool layers_configurable; > > + u32 layers_count; > > +}; > > + > > +struct logicvc_drm_caps { > > + bool layer_address; > > +}; > > + > > +struct logicvc_drm { > > + const struct logicvc_drm_caps *caps; > > + struct logicvc_drm_config config; > > + > > + struct drm_device drm_dev; > > + phys_addr_t reserved_mem_base; > > + struct regmap *regmap; > > + > > + struct clk *vclk; > > + struct clk *vclk2; > > + struct clk *lvdsclk; > > + struct clk *lvdsclkn; > > + > > + struct list_head layers_list; > > + struct logicvc_crtc *crtc; > > + struct logicvc_interface *interface; > > +}; > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.c b/drivers/gpu/drm/logicvc/logicvc_interface.c > > new file mode 100644 > > index 000000000000..0cfded3792d8 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.c > > @@ -0,0 +1,224 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_bridge.h> > > +#include <drm/drm_connector.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_drv.h> > > +#include <drm/drm_encoder.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_modeset_helper_vtables.h> > > +#include <drm/drm_of.h> > > +#include <drm/drm_panel.h> > > +#include <drm/drm_print.h> > > +#include <drm/drm_probe_helper.h> > > + > > +#include "logicvc_crtc.h" > > +#include "logicvc_drm.h" > > +#include "logicvc_interface.h" > > +#include "logicvc_regs.h" > > + > > +#define logicvc_interface_from_drm_encoder(c) \ > > + container_of(c, struct logicvc_interface, drm_encoder) > > +#define logicvc_interface_from_drm_connector(c) \ > > + container_of(c, struct logicvc_interface, drm_connector) > > + > > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > > +{ > > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > > + struct logicvc_interface *interface = > > + logicvc_interface_from_drm_encoder(drm_encoder); > > + > > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > > + > > + if (interface->drm_panel) { > > + drm_panel_prepare(interface->drm_panel); > > + > > + /* Encoder enable is too early to enable the panel and a white > > + * screen will be seen if the panel gets enabled before the > > + * first page flip is done (and no other framebuffer > > + * configuration remains from the boot software). */ > > + interface->drm_panel_enabled = false; > > + } > > +} > > That's fishy (and the similar stuff in commit_tail). Is it because you > need to have the CRTC powered before the encoder? > > If so, you should try the commit_tail_rpm variant, it makes sure the > CRTC is powered on before making a commit. No, this is unrelated to CRTC vs encoder enable order. Instead, it's about panel enable order: I don't want to enable the panel before a buffer was flipped on the CRTC otherwise a blank/white/garbage screen will be shown. This is why this drm_panel_enabled variable is used to make sure we don't enable the panel before. This is nothing specific to my hardware, but a general concern that probably exists in every DRM driver. Nobody really seems to care about it but I've decided that I would in this driver. Now if you think this is too exotic, I don't mind removing it. > > +static void logicvc_encoder_disable(struct drm_encoder *drm_encoder) > > +{ > > + struct logicvc_interface *interface = > > + logicvc_interface_from_drm_encoder(drm_encoder); > > + > > + if (interface->drm_panel) { > > + drm_panel_disable(interface->drm_panel); > > + drm_panel_unprepare(interface->drm_panel); > > + } > > +} > > + > > +static const struct drm_encoder_helper_funcs logicvc_encoder_helper_funcs = { > > + .enable = logicvc_encoder_enable, > > + .disable = logicvc_encoder_disable, > > +}; > > + > > +static const struct drm_encoder_funcs logicvc_encoder_funcs = { > > + .destroy = drm_encoder_cleanup, > > +}; > > + > > +static int logicvc_connector_get_modes(struct drm_connector *drm_connector) > > +{ > > + struct logicvc_interface *interface = > > + logicvc_interface_from_drm_connector(drm_connector); > > + > > + if (interface->drm_panel) > > + return drm_panel_get_modes(interface->drm_panel, drm_connector); > > + else > > + WARN_ONCE(1, "Retrieving modes from a native connector is not implemented."); > > + > > + return 0; > > +} > > + > > +static const struct drm_connector_helper_funcs logicvc_connector_helper_funcs = { > > + .get_modes = logicvc_connector_get_modes, > > +}; > > + > > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > > +{ > > + drm_connector_cleanup(drm_connector); > > +} > > I guess you don't need that intermediate function? I would need to check if that call is necessary or if some implied mechanism calls it for me already. > > +static const struct drm_connector_funcs logicvc_connector_funcs = { > > + .reset = drm_atomic_helper_connector_reset, > > + .fill_modes = drm_helper_probe_single_connector_modes, > > + .destroy = logicvc_connector_destroy, > > + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > > +}; > > + > > +static int logicvc_interface_encoder_type(struct logicvc_drm *logicvc) > > +{ > > + switch (logicvc->config.display_interface) { > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > > + return DRM_MODE_ENCODER_LVDS; > > + case LOGICVC_DISPLAY_INTERFACE_DVI: > > + return DRM_MODE_ENCODER_TMDS; > > + case LOGICVC_DISPLAY_INTERFACE_RGB: > > + return DRM_MODE_ENCODER_DPI; > > + default: > > + return DRM_MODE_ENCODER_NONE; > > + } > > +} > > + > > +static int logicvc_interface_connector_type(struct logicvc_drm *logicvc) > > +{ > > + switch (logicvc->config.display_interface) { > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_4BITS_CAMERA: > > + case LOGICVC_DISPLAY_INTERFACE_LVDS_3BITS: > > + return DRM_MODE_CONNECTOR_LVDS; > > + case LOGICVC_DISPLAY_INTERFACE_DVI: > > + return DRM_MODE_CONNECTOR_DVID; > > + case LOGICVC_DISPLAY_INTERFACE_RGB: > > + return DRM_MODE_CONNECTOR_DPI; > > + default: > > + return DRM_MODE_CONNECTOR_Unknown; > > + } > > +} > > + > > +static bool logicvc_interface_native_connector(struct logicvc_drm *logicvc) > > +{ > > + switch (logicvc->config.display_interface) { > > + case LOGICVC_DISPLAY_INTERFACE_DVI: > > + return true; > > + default: > > + return false; > > + } > > +} > > + > > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc) > > +{ > > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > > + > > + logicvc->interface->drm_encoder.possible_crtcs = possible_crtcs; > > +} > > + > > +int logicvc_interface_init(struct logicvc_drm *logicvc) > > +{ > > + struct logicvc_interface *interface; > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + int encoder_type = logicvc_interface_encoder_type(logicvc); > > + int connector_type = logicvc_interface_connector_type(logicvc); > > + bool native_connector = logicvc_interface_native_connector(logicvc); > > + int ret; > > + > > + interface = devm_kzalloc(dev, sizeof(*interface), GFP_KERNEL); > > + if (!interface) { > > + ret = -ENOMEM; > > + goto error_early; > > + } > > + > > + ret = drm_of_find_panel_or_bridge(of_node, 1, 0, &interface->drm_panel, > > + &interface->drm_bridge); > > + if (ret == -EPROBE_DEFER) > > + goto error_early; > > + > > + ret = drm_encoder_init(drm_dev, &interface->drm_encoder, > > + &logicvc_encoder_funcs, encoder_type, NULL); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initalize encoder\n"); > > + goto error_early; > > + } > > + > > + drm_encoder_helper_add(&interface->drm_encoder, > > + &logicvc_encoder_helper_funcs); > > + > > + if (native_connector || interface->drm_panel) { > > + ret = drm_connector_init(drm_dev, &interface->drm_connector, > > + &logicvc_connector_funcs, > > + connector_type); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initalize connector\n"); > > + goto error_encoder; > > + } > > + > > + drm_connector_helper_add(&interface->drm_connector, > > + &logicvc_connector_helper_funcs); > > + > > + ret = drm_connector_attach_encoder(&interface->drm_connector, > > + &interface->drm_encoder); > > + if (ret) { > > + drm_err(drm_dev, > > + "Failed to attach connector to encoder\n"); > > + goto error_encoder; > > + } > > + } > > + > > + if (interface->drm_bridge) { > > + ret = drm_bridge_attach(&interface->drm_encoder, > > + interface->drm_bridge, NULL, 0); > > + if (ret) { > > + drm_err(drm_dev, > > + "Failed to attach bridge to encoder\n"); > > + goto error_encoder; > > + } > > + } > > You should consider using the bridge_or_panel API. I have considered it and concluded that it's not a good fit given that the hardware can support a DVI connector. > > + logicvc->interface = interface; > > + > > + return 0; > > + > > +error_encoder: > > + drm_encoder_cleanup(&interface->drm_encoder); > > + > > +error_early: > > + return ret; > > +} > > diff --git a/drivers/gpu/drm/logicvc/logicvc_interface.h b/drivers/gpu/drm/logicvc/logicvc_interface.h > > new file mode 100644 > > index 000000000000..fb2e9e6e04aa > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_interface.h > > @@ -0,0 +1,30 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_INTERFACE_H_ > > +#define _LOGICVC_INTERFACE_H_ > > + > > +#include <drm/drm_bridge.h> > > +#include <drm/drm_connector.h> > > +#include <drm/drm_encoder.h> > > +#include <drm/drm_panel.h> > > + > > +struct logicvc_drm; > > + > > +struct logicvc_interface { > > + struct drm_encoder drm_encoder; > > + struct drm_connector drm_connector; > > + > > + struct drm_panel *drm_panel; > > + struct drm_bridge *drm_bridge; > > + > > + bool drm_panel_enabled; > > +}; > > + > > +void logicvc_interface_attach_crtc(struct logicvc_drm *logicvc); > > +int logicvc_interface_init(struct logicvc_drm *logicvc); > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.c b/drivers/gpu/drm/logicvc/logicvc_layer.c > > new file mode 100644 > > index 000000000000..9188d45cef77 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.c > > @@ -0,0 +1,615 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/of.h> > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic.h> > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_fb_cma_helper.h> > > +#include <drm/drm_fourcc.h> > > +#include <drm/drm_plane.h> > > +#include <drm/drm_plane_helper.h> > > +#include <drm/drm_print.h> > > + > > +#include "logicvc_crtc.h" > > +#include "logicvc_drm.h" > > +#include "logicvc_layer.h" > > +#include "logicvc_of.h" > > +#include "logicvc_regs.h" > > + > > +#define logicvc_layer(p) \ > > + container_of(p, struct logicvc_layer, drm_plane) > > + > > +static uint32_t logicvc_layer_formats_rgb16[] = { > > + DRM_FORMAT_RGB565, > > + DRM_FORMAT_BGR565, > > + DRM_FORMAT_INVALID, > > +}; > > + > > +static uint32_t logicvc_layer_formats_rgb24[] = { > > + DRM_FORMAT_XRGB8888, > > + DRM_FORMAT_XBGR8888, > > + DRM_FORMAT_INVALID, > > +}; > > + > > +/* What we call depth in this driver only counts color components, not alpha. > > + * This allows us to stay compatible with the LogiCVC bistream definitions. */ > > +static uint32_t logicvc_layer_formats_rgb24_alpha[] = { > > + DRM_FORMAT_ARGB8888, > > + DRM_FORMAT_ABGR8888, > > + DRM_FORMAT_INVALID, > > +}; > > + > > +static struct logicvc_layer_formats logicvc_layer_formats[] = { > > + { > > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > > + .depth = 16, > > + .formats = logicvc_layer_formats_rgb16, > > + }, > > + { > > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > > + .depth = 24, > > + .formats = logicvc_layer_formats_rgb24, > > + }, > > + { > > + .colorspace = LOGICVC_LAYER_COLORSPACE_RGB, > > + .depth = 24, > > + .alpha = true, > > + .formats = logicvc_layer_formats_rgb24_alpha, > > + }, > > + { } > > +}; > > + > > +static bool logicvc_layer_format_inverted(uint32_t format) > > +{ > > + switch (format) { > > + case DRM_FORMAT_BGR565: > > + case DRM_FORMAT_BGR888: > > + case DRM_FORMAT_XBGR8888: > > + case DRM_FORMAT_ABGR8888: > > + return true; > > + default: > > + return false; > > + } > > +} > > + > > +static int logicvc_plane_atomic_check(struct drm_plane *drm_plane, > > + struct drm_plane_state *state) > > +{ > > + struct drm_device *drm_dev = drm_plane->dev; > > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > > + struct drm_crtc_state *crtc_state; > > + int min_scale, max_scale; > > + bool can_position; > > + int ret; > > + > > + if (!state->crtc) > > + return 0; > > + > > + crtc_state = drm_atomic_get_existing_crtc_state(state->state, > > + state->crtc); > > + if (WARN_ON(!crtc_state)) > > + return -EINVAL; > > + > > + if (state->crtc_x < 0 || state->crtc_y < 0) { > > + drm_err(drm_dev, > > + "Negative on-CRTC positions are not supported.\n"); > > + return -EINVAL; > > + } > > + > > + if (!logicvc->caps->layer_address) { > > + ret = logicvc_layer_buffer_find_setup(logicvc, layer, state, > > + NULL); > > + if (ret) { > > + drm_err(drm_dev, "No viable setup for buffer found.\n"); > > + return ret; > > + } > > + } > > + > > + min_scale = DRM_PLANE_HELPER_NO_SCALING; > > + max_scale = DRM_PLANE_HELPER_NO_SCALING; > > + > > + can_position = (drm_plane->type == DRM_PLANE_TYPE_OVERLAY && > > + layer->index != (logicvc->config.layers_count - 1) && > > + logicvc->config.layers_configurable); > > + > > + ret = drm_atomic_helper_check_plane_state(state, crtc_state, > > + min_scale, max_scale, > > + can_position, true); > > + if (ret) { > > + drm_err(drm_dev, "Invalid plane state\n\n"); > > + return ret; > > + } > > + > > + return 0; > > +} > > + > > +static void logicvc_plane_atomic_update(struct drm_plane *drm_plane, > > + struct drm_plane_state *old_state) > > +{ > > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > > + struct drm_plane_state *state = drm_plane->state; > > + struct drm_crtc *drm_crtc = &logicvc->crtc->drm_crtc; > > + struct drm_display_mode *mode = &drm_crtc->state->adjusted_mode; > > + struct drm_framebuffer *fb = state->fb; > > + struct logicvc_layer_buffer_setup setup = {}; > > + u32 index = layer->index; > > + u32 reg; > > + > > + /* Layer dimensions */ > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_WIDTH_REG(index), > > + state->crtc_w - 1); > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HEIGHT_REG(index), > > + state->crtc_h - 1); > > + > > + if (logicvc->caps->layer_address) { > > + phys_addr_t fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ADDRESS_REG(index), > > + fb_addr); > > + } else { > > + /* Rely on offsets to configure the address. */ > > + > > + logicvc_layer_buffer_find_setup(logicvc, layer, state, &setup); > > + > > + /* Layer memory offsets */ > > + > > + regmap_write(logicvc->regmap, LOGICVC_BUFFER_SEL_REG, > > + LOGICVC_BUFFER_SEL_VALUE(index, setup.buffer_sel)); > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HOFFSET_REG(index), > > + setup.hoffset); > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VOFFSET_REG(index), > > + setup.voffset); > > + } > > + > > + /* Layer position */ > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_HPOSITION_REG(index), > > + mode->hdisplay - 1 - state->crtc_x); > > + > > + /* Vertical position must be set last to sync layer register changes. */ > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_VPOSITION_REG(index), > > + mode->vdisplay - 1 - state->crtc_y); > > + > > + /* Layer alpha */ > > + > > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) { > > + u32 alpha_bits; > > + u32 alpha_max; > > + u32 alpha; > > + > > + switch (layer->config.depth) { > > + case 8: > > + alpha_bits = 3; > > + break; > > + case 16: > > + if (layer->config.colorspace == LOGICVC_LAYER_COLORSPACE_YUV) > > + alpha_bits = 8; > > + else > > + alpha_bits = 6; > > + break; > > + default: > > + alpha_bits = 8; > > + break; > > + } > > + > > + alpha_max = BIT(alpha_bits) - 1; > > + alpha = state->alpha * alpha_max / DRM_BLEND_ALPHA_OPAQUE; > > + > > + DRM_DEBUG_DRIVER("Setting layer %d alpha to %d/%d\n", index, > > + alpha, alpha_max); > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_ALPHA_REG(index), > > + alpha); > > + } > > + > > + /* Layer control */ > > + > > + reg = LOGICVC_LAYER_CTRL_ENABLE; > > + > > + if (logicvc_layer_format_inverted(fb->format->format)) > > + reg |= LOGICVC_LAYER_CTRL_PIXEL_FORMAT_INVERT; > > + > > + reg |= LOGICVC_LAYER_CTRL_COLOR_KEY_DISABLE; > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), reg); > > +} > > + > > +static void logicvc_plane_atomic_disable(struct drm_plane *drm_plane, > > + struct drm_plane_state *old_state) > > +{ > > + struct logicvc_layer *layer = logicvc_layer(drm_plane); > > + struct logicvc_drm *logicvc = logicvc_drm(drm_plane->dev); > > + u32 index = layer->index; > > + > > + regmap_write(logicvc->regmap, LOGICVC_LAYER_CTRL_REG(index), 0); > > +} > > + > > +static struct drm_plane_helper_funcs logicvc_plane_helper_funcs = { > > + .atomic_check = logicvc_plane_atomic_check, > > + .atomic_update = logicvc_plane_atomic_update, > > + .atomic_disable = logicvc_plane_atomic_disable, > > +}; > > + > > +static const struct drm_plane_funcs logicvc_plane_funcs = { > > + .update_plane = drm_atomic_helper_update_plane, > > + .disable_plane = drm_atomic_helper_disable_plane, > > + .destroy = drm_plane_cleanup, > > + .reset = drm_atomic_helper_plane_reset, > > + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > > + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > > +}; > > + > > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer, > > + struct drm_plane_state *state, > > + struct logicvc_layer_buffer_setup *setup) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct drm_framebuffer *fb = state->fb; > > + /* All the supported formats have a single data plane. */ > > + u32 layer_bytespp = fb->format->cpp[0]; > > + u32 layer_stride = layer_bytespp * logicvc->config.row_stride; > > + u32 base_offset = layer->config.base_offset * layer_stride; > > + u32 buffer_offset = layer->config.buffer_offset * layer_stride; > > + u8 buffer_sel = 0; > > + u16 voffset = 0; > > + u16 hoffset = 0; > > + phys_addr_t fb_addr; > > + u32 fb_offset; > > + u32 gap; > > + > > + if (!logicvc->reserved_mem_base) { > > + drm_err(drm_dev, "No reserved memory base was registered!\n"); > > + return -ENOMEM; > > + } > > + > > + fb_addr = drm_fb_cma_get_gem_addr(fb, state, 0); > > + if (fb_addr < logicvc->reserved_mem_base) { > > + drm_err(drm_dev, > > + "Framebuffer memory below reserved memory base!\n"); > > + return -EINVAL; > > + } > > + > > + fb_offset = (u32) (fb_addr - logicvc->reserved_mem_base); > > + > > + if (fb_offset < base_offset) { > > + drm_err(drm_dev, > > + "Framebuffer offset below layer base offset!\n"); > > + return -EINVAL; > > + } > > + > > + gap = fb_offset - base_offset; > > + > > + /* Use the possible video buffers selection. */ > > + if (gap && buffer_offset) { > > + buffer_sel = gap / buffer_offset; > > + if (buffer_sel > LOGICVC_BUFFER_SEL_MAX) > > + buffer_sel = LOGICVC_BUFFER_SEL_MAX; > > + > > + gap -= buffer_sel * buffer_offset; > > + } > > + > > + /* Use the vertical offset. */ > > + if (gap && layer_stride && logicvc->config.layers_configurable) { > > + voffset = gap / layer_stride; > > + if (voffset > LOGICVC_LAYER_VOFFSET_MAX) > > + voffset = LOGICVC_LAYER_VOFFSET_MAX; > > + > > + gap -= voffset * layer_stride; > > + } > > + > > + /* Use the horizontal offset. */ > > + if (gap && layer_bytespp && logicvc->config.layers_configurable) { > > + hoffset = gap / layer_bytespp; > > + if (hoffset > LOGICVC_DIMENSIONS_MAX) > > + hoffset = LOGICVC_DIMENSIONS_MAX; > > + > > + gap -= hoffset * layer_bytespp; > > + } > > + > > + if (gap) { > > + drm_err(drm_dev, > > + "Unable to find layer %d buffer setup for 0x%x byte gap\n", > > + layer->index, fb_offset - base_offset); > > + return -EINVAL; > > + } > > + > > + DRM_DEBUG_DRIVER("Found layer %d buffer setup for 0x%x byte gap:\n", > > + layer->index, fb_offset - base_offset); > > + > > + DRM_DEBUG_DRIVER("- buffer_sel = 0x%x chunks of 0x%x bytes\n", > > + buffer_sel, buffer_offset); > > + DRM_DEBUG_DRIVER("- voffset = 0x%x chunks of 0x%x bytes\n", voffset, > > + layer_stride); > > + DRM_DEBUG_DRIVER("- hoffset = 0x%x chunks of 0x%x bytes\n", hoffset, > > + layer_bytespp); > > + > > + if (setup) { > > + setup->buffer_sel = buffer_sel; > > + setup->voffset = voffset; > > + setup->hoffset = hoffset; > > + } > > + > > + return 0; > > +} > > + > > +static struct logicvc_layer_formats *logicvc_layer_formats_lookup(struct logicvc_layer *layer) > > +{ > > + bool alpha; > > + unsigned int i = 0; > > + > > + alpha = (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_PIXEL); > > + > > + while (logicvc_layer_formats[i].formats) { > > + if (logicvc_layer_formats[i].colorspace == layer->config.colorspace && > > + logicvc_layer_formats[i].depth == layer->config.depth && > > + logicvc_layer_formats[i].alpha == alpha) > > + return &logicvc_layer_formats[i]; > > + > > + i++; > > + } > > + > > + return NULL; > > +} > > + > > +static unsigned int logicvc_layer_formats_count(struct logicvc_layer_formats *formats) > > +{ > > + unsigned int count = 0; > > + > > + while (formats->formats[count] != DRM_FORMAT_INVALID) > > + count++; > > + > > + return count; > > +} > > + > > +static int logicvc_layer_config_parse(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer) > > +{ > > + struct device_node *of_node = layer->of_node; > > + struct logicvc_layer_config *config = &layer->config; > > + int ret; > > + > > + logicvc_of_property_parse_bool(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_PRIMARY, > > + &config->primary); > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_COLORSPACE, > > + &config->colorspace); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_DEPTH, > > + &config->depth); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_ALPHA_MODE, > > + &config->alpha_mode); > > + if (ret) > > + return ret; > > + > > + /* Memory offset is only relevant without layer address configuration. */ > > + if (logicvc->caps->layer_address) > > + return 0; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_BASE_OFFSET, > > + &config->base_offset); > > + if (ret) > > + return ret; > > + > > + ret = logicvc_of_property_parse_u32(of_node, > > + LOGICVC_OF_PROPERTY_LAYER_BUFFER_OFFSET, > > + &config->buffer_offset); > > + if (ret) > > + return ret; > > + > > + return 0; > > +} > > + > > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > > + u32 index) > > +{ > > + struct logicvc_layer *layer; > > + > > + list_for_each_entry(layer, &logicvc->layers_list, list) > > + if (layer->index == index) > > + return layer; > > + > > + return NULL; > > +} > > + > > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > > + enum drm_plane_type type) > > +{ > > + struct logicvc_layer *layer; > > + > > + list_for_each_entry(layer, &logicvc->layers_list, list) > > + if (layer->drm_plane.type == type) > > + return layer; > > + > > + return NULL; > > +} > > + > > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc) > > +{ > > + return logicvc_layer_get_from_type(logicvc, DRM_PLANE_TYPE_PRIMARY); > > +} > > + > > +static int logicvc_layer_init(struct logicvc_drm *logicvc, > > + struct device_node *of_node, u32 index) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct logicvc_layer *layer = NULL; > > + struct logicvc_layer_formats *formats; > > + unsigned int formats_count; > > + enum drm_plane_type type; > > + unsigned int zpos; > > + int ret; > > + > > + layer = devm_kzalloc(dev, sizeof(*layer), GFP_KERNEL); > > + if (!layer) { > > + ret = -ENOMEM; > > + goto error; > > + } > > + > > + layer->of_node = of_node; > > + layer->index = index; > > + > > + ret = logicvc_layer_config_parse(logicvc, layer); > > + if (ret) { > > + drm_err(drm_dev, "Failed to parse config for layer #%d\n", > > + index); > > + goto error; > > + } > > + > > + formats = logicvc_layer_formats_lookup(layer); > > + if (!formats) { > > + drm_err(drm_dev, "Failed to lookup formats for layer #%d\n", > > + index); > > + goto error; > > + } > > + > > + formats_count = logicvc_layer_formats_count(formats); > > + > > + /* The final layer can be configured as a background layer. */ > > + if (logicvc->config.background_layer && > > + index == (logicvc->config.layers_count - 1)) { > > + /* A zero value for black is only valid for RGB, not for YUV, > > + * so this will need to take the format in account for YUV. */ > > + u32 background = 0; > > + > > + DRM_DEBUG_DRIVER("Using layer #%d as background layer\n", > > + index); > > + > > + regmap_write(logicvc->regmap, LOGICVC_BACKGROUND_COLOR_REG, > > + background); > > + > > + devm_kfree(dev, layer); > > + > > + return 0; > > + } > > + > > + if (layer->config.primary) > > + type = DRM_PLANE_TYPE_PRIMARY; > > + else > > + type = DRM_PLANE_TYPE_OVERLAY; > > + > > + ret = drm_universal_plane_init(drm_dev, &layer->drm_plane, 0, > > + &logicvc_plane_funcs, formats->formats, > > + formats_count, NULL, type, NULL); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize layer plane\n"); > > + return ret; > > + } > > + > > + drm_plane_helper_add(&layer->drm_plane, &logicvc_plane_helper_funcs); > > + > > + zpos = logicvc->config.layers_count - index - 1; > > + DRM_DEBUG_DRIVER("Giving layer #%d zpos %d\n", index, zpos); > > + > > + if (layer->config.alpha_mode == LOGICVC_LAYER_ALPHA_LAYER) > > + drm_plane_create_alpha_property(&layer->drm_plane); > > + > > + drm_plane_create_zpos_immutable_property(&layer->drm_plane, zpos); > > + > > + DRM_DEBUG_DRIVER("Registering layer #%d\n", index); > > + > > + layer->formats = formats; > > + > > + list_add_tail(&layer->list, &logicvc->layers_list); > > + > > + return 0; > > + > > +error: > > + if (layer) > > + devm_kfree(dev, layer); > > + > > + return ret; > > +} > > + > > +static void logicvc_layer_fini(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer) > > +{ > > + struct device *dev = logicvc->drm_dev.dev; > > + > > + list_del(&layer->list); > > + devm_kfree(dev, layer); > > +} > > + > > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc) > > +{ > > + uint32_t possible_crtcs = drm_crtc_mask(&logicvc->crtc->drm_crtc); > > + struct logicvc_layer *layer; > > + > > + list_for_each_entry(layer, &logicvc->layers_list, list) { > > + if (layer->drm_plane.type != DRM_PLANE_TYPE_OVERLAY) > > + continue; > > + > > + layer->drm_plane.possible_crtcs = possible_crtcs; > > + } > > +} > > + > > +int logicvc_layers_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct device_node *layer_node = NULL; > > + struct device_node *layers_node; > > + struct logicvc_layer *layer; > > + struct logicvc_layer *next; > > + int ret = 0; > > + > > + layers_node = of_get_child_by_name(of_node, "layers"); > > + if (!layers_node) { > > + DRM_ERROR("No layers node found in the description\n"); > > + ret = -ENODEV; > > + goto error; > > + } > > + > > + for_each_child_of_node(layers_node, layer_node) { > > + u32 index = 0; > > + > > + if (!logicvc_of_node_is_layer(layer_node)) > > + continue; > > + > > + ret = of_property_read_u32(layer_node, "reg", &index); > > + if (ret) > > + continue; > > + > > + layer = logicvc_layer_get_from_index(logicvc, index); > > + if (layer) { > > + DRM_ERROR("Duplicated entry for layer #%d\n", index); > > + continue; > > + } > > + > > + ret = logicvc_layer_init(logicvc, layer_node, index); > > + if (ret) > > + goto error; > > + > > + of_node_put(layer_node); > > + } > > + > > + of_node_put(layers_node); > > + > > + return 0; > > + > > +error: > > + list_for_each_entry_safe(layer, next, &logicvc->layers_list, list) > > + logicvc_layer_fini(logicvc, layer); > > + > > + return ret; > > +} > > diff --git a/drivers/gpu/drm/logicvc/logicvc_layer.h b/drivers/gpu/drm/logicvc/logicvc_layer.h > > new file mode 100644 > > index 000000000000..c5767c81f446 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_layer.h > > @@ -0,0 +1,64 @@ > > +/* SPDX-License-Identifier: GPL-2.0+ */ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#ifndef _LOGICVC_LAYER_H_ > > +#define _LOGICVC_LAYER_H_ > > + > > +#include <linux/of.h> > > +#include <linux/types.h> > > +#include <drm/drm_plane.h> > > + > > +#define LOGICVC_LAYER_COLORSPACE_RGB 0 > > +#define LOGICVC_LAYER_COLORSPACE_YUV 1 > > + > > +#define LOGICVC_LAYER_ALPHA_LAYER 0 > > +#define LOGICVC_LAYER_ALPHA_PIXEL 1 > > + > > +struct logicvc_layer_buffer_setup { > > + u8 buffer_sel; > > + u16 voffset; > > + u16 hoffset; > > +}; > > + > > +struct logicvc_layer_config { > > + u32 colorspace; > > + u32 depth; > > + u32 alpha_mode; > > + u32 base_offset; > > + u32 buffer_offset; > > + bool primary; > > +}; > > + > > +struct logicvc_layer_formats { > > + u32 colorspace; > > + u32 depth; > > + bool alpha; > > + uint32_t *formats; > > +}; > > + > > +struct logicvc_layer { > > + struct logicvc_layer_config config; > > + struct logicvc_layer_formats *formats; > > + struct device_node *of_node; > > + > > + struct drm_plane drm_plane; > > + struct list_head list; > > + u32 index; > > +}; > > + > > +int logicvc_layer_buffer_find_setup(struct logicvc_drm *logicvc, > > + struct logicvc_layer *layer, > > + struct drm_plane_state *state, > > + struct logicvc_layer_buffer_setup *setup); > > +struct logicvc_layer *logicvc_layer_get_from_index(struct logicvc_drm *logicvc, > > + u32 index); > > +struct logicvc_layer *logicvc_layer_get_from_type(struct logicvc_drm *logicvc, > > + enum drm_plane_type type); > > +struct logicvc_layer *logicvc_layer_get_primary(struct logicvc_drm *logicvc); > > +void logicvc_layers_attach_crtc(struct logicvc_drm *logicvc); > > +int logicvc_layers_init(struct logicvc_drm *logicvc); > > + > > +#endif > > diff --git a/drivers/gpu/drm/logicvc/logicvc_mode.c b/drivers/gpu/drm/logicvc/logicvc_mode.c > > new file mode 100644 > > index 000000000000..aa8f35b64c75 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_mode.c > > @@ -0,0 +1,101 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > > +#include <linux/types.h> > > + > > +#include <drm/drm_atomic.h> > > +#include <drm/drm_atomic_helper.h> > > +#include <drm/drm_crtc_helper.h> > > +#include <drm/drm_drv.h> > > +#include <drm/drm_fb_cma_helper.h> > > +#include <drm/drm_fb_helper.h> > > +#include <drm/drm_gem_cma_helper.h> > > +#include <drm/drm_gem_framebuffer_helper.h> > > +#include <drm/drm_mode_config.h> > > +#include <drm/drm_panel.h> > > +#include <drm/drm_print.h> > > +#include <drm/drm_probe_helper.h> > > +#include <drm/drm_vblank.h> > > + > > +#include "logicvc_drm.h" > > +#include "logicvc_interface.h" > > +#include "logicvc_layer.h" > > +#include "logicvc_mode.h" > > + > > +static void logicvc_mode_atomic_commit_tail(struct drm_atomic_state *old_state) > > +{ > > + struct drm_device *drm_dev = old_state->dev; > > + struct logicvc_drm *logicvc = logicvc_drm(drm_dev); > > + struct logicvc_interface *interface = logicvc->interface; > > + > > + drm_atomic_helper_commit_tail(old_state); > > + > > + /* Enable the panel after the first commit, which concerns our panel > > + * since we only support a single interface. */ > > + if (interface->drm_panel && !interface->drm_panel_enabled) { > > + drm_panel_enable(interface->drm_panel); > > + interface->drm_panel_enabled = true; > > + } > > +} > > + > > +static const struct drm_mode_config_helper_funcs logicvc_mode_config_helper_funcs = { > > + .atomic_commit_tail = logicvc_mode_atomic_commit_tail, > > +}; > > + > > +static const struct drm_mode_config_funcs logicvc_mode_config_funcs = { > > + .fb_create = drm_gem_fb_create, > > + .output_poll_changed = drm_fb_helper_output_poll_changed, > > + .atomic_check = drm_atomic_helper_check, > > + .atomic_commit = drm_atomic_helper_commit, > > +}; > > + > > +int logicvc_mode_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct drm_mode_config *mode_config = &drm_dev->mode_config; > > + struct logicvc_layer *layer_primary; > > + uint32_t preferred_depth; > > + int ret; > > + > > + ret = drm_vblank_init(drm_dev, mode_config->num_crtc); > > + if (ret) { > > + drm_err(drm_dev, "Failed to initialize vblank\n"); > > + return ret; > > + } > > + > > + layer_primary = logicvc_layer_get_primary(logicvc); > > + if (!layer_primary) { > > + drm_err(drm_dev, "Failed to get primary layer\n"); > > + return -EINVAL; > > + } > > + > > + preferred_depth = layer_primary->formats->depth; > > + > > + /* DRM counts alpha in depth, our driver doesn't. */ > > + if (layer_primary->formats->alpha) > > + preferred_depth += 8; > > + > > + mode_config->min_width = 64; > > + mode_config->max_width = 2048; > > + mode_config->min_height = 1; > > + mode_config->max_height = 2048; > > + mode_config->preferred_depth = preferred_depth; > > + mode_config->funcs = &logicvc_mode_config_funcs; > > + mode_config->helper_private = &logicvc_mode_config_helper_funcs; > > + > > + drm_mode_config_reset(drm_dev); > > + > > + drm_kms_helper_poll_init(drm_dev); > > + > > + return 0; > > +} > > + > > +void logicvc_mode_fini(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + > > + drm_kms_helper_poll_fini(drm_dev); > > +} > > You should consider using a drmm_add_action_or_reset here to simplify > your error / remove path. Thanks for the suggestion (and the review)! Cheers, Paul -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller 2020-12-02 16:06 ` Paul Kocialkowski @ 2020-12-07 10:42 ` Maxime Ripard -1 siblings, 0 replies; 15+ messages in thread From: Maxime Ripard @ 2020-12-07 10:42 UTC (permalink / raw) To: Daniel Vetter, Paul Kocialkowski Cc: dri-devel, devicetree, linux-kernel, David Airlie, Rob Herring, Maarten Lankhorst, Thomas Zimmermann, Thomas Petazzoni [-- Attachment #1: Type: text/plain, Size: 4885 bytes --] On Wed, Dec 02, 2020 at 05:06:40PM +0100, Paul Kocialkowski wrote: > > > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > > > + struct drm_atomic_state *state) > > > +{ > > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > > + struct drm_crtc_state *crtc_state = > > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > > + struct drm_device *drm_dev = drm_crtc->dev; > > > + unsigned long flags; > > > + > > > + /* Register pending event, only if vblank is already on. */ > > > + if (drm_crtc->state->event && crtc_state->active) { > > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > > + > > > + crtc->event = drm_crtc->state->event; > > > + drm_crtc->state->event = NULL; > > > + > > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > > + } > > > +} > > > > That's unusual to do it in atomic_begin, why do you need it? > > This is to cover the case where we need to send a page flip event but the > crtc is already on. In that case, neither atomic_enable nor atomic_disable > will be called so we need to rely on atomic_begin to grab that event. > This happens for example when a single plane is updated. > > The same thing is done in e.g. sun4i-drm. Yeah, but I'm not sure why that's needed in the first place on sun4i-drm either. This looks to me as either something that should be handled by the helpers, or isn't needed at all. Just like the other times you fiddle with the vblank in your driver. I looked around and the only drivers that have that logic seem to be ARM HDLCD, Atmel HCLDC, Meson, Tegra. This looks like it might be some cargo cult. Daniel, do you know why that would be needed? > > > +static void logicvc_version_print(struct logicvc_drm *logicvc) > > > +{ > > > + u32 version; > > > + > > > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > > > + > > > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > > > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > > > + 'a'); > > > > DRM_DEV_INFO? > > Okay but now according to Sam, "DRM_DEV_ERROR() and friends are deprecated" > so I wonder which is the right one to use at this point. AFAIU, it's drm_info / drm_err > > > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > > > +{ > > > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > > > + struct logicvc_interface *interface = > > > + logicvc_interface_from_drm_encoder(drm_encoder); > > > + > > > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > > > + > > > + if (interface->drm_panel) { > > > + drm_panel_prepare(interface->drm_panel); > > > + > > > + /* Encoder enable is too early to enable the panel and a white > > > + * screen will be seen if the panel gets enabled before the > > > + * first page flip is done (and no other framebuffer > > > + * configuration remains from the boot software). */ > > > + interface->drm_panel_enabled = false; > > > + } > > > +} > > > > That's fishy (and the similar stuff in commit_tail). Is it because you > > need to have the CRTC powered before the encoder? > > > > If so, you should try the commit_tail_rpm variant, it makes sure the > > CRTC is powered on before making a commit. > > No, this is unrelated to CRTC vs encoder enable order. Instead, it's about > panel enable order: I don't want to enable the panel before a buffer was > flipped on the CRTC otherwise a blank/white/garbage screen will be shown. Well, since the encoder will enable the panel, it's kind of related though? > This is why this drm_panel_enabled variable is used to make sure we don't > enable the panel before. > > This is nothing specific to my hardware, but a general concern that probably > exists in every DRM driver. Nobody really seems to care about it but I've > decided that I would in this driver. Now if you think this is too exotic, > I don't mind removing it. If this is a concern of yours and affects multiple drivers, then it should be fixed in the core, not in one particular driver. > > > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > > > +{ > > > + drm_connector_cleanup(drm_connector); > > > +} > > > > I guess you don't need that intermediate function? > > I would need to check if that call is necessary or if some implied mechanism > calls it for me already. What I meant is that you don't need logicvc_connector_destroy, you can directly set the atomic_destroy_state to drm_connector_cleanup. Maximey [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller @ 2020-12-07 10:42 ` Maxime Ripard 0 siblings, 0 replies; 15+ messages in thread From: Maxime Ripard @ 2020-12-07 10:42 UTC (permalink / raw) To: Daniel Vetter, Paul Kocialkowski Cc: devicetree, Thomas Petazzoni, David Airlie, linux-kernel, dri-devel, Rob Herring, Thomas Zimmermann [-- Attachment #1.1: Type: text/plain, Size: 4885 bytes --] On Wed, Dec 02, 2020 at 05:06:40PM +0100, Paul Kocialkowski wrote: > > > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > > > + struct drm_atomic_state *state) > > > +{ > > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > > + struct drm_crtc_state *crtc_state = > > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > > + struct drm_device *drm_dev = drm_crtc->dev; > > > + unsigned long flags; > > > + > > > + /* Register pending event, only if vblank is already on. */ > > > + if (drm_crtc->state->event && crtc_state->active) { > > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > > + > > > + crtc->event = drm_crtc->state->event; > > > + drm_crtc->state->event = NULL; > > > + > > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > > + } > > > +} > > > > That's unusual to do it in atomic_begin, why do you need it? > > This is to cover the case where we need to send a page flip event but the > crtc is already on. In that case, neither atomic_enable nor atomic_disable > will be called so we need to rely on atomic_begin to grab that event. > This happens for example when a single plane is updated. > > The same thing is done in e.g. sun4i-drm. Yeah, but I'm not sure why that's needed in the first place on sun4i-drm either. This looks to me as either something that should be handled by the helpers, or isn't needed at all. Just like the other times you fiddle with the vblank in your driver. I looked around and the only drivers that have that logic seem to be ARM HDLCD, Atmel HCLDC, Meson, Tegra. This looks like it might be some cargo cult. Daniel, do you know why that would be needed? > > > +static void logicvc_version_print(struct logicvc_drm *logicvc) > > > +{ > > > + u32 version; > > > + > > > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > > > + > > > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > > > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > > > + 'a'); > > > > DRM_DEV_INFO? > > Okay but now according to Sam, "DRM_DEV_ERROR() and friends are deprecated" > so I wonder which is the right one to use at this point. AFAIU, it's drm_info / drm_err > > > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > > > +{ > > > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > > > + struct logicvc_interface *interface = > > > + logicvc_interface_from_drm_encoder(drm_encoder); > > > + > > > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > > > + > > > + if (interface->drm_panel) { > > > + drm_panel_prepare(interface->drm_panel); > > > + > > > + /* Encoder enable is too early to enable the panel and a white > > > + * screen will be seen if the panel gets enabled before the > > > + * first page flip is done (and no other framebuffer > > > + * configuration remains from the boot software). */ > > > + interface->drm_panel_enabled = false; > > > + } > > > +} > > > > That's fishy (and the similar stuff in commit_tail). Is it because you > > need to have the CRTC powered before the encoder? > > > > If so, you should try the commit_tail_rpm variant, it makes sure the > > CRTC is powered on before making a commit. > > No, this is unrelated to CRTC vs encoder enable order. Instead, it's about > panel enable order: I don't want to enable the panel before a buffer was > flipped on the CRTC otherwise a blank/white/garbage screen will be shown. Well, since the encoder will enable the panel, it's kind of related though? > This is why this drm_panel_enabled variable is used to make sure we don't > enable the panel before. > > This is nothing specific to my hardware, but a general concern that probably > exists in every DRM driver. Nobody really seems to care about it but I've > decided that I would in this driver. Now if you think this is too exotic, > I don't mind removing it. If this is a concern of yours and affects multiple drivers, then it should be fixed in the core, not in one particular driver. > > > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > > > +{ > > > + drm_connector_cleanup(drm_connector); > > > +} > > > > I guess you don't need that intermediate function? > > I would need to check if that call is necessary or if some implied mechanism > calls it for me already. What I meant is that you don't need logicvc_connector_destroy, you can directly set the atomic_destroy_state to drm_connector_cleanup. Maximey [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller 2020-12-07 10:42 ` Maxime Ripard @ 2020-12-11 13:17 ` Paul Kocialkowski -1 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-12-11 13:17 UTC (permalink / raw) To: Maxime Ripard Cc: Daniel Vetter, dri-devel, devicetree, linux-kernel, David Airlie, Rob Herring, Maarten Lankhorst, Thomas Zimmermann, Thomas Petazzoni [-- Attachment #1: Type: text/plain, Size: 6370 bytes --] Hi, On Mon 07 Dec 20, 11:42, Maxime Ripard wrote: > On Wed, Dec 02, 2020 at 05:06:40PM +0100, Paul Kocialkowski wrote: > > > > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > > > > + struct drm_atomic_state *state) > > > > +{ > > > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > > > + struct drm_crtc_state *crtc_state = > > > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > > > + struct drm_device *drm_dev = drm_crtc->dev; > > > > + unsigned long flags; > > > > + > > > > + /* Register pending event, only if vblank is already on. */ > > > > + if (drm_crtc->state->event && crtc_state->active) { > > > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > > > + > > > > + crtc->event = drm_crtc->state->event; > > > > + drm_crtc->state->event = NULL; > > > > + > > > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > > > + } > > > > +} > > > > > > That's unusual to do it in atomic_begin, why do you need it? > > > > This is to cover the case where we need to send a page flip event but the > > crtc is already on. In that case, neither atomic_enable nor atomic_disable > > will be called so we need to rely on atomic_begin to grab that event. > > This happens for example when a single plane is updated. > > > > The same thing is done in e.g. sun4i-drm. > > Yeah, but I'm not sure why that's needed in the first place on sun4i-drm > either. This looks to me as either something that should be handled by > the helpers, or isn't needed at all. Just like the other times you > fiddle with the vblank in your driver. I didn't really question myself about whether this could be done in helpers, but it looks like the philosophy now is that the driver grabs the page flip done event when it can and serves the event in the IRQ routine. So nothing unusual about this driver in particular. > I looked around and the only drivers that have that logic seem to be ARM > HDLCD, Atmel HCLDC, Meson, Tegra. This looks like it might be some cargo > cult. > > Daniel, do you know why that would be needed? As far as I understand, this could work just as well with a helper in my case (and sun4i-drm's case as well). But in any case, what this patch implements is the current philosophy and I guess that reworking it through helpers is way out of the scope of this series ;) > > > > +static void logicvc_version_print(struct logicvc_drm *logicvc) > > > > +{ > > > > + u32 version; > > > > + > > > > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > > > > + > > > > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > > > > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > > > > + 'a'); > > > > > > DRM_DEV_INFO? > > > > Okay but now according to Sam, "DRM_DEV_ERROR() and friends are deprecated" > > so I wonder which is the right one to use at this point. > > AFAIU, it's drm_info / drm_err Thanks! > > > > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > > > > +{ > > > > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > > > > + struct logicvc_interface *interface = > > > > + logicvc_interface_from_drm_encoder(drm_encoder); > > > > + > > > > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > > > > + > > > > + if (interface->drm_panel) { > > > > + drm_panel_prepare(interface->drm_panel); > > > > + > > > > + /* Encoder enable is too early to enable the panel and a white > > > > + * screen will be seen if the panel gets enabled before the > > > > + * first page flip is done (and no other framebuffer > > > > + * configuration remains from the boot software). */ > > > > + interface->drm_panel_enabled = false; > > > > + } > > > > +} > > > > > > That's fishy (and the similar stuff in commit_tail). Is it because you > > > need to have the CRTC powered before the encoder? > > > > > > If so, you should try the commit_tail_rpm variant, it makes sure the > > > CRTC is powered on before making a commit. > > > > No, this is unrelated to CRTC vs encoder enable order. Instead, it's about > > panel enable order: I don't want to enable the panel before a buffer was > > flipped on the CRTC otherwise a blank/white/garbage screen will be shown. > > Well, since the encoder will enable the panel, it's kind of related > though? Right, I meant that it's not related to the CRTC in particular. > > This is why this drm_panel_enabled variable is used to make sure we don't > > enable the panel before. > > > > This is nothing specific to my hardware, but a general concern that probably > > exists in every DRM driver. Nobody really seems to care about it but I've > > decided that I would in this driver. Now if you think this is too exotic, > > I don't mind removing it. > > If this is a concern of yours and affects multiple drivers, then it > should be fixed in the core, not in one particular driver. So I suppose this should be fixed by having the core enable the encoder at first page flip and not before then, right? In that case the change should indeed be separate from this series and my driver should still enable the panel at encoder enable time. In spite of that, I agree this implementation is not very appropriate so I'll get rid of it in the next revision. > > > > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > > > > +{ > > > > + drm_connector_cleanup(drm_connector); > > > > +} > > > > > > I guess you don't need that intermediate function? > > > > I would need to check if that call is necessary or if some implied mechanism > > calls it for me already. > > What I meant is that you don't need logicvc_connector_destroy, you can > directly set the atomic_destroy_state to drm_connector_cleanup. Oh right, I hadn't really noticed that the prototypes are 100% the same :) Thanks for the review, Paul -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller @ 2020-12-11 13:17 ` Paul Kocialkowski 0 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-12-11 13:17 UTC (permalink / raw) To: Maxime Ripard Cc: devicetree, Thomas Petazzoni, Thomas Zimmermann, David Airlie, linux-kernel, dri-devel, Rob Herring [-- Attachment #1.1: Type: text/plain, Size: 6370 bytes --] Hi, On Mon 07 Dec 20, 11:42, Maxime Ripard wrote: > On Wed, Dec 02, 2020 at 05:06:40PM +0100, Paul Kocialkowski wrote: > > > > +static void logicvc_crtc_atomic_begin(struct drm_crtc *drm_crtc, > > > > + struct drm_atomic_state *state) > > > > +{ > > > > + struct logicvc_crtc *crtc = logicvc_crtc(drm_crtc); > > > > + struct drm_crtc_state *crtc_state = > > > > + drm_atomic_get_old_crtc_state(state, drm_crtc); > > > > + struct drm_device *drm_dev = drm_crtc->dev; > > > > + unsigned long flags; > > > > + > > > > + /* Register pending event, only if vblank is already on. */ > > > > + if (drm_crtc->state->event && crtc_state->active) { > > > > + spin_lock_irqsave(&drm_dev->event_lock, flags); > > > > + WARN_ON(drm_crtc_vblank_get(drm_crtc) != 0); > > > > + > > > > + crtc->event = drm_crtc->state->event; > > > > + drm_crtc->state->event = NULL; > > > > + > > > > + spin_unlock_irqrestore(&drm_dev->event_lock, flags); > > > > + } > > > > +} > > > > > > That's unusual to do it in atomic_begin, why do you need it? > > > > This is to cover the case where we need to send a page flip event but the > > crtc is already on. In that case, neither atomic_enable nor atomic_disable > > will be called so we need to rely on atomic_begin to grab that event. > > This happens for example when a single plane is updated. > > > > The same thing is done in e.g. sun4i-drm. > > Yeah, but I'm not sure why that's needed in the first place on sun4i-drm > either. This looks to me as either something that should be handled by > the helpers, or isn't needed at all. Just like the other times you > fiddle with the vblank in your driver. I didn't really question myself about whether this could be done in helpers, but it looks like the philosophy now is that the driver grabs the page flip done event when it can and serves the event in the IRQ routine. So nothing unusual about this driver in particular. > I looked around and the only drivers that have that logic seem to be ARM > HDLCD, Atmel HCLDC, Meson, Tegra. This looks like it might be some cargo > cult. > > Daniel, do you know why that would be needed? As far as I understand, this could work just as well with a helper in my case (and sun4i-drm's case as well). But in any case, what this patch implements is the current philosophy and I guess that reworking it through helpers is way out of the scope of this series ;) > > > > +static void logicvc_version_print(struct logicvc_drm *logicvc) > > > > +{ > > > > + u32 version; > > > > + > > > > + regmap_read(logicvc->regmap, LOGICVC_IP_VERSION_REG, &version); > > > > + > > > > + DRM_INFO("LogiCVC version %d.%02d.%c\n", > > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MAJOR, version), > > > > + (int)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_MINOR, version), > > > > + (char)LOGICVC_FIELD_GET(LOGICVC_IP_VERSION_LEVEL, version) + > > > > + 'a'); > > > > > > DRM_DEV_INFO? > > > > Okay but now according to Sam, "DRM_DEV_ERROR() and friends are deprecated" > > so I wonder which is the right one to use at this point. > > AFAIU, it's drm_info / drm_err Thanks! > > > > +static void logicvc_encoder_enable(struct drm_encoder *drm_encoder) > > > > +{ > > > > + struct logicvc_drm *logicvc = logicvc_drm(drm_encoder->dev); > > > > + struct logicvc_interface *interface = > > > > + logicvc_interface_from_drm_encoder(drm_encoder); > > > > + > > > > + regmap_update_bits(logicvc->regmap, LOGICVC_POWER_CTRL_REG, > > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE, > > > > + LOGICVC_POWER_CTRL_VIDEO_ENABLE); > > > > + > > > > + if (interface->drm_panel) { > > > > + drm_panel_prepare(interface->drm_panel); > > > > + > > > > + /* Encoder enable is too early to enable the panel and a white > > > > + * screen will be seen if the panel gets enabled before the > > > > + * first page flip is done (and no other framebuffer > > > > + * configuration remains from the boot software). */ > > > > + interface->drm_panel_enabled = false; > > > > + } > > > > +} > > > > > > That's fishy (and the similar stuff in commit_tail). Is it because you > > > need to have the CRTC powered before the encoder? > > > > > > If so, you should try the commit_tail_rpm variant, it makes sure the > > > CRTC is powered on before making a commit. > > > > No, this is unrelated to CRTC vs encoder enable order. Instead, it's about > > panel enable order: I don't want to enable the panel before a buffer was > > flipped on the CRTC otherwise a blank/white/garbage screen will be shown. > > Well, since the encoder will enable the panel, it's kind of related > though? Right, I meant that it's not related to the CRTC in particular. > > This is why this drm_panel_enabled variable is used to make sure we don't > > enable the panel before. > > > > This is nothing specific to my hardware, but a general concern that probably > > exists in every DRM driver. Nobody really seems to care about it but I've > > decided that I would in this driver. Now if you think this is too exotic, > > I don't mind removing it. > > If this is a concern of yours and affects multiple drivers, then it > should be fixed in the core, not in one particular driver. So I suppose this should be fixed by having the core enable the encoder at first page flip and not before then, right? In that case the change should indeed be separate from this series and my driver should still enable the panel at encoder enable time. In spite of that, I agree this implementation is not very appropriate so I'll get rid of it in the next revision. > > > > +static void logicvc_connector_destroy(struct drm_connector *drm_connector) > > > > +{ > > > > + drm_connector_cleanup(drm_connector); > > > > +} > > > > > > I guess you don't need that intermediate function? > > > > I would need to check if that call is necessary or if some implied mechanism > > calls it for me already. > > What I meant is that you don't need logicvc_connector_destroy, you can > directly set the atomic_destroy_state to drm_connector_cleanup. Oh right, I hadn't really noticed that the prototypes are 100% the same :) Thanks for the review, Paul -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller 2020-11-02 15:53 ` Paul Kocialkowski @ 2020-11-04 21:22 ` Sam Ravnborg -1 siblings, 0 replies; 15+ messages in thread From: Sam Ravnborg @ 2020-11-04 21:22 UTC (permalink / raw) To: Paul Kocialkowski Cc: dri-devel, devicetree, linux-kernel, David Airlie, Thomas Petazzoni, Rob Herring, Thomas Zimmermann Hi Paul. A few comments in the following. I did not find time to read all of the driver. Sam On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > Introduces a driver for the LogiCVC display controller, a programmable > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > Xilinx FPGAs. The controller is mostly configured at logic synthesis > time so only a subset of configuration is left for the driver to > handle. > > The following features are implemented and tested: > - LVDS 4-bit interface; > - RGB565 pixel formats; > - Multiple layers and hardware composition; > - Layer-wide alpha mode; > > The following features are implemented but untested: > - Other RGB pixel formats; > - Layer framebuffer configuration for version 4; > - Lowest-layer used as background color; > - Per-pixel alpha mode. > > The following features are not implemented: > - YUV pixel formats; > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > - External parallel input for layer; > - Color-keying; > - LUT-based alpha modes. > > Additional implementation-specific notes: > - Panels are only enabled after the first page flip to avoid flashing a > white screen. > - Depth used in context of the LogiCVC driver only counts color components > to match the definition of the synthesis parameters. > > Support is implemented for both version 3 and 4 of the controller. > > With version 3, framebuffers are stored in a dedicated contiguous > memory area, with a base address hardcoded for each layer. This requires > using a dedicated CMA pool registered at the base address and tweaking a > few offset-related registers to try to use any buffer allocated from > the pool. This is done on a best-effort basis to have the hardware cope > with the DRM framebuffer allocation model and there is no guarantee > that each buffer allocated by GEM CMA can be used for any layer. > In particular, buffers allocated below the base address for a layer are > guaranteed not to be configurable for that layer. See the implementation of > logicvc_layer_buffer_find_setup for specifics. > > Version 4 allows configuring each buffer address directly, which > guarantees that any buffer can be configured. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > Reviewed-by: Maxime Ripard <mripard@kernel.org> > --- > MAINTAINERS | 6 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/logicvc/Kconfig | 9 + > drivers/gpu/drm/logicvc/Makefile | 4 + > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > 18 files changed, 2236 insertions(+) > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > create mode 100644 drivers/gpu/drm/logicvc/Makefile > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 71e29dc0ab9d..9c4c5edef0ba 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > F: drivers/gpu/drm/i810/ > F: include/uapi/drm/i810_drm.h > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > +T: git git://anongit.freedesktop.org/drm/drm-misc > +S: Supported > +F: drivers/gpu/drm/logicvc/ > + > DRM DRIVER FOR LVDS PANELS > M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > L: dri-devel@lists.freedesktop.org > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 64376dd298ed..7b280056207f 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -352,6 +352,8 @@ source "drivers/gpu/drm/arc/Kconfig" > > source "drivers/gpu/drm/hisilicon/Kconfig" > > +source "drivers/gpu/drm/logicvc/Kconfig" > + > source "drivers/gpu/drm/mediatek/Kconfig" > > source "drivers/gpu/drm/zte/Kconfig" > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 81569009f884..29fbb7cd9570 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -102,6 +102,7 @@ obj-$(CONFIG_DRM_STM) += stm/ > obj-$(CONFIG_DRM_STI) += sti/ > obj-y += imx/ > obj-$(CONFIG_DRM_INGENIC) += ingenic/ > +obj-$(CONFIG_DRM_LOGICVC) += logicvc/ > obj-$(CONFIG_DRM_MEDIATEK) += mediatek/ > obj-$(CONFIG_DRM_MESON) += meson/ > obj-y += i2c/ > diff --git a/drivers/gpu/drm/logicvc/Kconfig b/drivers/gpu/drm/logicvc/Kconfig > new file mode 100644 > index 000000000000..300b2be07385 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/Kconfig > @@ -0,0 +1,9 @@ > +config DRM_LOGICVC > + tristate "LogiCVC DRM" > + depends on DRM > + depends on OF || COMPILE_TEST > + select DRM_KMS_HELPER > + select DRM_KMS_CMA_HELPER > + select DRM_GEM_CMA_HELPER > + help > + DRM display driver for the logiCVC programmable logic block from Xylon > diff --git a/drivers/gpu/drm/logicvc/Makefile b/drivers/gpu/drm/logicvc/Makefile > new file mode 100644 > index 000000000000..c09531fbd6ad > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/Makefile > @@ -0,0 +1,4 @@ > +logicvc-drm-y += logicvc_crtc.o logicvc_drm.o logicvc_interface.o \ > + logicvc_layer.o logicvc_mode.o logicvc_of.o > + Even after maintaining kbuild for several years and reading far too many Makefile I still dislike the use of '\' to break long assignments. logicvc-drm-y := logicvc_crtc.o logicvc-drm-y += logicvc_drm.o logicvc-drm-y += logicvc_interface.o logicvc-drm-y += logicvc_layer.o logicvc-drm-y += logicvc_mode.o logicvc-drm-y += logicvc_of.o Or if this is too much repeated the shorter: logicvc-drm-y := logicvc_crtc.o logicvc_drm.o logicvc_interface.o logicvc-drm-y += logicvc_layer.o logicvc_mode.o logicvc_of.o Also note that the first stement is an assingnment and not an addition. It is a personal thing - so feel free to ignore. > +obj-$(CONFIG_DRM_LOGICVC) += logicvc-drm.o > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.c b/drivers/gpu/drm/logicvc/logicvc_crtc.c > new file mode 100644 > index 000000000000..75e6a47a7724 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.c > @@ -0,0 +1,277 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + ... + > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct logicvc_crtc *crtc; > + struct logicvc_layer *layer_primary; > + int ret; > + > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > + if (!crtc) > + return -ENOMEM; > + > + layer_primary = logicvc_layer_get_primary(logicvc); > + if (!layer_primary) { > + DRM_ERROR("Failed to get primary layer\n"); > + return -EINVAL; > + } Please use drm_err(logicvc->drm, "...") and friends all over the file. DRM_DEV_ERROR() and friends are deprecated. If you have no drm_device use whatever. ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller @ 2020-11-04 21:22 ` Sam Ravnborg 0 siblings, 0 replies; 15+ messages in thread From: Sam Ravnborg @ 2020-11-04 21:22 UTC (permalink / raw) To: Paul Kocialkowski Cc: devicetree, Thomas Zimmermann, David Airlie, linux-kernel, dri-devel, Rob Herring, Thomas Petazzoni Hi Paul. A few comments in the following. I did not find time to read all of the driver. Sam On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > Introduces a driver for the LogiCVC display controller, a programmable > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > Xilinx FPGAs. The controller is mostly configured at logic synthesis > time so only a subset of configuration is left for the driver to > handle. > > The following features are implemented and tested: > - LVDS 4-bit interface; > - RGB565 pixel formats; > - Multiple layers and hardware composition; > - Layer-wide alpha mode; > > The following features are implemented but untested: > - Other RGB pixel formats; > - Layer framebuffer configuration for version 4; > - Lowest-layer used as background color; > - Per-pixel alpha mode. > > The following features are not implemented: > - YUV pixel formats; > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > - External parallel input for layer; > - Color-keying; > - LUT-based alpha modes. > > Additional implementation-specific notes: > - Panels are only enabled after the first page flip to avoid flashing a > white screen. > - Depth used in context of the LogiCVC driver only counts color components > to match the definition of the synthesis parameters. > > Support is implemented for both version 3 and 4 of the controller. > > With version 3, framebuffers are stored in a dedicated contiguous > memory area, with a base address hardcoded for each layer. This requires > using a dedicated CMA pool registered at the base address and tweaking a > few offset-related registers to try to use any buffer allocated from > the pool. This is done on a best-effort basis to have the hardware cope > with the DRM framebuffer allocation model and there is no guarantee > that each buffer allocated by GEM CMA can be used for any layer. > In particular, buffers allocated below the base address for a layer are > guaranteed not to be configurable for that layer. See the implementation of > logicvc_layer_buffer_find_setup for specifics. > > Version 4 allows configuring each buffer address directly, which > guarantees that any buffer can be configured. > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > Reviewed-by: Maxime Ripard <mripard@kernel.org> > --- > MAINTAINERS | 6 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/logicvc/Kconfig | 9 + > drivers/gpu/drm/logicvc/Makefile | 4 + > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > 18 files changed, 2236 insertions(+) > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > create mode 100644 drivers/gpu/drm/logicvc/Makefile > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 71e29dc0ab9d..9c4c5edef0ba 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > F: drivers/gpu/drm/i810/ > F: include/uapi/drm/i810_drm.h > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > +T: git git://anongit.freedesktop.org/drm/drm-misc > +S: Supported > +F: drivers/gpu/drm/logicvc/ > + > DRM DRIVER FOR LVDS PANELS > M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > L: dri-devel@lists.freedesktop.org > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > index 64376dd298ed..7b280056207f 100644 > --- a/drivers/gpu/drm/Kconfig > +++ b/drivers/gpu/drm/Kconfig > @@ -352,6 +352,8 @@ source "drivers/gpu/drm/arc/Kconfig" > > source "drivers/gpu/drm/hisilicon/Kconfig" > > +source "drivers/gpu/drm/logicvc/Kconfig" > + > source "drivers/gpu/drm/mediatek/Kconfig" > > source "drivers/gpu/drm/zte/Kconfig" > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index 81569009f884..29fbb7cd9570 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -102,6 +102,7 @@ obj-$(CONFIG_DRM_STM) += stm/ > obj-$(CONFIG_DRM_STI) += sti/ > obj-y += imx/ > obj-$(CONFIG_DRM_INGENIC) += ingenic/ > +obj-$(CONFIG_DRM_LOGICVC) += logicvc/ > obj-$(CONFIG_DRM_MEDIATEK) += mediatek/ > obj-$(CONFIG_DRM_MESON) += meson/ > obj-y += i2c/ > diff --git a/drivers/gpu/drm/logicvc/Kconfig b/drivers/gpu/drm/logicvc/Kconfig > new file mode 100644 > index 000000000000..300b2be07385 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/Kconfig > @@ -0,0 +1,9 @@ > +config DRM_LOGICVC > + tristate "LogiCVC DRM" > + depends on DRM > + depends on OF || COMPILE_TEST > + select DRM_KMS_HELPER > + select DRM_KMS_CMA_HELPER > + select DRM_GEM_CMA_HELPER > + help > + DRM display driver for the logiCVC programmable logic block from Xylon > diff --git a/drivers/gpu/drm/logicvc/Makefile b/drivers/gpu/drm/logicvc/Makefile > new file mode 100644 > index 000000000000..c09531fbd6ad > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/Makefile > @@ -0,0 +1,4 @@ > +logicvc-drm-y += logicvc_crtc.o logicvc_drm.o logicvc_interface.o \ > + logicvc_layer.o logicvc_mode.o logicvc_of.o > + Even after maintaining kbuild for several years and reading far too many Makefile I still dislike the use of '\' to break long assignments. logicvc-drm-y := logicvc_crtc.o logicvc-drm-y += logicvc_drm.o logicvc-drm-y += logicvc_interface.o logicvc-drm-y += logicvc_layer.o logicvc-drm-y += logicvc_mode.o logicvc-drm-y += logicvc_of.o Or if this is too much repeated the shorter: logicvc-drm-y := logicvc_crtc.o logicvc_drm.o logicvc_interface.o logicvc-drm-y += logicvc_layer.o logicvc_mode.o logicvc_of.o Also note that the first stement is an assingnment and not an addition. It is a personal thing - so feel free to ignore. > +obj-$(CONFIG_DRM_LOGICVC) += logicvc-drm.o > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.c b/drivers/gpu/drm/logicvc/logicvc_crtc.c > new file mode 100644 > index 000000000000..75e6a47a7724 > --- /dev/null > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.c > @@ -0,0 +1,277 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Copyright (C) 2019 Bootlin > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > + */ > + ... + > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > +{ > + struct drm_device *drm_dev = &logicvc->drm_dev; > + struct device *dev = drm_dev->dev; > + struct device_node *of_node = dev->of_node; > + struct logicvc_crtc *crtc; > + struct logicvc_layer *layer_primary; > + int ret; > + > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > + if (!crtc) > + return -ENOMEM; > + > + layer_primary = logicvc_layer_get_primary(logicvc); > + if (!layer_primary) { > + DRM_ERROR("Failed to get primary layer\n"); > + return -EINVAL; > + } Please use drm_err(logicvc->drm, "...") and friends all over the file. DRM_DEV_ERROR() and friends are deprecated. If you have no drm_device use whatever. _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller 2020-11-04 21:22 ` Sam Ravnborg @ 2020-12-02 15:36 ` Paul Kocialkowski -1 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-12-02 15:36 UTC (permalink / raw) To: Sam Ravnborg Cc: dri-devel, devicetree, linux-kernel, David Airlie, Thomas Petazzoni, Rob Herring, Thomas Zimmermann [-- Attachment #1: Type: text/plain, Size: 9601 bytes --] Hi Sam, On Wed 04 Nov 20, 22:22, Sam Ravnborg wrote: > Hi Paul. > > A few comments in the following. I did not find time to read all of the > driver. Thanks for taking a look at the driver! > > Sam > > On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > > Introduces a driver for the LogiCVC display controller, a programmable > > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > > Xilinx FPGAs. The controller is mostly configured at logic synthesis > > time so only a subset of configuration is left for the driver to > > handle. > > > > The following features are implemented and tested: > > - LVDS 4-bit interface; > > - RGB565 pixel formats; > > - Multiple layers and hardware composition; > > - Layer-wide alpha mode; > > > > The following features are implemented but untested: > > - Other RGB pixel formats; > > - Layer framebuffer configuration for version 4; > > - Lowest-layer used as background color; > > - Per-pixel alpha mode. > > > > The following features are not implemented: > > - YUV pixel formats; > > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > > - External parallel input for layer; > > - Color-keying; > > - LUT-based alpha modes. > > > > Additional implementation-specific notes: > > - Panels are only enabled after the first page flip to avoid flashing a > > white screen. > > - Depth used in context of the LogiCVC driver only counts color components > > to match the definition of the synthesis parameters. > > > > Support is implemented for both version 3 and 4 of the controller. > > > > With version 3, framebuffers are stored in a dedicated contiguous > > memory area, with a base address hardcoded for each layer. This requires > > using a dedicated CMA pool registered at the base address and tweaking a > > few offset-related registers to try to use any buffer allocated from > > the pool. This is done on a best-effort basis to have the hardware cope > > with the DRM framebuffer allocation model and there is no guarantee > > that each buffer allocated by GEM CMA can be used for any layer. > > In particular, buffers allocated below the base address for a layer are > > guaranteed not to be configurable for that layer. See the implementation of > > logicvc_layer_buffer_find_setup for specifics. > > > > Version 4 allows configuring each buffer address directly, which > > guarantees that any buffer can be configured. > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > Reviewed-by: Maxime Ripard <mripard@kernel.org> > > --- > > MAINTAINERS | 6 + > > drivers/gpu/drm/Kconfig | 2 + > > drivers/gpu/drm/Makefile | 1 + > > drivers/gpu/drm/logicvc/Kconfig | 9 + > > drivers/gpu/drm/logicvc/Makefile | 4 + > > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > > 18 files changed, 2236 insertions(+) > > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > > create mode 100644 drivers/gpu/drm/logicvc/Makefile > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 71e29dc0ab9d..9c4c5edef0ba 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > > F: drivers/gpu/drm/i810/ > > F: include/uapi/drm/i810_drm.h > > > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > +T: git git://anongit.freedesktop.org/drm/drm-misc > > +S: Supported > > +F: drivers/gpu/drm/logicvc/ > > + > > DRM DRIVER FOR LVDS PANELS > > M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > L: dri-devel@lists.freedesktop.org > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > > index 64376dd298ed..7b280056207f 100644 > > --- a/drivers/gpu/drm/Kconfig > > +++ b/drivers/gpu/drm/Kconfig > > @@ -352,6 +352,8 @@ source "drivers/gpu/drm/arc/Kconfig" > > > > source "drivers/gpu/drm/hisilicon/Kconfig" > > > > +source "drivers/gpu/drm/logicvc/Kconfig" > > + > > source "drivers/gpu/drm/mediatek/Kconfig" > > > > source "drivers/gpu/drm/zte/Kconfig" > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > > index 81569009f884..29fbb7cd9570 100644 > > --- a/drivers/gpu/drm/Makefile > > +++ b/drivers/gpu/drm/Makefile > > @@ -102,6 +102,7 @@ obj-$(CONFIG_DRM_STM) += stm/ > > obj-$(CONFIG_DRM_STI) += sti/ > > obj-y += imx/ > > obj-$(CONFIG_DRM_INGENIC) += ingenic/ > > +obj-$(CONFIG_DRM_LOGICVC) += logicvc/ > > obj-$(CONFIG_DRM_MEDIATEK) += mediatek/ > > obj-$(CONFIG_DRM_MESON) += meson/ > > obj-y += i2c/ > > diff --git a/drivers/gpu/drm/logicvc/Kconfig b/drivers/gpu/drm/logicvc/Kconfig > > new file mode 100644 > > index 000000000000..300b2be07385 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/Kconfig > > @@ -0,0 +1,9 @@ > > +config DRM_LOGICVC > > + tristate "LogiCVC DRM" > > + depends on DRM > > + depends on OF || COMPILE_TEST > > + select DRM_KMS_HELPER > > + select DRM_KMS_CMA_HELPER > > + select DRM_GEM_CMA_HELPER > > + help > > + DRM display driver for the logiCVC programmable logic block from Xylon > > diff --git a/drivers/gpu/drm/logicvc/Makefile b/drivers/gpu/drm/logicvc/Makefile > > new file mode 100644 > > index 000000000000..c09531fbd6ad > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/Makefile > > @@ -0,0 +1,4 @@ > > +logicvc-drm-y += logicvc_crtc.o logicvc_drm.o logicvc_interface.o \ > > + logicvc_layer.o logicvc_mode.o logicvc_of.o > > + > Even after maintaining kbuild for several years and reading far too many > Makefile I still dislike the use of '\' to break long assignments. > > logicvc-drm-y := logicvc_crtc.o > logicvc-drm-y += logicvc_drm.o > logicvc-drm-y += logicvc_interface.o > logicvc-drm-y += logicvc_layer.o > logicvc-drm-y += logicvc_mode.o > logicvc-drm-y += logicvc_of.o > > Or if this is too much repeated the shorter: > logicvc-drm-y := logicvc_crtc.o logicvc_drm.o logicvc_interface.o > logicvc-drm-y += logicvc_layer.o logicvc_mode.o logicvc_of.o > > Also note that the first stement is an assingnment and not an addition. > > It is a personal thing - so feel free to ignore. I agree that it looks ugly and starting with += doesn't really make sense. But personally, I find that repeating the variable name doesn't look quite nice either. I think I'll settle for something like: logicvc-drm-y = logicvc_crtc.o \ logicvc_drm.o \ ... logicvc_of.o > > > +obj-$(CONFIG_DRM_LOGICVC) += logicvc-drm.o > > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.c b/drivers/gpu/drm/logicvc/logicvc_crtc.c > > new file mode 100644 > > index 000000000000..75e6a47a7724 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.c > > @@ -0,0 +1,277 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > ... > > + > > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct logicvc_crtc *crtc; > > + struct logicvc_layer *layer_primary; > > + int ret; > > + > > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > > + if (!crtc) > > + return -ENOMEM; > > + > > + layer_primary = logicvc_layer_get_primary(logicvc); > > + if (!layer_primary) { > > + DRM_ERROR("Failed to get primary layer\n"); > > + return -EINVAL; > > + } > Please use drm_err(logicvc->drm, "...") and friends all over the file. > DRM_DEV_ERROR() and friends are deprecated. > If you have no drm_device use whatever. Understood, I'll change that in the next revision! Cheers, Paul -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v7 2/3] drm: Add support for the LogiCVC display controller @ 2020-12-02 15:36 ` Paul Kocialkowski 0 siblings, 0 replies; 15+ messages in thread From: Paul Kocialkowski @ 2020-12-02 15:36 UTC (permalink / raw) To: Sam Ravnborg Cc: devicetree, Thomas Zimmermann, David Airlie, linux-kernel, dri-devel, Rob Herring, Thomas Petazzoni [-- Attachment #1.1: Type: text/plain, Size: 9601 bytes --] Hi Sam, On Wed 04 Nov 20, 22:22, Sam Ravnborg wrote: > Hi Paul. > > A few comments in the following. I did not find time to read all of the > driver. Thanks for taking a look at the driver! > > Sam > > On Mon, Nov 02, 2020 at 04:53:07PM +0100, Paul Kocialkowski wrote: > > Introduces a driver for the LogiCVC display controller, a programmable > > logic controller optimized for use in Xilinx Zynq-7000 SoCs and other > > Xilinx FPGAs. The controller is mostly configured at logic synthesis > > time so only a subset of configuration is left for the driver to > > handle. > > > > The following features are implemented and tested: > > - LVDS 4-bit interface; > > - RGB565 pixel formats; > > - Multiple layers and hardware composition; > > - Layer-wide alpha mode; > > > > The following features are implemented but untested: > > - Other RGB pixel formats; > > - Layer framebuffer configuration for version 4; > > - Lowest-layer used as background color; > > - Per-pixel alpha mode. > > > > The following features are not implemented: > > - YUV pixel formats; > > - DVI, LVDS 3-bit, ITU656 and camera link interfaces; > > - External parallel input for layer; > > - Color-keying; > > - LUT-based alpha modes. > > > > Additional implementation-specific notes: > > - Panels are only enabled after the first page flip to avoid flashing a > > white screen. > > - Depth used in context of the LogiCVC driver only counts color components > > to match the definition of the synthesis parameters. > > > > Support is implemented for both version 3 and 4 of the controller. > > > > With version 3, framebuffers are stored in a dedicated contiguous > > memory area, with a base address hardcoded for each layer. This requires > > using a dedicated CMA pool registered at the base address and tweaking a > > few offset-related registers to try to use any buffer allocated from > > the pool. This is done on a best-effort basis to have the hardware cope > > with the DRM framebuffer allocation model and there is no guarantee > > that each buffer allocated by GEM CMA can be used for any layer. > > In particular, buffers allocated below the base address for a layer are > > guaranteed not to be configurable for that layer. See the implementation of > > logicvc_layer_buffer_find_setup for specifics. > > > > Version 4 allows configuring each buffer address directly, which > > guarantees that any buffer can be configured. > > > > Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > Reviewed-by: Maxime Ripard <mripard@kernel.org> > > --- > > MAINTAINERS | 6 + > > drivers/gpu/drm/Kconfig | 2 + > > drivers/gpu/drm/Makefile | 1 + > > drivers/gpu/drm/logicvc/Kconfig | 9 + > > drivers/gpu/drm/logicvc/Makefile | 4 + > > drivers/gpu/drm/logicvc/logicvc_crtc.c | 277 +++++++++ > > drivers/gpu/drm/logicvc/logicvc_crtc.h | 21 + > > drivers/gpu/drm/logicvc/logicvc_drm.c | 472 +++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_drm.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_interface.c | 224 +++++++ > > drivers/gpu/drm/logicvc/logicvc_interface.h | 30 + > > drivers/gpu/drm/logicvc/logicvc_layer.c | 615 ++++++++++++++++++++ > > drivers/gpu/drm/logicvc/logicvc_layer.h | 64 ++ > > drivers/gpu/drm/logicvc/logicvc_mode.c | 101 ++++ > > drivers/gpu/drm/logicvc/logicvc_mode.h | 15 + > > drivers/gpu/drm/logicvc/logicvc_of.c | 197 +++++++ > > drivers/gpu/drm/logicvc/logicvc_of.h | 46 ++ > > drivers/gpu/drm/logicvc/logicvc_regs.h | 88 +++ > > 18 files changed, 2236 insertions(+) > > create mode 100644 drivers/gpu/drm/logicvc/Kconfig > > create mode 100644 drivers/gpu/drm/logicvc/Makefile > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_crtc.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_drm.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_interface.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_layer.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_mode.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.c > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_of.h > > create mode 100644 drivers/gpu/drm/logicvc/logicvc_regs.h > > > > diff --git a/MAINTAINERS b/MAINTAINERS > > index 71e29dc0ab9d..9c4c5edef0ba 100644 > > --- a/MAINTAINERS > > +++ b/MAINTAINERS > > @@ -5522,6 +5522,12 @@ S: Orphan / Obsolete > > F: drivers/gpu/drm/i810/ > > F: include/uapi/drm/i810_drm.h > > > > +DRM DRIVER FOR LOGICVC DISPLAY CONTROLLER > > +M: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > +T: git git://anongit.freedesktop.org/drm/drm-misc > > +S: Supported > > +F: drivers/gpu/drm/logicvc/ > > + > > DRM DRIVER FOR LVDS PANELS > > M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > > L: dri-devel@lists.freedesktop.org > > diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig > > index 64376dd298ed..7b280056207f 100644 > > --- a/drivers/gpu/drm/Kconfig > > +++ b/drivers/gpu/drm/Kconfig > > @@ -352,6 +352,8 @@ source "drivers/gpu/drm/arc/Kconfig" > > > > source "drivers/gpu/drm/hisilicon/Kconfig" > > > > +source "drivers/gpu/drm/logicvc/Kconfig" > > + > > source "drivers/gpu/drm/mediatek/Kconfig" > > > > source "drivers/gpu/drm/zte/Kconfig" > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > > index 81569009f884..29fbb7cd9570 100644 > > --- a/drivers/gpu/drm/Makefile > > +++ b/drivers/gpu/drm/Makefile > > @@ -102,6 +102,7 @@ obj-$(CONFIG_DRM_STM) += stm/ > > obj-$(CONFIG_DRM_STI) += sti/ > > obj-y += imx/ > > obj-$(CONFIG_DRM_INGENIC) += ingenic/ > > +obj-$(CONFIG_DRM_LOGICVC) += logicvc/ > > obj-$(CONFIG_DRM_MEDIATEK) += mediatek/ > > obj-$(CONFIG_DRM_MESON) += meson/ > > obj-y += i2c/ > > diff --git a/drivers/gpu/drm/logicvc/Kconfig b/drivers/gpu/drm/logicvc/Kconfig > > new file mode 100644 > > index 000000000000..300b2be07385 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/Kconfig > > @@ -0,0 +1,9 @@ > > +config DRM_LOGICVC > > + tristate "LogiCVC DRM" > > + depends on DRM > > + depends on OF || COMPILE_TEST > > + select DRM_KMS_HELPER > > + select DRM_KMS_CMA_HELPER > > + select DRM_GEM_CMA_HELPER > > + help > > + DRM display driver for the logiCVC programmable logic block from Xylon > > diff --git a/drivers/gpu/drm/logicvc/Makefile b/drivers/gpu/drm/logicvc/Makefile > > new file mode 100644 > > index 000000000000..c09531fbd6ad > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/Makefile > > @@ -0,0 +1,4 @@ > > +logicvc-drm-y += logicvc_crtc.o logicvc_drm.o logicvc_interface.o \ > > + logicvc_layer.o logicvc_mode.o logicvc_of.o > > + > Even after maintaining kbuild for several years and reading far too many > Makefile I still dislike the use of '\' to break long assignments. > > logicvc-drm-y := logicvc_crtc.o > logicvc-drm-y += logicvc_drm.o > logicvc-drm-y += logicvc_interface.o > logicvc-drm-y += logicvc_layer.o > logicvc-drm-y += logicvc_mode.o > logicvc-drm-y += logicvc_of.o > > Or if this is too much repeated the shorter: > logicvc-drm-y := logicvc_crtc.o logicvc_drm.o logicvc_interface.o > logicvc-drm-y += logicvc_layer.o logicvc_mode.o logicvc_of.o > > Also note that the first stement is an assingnment and not an addition. > > It is a personal thing - so feel free to ignore. I agree that it looks ugly and starting with += doesn't really make sense. But personally, I find that repeating the variable name doesn't look quite nice either. I think I'll settle for something like: logicvc-drm-y = logicvc_crtc.o \ logicvc_drm.o \ ... logicvc_of.o > > > +obj-$(CONFIG_DRM_LOGICVC) += logicvc-drm.o > > diff --git a/drivers/gpu/drm/logicvc/logicvc_crtc.c b/drivers/gpu/drm/logicvc/logicvc_crtc.c > > new file mode 100644 > > index 000000000000..75e6a47a7724 > > --- /dev/null > > +++ b/drivers/gpu/drm/logicvc/logicvc_crtc.c > > @@ -0,0 +1,277 @@ > > +// SPDX-License-Identifier: GPL-2.0+ > > +/* > > + * Copyright (C) 2019 Bootlin > > + * Author: Paul Kocialkowski <paul.kocialkowski@bootlin.com> > > + */ > > + > ... > > + > > +int logicvc_crtc_init(struct logicvc_drm *logicvc) > > +{ > > + struct drm_device *drm_dev = &logicvc->drm_dev; > > + struct device *dev = drm_dev->dev; > > + struct device_node *of_node = dev->of_node; > > + struct logicvc_crtc *crtc; > > + struct logicvc_layer *layer_primary; > > + int ret; > > + > > + crtc = devm_kzalloc(dev, sizeof(*crtc), GFP_KERNEL); > > + if (!crtc) > > + return -ENOMEM; > > + > > + layer_primary = logicvc_layer_get_primary(logicvc); > > + if (!layer_primary) { > > + DRM_ERROR("Failed to get primary layer\n"); > > + return -EINVAL; > > + } > Please use drm_err(logicvc->drm, "...") and friends all over the file. > DRM_DEV_ERROR() and friends are deprecated. > If you have no drm_device use whatever. Understood, I'll change that in the next revision! Cheers, Paul -- Paul Kocialkowski, Bootlin Embedded Linux and kernel engineering https://bootlin.com [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] [-- Attachment #2: Type: text/plain, Size: 160 bytes --] _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-12-11 13:19 UTC | newest] Thread overview: 15+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2020-11-14 6:50 [PATCH v7 2/3] drm: Add support for the LogiCVC display controller kernel test robot -- strict thread matches above, loose matches on Subject: below -- 2020-11-02 15:53 [PATCH v7 0/3] drm: LogiCVC display controller support Paul Kocialkowski 2020-11-02 15:53 ` [PATCH v7 2/3] drm: Add support for the LogiCVC display controller Paul Kocialkowski 2020-11-02 15:53 ` Paul Kocialkowski 2020-11-03 9:46 ` Maxime Ripard 2020-11-03 9:46 ` Maxime Ripard 2020-12-02 16:06 ` Paul Kocialkowski 2020-12-02 16:06 ` Paul Kocialkowski 2020-12-07 10:42 ` Maxime Ripard 2020-12-07 10:42 ` Maxime Ripard 2020-12-11 13:17 ` Paul Kocialkowski 2020-12-11 13:17 ` Paul Kocialkowski 2020-11-04 21:22 ` Sam Ravnborg 2020-11-04 21:22 ` Sam Ravnborg 2020-12-02 15:36 ` Paul Kocialkowski 2020-12-02 15:36 ` Paul Kocialkowski
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.