* [PATCH v8 0/5] Xilinx ZynqMP DisplayPort KMS driver
@ 2018-07-08 2:05 Hyun Kwon
2018-07-08 2:05 ` [PATCH v8 1/5] drm: xlnx: Xilinx DRM KMS module Hyun Kwon
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Hyun Kwon @ 2018-07-08 2:05 UTC (permalink / raw)
To: dri-devel, devicetree, Laurent Pinchart
Cc: Daniel Vetter, Rob Herring, Michal Simek, Hyun Kwon
Hi Laurent,
This series is primary waiting for your ack as I didn't hear back on v7 [1].
Please take a look and let me know if there's any concern. I've addressed
most of your comments in v6.
Thanks,
-hyun
[1] https://www.mail-archive.com/dri-devel@lists.freedesktop.org/msg218915.html
Hyun Kwon (5):
drm: xlnx: Xilinx DRM KMS module
dt-bindings: display: xlnx: Add ZynqMP DP subsystem bindings
drm: xlnx: DRM KMS driver for Xilinx ZynqMP DP subsystem display
drm: xlnx: DRM KMS driver for Xilinx ZynqMP DisplayPort
drm: xlnx: ZynqMP DP subsystem DRM KMS driver
.../bindings/display/xlnx/xlnx,zynqmp-dpsub.txt | 77 +
MAINTAINERS | 9 +
drivers/gpu/drm/Kconfig | 2 +
drivers/gpu/drm/Makefile | 1 +
drivers/gpu/drm/xlnx/Kconfig | 23 +
drivers/gpu/drm/xlnx/Makefile | 5 +
drivers/gpu/drm/xlnx/xlnx_crtc.c | 142 +
drivers/gpu/drm/xlnx/xlnx_crtc.h | 83 +
drivers/gpu/drm/xlnx/xlnx_drv.c | 433 +++
drivers/gpu/drm/xlnx/xlnx_drv.h | 23 +
drivers/gpu/drm/xlnx/xlnx_fb.c | 249 ++
drivers/gpu/drm/xlnx/xlnx_fb.h | 27 +
drivers/gpu/drm/xlnx/xlnx_gem.c | 36 +
drivers/gpu/drm/xlnx/xlnx_gem.h | 21 +
drivers/gpu/drm/xlnx/zynqmp_disp.c | 2777 ++++++++++++++++++++
drivers/gpu/drm/xlnx/zynqmp_disp.h | 29 +
drivers/gpu/drm/xlnx/zynqmp_dp.c | 1756 +++++++++++++
drivers/gpu/drm/xlnx/zynqmp_dp.h | 30 +
drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 158 ++
drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 23 +
20 files changed, 5904 insertions(+)
create mode 100644 Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt
create mode 100644 drivers/gpu/drm/xlnx/Kconfig
create mode 100644 drivers/gpu/drm/xlnx/Makefile
create mode 100644 drivers/gpu/drm/xlnx/xlnx_crtc.c
create mode 100644 drivers/gpu/drm/xlnx/xlnx_crtc.h
create mode 100644 drivers/gpu/drm/xlnx/xlnx_drv.c
create mode 100644 drivers/gpu/drm/xlnx/xlnx_drv.h
create mode 100644 drivers/gpu/drm/xlnx/xlnx_fb.c
create mode 100644 drivers/gpu/drm/xlnx/xlnx_fb.h
create mode 100644 drivers/gpu/drm/xlnx/xlnx_gem.c
create mode 100644 drivers/gpu/drm/xlnx/xlnx_gem.h
create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.c
create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.h
create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp.c
create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp.h
create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.c
create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.h
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH v8 1/5] drm: xlnx: Xilinx DRM KMS module 2018-07-08 2:05 [PATCH v8 0/5] Xilinx ZynqMP DisplayPort KMS driver Hyun Kwon @ 2018-07-08 2:05 ` Hyun Kwon 2019-02-17 23:33 ` Laurent Pinchart 2018-07-08 2:05 ` [PATCH v8 2/5] dt-bindings: display: xlnx: Add ZynqMP DP subsystem bindings Hyun Kwon ` (3 subsequent siblings) 4 siblings, 1 reply; 10+ messages in thread From: Hyun Kwon @ 2018-07-08 2:05 UTC (permalink / raw) To: dri-devel, devicetree, Laurent Pinchart Cc: Daniel Vetter, Rob Herring, Michal Simek, Hyun Kwon Xilinx has various platforms for display, where users can create using multiple IPs in the programmable FPGA fabric, or where some hardened pipeline is available on the chip. Furthermore, hardened pipeline can also interact with soft logics in FPGA. The Xilinx DRM KMS module is to integrate multiple subdevices and to represent the entire pipeline as a single DRM device. The module includes helper (ex, framebuffer and gem helpers) and glue logic (ex, crtc interface) functions. Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- v7 - Unbind as component in shutdown - Register release callback for master device v6 - Fix the function desc for pipeline calls - Rebase on drm-misc-next - Fix typos in documentation - Match types for return and internal variables - Remove use of 'tmp' variables - Protect any crtc list iteration with mutex - Remove a check for drm device in crtc unregistration - Split the crtc ops as a separate struct to constify - Embed xlnx_crtc_helper into xlnx_drm - Move to_xlnx_crtc macro close to xlnx_crtc - Remove unneeded include - Replace custom vres module param with CONFIG_DRM_FBDEV_OVERALLOC - Rename crtc to crtc_helper to make it clearer - Use 'DRM device' instead of 'DRM core' - Remove unused function, xlnx_get_format() - Use device instead of platform device for the logical master - Inline xlnx_of_component_probe() - Use of_get_parent() - Remove the port binding handling in the driver - Do complete forward-declarations in headers - Constify all function pointers - Use the default ioctl from fb helper - Return the minimum pitch always - Clean up the duplicate license paragraphs - Get common bits for dma mask instead of minimum value - Remove dummy function declaration from header - Fix a typo in the commit message with some re-organization v5 - Redefine xlnx_pipeline_init() v4 - Fix a bug in of graph binding handling - Remove vblank callbacks from xlnx_crtc - Remove the dt binding. This module becomes more like a library. - Rephrase the commit message v3 - Add Laurent as a maintainer - Fix multiple-reference on gem objects v2 - Change the SPDX identifier format - Merge patches(crtc, gem, fb) into single one v2 of xlnx_drv - Rename kms to display in xlnx_drv - Replace some xlnx specific fb helper with common helpers in xlnx_drv - Don't set the commit tail callback in xlnx_drv - Support 'ports' graph binding in xlnx_drv v2 of xlnx_fb - Remove wrappers in xlnx_fb - Replace some functions with drm core helpers in xlnx_fb --- --- MAINTAINERS | 9 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/xlnx/Kconfig | 12 ++ drivers/gpu/drm/xlnx/Makefile | 2 + drivers/gpu/drm/xlnx/xlnx_crtc.c | 142 +++++++++++++ drivers/gpu/drm/xlnx/xlnx_crtc.h | 83 ++++++++ drivers/gpu/drm/xlnx/xlnx_drv.c | 433 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/xlnx/xlnx_drv.h | 23 +++ drivers/gpu/drm/xlnx/xlnx_fb.c | 249 ++++++++++++++++++++++ drivers/gpu/drm/xlnx/xlnx_fb.h | 27 +++ drivers/gpu/drm/xlnx/xlnx_gem.c | 36 ++++ drivers/gpu/drm/xlnx/xlnx_gem.h | 21 ++ 13 files changed, 1040 insertions(+) create mode 100644 drivers/gpu/drm/xlnx/Kconfig create mode 100644 drivers/gpu/drm/xlnx/Makefile create mode 100644 drivers/gpu/drm/xlnx/xlnx_crtc.c create mode 100644 drivers/gpu/drm/xlnx/xlnx_crtc.h create mode 100644 drivers/gpu/drm/xlnx/xlnx_drv.c create mode 100644 drivers/gpu/drm/xlnx/xlnx_drv.h create mode 100644 drivers/gpu/drm/xlnx/xlnx_fb.c create mode 100644 drivers/gpu/drm/xlnx/xlnx_fb.h create mode 100644 drivers/gpu/drm/xlnx/xlnx_gem.c create mode 100644 drivers/gpu/drm/xlnx/xlnx_gem.h diff --git a/MAINTAINERS b/MAINTAINERS index 07d1576..137efd6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4846,6 +4846,15 @@ F: drivers/gpu/drm/etnaviv/ F: include/uapi/drm/etnaviv_drm.h F: Documentation/devicetree/bindings/display/etnaviv/ +DRM DRIVERS FOR XILINX +M: Hyun Kwon <hyun.kwon@xilinx.com> +M: Laurent Pinchart <laurent.pinchart@ideasonboard.com> +L: dri-devel@lists.freedesktop.org +S: Maintained +F: drivers/gpu/drm/xlnx/ +F: Documentation/devicetree/bindings/display/xlnx/ +T: git git://anongit.freedesktop.org/drm/drm-misc + DRM DRIVERS FOR ZTE ZX M: Shawn Guo <shawnguo@kernel.org> L: dri-devel@lists.freedesktop.org diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index 10f9f01..ad6891f 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -304,6 +304,8 @@ source "drivers/gpu/drm/tve200/Kconfig" source "drivers/gpu/drm/xen/Kconfig" +source "drivers/gpu/drm/xlnx/Kconfig" + # Keep legacy drivers last menuconfig DRM_LEGACY diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 6ae535c..f6672a5 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -106,3 +106,4 @@ obj-$(CONFIG_DRM_TINYDRM) += tinydrm/ obj-$(CONFIG_DRM_PL111) += pl111/ obj-$(CONFIG_DRM_TVE200) += tve200/ obj-$(CONFIG_DRM_XEN) += xen/ +obj-$(CONFIG_DRM_XLNX) += xlnx/ diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig new file mode 100644 index 0000000..19fd7cd --- /dev/null +++ b/drivers/gpu/drm/xlnx/Kconfig @@ -0,0 +1,12 @@ +config DRM_XLNX + tristate "Xilinx DRM KMS Driver" + depends on DRM && OF + select DRM_KMS_HELPER + select DRM_KMS_CMA_HELPER + select DRM_GEM_CMA_HELPER + help + Xilinx DRM KMS driver. Choose this option if you have + a Xilinx SoCs with hardened display pipeline or soft + display pipeline using Xilinx IPs in FPGA. This module + provides the kernel mode setting functionalities + for Xilinx display drivers. diff --git a/drivers/gpu/drm/xlnx/Makefile b/drivers/gpu/drm/xlnx/Makefile new file mode 100644 index 0000000..c60a281 --- /dev/null +++ b/drivers/gpu/drm/xlnx/Makefile @@ -0,0 +1,2 @@ +xlnx_drm-objs += xlnx_crtc.o xlnx_drv.o xlnx_fb.o xlnx_gem.o +obj-$(CONFIG_DRM_XLNX) += xlnx_drm.o diff --git a/drivers/gpu/drm/xlnx/xlnx_crtc.c b/drivers/gpu/drm/xlnx/xlnx_crtc.c new file mode 100644 index 0000000..06f1d70 --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_crtc.c @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM crtc driver + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#include <drm/drmP.h> + +#include "xlnx_crtc.h" +#include "xlnx_drv.h" + +/* + * Overview + * -------- + * + * The Xilinx CRTC layer is to enable the custom interface to CRTC drivers. + * The interface is used by Xilinx DRM driver where it needs CRTC + * functionality. CRTC drivers should attach the desired callbacks + * to struct xlnx_crtc and register the xlnx_crtc with corresponding + * drm_device. It's highly recommended CRTC drivers register all callbacks + * even though many of them are optional. + * The CRTC helper simply walks through the registered CRTC device, + * and calls the callbacks. + */ + +unsigned int xlnx_crtc_helper_get_align(struct xlnx_crtc_helper *helper) +{ + struct xlnx_crtc *crtc; + unsigned int align = 1; + + mutex_lock(&helper->lock); + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { + if (crtc->ops->get_align) + align = ALIGN(align, crtc->ops->get_align(crtc)); + } + mutex_unlock(&helper->lock); + + return align; +} + +u64 xlnx_crtc_helper_get_dma_mask(struct xlnx_crtc_helper *helper) +{ + struct xlnx_crtc *crtc; + u64 mask = DMA_BIT_MASK(sizeof(dma_addr_t) * 8); + + mutex_lock(&helper->lock); + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { + if (crtc->ops->get_dma_mask) + mask &= crtc->ops->get_dma_mask(crtc); + } + mutex_unlock(&helper->lock); + + return mask; +} + +int xlnx_crtc_helper_get_max_width(struct xlnx_crtc_helper *helper) +{ + struct xlnx_crtc *crtc; + int width = S32_MAX; + + mutex_lock(&helper->lock); + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { + if (crtc->ops->get_max_width) + width = min(width, crtc->ops->get_max_width(crtc)); + } + mutex_unlock(&helper->lock); + + return width; +} + +int xlnx_crtc_helper_get_max_height(struct xlnx_crtc_helper *helper) +{ + struct xlnx_crtc *crtc; + int height = S32_MAX; + + mutex_lock(&helper->lock); + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { + if (crtc->ops->get_max_height) + height = min(height, crtc->ops->get_max_height(crtc)); + } + mutex_unlock(&helper->lock); + + return height; +} + +u32 xlnx_crtc_helper_get_format(struct xlnx_crtc_helper *helper) +{ + struct xlnx_crtc *crtc; + u32 result = 0, format; + + mutex_lock(&helper->lock); + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { + if (crtc->ops->get_format) { + format = crtc->ops->get_format(crtc); + if (result && result != format) { + mutex_unlock(&helper->lock); + return 0; + } + result = format; + } + } + mutex_unlock(&helper->lock); + + return result; +} + +void xlnx_crtc_helper_init(struct xlnx_crtc_helper *helper) +{ + INIT_LIST_HEAD(&helper->xlnx_crtcs); + mutex_init(&helper->lock); +} + +void xlnx_crtc_helper_fini(struct xlnx_crtc_helper *helper) +{ + if (WARN_ON(!list_empty(&helper->xlnx_crtcs))) + return; + + mutex_destroy(&helper->lock); +} + +void xlnx_crtc_register(struct drm_device *drm, struct xlnx_crtc *crtc) +{ + struct xlnx_crtc_helper *helper = xlnx_get_crtc_helper(drm); + + mutex_lock(&helper->lock); + list_add_tail(&crtc->list, &helper->xlnx_crtcs); + mutex_unlock(&helper->lock); +} +EXPORT_SYMBOL_GPL(xlnx_crtc_register); + +void xlnx_crtc_unregister(struct drm_device *drm, struct xlnx_crtc *crtc) +{ + struct xlnx_crtc_helper *helper = xlnx_get_crtc_helper(drm); + + mutex_lock(&helper->lock); + list_del(&crtc->list); + mutex_unlock(&helper->lock); +} +EXPORT_SYMBOL_GPL(xlnx_crtc_unregister); diff --git a/drivers/gpu/drm/xlnx/xlnx_crtc.h b/drivers/gpu/drm/xlnx/xlnx_crtc.h new file mode 100644 index 0000000..a6b5f59 --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_crtc.h @@ -0,0 +1,83 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM crtc header + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#ifndef _XLNX_CRTC_H_ +#define _XLNX_CRTC_H_ + +#include <drm/drm_crtc.h> +#include <linux/list.h> +#include <linux/mutex.h> + +struct drm_device; +struct xlnx_crtc; + +/** + * struct xlnx_crtc_ops - Xilinx CRTC operations + * @get_align: Get the alignment requirement of CRTC device + * @get_dma_mask: Get the dma mask of CRTC device + * @get_max_width: Get the maximum supported width + * @get_max_height: Get the maximum supported height + * @get_format: Get the current format of CRTC device + */ +struct xlnx_crtc_ops { + unsigned int (*get_align)(struct xlnx_crtc *crtc); + u64 (*get_dma_mask)(struct xlnx_crtc *crtc); + int (*get_max_width)(struct xlnx_crtc *crtc); + int (*get_max_height)(struct xlnx_crtc *crtc); + u32 (*get_format)(struct xlnx_crtc *crtc); +}; + +/** + * struct xlnx_crtc - Xilinx CRTC device + * @crtc: DRM CRTC device + * @list: list node for Xilinx CRTC device list + * @ops: Xilinx CRTC ops + */ +struct xlnx_crtc { + struct drm_crtc crtc; + struct list_head list; + const struct xlnx_crtc_ops *ops; +}; + +static inline struct xlnx_crtc *to_xlnx_crtc(struct drm_crtc *crtc) +{ + return container_of(crtc, struct xlnx_crtc, crtc); +} + +/* + * Helper functions: used within Xlnx DRM + */ + +/** + * struct xlnx_crtc_helper - Xilinx CRTC helper + * @xlnx_crtcs: list of Xilinx CRTC devices + * @lock: lock to protect @xlnx_crtcs + */ +struct xlnx_crtc_helper { + struct list_head xlnx_crtcs; + struct mutex lock; /* lock for @xlnx_crtcs */ +}; + +unsigned int xlnx_crtc_helper_get_align(struct xlnx_crtc_helper *helper); +u64 xlnx_crtc_helper_get_dma_mask(struct xlnx_crtc_helper *helper); +int xlnx_crtc_helper_get_max_width(struct xlnx_crtc_helper *helper); +int xlnx_crtc_helper_get_max_height(struct xlnx_crtc_helper *helper); +u32 xlnx_crtc_helper_get_format(struct xlnx_crtc_helper *helper); + +void xlnx_crtc_helper_init(struct xlnx_crtc_helper *helper); +void xlnx_crtc_helper_fini(struct xlnx_crtc_helper *helper); + +/* + * CRTC registration: used by other sub-driver modules + */ + +void xlnx_crtc_register(struct drm_device *drm, struct xlnx_crtc *crtc); +void xlnx_crtc_unregister(struct drm_device *drm, struct xlnx_crtc *crtc); + +#endif /* _XLNX_CRTC_H_ */ diff --git a/drivers/gpu/drm/xlnx/xlnx_drv.c b/drivers/gpu/drm/xlnx/xlnx_drv.c new file mode 100644 index 0000000..5ad2dc2 --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_drv.c @@ -0,0 +1,433 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM KMS Driver + * + * Copyright (C) 2013 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#include <drm/drmP.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> + +#include <linux/component.h> +#include <linux/device.h> +#include <linux/dma-buf.h> +#include <linux/module.h> +#include <linux/of_graph.h> + +#include "xlnx_crtc.h" +#include "xlnx_fb.h" +#include "xlnx_gem.h" + +#define DRIVER_NAME "xlnx" +#define DRIVER_DESC "Xilinx DRM KMS Driver" +#define DRIVER_DATE "20130509" +#define DRIVER_MAJOR 1 +#define DRIVER_MINOR 0 + +/** + * struct xlnx_drm - Xilinx DRM private data + * @drm: DRM device + * @crtc_helper: Helper to access Xilinx CRTCs + * @fb: DRM fb helper + * @master: logical master device for pipeline + * @suspend_state: atomic state for suspend / resume + */ +struct xlnx_drm { + struct drm_device *drm; + struct xlnx_crtc_helper crtc_helper; + struct drm_fb_helper *fb; + struct device *master; + struct drm_atomic_state *suspend_state; +}; + +/** + * xlnx_get_crtc_helper - Return the crtc helper instance + * @drm: DRM device + * + * Return: the crtc helper instance + */ +struct xlnx_crtc_helper *xlnx_get_crtc_helper(struct drm_device *drm) +{ + struct xlnx_drm *xlnx_drm = drm->dev_private; + + return &xlnx_drm->crtc_helper; +} + +/** + * xlnx_get_align - Return the align requirement through CRTC helper + * @drm: DRM device + * + * Return: the alignment requirement + */ +unsigned int xlnx_get_align(struct drm_device *drm) +{ + struct xlnx_drm *xlnx_drm = drm->dev_private; + + return xlnx_crtc_helper_get_align(&xlnx_drm->crtc_helper); +} + +static void xlnx_output_poll_changed(struct drm_device *drm) +{ + struct xlnx_drm *xlnx_drm = drm->dev_private; + + if (xlnx_drm->fb) + drm_fb_helper_hotplug_event(xlnx_drm->fb); +} + +static const struct drm_mode_config_funcs xlnx_mode_config_funcs = { + .fb_create = xlnx_fb_create, + .output_poll_changed = xlnx_output_poll_changed, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +}; + +static void xlnx_mode_config_init(struct drm_device *drm) +{ + struct xlnx_drm *xlnx_drm = drm->dev_private; + struct xlnx_crtc_helper *crtc_helper = &xlnx_drm->crtc_helper; + + drm->mode_config.min_width = 0; + drm->mode_config.min_height = 0; + drm->mode_config.max_width = + xlnx_crtc_helper_get_max_width(crtc_helper); + drm->mode_config.max_height = + xlnx_crtc_helper_get_max_height(crtc_helper); +} + +static void xlnx_lastclose(struct drm_device *drm) +{ + struct xlnx_drm *xlnx_drm = drm->dev_private; + + if (xlnx_drm->fb) + drm_fb_helper_restore_fbdev_mode_unlocked(xlnx_drm->fb); +} + +static const struct file_operations xlnx_fops = { + .owner = THIS_MODULE, + .open = drm_open, + .release = drm_release, + .unlocked_ioctl = drm_ioctl, + .mmap = drm_gem_cma_mmap, + .poll = drm_poll, + .read = drm_read, +#ifdef CONFIG_COMPAT + .compat_ioctl = drm_compat_ioctl, +#endif + .llseek = noop_llseek, +}; + +static struct drm_driver xlnx_drm_driver = { + .driver_features = DRIVER_MODESET | DRIVER_GEM | + DRIVER_ATOMIC | DRIVER_PRIME, + .lastclose = xlnx_lastclose, + + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = drm_gem_prime_export, + .gem_prime_import = drm_gem_prime_import, + .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, + .gem_prime_vmap = drm_gem_cma_prime_vmap, + .gem_prime_vunmap = drm_gem_cma_prime_vunmap, + .gem_prime_mmap = drm_gem_cma_prime_mmap, + .gem_free_object = drm_gem_cma_free_object, + .gem_vm_ops = &drm_gem_cma_vm_ops, + .dumb_create = xlnx_gem_cma_dumb_create, + .dumb_destroy = drm_gem_dumb_destroy, + + .fops = &xlnx_fops, + + .name = DRIVER_NAME, + .desc = DRIVER_DESC, + .date = DRIVER_DATE, + .major = DRIVER_MAJOR, + .minor = DRIVER_MINOR, +}; + +static int xlnx_bind(struct device *master) +{ + struct xlnx_drm *xlnx_drm; + struct drm_device *drm; + const struct drm_format_info *info; + int ret; + u32 format; + + drm = drm_dev_alloc(&xlnx_drm_driver, master->parent); + if (IS_ERR(drm)) + return PTR_ERR(drm); + + xlnx_drm = devm_kzalloc(drm->dev, sizeof(*xlnx_drm), GFP_KERNEL); + if (!xlnx_drm) { + ret = -ENOMEM; + goto err_drm; + } + + drm_mode_config_init(drm); + drm->mode_config.funcs = &xlnx_mode_config_funcs; + + ret = drm_vblank_init(drm, 1); + if (ret) { + dev_err(master->parent, "failed to initialize vblank\n"); + goto err_xlnx_drm; + } + + drm->irq_enabled = 1; + drm->dev_private = xlnx_drm; + xlnx_drm->drm = drm; + xlnx_drm->master = master; + drm_kms_helper_poll_init(drm); + dev_set_drvdata(master, xlnx_drm); + + xlnx_crtc_helper_init(&xlnx_drm->crtc_helper); + + ret = component_bind_all(master, drm); + if (ret) + goto err_crtc; + + xlnx_mode_config_init(drm); + drm_mode_config_reset(drm); + dma_set_mask(drm->dev, + xlnx_crtc_helper_get_dma_mask(&xlnx_drm->crtc_helper)); + + format = xlnx_crtc_helper_get_format(&xlnx_drm->crtc_helper); + info = drm_format_info(format); + if (info && info->depth && info->cpp[0]) { + unsigned int align; + + align = xlnx_crtc_helper_get_align(&xlnx_drm->crtc_helper); + xlnx_drm->fb = xlnx_fb_init(drm, info->cpp[0] * 8, 1, align); + if (IS_ERR(xlnx_drm->fb)) { + dev_err(master->parent, + "failed to initialize drm fb\n"); + xlnx_drm->fb = NULL; + } + } else { + /* fbdev emulation is optional */ + dev_info(master->parent, "fbdev is not initialized\n"); + } + + ret = drm_dev_register(drm, 0); + if (ret < 0) + goto err_fb; + + return 0; + +err_fb: + if (xlnx_drm->fb) + xlnx_fb_fini(xlnx_drm->fb); + component_unbind_all(drm->dev, drm); +err_crtc: + xlnx_crtc_helper_fini(&xlnx_drm->crtc_helper); +err_xlnx_drm: + drm_mode_config_cleanup(drm); +err_drm: + drm_dev_unref(drm); + return ret; +} + +static void xlnx_unbind(struct device *master) +{ + struct xlnx_drm *xlnx_drm = dev_get_drvdata(master); + struct drm_device *drm = xlnx_drm->drm; + + drm_dev_unregister(drm); + if (xlnx_drm->fb) + xlnx_fb_fini(xlnx_drm->fb); + component_unbind_all(master, drm); + xlnx_crtc_helper_fini(&xlnx_drm->crtc_helper); + drm_kms_helper_poll_fini(drm); + drm_mode_config_cleanup(drm); + drm_dev_unref(drm); +} + +static const struct component_master_ops xlnx_master_ops = { + .bind = xlnx_bind, + .unbind = xlnx_unbind, +}; + +static int xlnx_compare_of(struct device *dev, void *data) +{ + return dev->of_node == data; +} + +static int xlnx_probe(struct device *master_dev) +{ + struct device *dev = master_dev->parent; + struct component_match *match = NULL; + + if (!dev->of_node) + return -EINVAL; + + component_match_add(master_dev, &match, xlnx_compare_of, dev->of_node); + + return component_master_add_with_match(master_dev, &xlnx_master_ops, + match); +} + +static int xlnx_remove(struct device *dev) +{ + component_master_del(dev, &xlnx_master_ops); + return 0; +} + +static void xlnx_shutdown(struct device *dev) +{ + component_master_del(dev, &xlnx_master_ops); +} + +static int __maybe_unused xlnx_pm_suspend(struct device *dev) +{ + struct xlnx_drm *xlnx_drm = dev_get_drvdata(dev); + struct drm_device *drm = xlnx_drm->drm; + + drm_kms_helper_poll_disable(drm); + + xlnx_drm->suspend_state = drm_atomic_helper_suspend(drm); + if (IS_ERR(xlnx_drm->suspend_state)) { + drm_kms_helper_poll_enable(drm); + return PTR_ERR(xlnx_drm->suspend_state); + } + + return 0; +} + +static int __maybe_unused xlnx_pm_resume(struct device *dev) +{ + struct xlnx_drm *xlnx_drm = dev_get_drvdata(dev); + struct drm_device *drm = xlnx_drm->drm; + + drm_atomic_helper_resume(drm, xlnx_drm->suspend_state); + drm_kms_helper_poll_enable(drm); + + return 0; +} + +static const struct dev_pm_ops xlnx_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(xlnx_pm_suspend, xlnx_pm_resume) +}; + +static int xlnx_drv_bus_match(struct device *dev, struct device_driver *drv) +{ + return !strncmp(dev_name(dev), drv->name, strlen(drv->name)); +} + +struct bus_type xlnx_driver_bus_type = { + .name = "xlnx-drm-bus", + .match = &xlnx_drv_bus_match, +}; + +static struct device_driver xlnx_driver = { + .probe = xlnx_probe, + .remove = xlnx_remove, + .shutdown = xlnx_shutdown, + .name = "xlnx-drm", + .pm = &xlnx_pm_ops, + .bus = &xlnx_driver_bus_type, + .owner = THIS_MODULE, +}; + +/* bitmap for master id */ +static u32 xlnx_master_ids = GENMASK(31, 0); + +static void xlnx_master_release(struct device *dev) +{ + kfree(dev); +} + +/** + * xlnx_drm_pipeline_init - Initialize the drm pipeline for the device + * @dev: The device to initialize the drm pipeline device + * + * This function initializes the drm pipeline device, struct drm_device, + * on @dev by creating a logical master device. The logical device acts + * as a master device to bind slave devices and represents the entire + * pipeline. + * The logical master uses the port bindings of the calling device to + * figure out the pipeline topology. + * + * Return: the logical master device if the drm device is initialized + * on @dev. Error code otherwise. + */ +struct device *xlnx_drm_pipeline_init(struct device *dev) +{ + struct device *master; + int id, ret; + + id = ffs(xlnx_master_ids); + if (!id) + return ERR_PTR(-ENOSPC); + + master = kzalloc(sizeof(*master), GFP_KERNEL); + if (!master) + return ERR_PTR(-ENOMEM); + device_initialize(master); + master->parent = dev; + master->bus = &xlnx_driver_bus_type; + master->release = xlnx_master_release; + + ret = dev_set_name(master, "xlnx-drm.%d", id); + if (ret) + goto err_kfree; + + ret = device_add(master); + if (ret) + goto err_kfree; + + xlnx_master_ids &= ~BIT(master->id); + return master; + +err_kfree: + kfree(master); + return ERR_PTR(ret); +} +EXPORT_SYMBOL_GPL(xlnx_drm_pipeline_init); + +/** + * xlnx_drm_pipeline_exit - Release the drm pipeline for the device + * @master: The master pipeline device to release + * + * Release the logical pipeline device returned by xlnx_drm_pipeline_init(). + */ +void xlnx_drm_pipeline_exit(struct device *master) +{ + xlnx_master_ids |= BIT(master->id); + device_unregister(master); +} +EXPORT_SYMBOL_GPL(xlnx_drm_pipeline_exit); + +static int __init xlnx_drm_drv_init(void) +{ + int ret; + + ret = bus_register(&xlnx_driver_bus_type); + if (ret) + return ret; + + ret = driver_register(&xlnx_driver); + if (ret) { + bus_unregister(&xlnx_driver_bus_type); + return ret; + } + + return 0; +} + +static void __exit xlnx_drm_drv_exit(void) +{ + bus_unregister(&xlnx_driver_bus_type); + driver_unregister(&xlnx_driver); +} + +module_init(xlnx_drm_drv_init); +module_exit(xlnx_drm_drv_exit); + +MODULE_AUTHOR("Xilinx, Inc."); +MODULE_DESCRIPTION("Xilinx DRM KMS Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/xlnx/xlnx_drv.h b/drivers/gpu/drm/xlnx/xlnx_drv.h new file mode 100644 index 0000000..b38ff2a --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_drv.h @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM KMS Header for Xilinx + * + * Copyright (C) 2013 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyunk@xilinx.com> + */ + +#ifndef _XLNX_DRV_H_ +#define _XLNX_DRV_H_ + +struct device; +struct drm_device; +struct xlnx_crtc_helper; + +struct device *xlnx_drm_pipeline_init(struct device *parent); +void xlnx_drm_pipeline_exit(struct device *pipeline); + +unsigned int xlnx_get_align(struct drm_device *drm); +struct xlnx_crtc_helper *xlnx_get_crtc_helper(struct drm_device *drm); + +#endif /* _XLNX_DRV_H_ */ diff --git a/drivers/gpu/drm/xlnx/xlnx_fb.c b/drivers/gpu/drm/xlnx/xlnx_fb.c new file mode 100644 index 0000000..8e8ab14 --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_fb.c @@ -0,0 +1,249 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM KMS Framebuffer helper + * + * Copyright (C) 2015 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + * + * Based on drm_fb_cma_helper.c + * + * Copyright (C) 2012 Analog Device Inc. + */ + +#include <drm/drmP.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_gem_framebuffer_helper.h> + +#include "xlnx_drv.h" +#include "xlnx_fb.h" + +#define XLNX_MAX_PLANES 4 + +struct xlnx_fbdev { + struct drm_fb_helper fb_helper; + struct drm_framebuffer *fb; + unsigned int align; +}; + +static inline struct xlnx_fbdev *to_fbdev(struct drm_fb_helper *fb_helper) +{ + return container_of(fb_helper, struct xlnx_fbdev, fb_helper); +} + +static const struct drm_framebuffer_funcs xlnx_fb_funcs = { + .destroy = drm_gem_fb_destroy, + .create_handle = drm_gem_fb_create_handle, +}; + +static struct fb_ops xlnx_fbdev_ops = { + .owner = THIS_MODULE, + .fb_fillrect = sys_fillrect, + .fb_copyarea = sys_copyarea, + .fb_imageblit = sys_imageblit, + DRM_FB_HELPER_DEFAULT_OPS, +}; + +/** + * xlnx_fbdev_create - Create the fbdev with a framebuffer + * @fb_helper: fb helper structure + * @size: framebuffer size info + * + * This function is based on drm_fbdev_cma_create(). + * + * Return: 0 if successful, or the error code. + */ +static int xlnx_fbdev_create(struct drm_fb_helper *fb_helper, + struct drm_fb_helper_surface_size *size) +{ + struct xlnx_fbdev *fbdev = to_fbdev(fb_helper); + struct drm_device *drm = fb_helper->dev; + struct drm_gem_cma_object *obj; + struct drm_framebuffer *fb; + unsigned int bytes_per_pixel; + unsigned long offset; + struct fb_info *fbi; + size_t bytes; + int ret; + + dev_dbg(drm->dev, "surface width(%d), height(%d) and bpp(%d)\n", + size->surface_width, size->surface_height, size->surface_bpp); + + bytes_per_pixel = DIV_ROUND_UP(size->surface_bpp, 8); + bytes = ALIGN(size->surface_width * bytes_per_pixel, fbdev->align); + bytes *= size->surface_height; + + obj = drm_gem_cma_create(drm, bytes); + if (IS_ERR(obj)) + return PTR_ERR(obj); + + fbi = framebuffer_alloc(0, drm->dev); + if (!fbi) { + dev_err(drm->dev, "Failed to allocate framebuffer info.\n"); + ret = -ENOMEM; + goto err_drm_gem_cma_free_object; + } + + fbdev->fb = drm_gem_fbdev_fb_create(drm, size, fbdev->align, &obj->base, + &xlnx_fb_funcs); + if (IS_ERR(fbdev->fb)) { + dev_err(drm->dev, "Failed to allocate DRM framebuffer.\n"); + ret = PTR_ERR(fbdev->fb); + goto err_framebuffer_release; + } + + fb = fbdev->fb; + fb_helper->fb = fb; + fb_helper->fbdev = fbi; + fbi->par = fb_helper; + fbi->flags = FBINFO_FLAG_DEFAULT; + fbi->fbops = &xlnx_fbdev_ops; + + ret = fb_alloc_cmap(&fbi->cmap, 256, 0); + if (ret) { + dev_err(drm->dev, "Failed to allocate color map.\n"); + goto err_fb_destroy; + } + + drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); + drm_fb_helper_fill_var(fbi, fb_helper, size->fb_width, size->fb_height); + + offset = fbi->var.xoffset * bytes_per_pixel; + offset += fbi->var.yoffset * fb->pitches[0]; + + drm->mode_config.fb_base = (resource_size_t)obj->paddr; + fbi->screen_base = (char __iomem *)(obj->vaddr + offset); + fbi->fix.smem_start = (unsigned long)(obj->paddr + offset); + fbi->screen_size = bytes; + fbi->fix.smem_len = bytes; + + return 0; + +err_fb_destroy: + drm_framebuffer_unregister_private(fb); + drm_gem_fb_destroy(fb); +err_framebuffer_release: + framebuffer_release(fbi); +err_drm_gem_cma_free_object: + drm_gem_cma_free_object(&obj->base); + return ret; +} + +static const struct drm_fb_helper_funcs xlnx_fb_helper_funcs = { + .fb_probe = xlnx_fbdev_create, +}; + +/** + * xlnx_fb_init - Allocate and initializes the Xilinx framebuffer + * @drm: DRM device + * @preferred_bpp: preferred bits per pixel for the device + * @max_conn_count: maximum number of connectors + * @align: alignment value for pitch + * + * This function is based on drm_fbdev_cma_init(). + * + * Return: a newly allocated drm_fb_helper struct or a ERR_PTR. + */ +struct drm_fb_helper * +xlnx_fb_init(struct drm_device *drm, int preferred_bpp, + unsigned int max_conn_count, unsigned int align) +{ + struct xlnx_fbdev *fbdev; + struct drm_fb_helper *fb_helper; + int ret; + + fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); + if (!fbdev) + return ERR_PTR(-ENOMEM); + + fbdev->align = align; + fb_helper = &fbdev->fb_helper; + drm_fb_helper_prepare(drm, fb_helper, &xlnx_fb_helper_funcs); + + ret = drm_fb_helper_init(drm, fb_helper, max_conn_count); + if (ret < 0) { + dev_err(drm->dev, "Failed to initialize drm fb helper.\n"); + goto err_free; + } + + ret = drm_fb_helper_single_add_all_connectors(fb_helper); + if (ret < 0) { + dev_err(drm->dev, "Failed to add connectors.\n"); + goto err_drm_fb_helper_fini; + } + + ret = drm_fb_helper_initial_config(fb_helper, preferred_bpp); + if (ret < 0) { + dev_err(drm->dev, "Failed to set initial hw configuration.\n"); + goto err_drm_fb_helper_fini; + } + + return fb_helper; + +err_drm_fb_helper_fini: + drm_fb_helper_fini(fb_helper); +err_free: + kfree(fbdev); + return ERR_PTR(ret); +} + +/** + * xlnx_fbdev_defio_fini - Free the defio fb + * @fbi: fb_info struct + * + * This function is based on drm_fbdev_cma_defio_fini(). + */ +static void xlnx_fbdev_defio_fini(struct fb_info *fbi) +{ + if (!fbi->fbdefio) + return; + + fb_deferred_io_cleanup(fbi); + kfree(fbi->fbdefio); + kfree(fbi->fbops); +} + +/** + * xlnx_fbdev_fini - Free the Xilinx framebuffer + * @fb_helper: drm_fb_helper struct + * + * This function is based on drm_fbdev_cma_fini(). + */ +void xlnx_fb_fini(struct drm_fb_helper *fb_helper) +{ + struct xlnx_fbdev *fbdev = to_fbdev(fb_helper); + + drm_fb_helper_unregister_fbi(&fbdev->fb_helper); + if (fbdev->fb_helper.fbdev) + xlnx_fbdev_defio_fini(fbdev->fb_helper.fbdev); + + if (fbdev->fb_helper.fb) + drm_framebuffer_remove(fbdev->fb_helper.fb); + + drm_fb_helper_fini(&fbdev->fb_helper); + kfree(fbdev); +} + +/** + * xlnx_fb_create - (struct drm_mode_config_funcs *)->fb_create callback + * @drm: DRM device + * @file_priv: drm file private data + * @mode_cmd: mode command for fb creation + * + * This functions creates a drm_framebuffer with xlnx_fb_funcs for given mode + * @mode_cmd. This functions is intended to be used for the fb_create callback + * function of drm_mode_config_funcs. + * + * Return: a drm_framebuffer object if successful, or + * ERR_PTR from drm_gem_fb_create_with_funcs(). + */ +struct drm_framebuffer * +xlnx_fb_create(struct drm_device *drm, struct drm_file *file_priv, + const struct drm_mode_fb_cmd2 *mode_cmd) +{ + return drm_gem_fb_create_with_funcs(drm, file_priv, mode_cmd, + &xlnx_fb_funcs); +} diff --git a/drivers/gpu/drm/xlnx/xlnx_fb.h b/drivers/gpu/drm/xlnx/xlnx_fb.h new file mode 100644 index 0000000..e41738e --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_fb.h @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM KMS Framebuffer helper header + * + * Copyright (C) 2015 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#ifndef _XLNX_FB_H_ +#define _XLNX_FB_H_ + +struct drm_device; +struct drm_file; +struct drm_fb_helper; +struct drm_framebuffer; +struct drm_mode_fb_cmd2; + +struct drm_framebuffer * +xlnx_fb_create(struct drm_device *drm, struct drm_file *file_priv, + const struct drm_mode_fb_cmd2 *mode_cmd); +struct drm_fb_helper * +xlnx_fb_init(struct drm_device *drm, int preferred_bpp, + unsigned int max_conn_count, unsigned int align); +void xlnx_fb_fini(struct drm_fb_helper *fb_helper); + +#endif /* _XLNX_FB_H_ */ diff --git a/drivers/gpu/drm/xlnx/xlnx_gem.c b/drivers/gpu/drm/xlnx/xlnx_gem.c new file mode 100644 index 0000000..6748dc1 --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_gem.c @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM KMS GEM helper + * + * Copyright (C) 2015 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#include <drm/drmP.h> +#include <drm/drm_gem_cma_helper.h> + +#include "xlnx_drv.h" +#include "xlnx_gem.h" + +/* + * xlnx_gem_cma_dumb_create - (struct drm_driver)->dumb_create callback + * @file_priv: drm_file object + * @drm: DRM object + * @args: info for dumb scanout buffer creation + * + * This function is for dumb_create callback of drm_driver struct. Simply + * it wraps around drm_gem_cma_dumb_create() and sets the pitch value + * by retrieving the value from the device. + * + * Return: The return value from drm_gem_cma_dumb_create() + */ +int xlnx_gem_cma_dumb_create(struct drm_file *file_priv, struct drm_device *drm, + struct drm_mode_create_dumb *args) +{ + unsigned int pitch = DIV_ROUND_UP(args->width * args->bpp, 8); + + args->pitch = ALIGN(pitch, xlnx_get_align(drm)); + + return drm_gem_cma_dumb_create_internal(file_priv, drm, args); +} diff --git a/drivers/gpu/drm/xlnx/xlnx_gem.h b/drivers/gpu/drm/xlnx/xlnx_gem.h new file mode 100644 index 0000000..3c9ed5f --- /dev/null +++ b/drivers/gpu/drm/xlnx/xlnx_gem.h @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Xilinx DRM KMS GEM helper header + * + * Copyright (C) 2015 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#ifndef _XLNX_GEM_H_ +#define _XLNX_GEM_H_ + +struct drm_device; +struct drm_file; +struct drm_mode_create_dumb; + +int xlnx_gem_cma_dumb_create(struct drm_file *file_priv, + struct drm_device *drm, + struct drm_mode_create_dumb *args); + +#endif /* _XLNX_GEM_H_ */ -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v8 1/5] drm: xlnx: Xilinx DRM KMS module 2018-07-08 2:05 ` [PATCH v8 1/5] drm: xlnx: Xilinx DRM KMS module Hyun Kwon @ 2019-02-17 23:33 ` Laurent Pinchart 0 siblings, 0 replies; 10+ messages in thread From: Laurent Pinchart @ 2019-02-17 23:33 UTC (permalink / raw) To: Hyun Kwon; +Cc: devicetree, Rob Herring, Michal Simek, dri-devel, Daniel Vetter Hi Hyun Thank you for the patch. On Sat, Jul 07, 2018 at 07:05:34PM -0700, Hyun Kwon wrote: > Xilinx has various platforms for display, where users can create > using multiple IPs in the programmable FPGA fabric, or where > some hardened pipeline is available on the chip. Furthermore, > hardened pipeline can also interact with soft logics in FPGA. > > The Xilinx DRM KMS module is to integrate multiple subdevices and > to represent the entire pipeline as a single DRM device. The module > includes helper (ex, framebuffer and gem helpers) and glue logic > (ex, crtc interface) functions. > > Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > v7 > - Unbind as component in shutdown > - Register release callback for master device > v6 > - Fix the function desc for pipeline calls > - Rebase on drm-misc-next > - Fix typos in documentation > - Match types for return and internal variables > - Remove use of 'tmp' variables > - Protect any crtc list iteration with mutex > - Remove a check for drm device in crtc unregistration > - Split the crtc ops as a separate struct to constify > - Embed xlnx_crtc_helper into xlnx_drm > - Move to_xlnx_crtc macro close to xlnx_crtc > - Remove unneeded include > - Replace custom vres module param with CONFIG_DRM_FBDEV_OVERALLOC > - Rename crtc to crtc_helper to make it clearer > - Use 'DRM device' instead of 'DRM core' > - Remove unused function, xlnx_get_format() > - Use device instead of platform device for the logical master > - Inline xlnx_of_component_probe() > - Use of_get_parent() > - Remove the port binding handling in the driver > - Do complete forward-declarations in headers > - Constify all function pointers > - Use the default ioctl from fb helper > - Return the minimum pitch always > - Clean up the duplicate license paragraphs > - Get common bits for dma mask instead of minimum value > - Remove dummy function declaration from header > - Fix a typo in the commit message with some re-organization > v5 > - Redefine xlnx_pipeline_init() > v4 > - Fix a bug in of graph binding handling > - Remove vblank callbacks from xlnx_crtc > - Remove the dt binding. This module becomes more like a library. > - Rephrase the commit message > v3 > - Add Laurent as a maintainer > - Fix multiple-reference on gem objects > v2 > - Change the SPDX identifier format > - Merge patches(crtc, gem, fb) into single one > v2 of xlnx_drv > - Rename kms to display in xlnx_drv > - Replace some xlnx specific fb helper with common helpers in xlnx_drv > - Don't set the commit tail callback in xlnx_drv > - Support 'ports' graph binding in xlnx_drv > v2 of xlnx_fb > - Remove wrappers in xlnx_fb > - Replace some functions with drm core helpers in xlnx_fb > --- > --- > MAINTAINERS | 9 + > drivers/gpu/drm/Kconfig | 2 + > drivers/gpu/drm/Makefile | 1 + > drivers/gpu/drm/xlnx/Kconfig | 12 ++ > drivers/gpu/drm/xlnx/Makefile | 2 + > drivers/gpu/drm/xlnx/xlnx_crtc.c | 142 +++++++++++++ > drivers/gpu/drm/xlnx/xlnx_crtc.h | 83 ++++++++ > drivers/gpu/drm/xlnx/xlnx_drv.c | 433 +++++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/xlnx/xlnx_drv.h | 23 +++ > drivers/gpu/drm/xlnx/xlnx_fb.c | 249 ++++++++++++++++++++++ > drivers/gpu/drm/xlnx/xlnx_fb.h | 27 +++ > drivers/gpu/drm/xlnx/xlnx_gem.c | 36 ++++ > drivers/gpu/drm/xlnx/xlnx_gem.h | 21 ++ > 13 files changed, 1040 insertions(+) > create mode 100644 drivers/gpu/drm/xlnx/Kconfig > create mode 100644 drivers/gpu/drm/xlnx/Makefile > create mode 100644 drivers/gpu/drm/xlnx/xlnx_crtc.c > create mode 100644 drivers/gpu/drm/xlnx/xlnx_crtc.h > create mode 100644 drivers/gpu/drm/xlnx/xlnx_drv.c > create mode 100644 drivers/gpu/drm/xlnx/xlnx_drv.h > create mode 100644 drivers/gpu/drm/xlnx/xlnx_fb.c > create mode 100644 drivers/gpu/drm/xlnx/xlnx_fb.h > create mode 100644 drivers/gpu/drm/xlnx/xlnx_gem.c > create mode 100644 drivers/gpu/drm/xlnx/xlnx_gem.h [snip] > diff --git a/drivers/gpu/drm/xlnx/xlnx_crtc.c b/drivers/gpu/drm/xlnx/xlnx_crtc.c > new file mode 100644 > index 0000000..06f1d70 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/xlnx_crtc.c > @@ -0,0 +1,142 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Xilinx DRM crtc driver > + * > + * Copyright (C) 2017 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#include <drm/drmP.h> drmP.h is deprecated, you should instead include the broken-down DRM headers (and the required other Linux headers). This holds true for the other files in this series, and for all the other patches. > +#include "xlnx_crtc.h" > +#include "xlnx_drv.h" > + > +/* > + * Overview > + * -------- > + * > + * The Xilinx CRTC layer is to enable the custom interface to CRTC drivers. > + * The interface is used by Xilinx DRM driver where it needs CRTC > + * functionality. CRTC drivers should attach the desired callbacks > + * to struct xlnx_crtc and register the xlnx_crtc with corresponding > + * drm_device. It's highly recommended CRTC drivers register all callbacks > + * even though many of them are optional. > + * The CRTC helper simply walks through the registered CRTC device, > + * and calls the callbacks. > + */ > + > +unsigned int xlnx_crtc_helper_get_align(struct xlnx_crtc_helper *helper) How about renaming get_align to get_alignment, here and everywhere else ? > +{ > + struct xlnx_crtc *crtc; > + unsigned int align = 1; > + > + mutex_lock(&helper->lock); > + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { > + if (crtc->ops->get_align) > + align = ALIGN(align, crtc->ops->get_align(crtc)); > + } > + mutex_unlock(&helper->lock); > + > + return align; > +} > + > +u64 xlnx_crtc_helper_get_dma_mask(struct xlnx_crtc_helper *helper) > +{ > + struct xlnx_crtc *crtc; > + u64 mask = DMA_BIT_MASK(sizeof(dma_addr_t) * 8); > + > + mutex_lock(&helper->lock); > + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { > + if (crtc->ops->get_dma_mask) > + mask &= crtc->ops->get_dma_mask(crtc); > + } > + mutex_unlock(&helper->lock); > + > + return mask; > +} > + > +int xlnx_crtc_helper_get_max_width(struct xlnx_crtc_helper *helper) Would it make sense to merge the get_max_width and get_max_height functions into a get_max_size function, given that they are both used in a single location ? > +{ > + struct xlnx_crtc *crtc; > + int width = S32_MAX; > + > + mutex_lock(&helper->lock); > + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { > + if (crtc->ops->get_max_width) > + width = min(width, crtc->ops->get_max_width(crtc)); > + } > + mutex_unlock(&helper->lock); > + > + return width; > +} > + > +int xlnx_crtc_helper_get_max_height(struct xlnx_crtc_helper *helper) > +{ > + struct xlnx_crtc *crtc; > + int height = S32_MAX; > + > + mutex_lock(&helper->lock); > + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { > + if (crtc->ops->get_max_height) > + height = min(height, crtc->ops->get_max_height(crtc)); > + } > + mutex_unlock(&helper->lock); > + > + return height; > +} > + > +u32 xlnx_crtc_helper_get_format(struct xlnx_crtc_helper *helper) > +{ > + struct xlnx_crtc *crtc; > + u32 result = 0, format; > + > + mutex_lock(&helper->lock); > + list_for_each_entry(crtc, &helper->xlnx_crtcs, list) { > + if (crtc->ops->get_format) { > + format = crtc->ops->get_format(crtc); > + if (result && result != format) { > + mutex_unlock(&helper->lock); > + return 0; > + } > + result = format; > + } > + } > + mutex_unlock(&helper->lock); > + > + return result; > +} > + > +void xlnx_crtc_helper_init(struct xlnx_crtc_helper *helper) > +{ > + INIT_LIST_HEAD(&helper->xlnx_crtcs); > + mutex_init(&helper->lock); > +} > + > +void xlnx_crtc_helper_fini(struct xlnx_crtc_helper *helper) > +{ > + if (WARN_ON(!list_empty(&helper->xlnx_crtcs))) > + return; I wouldn't return early, we're likely screwed anyway if this happens, so I think you can as well destroy the mutex. > + > + mutex_destroy(&helper->lock); > +} > + > +void xlnx_crtc_register(struct drm_device *drm, struct xlnx_crtc *crtc) > +{ > + struct xlnx_crtc_helper *helper = xlnx_get_crtc_helper(drm); Do we really need xlnx_get_crtc_helper() ? Can't this function access xlnx_drm directly ? I understand you may not want to expose the internals of xlnx_drm to the xlnx_crtc implementations, but I don't see a reason not to expose it to xlnx_crtc.c. > + > + mutex_lock(&helper->lock); > + list_add_tail(&crtc->list, &helper->xlnx_crtcs); > + mutex_unlock(&helper->lock); > +} > +EXPORT_SYMBOL_GPL(xlnx_crtc_register); > + > +void xlnx_crtc_unregister(struct drm_device *drm, struct xlnx_crtc *crtc) > +{ > + struct xlnx_crtc_helper *helper = xlnx_get_crtc_helper(drm); > + > + mutex_lock(&helper->lock); > + list_del(&crtc->list); > + mutex_unlock(&helper->lock); > +} > +EXPORT_SYMBOL_GPL(xlnx_crtc_unregister); > diff --git a/drivers/gpu/drm/xlnx/xlnx_crtc.h b/drivers/gpu/drm/xlnx/xlnx_crtc.h > new file mode 100644 > index 0000000..a6b5f59 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/xlnx_crtc.h > @@ -0,0 +1,83 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Xilinx DRM crtc header > + * > + * Copyright (C) 2017 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#ifndef _XLNX_CRTC_H_ > +#define _XLNX_CRTC_H_ > + > +#include <drm/drm_crtc.h> > +#include <linux/list.h> > +#include <linux/mutex.h> > + > +struct drm_device; > +struct xlnx_crtc; > + > +/** > + * struct xlnx_crtc_ops - Xilinx CRTC operations > + * @get_align: Get the alignment requirement of CRTC device > + * @get_dma_mask: Get the dma mask of CRTC device > + * @get_max_width: Get the maximum supported width > + * @get_max_height: Get the maximum supported height > + * @get_format: Get the current format of CRTC device "current format" seems to imply that the format can change, while I don't think you support this. Is that correct ? If so I would make that clear in the field description. > + */ > +struct xlnx_crtc_ops { > + unsigned int (*get_align)(struct xlnx_crtc *crtc); > + u64 (*get_dma_mask)(struct xlnx_crtc *crtc); > + int (*get_max_width)(struct xlnx_crtc *crtc); > + int (*get_max_height)(struct xlnx_crtc *crtc); > + u32 (*get_format)(struct xlnx_crtc *crtc); Couldn't we replace all those operations with corresponding integer fields in struct xlnx_crtc ? They seem to all be fixed. > +}; > + > +/** > + * struct xlnx_crtc - Xilinx CRTC device > + * @crtc: DRM CRTC device > + * @list: list node for Xilinx CRTC device list > + * @ops: Xilinx CRTC ops > + */ > +struct xlnx_crtc { > + struct drm_crtc crtc; > + struct list_head list; > + const struct xlnx_crtc_ops *ops; > +}; > + > +static inline struct xlnx_crtc *to_xlnx_crtc(struct drm_crtc *crtc) > +{ > + return container_of(crtc, struct xlnx_crtc, crtc); > +} > + > +/* > + * Helper functions: used within Xlnx DRM > + */ > + > +/** > + * struct xlnx_crtc_helper - Xilinx CRTC helper > + * @xlnx_crtcs: list of Xilinx CRTC devices > + * @lock: lock to protect @xlnx_crtcs > + */ > +struct xlnx_crtc_helper { > + struct list_head xlnx_crtcs; > + struct mutex lock; /* lock for @xlnx_crtcs */ > +}; If you access the internals of xlnx_drm in xlnx_crtc.c as advised above, you can inline the two fields in struct xlnx_drm and remove this structure. I think it will simplify the code. > +unsigned int xlnx_crtc_helper_get_align(struct xlnx_crtc_helper *helper); > +u64 xlnx_crtc_helper_get_dma_mask(struct xlnx_crtc_helper *helper); > +int xlnx_crtc_helper_get_max_width(struct xlnx_crtc_helper *helper); > +int xlnx_crtc_helper_get_max_height(struct xlnx_crtc_helper *helper); > +u32 xlnx_crtc_helper_get_format(struct xlnx_crtc_helper *helper); > + > +void xlnx_crtc_helper_init(struct xlnx_crtc_helper *helper); > +void xlnx_crtc_helper_fini(struct xlnx_crtc_helper *helper); > + > +/* > + * CRTC registration: used by other sub-driver modules > + */ > + > +void xlnx_crtc_register(struct drm_device *drm, struct xlnx_crtc *crtc); > +void xlnx_crtc_unregister(struct drm_device *drm, struct xlnx_crtc *crtc); > + > +#endif /* _XLNX_CRTC_H_ */ > diff --git a/drivers/gpu/drm/xlnx/xlnx_drv.c b/drivers/gpu/drm/xlnx/xlnx_drv.c > new file mode 100644 > index 0000000..5ad2dc2 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/xlnx_drv.c > @@ -0,0 +1,433 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Xilinx DRM KMS Driver > + * > + * Copyright (C) 2013 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_of.h> > + > +#include <linux/component.h> > +#include <linux/device.h> > +#include <linux/dma-buf.h> > +#include <linux/module.h> > +#include <linux/of_graph.h> > + > +#include "xlnx_crtc.h" > +#include "xlnx_fb.h" > +#include "xlnx_gem.h" > + > +#define DRIVER_NAME "xlnx" > +#define DRIVER_DESC "Xilinx DRM KMS Driver" > +#define DRIVER_DATE "20130509" > +#define DRIVER_MAJOR 1 > +#define DRIVER_MINOR 0 > + > +/** > + * struct xlnx_drm - Xilinx DRM private data > + * @drm: DRM device > + * @crtc_helper: Helper to access Xilinx CRTCs > + * @fb: DRM fb helper > + * @master: logical master device for pipeline > + * @suspend_state: atomic state for suspend / resume > + */ > +struct xlnx_drm { > + struct drm_device *drm; > + struct xlnx_crtc_helper crtc_helper; > + struct drm_fb_helper *fb; > + struct device *master; > + struct drm_atomic_state *suspend_state; > +}; > + > +/** > + * xlnx_get_crtc_helper - Return the crtc helper instance > + * @drm: DRM device > + * > + * Return: the crtc helper instance > + */ > +struct xlnx_crtc_helper *xlnx_get_crtc_helper(struct drm_device *drm) > +{ > + struct xlnx_drm *xlnx_drm = drm->dev_private; > + > + return &xlnx_drm->crtc_helper; > +} > + > +/** > + * xlnx_get_align - Return the align requirement through CRTC helper > + * @drm: DRM device > + * > + * Return: the alignment requirement > + */ > +unsigned int xlnx_get_align(struct drm_device *drm) This is a very generic name, would it make sense to rename the function to xlnx_drm_get_align() to avoid name collisions ? It could make sense to rename other functions accordingly to standardize on the xlnx_drm_ prefix (at least when there's no other prefix such as xlnx_crtc_). > +{ > + struct xlnx_drm *xlnx_drm = drm->dev_private; > + > + return xlnx_crtc_helper_get_align(&xlnx_drm->crtc_helper); > +} > + > +static void xlnx_output_poll_changed(struct drm_device *drm) > +{ > + struct xlnx_drm *xlnx_drm = drm->dev_private; > + > + if (xlnx_drm->fb) > + drm_fb_helper_hotplug_event(xlnx_drm->fb); > +} > + > +static const struct drm_mode_config_funcs xlnx_mode_config_funcs = { > + .fb_create = xlnx_fb_create, > + .output_poll_changed = xlnx_output_poll_changed, > + .atomic_check = drm_atomic_helper_check, > + .atomic_commit = drm_atomic_helper_commit, > +}; > + > +static void xlnx_mode_config_init(struct drm_device *drm) > +{ > + struct xlnx_drm *xlnx_drm = drm->dev_private; > + struct xlnx_crtc_helper *crtc_helper = &xlnx_drm->crtc_helper; > + > + drm->mode_config.min_width = 0; > + drm->mode_config.min_height = 0; > + drm->mode_config.max_width = > + xlnx_crtc_helper_get_max_width(crtc_helper); > + drm->mode_config.max_height = > + xlnx_crtc_helper_get_max_height(crtc_helper); This restricts the framebuffer size to the maximum CRTC size, which prevents creating a single framebuffer that spans multiple CRTCs. Isn't that a problem ? > +} > + > +static void xlnx_lastclose(struct drm_device *drm) > +{ > + struct xlnx_drm *xlnx_drm = drm->dev_private; > + > + if (xlnx_drm->fb) > + drm_fb_helper_restore_fbdev_mode_unlocked(xlnx_drm->fb); > +} > + > +static const struct file_operations xlnx_fops = { > + .owner = THIS_MODULE, > + .open = drm_open, > + .release = drm_release, > + .unlocked_ioctl = drm_ioctl, > + .mmap = drm_gem_cma_mmap, > + .poll = drm_poll, > + .read = drm_read, > +#ifdef CONFIG_COMPAT > + .compat_ioctl = drm_compat_ioctl, > +#endif > + .llseek = noop_llseek, > +}; > + > +static struct drm_driver xlnx_drm_driver = { > + .driver_features = DRIVER_MODESET | DRIVER_GEM | > + DRIVER_ATOMIC | DRIVER_PRIME, > + .lastclose = xlnx_lastclose, > + > + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, > + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, > + .gem_prime_export = drm_gem_prime_export, > + .gem_prime_import = drm_gem_prime_import, > + .gem_prime_get_sg_table = drm_gem_cma_prime_get_sg_table, > + .gem_prime_import_sg_table = drm_gem_cma_prime_import_sg_table, > + .gem_prime_vmap = drm_gem_cma_prime_vmap, > + .gem_prime_vunmap = drm_gem_cma_prime_vunmap, > + .gem_prime_mmap = drm_gem_cma_prime_mmap, > + .gem_free_object = drm_gem_cma_free_object, > + .gem_vm_ops = &drm_gem_cma_vm_ops, > + .dumb_create = xlnx_gem_cma_dumb_create, > + .dumb_destroy = drm_gem_dumb_destroy, > + > + .fops = &xlnx_fops, > + > + .name = DRIVER_NAME, > + .desc = DRIVER_DESC, > + .date = DRIVER_DATE, > + .major = DRIVER_MAJOR, > + .minor = DRIVER_MINOR, > +}; > + > +static int xlnx_bind(struct device *master) > +{ > + struct xlnx_drm *xlnx_drm; > + struct drm_device *drm; > + const struct drm_format_info *info; > + int ret; > + u32 format; > + > + drm = drm_dev_alloc(&xlnx_drm_driver, master->parent); > + if (IS_ERR(drm)) > + return PTR_ERR(drm); > + > + xlnx_drm = devm_kzalloc(drm->dev, sizeof(*xlnx_drm), GFP_KERNEL); > + if (!xlnx_drm) { > + ret = -ENOMEM; > + goto err_drm; > + } > + > + drm_mode_config_init(drm); > + drm->mode_config.funcs = &xlnx_mode_config_funcs; > + > + ret = drm_vblank_init(drm, 1); > + if (ret) { > + dev_err(master->parent, "failed to initialize vblank\n"); > + goto err_xlnx_drm; > + } > + > + drm->irq_enabled = 1; > + drm->dev_private = xlnx_drm; > + xlnx_drm->drm = drm; > + xlnx_drm->master = master; > + drm_kms_helper_poll_init(drm); > + dev_set_drvdata(master, xlnx_drm); > + > + xlnx_crtc_helper_init(&xlnx_drm->crtc_helper); > + > + ret = component_bind_all(master, drm); > + if (ret) > + goto err_crtc; > + > + xlnx_mode_config_init(drm); > + drm_mode_config_reset(drm); > + dma_set_mask(drm->dev, > + xlnx_crtc_helper_get_dma_mask(&xlnx_drm->crtc_helper)); > + > + format = xlnx_crtc_helper_get_format(&xlnx_drm->crtc_helper); > + info = drm_format_info(format); > + if (info && info->depth && info->cpp[0]) { > + unsigned int align; > + > + align = xlnx_crtc_helper_get_align(&xlnx_drm->crtc_helper); > + xlnx_drm->fb = xlnx_fb_init(drm, info->cpp[0] * 8, 1, align); > + if (IS_ERR(xlnx_drm->fb)) { > + dev_err(master->parent, > + "failed to initialize drm fb\n"); > + xlnx_drm->fb = NULL; > + } > + } else { > + /* fbdev emulation is optional */ > + dev_info(master->parent, "fbdev is not initialized\n"); > + } > + > + ret = drm_dev_register(drm, 0); > + if (ret < 0) > + goto err_fb; > + > + return 0; > + > +err_fb: > + if (xlnx_drm->fb) > + xlnx_fb_fini(xlnx_drm->fb); > + component_unbind_all(drm->dev, drm); > +err_crtc: > + xlnx_crtc_helper_fini(&xlnx_drm->crtc_helper); > +err_xlnx_drm: > + drm_mode_config_cleanup(drm); > +err_drm: > + drm_dev_unref(drm); > + return ret; > +} > + > +static void xlnx_unbind(struct device *master) > +{ > + struct xlnx_drm *xlnx_drm = dev_get_drvdata(master); > + struct drm_device *drm = xlnx_drm->drm; > + > + drm_dev_unregister(drm); > + if (xlnx_drm->fb) > + xlnx_fb_fini(xlnx_drm->fb); > + component_unbind_all(master, drm); > + xlnx_crtc_helper_fini(&xlnx_drm->crtc_helper); > + drm_kms_helper_poll_fini(drm); > + drm_mode_config_cleanup(drm); > + drm_dev_unref(drm); > +} > + > +static const struct component_master_ops xlnx_master_ops = { > + .bind = xlnx_bind, > + .unbind = xlnx_unbind, > +}; > + > +static int xlnx_compare_of(struct device *dev, void *data) > +{ > + return dev->of_node == data; > +} > + > +static int xlnx_probe(struct device *master_dev) > +{ > + struct device *dev = master_dev->parent; > + struct component_match *match = NULL; > + > + if (!dev->of_node) > + return -EINVAL; > + > + component_match_add(master_dev, &match, xlnx_compare_of, dev->of_node); > + > + return component_master_add_with_match(master_dev, &xlnx_master_ops, > + match); I'm not sure to understand what you're doing here. You're registering a component master for the xlnx-drm device with a single component match, for the parent of the xlnx-drm device. The xlnx-drm device is registered with a call to xlnx_drm_pipeline_init(), which is this series is called from zynqmp_dpsub_probe() only, and you register the corresponding component in the same function. This seems very convoluted to me, can't this be implemented in a much simpler way ? I think we could just initialize the zynqmp_disp and zynqmp_dp synchronously from the zynqmp_dpsub probe function without needing the component framework at all. Do you envision the zynqmp_disp and zynqmp_dp parts to be reused in other display pipelines, or will they always be combined together in zynqmp_dpsub ? I would also say that if the component is a parent of the component master, you're likely doing something wrong. Component are supposed to represent pieces of the whole DRM device, and as such should be children of the master, or sometimes possibly unrelated devices. > +} > + > +static int xlnx_remove(struct device *dev) > +{ > + component_master_del(dev, &xlnx_master_ops); > + return 0; > +} > + > +static void xlnx_shutdown(struct device *dev) > +{ > + component_master_del(dev, &xlnx_master_ops); > +} > + > +static int __maybe_unused xlnx_pm_suspend(struct device *dev) > +{ > + struct xlnx_drm *xlnx_drm = dev_get_drvdata(dev); > + struct drm_device *drm = xlnx_drm->drm; > + > + drm_kms_helper_poll_disable(drm); > + > + xlnx_drm->suspend_state = drm_atomic_helper_suspend(drm); > + if (IS_ERR(xlnx_drm->suspend_state)) { > + drm_kms_helper_poll_enable(drm); > + return PTR_ERR(xlnx_drm->suspend_state); > + } You can use the drm_mode_config_helper_suspend() and drm_mode_config_helper_resume() functions, removing the need to track suspend_state manually in xlnx_drm. > + > + return 0; > +} > + > +static int __maybe_unused xlnx_pm_resume(struct device *dev) > +{ > + struct xlnx_drm *xlnx_drm = dev_get_drvdata(dev); > + struct drm_device *drm = xlnx_drm->drm; > + > + drm_atomic_helper_resume(drm, xlnx_drm->suspend_state); > + drm_kms_helper_poll_enable(drm); > + > + return 0; > +} > + > +static const struct dev_pm_ops xlnx_pm_ops = { > + SET_SYSTEM_SLEEP_PM_OPS(xlnx_pm_suspend, xlnx_pm_resume) > +}; > + > +static int xlnx_drv_bus_match(struct device *dev, struct device_driver *drv) > +{ > + return !strncmp(dev_name(dev), drv->name, strlen(drv->name)); > +} > + > +struct bus_type xlnx_driver_bus_type = { > + .name = "xlnx-drm-bus", > + .match = &xlnx_drv_bus_match, > +}; Why do you need a custom bus ? Can't you just use platform devices with a platform_driver and remove all the code below ? Is there a reason not to do so ? > +static struct device_driver xlnx_driver = { > + .probe = xlnx_probe, > + .remove = xlnx_remove, > + .shutdown = xlnx_shutdown, > + .name = "xlnx-drm", > + .pm = &xlnx_pm_ops, > + .bus = &xlnx_driver_bus_type, > + .owner = THIS_MODULE, > +}; > + > +/* bitmap for master id */ > +static u32 xlnx_master_ids = GENMASK(31, 0); > + > +static void xlnx_master_release(struct device *dev) > +{ > + kfree(dev); > +} > + > +/** > + * xlnx_drm_pipeline_init - Initialize the drm pipeline for the device > + * @dev: The device to initialize the drm pipeline device > + * > + * This function initializes the drm pipeline device, struct drm_device, > + * on @dev by creating a logical master device. The logical device acts > + * as a master device to bind slave devices and represents the entire > + * pipeline. > + * The logical master uses the port bindings of the calling device to > + * figure out the pipeline topology. > + * > + * Return: the logical master device if the drm device is initialized > + * on @dev. Error code otherwise. > + */ > +struct device *xlnx_drm_pipeline_init(struct device *dev) > +{ > + struct device *master; > + int id, ret; > + > + id = ffs(xlnx_master_ids); > + if (!id) > + return ERR_PTR(-ENOSPC); > + > + master = kzalloc(sizeof(*master), GFP_KERNEL); > + if (!master) > + return ERR_PTR(-ENOMEM); > + device_initialize(master); > + master->parent = dev; > + master->bus = &xlnx_driver_bus_type; > + master->release = xlnx_master_release; > + > + ret = dev_set_name(master, "xlnx-drm.%d", id); > + if (ret) > + goto err_kfree; > + > + ret = device_add(master); > + if (ret) > + goto err_kfree; > + > + xlnx_master_ids &= ~BIT(master->id); > + return master; > + > +err_kfree: > + kfree(master); > + return ERR_PTR(ret); > +} > +EXPORT_SYMBOL_GPL(xlnx_drm_pipeline_init); > + > +/** > + * xlnx_drm_pipeline_exit - Release the drm pipeline for the device > + * @master: The master pipeline device to release > + * > + * Release the logical pipeline device returned by xlnx_drm_pipeline_init(). > + */ > +void xlnx_drm_pipeline_exit(struct device *master) > +{ > + xlnx_master_ids |= BIT(master->id); > + device_unregister(master); > +} > +EXPORT_SYMBOL_GPL(xlnx_drm_pipeline_exit); > + > +static int __init xlnx_drm_drv_init(void) > +{ > + int ret; > + > + ret = bus_register(&xlnx_driver_bus_type); > + if (ret) > + return ret; > + > + ret = driver_register(&xlnx_driver); > + if (ret) { > + bus_unregister(&xlnx_driver_bus_type); > + return ret; > + } > + > + return 0; > +} > + > +static void __exit xlnx_drm_drv_exit(void) > +{ > + bus_unregister(&xlnx_driver_bus_type); > + driver_unregister(&xlnx_driver); > +} > + > +module_init(xlnx_drm_drv_init); > +module_exit(xlnx_drm_drv_exit); > + > +MODULE_AUTHOR("Xilinx, Inc."); > +MODULE_DESCRIPTION("Xilinx DRM KMS Driver"); > +MODULE_LICENSE("GPL v2"); > diff --git a/drivers/gpu/drm/xlnx/xlnx_drv.h b/drivers/gpu/drm/xlnx/xlnx_drv.h > new file mode 100644 > index 0000000..b38ff2a > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/xlnx_drv.h > @@ -0,0 +1,23 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Xilinx DRM KMS Header for Xilinx > + * > + * Copyright (C) 2013 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyunk@xilinx.com> > + */ > + > +#ifndef _XLNX_DRV_H_ > +#define _XLNX_DRV_H_ > + > +struct device; > +struct drm_device; > +struct xlnx_crtc_helper; > + > +struct device *xlnx_drm_pipeline_init(struct device *parent); > +void xlnx_drm_pipeline_exit(struct device *pipeline); > + > +unsigned int xlnx_get_align(struct drm_device *drm); > +struct xlnx_crtc_helper *xlnx_get_crtc_helper(struct drm_device *drm); > + > +#endif /* _XLNX_DRV_H_ */ > diff --git a/drivers/gpu/drm/xlnx/xlnx_fb.c b/drivers/gpu/drm/xlnx/xlnx_fb.c > new file mode 100644 > index 0000000..8e8ab14 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/xlnx_fb.c > @@ -0,0 +1,249 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Xilinx DRM KMS Framebuffer helper > + * > + * Copyright (C) 2015 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + * > + * Based on drm_fb_cma_helper.c > + * > + * Copyright (C) 2012 Analog Device Inc. > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_fb_helper.h> > +#include <drm/drm_gem_cma_helper.h> > +#include <drm/drm_gem_framebuffer_helper.h> > + > +#include "xlnx_drv.h" > +#include "xlnx_fb.h" > + > +#define XLNX_MAX_PLANES 4 This isn't used. > +struct xlnx_fbdev { > + struct drm_fb_helper fb_helper; > + struct drm_framebuffer *fb; > + unsigned int align; > +}; > + > +static inline struct xlnx_fbdev *to_fbdev(struct drm_fb_helper *fb_helper) > +{ > + return container_of(fb_helper, struct xlnx_fbdev, fb_helper); > +} > + > +static const struct drm_framebuffer_funcs xlnx_fb_funcs = { > + .destroy = drm_gem_fb_destroy, > + .create_handle = drm_gem_fb_create_handle, > +}; > + > +static struct fb_ops xlnx_fbdev_ops = { > + .owner = THIS_MODULE, > + .fb_fillrect = sys_fillrect, > + .fb_copyarea = sys_copyarea, > + .fb_imageblit = sys_imageblit, > + DRM_FB_HELPER_DEFAULT_OPS, > +}; > + > +/** > + * xlnx_fbdev_create - Create the fbdev with a framebuffer > + * @fb_helper: fb helper structure > + * @size: framebuffer size info > + * > + * This function is based on drm_fbdev_cma_create(). The fbdev compatibility layer has been improved in DRM, is there a way you could use drm_fbdev_generic_setup() instead of reimplementing fbdev create yourself ? > + * Return: 0 if successful, or the error code. > + */ > +static int xlnx_fbdev_create(struct drm_fb_helper *fb_helper, > + struct drm_fb_helper_surface_size *size) > +{ > + struct xlnx_fbdev *fbdev = to_fbdev(fb_helper); > + struct drm_device *drm = fb_helper->dev; > + struct drm_gem_cma_object *obj; > + struct drm_framebuffer *fb; > + unsigned int bytes_per_pixel; > + unsigned long offset; > + struct fb_info *fbi; > + size_t bytes; > + int ret; > + > + dev_dbg(drm->dev, "surface width(%d), height(%d) and bpp(%d)\n", > + size->surface_width, size->surface_height, size->surface_bpp); > + > + bytes_per_pixel = DIV_ROUND_UP(size->surface_bpp, 8); > + bytes = ALIGN(size->surface_width * bytes_per_pixel, fbdev->align); > + bytes *= size->surface_height; > + > + obj = drm_gem_cma_create(drm, bytes); > + if (IS_ERR(obj)) > + return PTR_ERR(obj); > + > + fbi = framebuffer_alloc(0, drm->dev); > + if (!fbi) { > + dev_err(drm->dev, "Failed to allocate framebuffer info.\n"); > + ret = -ENOMEM; > + goto err_drm_gem_cma_free_object; > + } > + > + fbdev->fb = drm_gem_fbdev_fb_create(drm, size, fbdev->align, &obj->base, > + &xlnx_fb_funcs); As xlnx_fb_funcs is identical to drm_gem_fb_funcs you can pass NULL as the last parameter to this function. > + if (IS_ERR(fbdev->fb)) { > + dev_err(drm->dev, "Failed to allocate DRM framebuffer.\n"); > + ret = PTR_ERR(fbdev->fb); > + goto err_framebuffer_release; > + } > + > + fb = fbdev->fb; > + fb_helper->fb = fb; > + fb_helper->fbdev = fbi; > + fbi->par = fb_helper; > + fbi->flags = FBINFO_FLAG_DEFAULT; > + fbi->fbops = &xlnx_fbdev_ops; > + > + ret = fb_alloc_cmap(&fbi->cmap, 256, 0); > + if (ret) { > + dev_err(drm->dev, "Failed to allocate color map.\n"); > + goto err_fb_destroy; > + } > + > + drm_fb_helper_fill_fix(fbi, fb->pitches[0], fb->format->depth); > + drm_fb_helper_fill_var(fbi, fb_helper, size->fb_width, size->fb_height); > + > + offset = fbi->var.xoffset * bytes_per_pixel; > + offset += fbi->var.yoffset * fb->pitches[0]; > + > + drm->mode_config.fb_base = (resource_size_t)obj->paddr; > + fbi->screen_base = (char __iomem *)(obj->vaddr + offset); > + fbi->fix.smem_start = (unsigned long)(obj->paddr + offset); > + fbi->screen_size = bytes; > + fbi->fix.smem_len = bytes; > + > + return 0; > + > +err_fb_destroy: > + drm_framebuffer_unregister_private(fb); > + drm_gem_fb_destroy(fb); > +err_framebuffer_release: > + framebuffer_release(fbi); > +err_drm_gem_cma_free_object: > + drm_gem_cma_free_object(&obj->base); > + return ret; > +} > + > +static const struct drm_fb_helper_funcs xlnx_fb_helper_funcs = { > + .fb_probe = xlnx_fbdev_create, > +}; > + > +/** > + * xlnx_fb_init - Allocate and initializes the Xilinx framebuffer Unless I'm mistaken this function deals with fbdev compatibility, not drm_framuffer. I would s/fb/fbdev/ for clarity. Ideally the function should be removed completely and the driver should use drm_fbdev_generic_setup() instead. > + * @drm: DRM device > + * @preferred_bpp: preferred bits per pixel for the device > + * @max_conn_count: maximum number of connectors > + * @align: alignment value for pitch > + * > + * This function is based on drm_fbdev_cma_init(). > + * > + * Return: a newly allocated drm_fb_helper struct or a ERR_PTR. > + */ > +struct drm_fb_helper * > +xlnx_fb_init(struct drm_device *drm, int preferred_bpp, > + unsigned int max_conn_count, unsigned int align) > +{ > + struct xlnx_fbdev *fbdev; > + struct drm_fb_helper *fb_helper; > + int ret; > + > + fbdev = kzalloc(sizeof(*fbdev), GFP_KERNEL); > + if (!fbdev) > + return ERR_PTR(-ENOMEM); > + > + fbdev->align = align; > + fb_helper = &fbdev->fb_helper; > + drm_fb_helper_prepare(drm, fb_helper, &xlnx_fb_helper_funcs); > + > + ret = drm_fb_helper_init(drm, fb_helper, max_conn_count); > + if (ret < 0) { > + dev_err(drm->dev, "Failed to initialize drm fb helper.\n"); > + goto err_free; > + } > + > + ret = drm_fb_helper_single_add_all_connectors(fb_helper); > + if (ret < 0) { > + dev_err(drm->dev, "Failed to add connectors.\n"); > + goto err_drm_fb_helper_fini; > + } > + > + ret = drm_fb_helper_initial_config(fb_helper, preferred_bpp); > + if (ret < 0) { > + dev_err(drm->dev, "Failed to set initial hw configuration.\n"); > + goto err_drm_fb_helper_fini; > + } > + > + return fb_helper; > + > +err_drm_fb_helper_fini: > + drm_fb_helper_fini(fb_helper); > +err_free: > + kfree(fbdev); > + return ERR_PTR(ret); > +} > + > +/** > + * xlnx_fbdev_defio_fini - Free the defio fb > + * @fbi: fb_info struct > + * > + * This function is based on drm_fbdev_cma_defio_fini(). > + */ > +static void xlnx_fbdev_defio_fini(struct fb_info *fbi) > +{ > + if (!fbi->fbdefio) > + return; > + > + fb_deferred_io_cleanup(fbi); > + kfree(fbi->fbdefio); > + kfree(fbi->fbops); > +} > + > +/** > + * xlnx_fbdev_fini - Free the Xilinx framebuffer > + * @fb_helper: drm_fb_helper struct > + * > + * This function is based on drm_fbdev_cma_fini(). > + */ > +void xlnx_fb_fini(struct drm_fb_helper *fb_helper) > +{ > + struct xlnx_fbdev *fbdev = to_fbdev(fb_helper); > + > + drm_fb_helper_unregister_fbi(&fbdev->fb_helper); > + if (fbdev->fb_helper.fbdev) > + xlnx_fbdev_defio_fini(fbdev->fb_helper.fbdev); > + > + if (fbdev->fb_helper.fb) > + drm_framebuffer_remove(fbdev->fb_helper.fb); > + > + drm_fb_helper_fini(&fbdev->fb_helper); > + kfree(fbdev); > +} > + > +/** > + * xlnx_fb_create - (struct drm_mode_config_funcs *)->fb_create callback > + * @drm: DRM device > + * @file_priv: drm file private data > + * @mode_cmd: mode command for fb creation > + * > + * This functions creates a drm_framebuffer with xlnx_fb_funcs for given mode > + * @mode_cmd. This functions is intended to be used for the fb_create callback > + * function of drm_mode_config_funcs. I'd say "to be used as the drm_mode_config_funcs->fb_create() handler". > + * Return: a drm_framebuffer object if successful, or > + * ERR_PTR from drm_gem_fb_create_with_funcs(). > + */ > +struct drm_framebuffer * > +xlnx_fb_create(struct drm_device *drm, struct drm_file *file_priv, > + const struct drm_mode_fb_cmd2 *mode_cmd) > +{ > + return drm_gem_fb_create_with_funcs(drm, file_priv, mode_cmd, > + &xlnx_fb_funcs); > +} You can replace xlnx_fb_create() with drm_gem_fb_create() as xlnx_fb_funcs is identical to drm_gem_fb_funcs. Unless there's a reason that would prevent usage of drm_fbdev_generic_setup(), this file can be removed completely :-) The fb pointer in xlnx_drm could then be removed too. > diff --git a/drivers/gpu/drm/xlnx/xlnx_fb.h b/drivers/gpu/drm/xlnx/xlnx_fb.h > new file mode 100644 > index 0000000..e41738e > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/xlnx_fb.h > @@ -0,0 +1,27 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Xilinx DRM KMS Framebuffer helper header > + * > + * Copyright (C) 2015 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#ifndef _XLNX_FB_H_ > +#define _XLNX_FB_H_ > + > +struct drm_device; > +struct drm_file; > +struct drm_fb_helper; b comes before i in alphabetical order :-) > +struct drm_framebuffer; > +struct drm_mode_fb_cmd2; > + > +struct drm_framebuffer * > +xlnx_fb_create(struct drm_device *drm, struct drm_file *file_priv, > + const struct drm_mode_fb_cmd2 *mode_cmd); > +struct drm_fb_helper * > +xlnx_fb_init(struct drm_device *drm, int preferred_bpp, > + unsigned int max_conn_count, unsigned int align); > +void xlnx_fb_fini(struct drm_fb_helper *fb_helper); > + > +#endif /* _XLNX_FB_H_ */ > diff --git a/drivers/gpu/drm/xlnx/xlnx_gem.c b/drivers/gpu/drm/xlnx/xlnx_gem.c > new file mode 100644 > index 0000000..6748dc1 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/xlnx_gem.c > @@ -0,0 +1,36 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Xilinx DRM KMS GEM helper > + * > + * Copyright (C) 2015 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_gem_cma_helper.h> > + > +#include "xlnx_drv.h" > +#include "xlnx_gem.h" > + > +/* > + * xlnx_gem_cma_dumb_create - (struct drm_driver)->dumb_create callback > + * @file_priv: drm_file object > + * @drm: DRM object > + * @args: info for dumb scanout buffer creation > + * > + * This function is for dumb_create callback of drm_driver struct. Simply > + * it wraps around drm_gem_cma_dumb_create() and sets the pitch value > + * by retrieving the value from the device. This isn't entirely accurate, the function doesn't retrieve a value from the device. How about the following ? This function is the drm_driver.dumb_create() callback handler. It wraps the DRM GEM CMA helper implementation and computes the pitch based on the alignment constraints retrieved from the CRTC driver. > + * Return: The return value from drm_gem_cma_dumb_create() > + */ > +int xlnx_gem_cma_dumb_create(struct drm_file *file_priv, struct drm_device *drm, > + struct drm_mode_create_dumb *args) > +{ > + unsigned int pitch = DIV_ROUND_UP(args->width * args->bpp, 8); > + > + args->pitch = ALIGN(pitch, xlnx_get_align(drm)); > + > + return drm_gem_cma_dumb_create_internal(file_priv, drm, args); > +} -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v8 2/5] dt-bindings: display: xlnx: Add ZynqMP DP subsystem bindings 2018-07-08 2:05 [PATCH v8 0/5] Xilinx ZynqMP DisplayPort KMS driver Hyun Kwon 2018-07-08 2:05 ` [PATCH v8 1/5] drm: xlnx: Xilinx DRM KMS module Hyun Kwon @ 2018-07-08 2:05 ` Hyun Kwon 2019-02-17 23:33 ` Laurent Pinchart 2018-07-08 2:05 ` [PATCH v8 3/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DP subsystem display Hyun Kwon ` (2 subsequent siblings) 4 siblings, 1 reply; 10+ messages in thread From: Hyun Kwon @ 2018-07-08 2:05 UTC (permalink / raw) To: dri-devel, devicetree, Laurent Pinchart Cc: Daniel Vetter, Rob Herring, Michal Simek, Hyun Kwon This add a dt binding for ZynqMP DP subsystem. Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> Reviewed-by: Rob Herring <robh@kernel.org> --- v6 - Add more descriptions and references - Remove the description for child node v4 - Specify phy related descriptions - Specify dma related descriptions - Remove ports - Remove child nodes for layers - Update the example accordingly v2 - Group multiple ports under 'ports' - Replace linux specific terms with generic hardware descriptions --- --- .../bindings/display/xlnx/xlnx,zynqmp-dpsub.txt | 77 ++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt diff --git a/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt new file mode 100644 index 0000000..ec8a58a --- /dev/null +++ b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt @@ -0,0 +1,77 @@ +Xilinx ZynqMP DisplayPort subsystem +----------------------------------- + +The DisplayPort subsystem of Xilinx ZynqMP (Zynq UltraScale+ MPSoC) implements +the display and audio pipelines based on the DisplayPort v1.2 standard. +The subsystem includes multiple functional blocks as below: + + buffer manager <-> blender & mixer <-> DP Tx + +The buffer manager interacts with external interface such as DMA engines or +live streams. The blender and mixer blends the incoming video / audio streams +into single stream. The DP Tx converts and transmits the stream into DisplayPort +protocol through external phy. The subsystem supports 2 video and 2 audio +streams, and various pixel formats / depths up to 4K@30 resolution. + +Please refer to "Zynq UltraScale+ Device Technical Reference Manual" [UG1085] +for more details. + +Required properties: + +- compatible: Must be "xlnx,zynqmp-dpsub-1.7". + +- reg: Physical base address and length of the registers set for the device. +- reg-names: Must be "dp", "blend", "av_buf", and "aud" to map logical register + partitions. + +- interrupts: Interrupt number. +- interrupts-parent: phandle for interrupt controller. + +- clocks: phandles for axi, audio, non-live video, and live video clocks. + axi clock is required. Audio clock is optional. If not present, audio will + be disabled. One of non-live or live video clock should be present. +- clock-names: The identification strings are required. "aclk" for axi clock. + "dp_aud_clk" for audio clock. "dp_vtc_pixel_clk_in" for non-live video clock. + "dp_live_video_in_clk" for live video clock (clock from programmable logic). + +- phys: phandles for phy specifier. The number of lanes is configurable + between 1 and 2. The number of phandles should be 1 or 2. +- phy-names: The identifier strings. "dp-phy" followed by index, 0 or 1. + For single lane, only "dp-phy0" is required. For dual lane, both "dp-phy0" + and "dp-phy1" are required where "dp-phy0" is the primary lane. + +- power-domains: phandle for the corresponding power domain + +- dmas: phandles for DMA channels as defined in + Documentation/devicetree/bindings/dma/dma.txt. +- dma-names: The identifier strings are required. "gfx0" for graphics layer + dma channel. "vid" followed by index (0 - 2) for video layer dma channels. + +Example: + zynqmp-display-subsystem@fd4a0000 { + compatible = "xlnx,zynqmp-dpsub-1.7"; + reg = <0x0 0xfd4a0000 0x0 0x1000>, + <0x0 0xfd4aa000 0x0 0x1000>, + <0x0 0xfd4ab000 0x0 0x1000>, + <0x0 0xfd4ac000 0x0 0x1000>; + reg-names = "dp", "blend", "av_buf", "aud"; + interrupts = <0 119 4>; + interrupt-parent = <&gic>; + + clock-names = "dp_apb_clk", "dp_aud_clk", "dp_live_video_in_clk"; + clocks = <&dp_aclk>, <&clkc 17>, <&si570_1>; + + phys = <&lane1>, <&lane0>; + phy-names = "dp-phy0", "dp-phy1"; + + power-domains = <&pd_dp>; + + dma-names = "vid0", "vid1", "vid2", "gfx0"; + dmas = <&xlnx_dpdma 0>, + <&xlnx_dpdma 1>, + <&xlnx_dpdma 2>, + <&xlnx_dpdma 3>; + }; +}; + +[UG1085] https://www.xilinx.com/support/documentation/user_guides/ug1085-zynq-ultrascale-trm.pdf -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v8 2/5] dt-bindings: display: xlnx: Add ZynqMP DP subsystem bindings 2018-07-08 2:05 ` [PATCH v8 2/5] dt-bindings: display: xlnx: Add ZynqMP DP subsystem bindings Hyun Kwon @ 2019-02-17 23:33 ` Laurent Pinchart 0 siblings, 0 replies; 10+ messages in thread From: Laurent Pinchart @ 2019-02-17 23:33 UTC (permalink / raw) To: Hyun Kwon; +Cc: devicetree, Rob Herring, Michal Simek, dri-devel, Daniel Vetter Hi Hyun, Thank you for the patch. On Sat, Jul 07, 2018 at 07:05:35PM -0700, Hyun Kwon wrote: > This add a dt binding for ZynqMP DP subsystem. > > Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> > Reviewed-by: Rob Herring <robh@kernel.org> > --- > v6 > - Add more descriptions and references > - Remove the description for child node > v4 > - Specify phy related descriptions > - Specify dma related descriptions > - Remove ports > - Remove child nodes for layers > - Update the example accordingly > v2 > - Group multiple ports under 'ports' > - Replace linux specific terms with generic hardware descriptions > --- > --- > .../bindings/display/xlnx/xlnx,zynqmp-dpsub.txt | 77 ++++++++++++++++++++++ > 1 file changed, 77 insertions(+) > create mode 100644 Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt > > diff --git a/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt > new file mode 100644 > index 0000000..ec8a58a > --- /dev/null > +++ b/Documentation/devicetree/bindings/display/xlnx/xlnx,zynqmp-dpsub.txt > @@ -0,0 +1,77 @@ > +Xilinx ZynqMP DisplayPort subsystem > +----------------------------------- > + > +The DisplayPort subsystem of Xilinx ZynqMP (Zynq UltraScale+ MPSoC) implements > +the display and audio pipelines based on the DisplayPort v1.2 standard. > +The subsystem includes multiple functional blocks as below: > + > + buffer manager <-> blender & mixer <-> DP Tx Shouldn't it be -> instead of <-> ? I assume the data flow is from buffer to the DP Tx. > + > +The buffer manager interacts with external interface such as DMA engines or > +live streams. The blender and mixer blends the incoming video / audio streams > +into single stream. The DP Tx converts and transmits the stream into DisplayPort > +protocol through external phy. The subsystem supports 2 video and 2 audio > +streams, and various pixel formats / depths up to 4K@30 resolution. > + > +Please refer to "Zynq UltraScale+ Device Technical Reference Manual" [UG1085] > +for more details. > + > +Required properties: > + > +- compatible: Must be "xlnx,zynqmp-dpsub-1.7". > + > +- reg: Physical base address and length of the registers set for the device. Nitpicking, I'd write "registers sets" as there are four of them according to reg-names. > +- reg-names: Must be "dp", "blend", "av_buf", and "aud" to map logical register > + partitions. > + > +- interrupts: Interrupt number. > +- interrupts-parent: phandle for interrupt controller. > + > +- clocks: phandles for axi, audio, non-live video, and live video clocks. > + axi clock is required. Audio clock is optional. If not present, audio will > + be disabled. One of non-live or live video clock should be present. > +- clock-names: The identification strings are required. "aclk" for axi clock. > + "dp_aud_clk" for audio clock. "dp_vtc_pixel_clk_in" for non-live video clock. > + "dp_live_video_in_clk" for live video clock (clock from programmable logic). > + > +- phys: phandles for phy specifier. The number of lanes is configurable > + between 1 and 2. The number of phandles should be 1 or 2. > +- phy-names: The identifier strings. "dp-phy" followed by index, 0 or 1. > + For single lane, only "dp-phy0" is required. For dual lane, both "dp-phy0" > + and "dp-phy1" are required where "dp-phy0" is the primary lane. > + > +- power-domains: phandle for the corresponding power domain > + > +- dmas: phandles for DMA channels as defined in > + Documentation/devicetree/bindings/dma/dma.txt. > +- dma-names: The identifier strings are required. "gfx0" for graphics layer > + dma channel. "vid" followed by index (0 - 2) for video layer dma channels. You mention above that the blender support two video streams, but you define four possible DMA engines. How does this work ? > + > +Example: > + zynqmp-display-subsystem@fd4a0000 { > + compatible = "xlnx,zynqmp-dpsub-1.7"; > + reg = <0x0 0xfd4a0000 0x0 0x1000>, > + <0x0 0xfd4aa000 0x0 0x1000>, > + <0x0 0xfd4ab000 0x0 0x1000>, > + <0x0 0xfd4ac000 0x0 0x1000>; > + reg-names = "dp", "blend", "av_buf", "aud"; > + interrupts = <0 119 4>; > + interrupt-parent = <&gic>; > + > + clock-names = "dp_apb_clk", "dp_aud_clk", "dp_live_video_in_clk"; > + clocks = <&dp_aclk>, <&clkc 17>, <&si570_1>; > + > + phys = <&lane1>, <&lane0>; > + phy-names = "dp-phy0", "dp-phy1"; > + > + power-domains = <&pd_dp>; > + > + dma-names = "vid0", "vid1", "vid2", "gfx0"; > + dmas = <&xlnx_dpdma 0>, > + <&xlnx_dpdma 1>, > + <&xlnx_dpdma 2>, > + <&xlnx_dpdma 3>; > + }; > +}; > + > +[UG1085] https://www.xilinx.com/support/documentation/user_guides/ug1085-zynq-ultrascale-trm.pdf -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v8 3/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DP subsystem display 2018-07-08 2:05 [PATCH v8 0/5] Xilinx ZynqMP DisplayPort KMS driver Hyun Kwon 2018-07-08 2:05 ` [PATCH v8 1/5] drm: xlnx: Xilinx DRM KMS module Hyun Kwon 2018-07-08 2:05 ` [PATCH v8 2/5] dt-bindings: display: xlnx: Add ZynqMP DP subsystem bindings Hyun Kwon @ 2018-07-08 2:05 ` Hyun Kwon 2019-02-17 23:34 ` Laurent Pinchart 2018-07-08 2:05 ` [PATCH v8 4/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DisplayPort Hyun Kwon 2018-07-08 2:05 ` [PATCH v8 5/5] drm: xlnx: ZynqMP DP subsystem DRM KMS driver Hyun Kwon 4 siblings, 1 reply; 10+ messages in thread From: Hyun Kwon @ 2018-07-08 2:05 UTC (permalink / raw) To: dri-devel, devicetree, Laurent Pinchart Cc: Daniel Vetter, Rob Herring, Michal Simek, Hyun Kwon Xilinx ZynqMP has a hardened display pipeline. The pipeline can be logically partitioned into 2 parts: display controller and DisplayPort encoder / transmitter. This driver handles the display controller part of the pipeline that handles buffer management and blending. Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- v8 - Added a module param to specify the initial format for fbdev - Don't update the plane for the same fb v7 - Disable a plane when the fb format changes - Update planes asynchronously in the legacy set plane entry v6 - Use the new crtc op struct - Clean up the duplicated license paragraphs - Declare function pointer structures as static const - Do complete forward declaration in headers v4 - Use drm_crtc_funcs for vblank - Remove child nodes for layer v3 - Fix a small typo v2 - Use drm_fb_cma_get_gem_addr() - Use drm_crtc_arm_vblank_event() - Split drm properties into a separate patch - Remove dummy funcs - Don't add offset as it's already done by a new helper - Change the SPDX identifier format - Minor change of a commit message --- --- drivers/gpu/drm/xlnx/zynqmp_disp.c | 2777 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/xlnx/zynqmp_disp.h | 29 + 2 files changed, 2806 insertions(+) create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.c create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.h diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c new file mode 100644 index 0000000..de5c4a2 --- /dev/null +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c @@ -0,0 +1,2777 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ZynqMP Display Controller Driver + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#include <drm/drmP.h> +#include <drm/drm_atomic.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_fourcc.h> +#include <drm/drm_plane_helper.h> + +#include <linux/clk.h> +#include <linux/device.h> +#include <linux/dmaengine.h> +#include <linux/interrupt.h> +#include <linux/irqreturn.h> +#include <linux/list.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/of.h> +#include <linux/of_dma.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/spinlock.h> +#include <linux/uaccess.h> + +#include "xlnx_crtc.h" +#include "xlnx_fb.h" +#include "zynqmp_disp.h" +#include "zynqmp_dp.h" +#include "zynqmp_dpsub.h" + +/* + * Overview + * -------- + * + * The display part of ZynqMP DP subsystem. Internally, the device + * is partitioned into 3 blocks: AV buffer manager, Blender, Audio. + * The driver creates the DRM crtc and plane objectes and maps the DRM + * interface into those 3 blocks. In high level, the driver is layered + * in the following way: + * + * zynqmp_disp_crtc & zynqmp_disp_plane + * |->zynqmp_disp + * |->zynqmp_disp_aud + * |->zynqmp_disp_blend + * |->zynqmp_disp_av_buf + * + * The driver APIs are used externally by + * - zynqmp_dpsub: Top level ZynqMP DP subsystem driver + * - zynqmp_dp: ZynqMP DP driver + * - xlnx_crtc: Xilinx DRM specific crtc functions + */ + +/* The default value is ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565 */ +static uint zynqmp_disp_gfx_init_fmt; +module_param_named(gfx_init_fmt, zynqmp_disp_gfx_init_fmt, uint, 0444); +MODULE_PARM_DESC(gfx_init_fmt, "The initial format of the graphics layer\n" + "\t\t0 = rgb565 (default)\n" + "\t\t1 = rgb888\n" + "\t\t2 = argb8888\n"); +/* These value should be mapped to index of av_buf_gfx_fmts[] */ +#define ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565 10 +#define ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB888 5 +#define ZYNQMP_DISP_AV_BUF_GFX_FMT_ARGB8888 1 +static const u32 zynqmp_disp_gfx_init_fmts[] = { + ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565, + ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB888, + ZYNQMP_DISP_AV_BUF_GFX_FMT_ARGB8888, +}; + +/* Blender registers */ +#define ZYNQMP_DISP_V_BLEND_BG_CLR_0 0x0 +#define ZYNQMP_DISP_V_BLEND_BG_CLR_1 0x4 +#define ZYNQMP_DISP_V_BLEND_BG_CLR_2 0x8 +#define ZYNQMP_DISP_V_BLEND_BG_MAX 0xfff +#define ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA 0xc +#define ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA_MASK 0x1fe +#define ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA_MAX 0xff +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT 0x14 +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_RGB 0x0 +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR444 0x1 +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR422 0x2 +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YONLY 0x3 +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_XVYCC 0x4 +#define ZYNQMP_DISP_V_BLEND_OUTPUT_EN_DOWNSAMPLE BIT(4) +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL 0x18 +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_EN_US BIT(0) +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_RGB BIT(1) +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_BYPASS BIT(8) +#define ZYNQMP_DISP_V_BLEND_NUM_COEFF 9 +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF0 0x20 +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF1 0x24 +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF2 0x28 +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF3 0x2c +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF4 0x30 +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF5 0x34 +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF6 0x38 +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF7 0x3c +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF8 0x40 +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF0 0x44 +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF1 0x48 +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF2 0x4c +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF3 0x50 +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF4 0x54 +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF5 0x58 +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF6 0x5c +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF7 0x60 +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF8 0x64 +#define ZYNQMP_DISP_V_BLEND_NUM_OFFSET 3 +#define ZYNQMP_DISP_V_BLEND_LUMA_IN1CSC_OFFSET 0x68 +#define ZYNQMP_DISP_V_BLEND_CR_IN1CSC_OFFSET 0x6c +#define ZYNQMP_DISP_V_BLEND_CB_IN1CSC_OFFSET 0x70 +#define ZYNQMP_DISP_V_BLEND_LUMA_OUTCSC_OFFSET 0x74 +#define ZYNQMP_DISP_V_BLEND_CR_OUTCSC_OFFSET 0x78 +#define ZYNQMP_DISP_V_BLEND_CB_OUTCSC_OFFSET 0x7c +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF0 0x80 +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF1 0x84 +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF2 0x88 +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF3 0x8c +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF4 0x90 +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF5 0x94 +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF6 0x98 +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF7 0x9c +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF8 0xa0 +#define ZYNQMP_DISP_V_BLEND_LUMA_IN2CSC_OFFSET 0xa4 +#define ZYNQMP_DISP_V_BLEND_CR_IN2CSC_OFFSET 0xa8 +#define ZYNQMP_DISP_V_BLEND_CB_IN2CSC_OFFSET 0xac +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_ENABLE 0x1d0 +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_COMP1 0x1d4 +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_COMP2 0x1d8 +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_COMP3 0x1dc + +/* AV buffer manager registers */ +#define ZYNQMP_DISP_AV_BUF_FMT 0x0 +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_SHIFT 0 +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK (0x1f << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_UYVY (0 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_VYUY (1 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YVYU (2 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUYV (3 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16 (4 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24 (5 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI (6 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MONO (7 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2 (8 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUV444 (9 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888 (10 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGBA8880 (11 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888_10 (12 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUV444_10 (13 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2_10 (14 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_10 (15 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_10 (16 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24_10 (17 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YONLY_10 (18 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420 (19 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420 (20 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2_420 (21 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420_10 (22 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420_10 (23 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2_420_10 (24 << 0) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_SHIFT 8 +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK (0xf << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA8888 (0 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_ABGR8888 (1 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB888 (2 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_BGR888 (3 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA5551 (4 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA4444 (5 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB565 (6 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_8BPP (7 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_4BPP (8 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_2BPP (9 << 8) +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_1BPP (10 << 8) +#define ZYNQMP_DISP_AV_BUF_NON_LIVE_LATENCY 0x8 +#define ZYNQMP_DISP_AV_BUF_CHBUF 0x10 +#define ZYNQMP_DISP_AV_BUF_CHBUF_EN BIT(0) +#define ZYNQMP_DISP_AV_BUF_CHBUF_FLUSH BIT(1) +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_SHIFT 2 +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_MASK (0xf << 2) +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_MAX 0xf +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_AUD_MAX 0x3 +#define ZYNQMP_DISP_AV_BUF_STATUS 0x28 +#define ZYNQMP_DISP_AV_BUF_STC_CTRL 0x2c +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EN BIT(0) +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_SHIFT 1 +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_EX_VSYNC 0 +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_EX_VID 1 +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_EX_AUD 2 +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_INT_VSYNC 3 +#define ZYNQMP_DISP_AV_BUF_STC_INIT_VALUE0 0x30 +#define ZYNQMP_DISP_AV_BUF_STC_INIT_VALUE1 0x34 +#define ZYNQMP_DISP_AV_BUF_STC_ADJ 0x38 +#define ZYNQMP_DISP_AV_BUF_STC_VID_VSYNC_TS0 0x3c +#define ZYNQMP_DISP_AV_BUF_STC_VID_VSYNC_TS1 0x40 +#define ZYNQMP_DISP_AV_BUF_STC_EXT_VSYNC_TS0 0x44 +#define ZYNQMP_DISP_AV_BUF_STC_EXT_VSYNC_TS1 0x48 +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT_TS0 0x4c +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT_TS1 0x50 +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT2_TS0 0x54 +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT2_TS1 0x58 +#define ZYNQMP_DISP_AV_BUF_STC_SNAPSHOT0 0x60 +#define ZYNQMP_DISP_AV_BUF_STC_SNAPSHOT1 0x64 +#define ZYNQMP_DISP_AV_BUF_OUTPUT 0x70 +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT 0 +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK (0x3 << 0) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE (0 << 0) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM (1 << 0) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN (2 << 0) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE (3 << 0) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT 2 +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK (0x3 << 2) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE (0 << 2) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM (1 << 2) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE (2 << 2) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_NONE (3 << 2) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT 4 +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK (0x3 << 4) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PL (0 << 4) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM (1 << 4) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PATTERN (2 << 4) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE (3 << 4) +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN BIT(6) +#define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT0 0x74 +#define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT1 0x78 +#define ZYNQMP_DISP_AV_BUF_PATTERN_GEN_SELECT 0x100 +#define ZYNQMP_DISP_AV_BUF_CLK_SRC 0x120 +#define ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_FROM_PS BIT(0) +#define ZYNQMP_DISP_AV_BUF_CLK_SRC_AUD_FROM_PS BIT(1) +#define ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_INTERNAL_TIMING BIT(2) +#define ZYNQMP_DISP_AV_BUF_SRST_REG 0x124 +#define ZYNQMP_DISP_AV_BUF_SRST_REG_VID_RST BIT(1) +#define ZYNQMP_DISP_AV_BUF_AUDIO_CH_CONFIG 0x12c +#define ZYNQMP_DISP_AV_BUF_GFX_COMP0_SF 0x200 +#define ZYNQMP_DISP_AV_BUF_GFX_COMP1_SF 0x204 +#define ZYNQMP_DISP_AV_BUF_GFX_COMP2_SF 0x208 +#define ZYNQMP_DISP_AV_BUF_VID_COMP0_SF 0x20c +#define ZYNQMP_DISP_AV_BUF_VID_COMP1_SF 0x210 +#define ZYNQMP_DISP_AV_BUF_VID_COMP2_SF 0x214 +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_COMP0_SF 0x218 +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_COMP1_SF 0x21c +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_COMP2_SF 0x220 +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_CONFIG 0x224 +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_COMP0_SF 0x228 +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_COMP1_SF 0x22c +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_COMP2_SF 0x230 +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_CONFIG 0x234 +#define ZYNQMP_DISP_AV_BUF_4BIT_SF 0x11111 +#define ZYNQMP_DISP_AV_BUF_5BIT_SF 0x10842 +#define ZYNQMP_DISP_AV_BUF_6BIT_SF 0x10410 +#define ZYNQMP_DISP_AV_BUF_8BIT_SF 0x10101 +#define ZYNQMP_DISP_AV_BUF_10BIT_SF 0x10040 +#define ZYNQMP_DISP_AV_BUF_NULL_SF 0 +#define ZYNQMP_DISP_AV_BUF_NUM_SF 3 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_6 0x0 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 0x1 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_10 0x2 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_12 0x3 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_MASK GENMASK(2, 0) +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_RGB 0x0 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV444 0x1 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV422 0x2 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YONLY 0x3 +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_MASK GENMASK(5, 4) +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_CB_FIRST BIT(8) +#define ZYNQMP_DISP_AV_BUF_PALETTE_MEMORY 0x400 + +/* Audio registers */ +#define ZYNQMP_DISP_AUD_MIXER_VOLUME 0x0 +#define ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE 0x20002000 +#define ZYNQMP_DISP_AUD_MIXER_META_DATA 0x4 +#define ZYNQMP_DISP_AUD_CH_STATUS0 0x8 +#define ZYNQMP_DISP_AUD_CH_STATUS1 0xc +#define ZYNQMP_DISP_AUD_CH_STATUS2 0x10 +#define ZYNQMP_DISP_AUD_CH_STATUS3 0x14 +#define ZYNQMP_DISP_AUD_CH_STATUS4 0x18 +#define ZYNQMP_DISP_AUD_CH_STATUS5 0x1c +#define ZYNQMP_DISP_AUD_CH_A_DATA0 0x20 +#define ZYNQMP_DISP_AUD_CH_A_DATA1 0x24 +#define ZYNQMP_DISP_AUD_CH_A_DATA2 0x28 +#define ZYNQMP_DISP_AUD_CH_A_DATA3 0x2c +#define ZYNQMP_DISP_AUD_CH_A_DATA4 0x30 +#define ZYNQMP_DISP_AUD_CH_A_DATA5 0x34 +#define ZYNQMP_DISP_AUD_CH_B_DATA0 0x38 +#define ZYNQMP_DISP_AUD_CH_B_DATA1 0x3c +#define ZYNQMP_DISP_AUD_CH_B_DATA2 0x40 +#define ZYNQMP_DISP_AUD_CH_B_DATA3 0x44 +#define ZYNQMP_DISP_AUD_CH_B_DATA4 0x48 +#define ZYNQMP_DISP_AUD_CH_B_DATA5 0x4c +#define ZYNQMP_DISP_AUD_SOFT_RESET 0xc00 +#define ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST BIT(0) + +#define ZYNQMP_DISP_AV_BUF_NUM_VID_GFX_BUFFERS 4 +#define ZYNQMP_DISP_AV_BUF_NUM_BUFFERS 6 + +#define ZYNQMP_DISP_NUM_LAYERS 2 +#define ZYNQMP_DISP_MAX_NUM_SUB_PLANES 3 +/* + * 3840x2160 is advertised max resolution, but almost any resolutions under + * 300Mhz pixel rate would work. Thus put 4096 as maximum width and height. + */ +#define ZYNQMP_DISP_MAX_WIDTH 4096 +#define ZYNQMP_DISP_MAX_HEIGHT 4096 +/* 44 bit addressing. This is acutally DPDMA limitation */ +#define ZYNQMP_DISP_MAX_DMA_BIT 44 + +/** + * enum zynqmp_disp_layer_type - Layer type (can be used for hw ID) + * @ZYNQMP_DISP_LAYER_VID: Video layer + * @ZYNQMP_DISP_LAYER_GFX: Graphics layer + */ +enum zynqmp_disp_layer_type { + ZYNQMP_DISP_LAYER_VID, + ZYNQMP_DISP_LAYER_GFX +}; + +/** + * enum zynqmp_disp_layer_mode - Layer mode + * @ZYNQMP_DISP_LAYER_NONLIVE: non-live (memory) mode + * @ZYNQMP_DISP_LAYER_LIVE: live (stream) mode + */ +enum zynqmp_disp_layer_mode { + ZYNQMP_DISP_LAYER_NONLIVE, + ZYNQMP_DISP_LAYER_LIVE +}; + +/** + * struct zynqmp_disp_layer_dma - struct for DMA engine + * @chan: DMA channel + * @is_active: flag if the DMA is active + * @xt: Interleaved desc config container + * @sgl: Data chunk for dma_interleaved_template + */ +struct zynqmp_disp_layer_dma { + struct dma_chan *chan; + bool is_active; + struct dma_interleaved_template xt; + struct data_chunk sgl[1]; +}; + +/** + * struct zynqmp_disp_layer - Display subsystem layer + * @plane: DRM plane + * @of_node: device node + * @dma: struct for DMA engine + * @num_chan: Number of DMA channel + * @id: Layer ID + * @offset: Layer offset in the register space + * @enabled: flag if enabled + * @fmt: Current format descriptor + * @drm_fmts: Array of supported DRM formats + * @num_fmts: Number of supported DRM formats + * @bus_fmts: Array of supported bus formats + * @num_bus_fmts: Number of supported bus formats + * @w: Width + * @h: Height + * @mode: the operation mode + * @other: other layer + * @disp: back pointer to struct zynqmp_disp + */ +struct zynqmp_disp_layer { + struct drm_plane plane; + struct device_node *of_node; + struct zynqmp_disp_layer_dma dma[ZYNQMP_DISP_MAX_NUM_SUB_PLANES]; + unsigned int num_chan; + enum zynqmp_disp_layer_type id; + u32 offset; + u8 enabled; + const struct zynqmp_disp_fmt *fmt; + u32 *drm_fmts; + unsigned int num_fmts; + u32 *bus_fmts; + unsigned int num_bus_fmts; + u32 w; + u32 h; + enum zynqmp_disp_layer_mode mode; + struct zynqmp_disp_layer *other; + struct zynqmp_disp *disp; +}; + +/** + * struct zynqmp_disp_blend - Blender + * @base: Base address offset + */ +struct zynqmp_disp_blend { + void __iomem *base; +}; + +/** + * struct zynqmp_disp_av_buf - AV buffer manager + * @base: Base address offset + */ +struct zynqmp_disp_av_buf { + void __iomem *base; +}; + +/** + * struct zynqmp_disp_aud - Audio + * @base: Base address offset + */ +struct zynqmp_disp_aud { + void __iomem *base; +}; + +/** + * struct zynqmp_disp - Display subsystem + * @xlnx_crtc: Xilinx DRM crtc + * @dev: device structure + * @dpsub: Display subsystem + * @drm: DRM core + * @enabled: flag if enabled + * @blend: Blender block + * @av_buf: AV buffer manager block + * @aud:Audio block + * @layers: layers + * @alpha: current global alpha value + * @alpha_en: flag if the global alpha is enabled + * @color: current output color value + * @bg_c0: current value of 1st background color component + * @bg_c1: current value of 2nd background color component + * @bg_c2: current value of 3rd background color component + * @tpg_on: current TPG mode state + * @event: pending vblank event request + * @_ps_pclk: Pixel clock from PS + * @_pl_pclk: Pixel clock from PL + * @pclk: Pixel clock + * @pclk_en: Flag if the pixel clock is enabled + * @_ps_audclk: Audio clock from PS + * @_pl_audclk: Audio clock from PL + * @audclk: Audio clock + * @audclk_en: Flag if the audio clock is enabled + * @aclk: APB clock + * @aclk_en: Flag if the APB clock is enabled + */ +struct zynqmp_disp { + struct xlnx_crtc xlnx_crtc; + struct device *dev; + struct zynqmp_dpsub *dpsub; + struct drm_device *drm; + bool enabled; + struct zynqmp_disp_blend blend; + struct zynqmp_disp_av_buf av_buf; + struct zynqmp_disp_aud aud; + struct zynqmp_disp_layer layers[ZYNQMP_DISP_NUM_LAYERS]; + u32 alpha; + bool alpha_en; + unsigned int color; + u32 bg_c0; + u32 bg_c1; + u32 bg_c2; + bool tpg_on; + struct drm_pending_vblank_event *event; + /* Don't operate directly on _ps_ */ + struct clk *_ps_pclk; + struct clk *_pl_pclk; + struct clk *pclk; + bool pclk_en; + struct clk *_ps_audclk; + struct clk *_pl_audclk; + struct clk *audclk; + bool audclk_en; + struct clk *aclk; + bool aclk_en; +}; + +/** + * struct zynqmp_disp_fmt - Display subsystem format mapping + * @drm_fmt: drm format + * @disp_fmt: Display subsystem format + * @bus_fmt: Bus formats (live formats) + * @rgb: flag for RGB formats + * @swap: flag to swap r & b for rgb formats, and u & v for yuv formats + * @chroma_sub: flag for chroma subsampled formats + * @sf: scaling factors for upto 3 color components + */ +struct zynqmp_disp_fmt { + u32 drm_fmt; + u32 disp_fmt; + u32 bus_fmt; + bool rgb; + bool swap; + bool chroma_sub; + u32 sf[3]; +}; + +static void zynqmp_disp_write(void __iomem *base, int offset, u32 val) +{ + writel(val, base + offset); +} + +static u32 zynqmp_disp_read(void __iomem *base, int offset) +{ + return readl(base + offset); +} + +static void zynqmp_disp_clr(void __iomem *base, int offset, u32 clr) +{ + zynqmp_disp_write(base, offset, zynqmp_disp_read(base, offset) & ~clr); +} + +static void zynqmp_disp_set(void __iomem *base, int offset, u32 set) +{ + zynqmp_disp_write(base, offset, zynqmp_disp_read(base, offset) | set); +} + +/* + * Clock functions + */ + +/** + * zynqmp_disp_clk_enable - Enable the clock if needed + * @clk: clk device + * @flag: flag if the clock is enabled + * + * Enable the clock only if it's not enabled @flag. + * + * Return: value from clk_prepare_enable(). + */ +static int zynqmp_disp_clk_enable(struct clk *clk, bool *flag) +{ + int ret = 0; + + if (!*flag) { + ret = clk_prepare_enable(clk); + if (!ret) + *flag = true; + } + + return ret; +} + +/** + * zynqmp_disp_clk_enable - Enable the clock if needed + * @clk: clk device + * @flag: flag if the clock is enabled + * + * Disable the clock only if it's enabled @flag. + */ +static void zynqmp_disp_clk_disable(struct clk *clk, bool *flag) +{ + if (*flag) { + clk_disable_unprepare(clk); + *flag = false; + } +} + +/** + * zynqmp_disp_clk_enable - Enable and disable the clock + * @clk: clk device + * @flag: flag if the clock is enabled + * + * This is to ensure the clock is disabled. The initial hardware state is + * unknown, and this makes sure that the clock is disabled. + * + * Return: value from clk_prepare_enable(). + */ +static int zynqmp_disp_clk_enable_disable(struct clk *clk, bool *flag) +{ + int ret = 0; + + if (!*flag) { + ret = clk_prepare_enable(clk); + clk_disable_unprepare(clk); + } + + return ret; +} + +/* + * Blender functions + */ + +/** + * zynqmp_disp_blend_set_output_fmt - Set the output format of the blend + * @blend: blend object + * @fmt: output format + * + * Set the output format to @fmt. + */ +static void +zynqmp_disp_blend_set_output_fmt(struct zynqmp_disp_blend *blend, u32 fmt) +{ + u16 reset_coeffs[] = { 0x1000, 0x0, 0x0, + 0x0, 0x1000, 0x0, + 0x0, 0x0, 0x1000 }; + u32 reset_offsets[] = { 0x0, 0x0, 0x0 }; + u16 sdtv_coeffs[] = { 0x4c9, 0x864, 0x1d3, + 0x7d4d, 0x7ab3, 0x800, + 0x800, 0x794d, 0x7eb3 }; + u32 full_range_offsets[] = { 0x0, 0x8000000, 0x8000000 }; + u16 *coeffs; + u32 *offsets; + u32 offset, i; + + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT, fmt); + if (fmt == ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_RGB) { + coeffs = reset_coeffs; + offsets = reset_offsets; + } else { + /* Hardcode Full-range SDTV values. Can be runtime config */ + coeffs = sdtv_coeffs; + offsets = full_range_offsets; + } + + offset = ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF0; + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_COEFF; i++) + zynqmp_disp_write(blend->base, offset + i * 4, coeffs[i]); + + offset = ZYNQMP_DISP_V_BLEND_LUMA_OUTCSC_OFFSET; + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) + zynqmp_disp_write(blend->base, offset + i * 4, offsets[i]); +} + +/** + * zynqmp_disp_blend_layer_enable - Enable a layer + * @blend: blend object + * @layer: layer to enable + * + * Enable a layer @layer. + */ +static void zynqmp_disp_blend_layer_enable(struct zynqmp_disp_blend *blend, + struct zynqmp_disp_layer *layer) +{ + u32 reg, offset, i, s0, s1; + u16 sdtv_coeffs[] = { 0x1000, 0x166f, 0x0, + 0x1000, 0x7483, 0x7a7f, + 0x1000, 0x0, 0x1c5a }; + u16 swap_coeffs[] = { 0x1000, 0x0, 0x0, + 0x0, 0x1000, 0x0, + 0x0, 0x0, 0x1000 }; + u16 *coeffs; + u32 offsets[] = { 0x0, 0x1800, 0x1800 }; + + reg = layer->fmt->rgb ? ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_RGB : 0; + reg |= layer->fmt->chroma_sub ? + ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_EN_US : 0; + + zynqmp_disp_write(blend->base, + ZYNQMP_DISP_V_BLEND_LAYER_CONTROL + layer->offset, + reg); + + if (layer->id == ZYNQMP_DISP_LAYER_VID) + offset = ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF0; + else + offset = ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF0; + + if (!layer->fmt->rgb) { + coeffs = sdtv_coeffs; + s0 = 1; + s1 = 2; + } else { + coeffs = swap_coeffs; + s0 = 0; + s1 = 2; + + /* No offset for RGB formats */ + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) + offsets[i] = 0; + } + + if (layer->fmt->swap) { + for (i = 0; i < 3; i++) { + coeffs[i * 3 + s0] ^= coeffs[i * 3 + s1]; + coeffs[i * 3 + s1] ^= coeffs[i * 3 + s0]; + coeffs[i * 3 + s0] ^= coeffs[i * 3 + s1]; + } + } + + /* Program coefficients. Can be runtime configurable */ + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_COEFF; i++) + zynqmp_disp_write(blend->base, offset + i * 4, coeffs[i]); + + if (layer->id == ZYNQMP_DISP_LAYER_VID) + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN1CSC_OFFSET; + else + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN2CSC_OFFSET; + + /* Program offsets. Can be runtime configurable */ + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) + zynqmp_disp_write(blend->base, offset + i * 4, offsets[i]); +} + +/** + * zynqmp_disp_blend_layer_disable - Disable a layer + * @blend: blend object + * @layer: layer to disable + * + * Disable a layer @layer. + */ +static void zynqmp_disp_blend_layer_disable(struct zynqmp_disp_blend *blend, + struct zynqmp_disp_layer *layer) +{ + u32 offset; + unsigned int i; + + zynqmp_disp_write(blend->base, + ZYNQMP_DISP_V_BLEND_LAYER_CONTROL + layer->offset, 0); + + if (layer->id == ZYNQMP_DISP_LAYER_VID) + offset = ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF0; + else + offset = ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF0; + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_COEFF; i++) + zynqmp_disp_write(blend->base, offset + i * 4, 0); + + if (layer->id == ZYNQMP_DISP_LAYER_VID) + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN1CSC_OFFSET; + else + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN2CSC_OFFSET; + + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) + zynqmp_disp_write(blend->base, offset + i * 4, 0); +} + +/** + * zynqmp_disp_blend_set_bg_color - Set the background color + * @blend: blend object + * @c0: color component 0 + * @c1: color component 1 + * @c2: color component 2 + * + * Set the background color. + */ +static void zynqmp_disp_blend_set_bg_color(struct zynqmp_disp_blend *blend, + u32 c0, u32 c1, u32 c2) +{ + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_BG_CLR_0, c0); + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_BG_CLR_1, c1); + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_BG_CLR_2, c2); +} + +/** + * zynqmp_disp_blend_set_alpha - Set the alpha for blending + * @blend: blend object + * @alpha: alpha value to be used + * + * Set the alpha for blending. + */ +static void +zynqmp_disp_blend_set_alpha(struct zynqmp_disp_blend *blend, u32 alpha) +{ + u32 reg; + + reg = zynqmp_disp_read(blend->base, + ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA); + reg &= ~ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA_MASK; + reg |= alpha << 1; + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA, + reg); +} + +/** + * zynqmp_disp_blend_enable_alpha - Enable/disable the global alpha + * @blend: blend object + * @enable: flag to enable or disable alpha blending + * + * Enable/disable the global alpha blending based on @enable. + */ +static void +zynqmp_disp_blend_enable_alpha(struct zynqmp_disp_blend *blend, bool enable) +{ + if (enable) + zynqmp_disp_set(blend->base, + ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA, BIT(0)); + else + zynqmp_disp_clr(blend->base, + ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA, BIT(0)); +} + +/* List of blend output formats */ +/* The id / order should be aligned with zynqmp_disp_color_enum */ +static const struct zynqmp_disp_fmt blend_output_fmts[] = { + { + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_RGB, + }, { + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR444, + }, { + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR422, + }, { + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YONLY, + } +}; + +/* + * AV buffer manager functions + */ + +/* List of video layer formats */ +#define ZYNQMP_DISP_AV_BUF_VID_FMT_YUYV 2 +static const struct zynqmp_disp_fmt av_buf_vid_fmts[] = { + { + .drm_fmt = DRM_FORMAT_VYUY, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_VYUY, + .rgb = false, + .swap = true, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_UYVY, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_VYUY, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YUYV, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUYV, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YVYU, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUYV, + .rgb = false, + .swap = true, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YUV422, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YVU422, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16, + .rgb = false, + .swap = true, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YUV444, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24, + .rgb = false, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YVU444, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24, + .rgb = false, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_NV16, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_NV61, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI, + .rgb = false, + .swap = true, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_BGR888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_RGB888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_XBGR8888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGBA8880, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_XRGB8888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGBA8880, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_XBGR2101010, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888_10, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_XRGB2101010, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888_10, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YUV420, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_YVU420, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420, + .rgb = false, + .swap = true, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_NV12, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_NV21, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420, + .rgb = false, + .swap = true, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + } +}; + +/* List of graphics layer formats */ +static const struct zynqmp_disp_fmt av_buf_gfx_fmts[] = { + { + .drm_fmt = DRM_FORMAT_ABGR8888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA8888, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_ARGB8888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA8888, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_RGBA8888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_ABGR8888, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_BGRA8888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_ABGR8888, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_BGR888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB888, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_RGB888, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_BGR888, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_RGBA5551, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA5551, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_BGRA5551, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA5551, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_RGBA4444, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA4444, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_4BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_4BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_4BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_BGRA4444, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA4444, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_4BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_4BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_4BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_RGB565, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB565, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_6BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + }, { + .drm_fmt = DRM_FORMAT_BGR565, + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB565, + .rgb = true, + .swap = true, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_6BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, + } +}; + +/* List of live formats */ +/* Format can be combination of color, bpc, and cb-cr order. + * - Color: RGB / YUV444 / YUV422 / Y only + * - BPC: 6, 8, 10, 12 + * - Swap: Cb and Cr swap + * which can be 32 bus formats. Only list the subset of those for now. + */ +static const struct zynqmp_disp_fmt av_buf_live_fmts[] = { + { + .bus_fmt = MEDIA_BUS_FMT_RGB666_1X18, + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_6 || + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_RGB, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_6BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_6BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_6BIT_SF, + }, { + .bus_fmt = MEDIA_BUS_FMT_RBG888_1X24, + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 || + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_RGB, + .rgb = true, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .bus_fmt = MEDIA_BUS_FMT_UYVY8_1X16, + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 || + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV422, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .bus_fmt = MEDIA_BUS_FMT_VUY8_1X24, + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 || + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV444, + .rgb = false, + .swap = false, + .chroma_sub = false, + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, + }, { + .bus_fmt = MEDIA_BUS_FMT_UYVY10_1X20, + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_10 || + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV422, + .rgb = false, + .swap = false, + .chroma_sub = true, + .sf[0] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + .sf[1] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + .sf[2] = ZYNQMP_DISP_AV_BUF_10BIT_SF, + } +}; + +/** + * zynqmp_disp_av_buf_set_fmt - Set the input formats + * @av_buf: av buffer manager + * @fmt: formats + * + * Set the av buffer manager format to @fmt. @fmt should have valid values + * for both video and graphics layer. + */ +static void +zynqmp_disp_av_buf_set_fmt(struct zynqmp_disp_av_buf *av_buf, u32 fmt) +{ + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_FMT, fmt); +} + +/** + * zynqmp_disp_av_buf_get_fmt - Get the input formats + * @av_buf: av buffer manager + * + * Get the input formats (which include video and graphics) of + * av buffer manager. + * + * Return: value of ZYNQMP_DISP_AV_BUF_FMT register. + */ +static u32 +zynqmp_disp_av_buf_get_fmt(struct zynqmp_disp_av_buf *av_buf) +{ + return zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_FMT); +} + +/** + * zynqmp_disp_av_buf_set_vid_clock_src - Set the video clock source + * @av_buf: av buffer manager + * @from_ps: flag if the video clock is from ps + * + * Set the video clock source based on @from_ps. It can come from either PS or + * PL. + */ +static void +zynqmp_disp_av_buf_set_vid_clock_src(struct zynqmp_disp_av_buf *av_buf, + bool from_ps) +{ + u32 reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC); + + if (from_ps) + reg |= ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_FROM_PS; + else + reg &= ~ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_FROM_PS; + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC, reg); +} + +/** + * zynqmp_disp_av_buf_set_vid_timing_src - Set the video timing source + * @av_buf: av buffer manager + * @internal: flag if the video timing is generated internally + * + * Set the video timing source based on @internal. It can come externally or + * be generated internally. + */ +static void +zynqmp_disp_av_buf_set_vid_timing_src(struct zynqmp_disp_av_buf *av_buf, + bool internal) +{ + u32 reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC); + + if (internal) + reg |= ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_INTERNAL_TIMING; + else + reg &= ~ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_INTERNAL_TIMING; + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC, reg); +} + +/** + * zynqmp_disp_av_buf_set_aud_clock_src - Set the audio clock source + * @av_buf: av buffer manager + * @from_ps: flag if the video clock is from ps + * + * Set the audio clock source based on @from_ps. It can come from either PS or + * PL. + */ +static void +zynqmp_disp_av_buf_set_aud_clock_src(struct zynqmp_disp_av_buf *av_buf, + bool from_ps) +{ + u32 reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC); + + if (from_ps) + reg |= ZYNQMP_DISP_AV_BUF_CLK_SRC_AUD_FROM_PS; + else + reg &= ~ZYNQMP_DISP_AV_BUF_CLK_SRC_AUD_FROM_PS; + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC, reg); +} + +/** + * zynqmp_disp_av_buf_enable_buf - Enable buffers + * @av_buf: av buffer manager + * + * Enable all (video and audio) buffers. + */ +static void +zynqmp_disp_av_buf_enable_buf(struct zynqmp_disp_av_buf *av_buf) +{ + u32 reg, i; + + reg = ZYNQMP_DISP_AV_BUF_CHBUF_EN; + reg |= ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_MAX << + ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_SHIFT; + + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_VID_GFX_BUFFERS; i++) + zynqmp_disp_write(av_buf->base, + ZYNQMP_DISP_AV_BUF_CHBUF + i * 4, reg); + + reg = ZYNQMP_DISP_AV_BUF_CHBUF_EN; + reg |= ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_AUD_MAX << + ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_SHIFT; + + for (; i < ZYNQMP_DISP_AV_BUF_NUM_BUFFERS; i++) + zynqmp_disp_write(av_buf->base, + ZYNQMP_DISP_AV_BUF_CHBUF + i * 4, reg); +} + +/** + * zynqmp_disp_av_buf_disable_buf - Disable buffers + * @av_buf: av buffer manager + * + * Disable all (video and audio) buffers. + */ +static void +zynqmp_disp_av_buf_disable_buf(struct zynqmp_disp_av_buf *av_buf) +{ + u32 reg, i; + + reg = ZYNQMP_DISP_AV_BUF_CHBUF_FLUSH & ~ZYNQMP_DISP_AV_BUF_CHBUF_EN; + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_BUFFERS; i++) + zynqmp_disp_write(av_buf->base, + ZYNQMP_DISP_AV_BUF_CHBUF + i * 4, reg); +} + +/** + * zynqmp_disp_av_buf_enable_aud - Enable audio + * @av_buf: av buffer manager + * + * Enable all audio buffers. + */ +static void +zynqmp_disp_av_buf_enable_aud(struct zynqmp_disp_av_buf *av_buf) +{ + u32 reg; + + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM; + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); +} + +/** + * zynqmp_disp_av_buf_enable - Enable the video pipe + * @av_buf: av buffer manager + * + * De-assert the video pipe reset + */ +static void +zynqmp_disp_av_buf_enable(struct zynqmp_disp_av_buf *av_buf) +{ + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_SRST_REG, 0); +} + +/** + * zynqmp_disp_av_buf_disable - Disable the video pipe + * @av_buf: av buffer manager + * + * Assert the video pipe reset + */ +static void +zynqmp_disp_av_buf_disable(struct zynqmp_disp_av_buf *av_buf) +{ + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_SRST_REG, + ZYNQMP_DISP_AV_BUF_SRST_REG_VID_RST); +} + +/** + * zynqmp_disp_av_buf_disable_aud - Disable audio + * @av_buf: av buffer manager + * + * Disable all audio buffers. + */ +static void +zynqmp_disp_av_buf_disable_aud(struct zynqmp_disp_av_buf *av_buf) +{ + u32 reg; + + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE; + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); +} + +/** + * zynqmp_disp_av_buf_set_tpg - Set TPG mode + * @av_buf: av buffer manager + * @tpg_on: if TPG should be on + * + * Set the TPG mode based on @tpg_on. + */ +static void zynqmp_disp_av_buf_set_tpg(struct zynqmp_disp_av_buf *av_buf, + bool tpg_on) +{ + u32 reg; + + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; + if (tpg_on) + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN; + else + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN; + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); +} + +/** + * zynqmp_disp_av_buf_enable_vid - Enable the video layer buffer + * @av_buf: av buffer manager + * @layer: layer to enable + * @mode: operation mode of layer + * + * Enable the video/graphics buffer for @layer. + */ +static void zynqmp_disp_av_buf_enable_vid(struct zynqmp_disp_av_buf *av_buf, + struct zynqmp_disp_layer *layer, + enum zynqmp_disp_layer_mode mode) +{ + u32 reg; + + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); + if (layer->id == ZYNQMP_DISP_LAYER_VID) { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; + if (mode == ZYNQMP_DISP_LAYER_NONLIVE) + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; + else + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE; + } else { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; + if (mode == ZYNQMP_DISP_LAYER_NONLIVE) + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; + else + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE; + } + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); +} + +/** + * zynqmp_disp_av_buf_disable_vid - Disable the video layer buffer + * @av_buf: av buffer manager + * @layer: layer to disable + * + * Disable the video/graphics buffer for @layer. + */ +static void +zynqmp_disp_av_buf_disable_vid(struct zynqmp_disp_av_buf *av_buf, + struct zynqmp_disp_layer *layer) +{ + u32 reg; + + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); + if (layer->id == ZYNQMP_DISP_LAYER_VID) { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; + } else { + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE; + } + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); +} + +/** + * zynqmp_disp_av_buf_init_sf - Initialize scaling factors + * @av_buf: av buffer manager + * @vid_fmt: video format descriptor + * @gfx_fmt: graphics format descriptor + * + * Initialize scaling factors for both video and graphics layers. + * If the format descriptor is NULL, the function skips the programming. + */ +static void zynqmp_disp_av_buf_init_sf(struct zynqmp_disp_av_buf *av_buf, + const struct zynqmp_disp_fmt *vid_fmt, + const struct zynqmp_disp_fmt *gfx_fmt) +{ + unsigned int i; + u32 offset; + + if (gfx_fmt) { + offset = ZYNQMP_DISP_AV_BUF_GFX_COMP0_SF; + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) + zynqmp_disp_write(av_buf->base, offset + i * 4, + gfx_fmt->sf[i]); + } + + if (vid_fmt) { + offset = ZYNQMP_DISP_AV_BUF_VID_COMP0_SF; + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) + zynqmp_disp_write(av_buf->base, offset + i * 4, + vid_fmt->sf[i]); + } +} + +/* + * Audio functions + */ + +/** + * zynqmp_disp_aud_init - Initialize the audio + * @aud: audio + * + * Initialize the audio with default mixer volume. The de-assertion will + * initialize the audio states. + */ +static void zynqmp_disp_aud_init(struct zynqmp_disp_aud *aud) +{ + /* Clear the audio soft reset register as it's an non-reset flop */ + zynqmp_disp_write(aud->base, ZYNQMP_DISP_AUD_SOFT_RESET, 0); + zynqmp_disp_write(aud->base, ZYNQMP_DISP_AUD_MIXER_VOLUME, + ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE); +} + +/** + * zynqmp_disp_aud_deinit - De-initialize the audio + * @aud: audio + * + * Put the audio in reset. + */ +static void zynqmp_disp_aud_deinit(struct zynqmp_disp_aud *aud) +{ + zynqmp_disp_set(aud->base, ZYNQMP_DISP_AUD_SOFT_RESET, + ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST); +} + +/* + * ZynqMP Display layer functions + */ + +/** + * zynqmp_disp_layer_check_size - Verify width and height for the layer + * @disp: Display subsystem + * @layer: layer + * @width: width + * @height: height + * + * The Display subsystem has the limitation that both layers should have + * identical size. This function stores width and height of @layer, and verifies + * if the size (width and height) is valid. + * + * Return: 0 on success, or -EINVAL if width or/and height is invalid. + */ +static int zynqmp_disp_layer_check_size(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer, + u32 width, u32 height) +{ + struct zynqmp_disp_layer *other = layer->other; + + if (other->enabled && (other->w != width || other->h != height)) { + dev_err(disp->dev, "Layer width:height must be %d:%d\n", + other->w, other->h); + return -EINVAL; + } + + layer->w = width; + layer->h = height; + + return 0; +} + +/** + * zynqmp_disp_map_fmt - Find the Display subsystem format for given drm format + * @fmts: format table to look up + * @size: size of the table @fmts + * @drm_fmt: DRM format to search + * + * Search a Display subsystem format corresponding to the given DRM format + * @drm_fmt, and return the format descriptor which contains the Display + * subsystem format value. + * + * Return: a Display subsystem format descriptor on success, or NULL. + */ +static const struct zynqmp_disp_fmt * +zynqmp_disp_map_fmt(const struct zynqmp_disp_fmt fmts[], + unsigned int size, uint32_t drm_fmt) +{ + unsigned int i; + + for (i = 0; i < size; i++) + if (fmts[i].drm_fmt == drm_fmt) + return &fmts[i]; + + return NULL; +} + +/** + * zynqmp_disp_set_fmt - Set the format of the layer + * @disp: Display subsystem + * @layer: layer to set the format + * @drm_fmt: DRM format to set + * + * Set the format of the given layer to @drm_fmt. + * + * Return: 0 on success. -EINVAL if @drm_fmt is not supported by the layer. + */ +static int zynqmp_disp_layer_set_fmt(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer, + uint32_t drm_fmt) +{ + const struct zynqmp_disp_fmt *fmt; + const struct zynqmp_disp_fmt *vid_fmt = NULL, *gfx_fmt = NULL; + u32 size, fmts, mask; + + if (layer->id == ZYNQMP_DISP_LAYER_VID) { + size = ARRAY_SIZE(av_buf_vid_fmts); + mask = ~ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK; + fmt = zynqmp_disp_map_fmt(av_buf_vid_fmts, size, drm_fmt); + vid_fmt = fmt; + } else { + size = ARRAY_SIZE(av_buf_gfx_fmts); + mask = ~ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK; + fmt = zynqmp_disp_map_fmt(av_buf_gfx_fmts, size, drm_fmt); + gfx_fmt = fmt; + } + + if (!fmt) + return -EINVAL; + + fmts = zynqmp_disp_av_buf_get_fmt(&disp->av_buf); + fmts &= mask; + fmts |= fmt->disp_fmt; + zynqmp_disp_av_buf_set_fmt(&disp->av_buf, fmts); + zynqmp_disp_av_buf_init_sf(&disp->av_buf, vid_fmt, gfx_fmt); + layer->fmt = fmt; + + return 0; +} + +/** + * zynqmp_disp_set_tpg - Enable or disable TPG + * @disp: Display subsystem + * @layer: Video layer + * @tpg_on: flag if TPG needs to be enabled or disabled + * + * Enable / disable the TPG mode on the video layer @layer depending on + * @tpg_on. The video layer should be disabled prior to enable request. + * + * Return: 0 on success. -ENODEV if it's not video layer. -EIO if + * the video layer is enabled. + */ +static int zynqmp_disp_layer_set_tpg(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer, + bool tpg_on) +{ + if (layer->id != ZYNQMP_DISP_LAYER_VID) { + dev_err(disp->dev, + "only the video layer has the tpg mode\n"); + return -ENODEV; + } + + if (layer->enabled) { + dev_err(disp->dev, + "the video layer should be disabled for tpg mode\n"); + return -EIO; + } + + zynqmp_disp_av_buf_set_tpg(&disp->av_buf, tpg_on); + disp->tpg_on = tpg_on; + + return 0; +} + +/** + * zynqmp_disp_get_fmt - Get the supported DRM formats of the layer + * @disp: Display subsystem + * @layer: layer to get the formats + * @drm_fmts: pointer to array of DRM format strings + * @num_fmts: pointer to number of returned DRM formats + * + * Get the supported DRM formats of the given layer. + */ +static void zynqmp_disp_layer_get_fmts(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer, + u32 **drm_fmts, unsigned int *num_fmts) +{ + *drm_fmts = layer->drm_fmts; + *num_fmts = layer->num_fmts; +} + +/** + * zynqmp_disp_layer_enable - Enable the layer + * @disp: Display subsystem + * @layer: layer to esable + * @mode: operation mode + * + * Enable the layer @layer. + * + * Return: 0 on success, otherwise error code. + */ +static int zynqmp_disp_layer_enable(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer, + enum zynqmp_disp_layer_mode mode) +{ + struct device *dev = disp->dev; + struct dma_async_tx_descriptor *desc; + enum dma_ctrl_flags flags; + unsigned int i; + + if (layer->enabled && layer->mode != mode) { + dev_err(dev, "layer is already enabled in different mode\n"); + return -EBUSY; + } + + zynqmp_disp_av_buf_enable_vid(&disp->av_buf, layer, mode); + zynqmp_disp_blend_layer_enable(&disp->blend, layer); + + layer->enabled = true; + layer->mode = mode; + + if (mode == ZYNQMP_DISP_LAYER_LIVE) + return 0; + + for (i = 0; i < ZYNQMP_DISP_MAX_NUM_SUB_PLANES; i++) { + struct zynqmp_disp_layer_dma *dma = &layer->dma[i]; + + if (dma->chan && dma->is_active) { + flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT; + desc = dmaengine_prep_interleaved_dma(dma->chan, + &dma->xt, flags); + if (!desc) { + dev_err(dev, "failed to prep DMA descriptor\n"); + return -ENOMEM; + } + + dmaengine_submit(desc); + dma_async_issue_pending(dma->chan); + } + } + + return 0; +} + +/** + * zynqmp_disp_layer_disable - Disable the layer + * @disp: Display subsystem + * @layer: layer to disable + * @mode: operation mode + * + * Disable the layer @layer. + * + * Return: 0 on success, or -EBUSY if the layer is in different mode. + */ +static int zynqmp_disp_layer_disable(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer, + enum zynqmp_disp_layer_mode mode) +{ + struct device *dev = disp->dev; + unsigned int i; + + if (layer->mode != mode) { + dev_err(dev, "the layer is operating in different mode\n"); + return -EBUSY; + } + + for (i = 0; i < ZYNQMP_DISP_MAX_NUM_SUB_PLANES; i++) + if (layer->dma[i].chan && layer->dma[i].is_active) + dmaengine_terminate_sync(layer->dma[i].chan); + + zynqmp_disp_av_buf_disable_vid(&disp->av_buf, layer); + zynqmp_disp_blend_layer_disable(&disp->blend, layer); + layer->enabled = false; + + return 0; +} + +/** + * zynqmp_disp_layer_request_dma - Request DMA channels for a layer + * @disp: Display subsystem + * @layer: layer to request DMA channels + * @name: identifier string for layer type + * + * Request DMA engine channels for corresponding layer. + * + * Return: 0 on success, or err value from of_dma_request_slave_channel(). + */ +static int +zynqmp_disp_layer_request_dma(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer, const char *name) +{ + struct zynqmp_disp_layer_dma *dma; + unsigned int i; + int ret; + + for (i = 0; i < layer->num_chan; i++) { + char temp[16]; + + dma = &layer->dma[i]; + snprintf(temp, sizeof(temp), "%s%d", name, i); + dma->chan = of_dma_request_slave_channel(layer->of_node, + temp); + if (IS_ERR(dma->chan)) { + dev_err(disp->dev, "failed to request dma channel\n"); + ret = PTR_ERR(dma->chan); + dma->chan = NULL; + return ret; + } + } + + return 0; +} + +/** + * zynqmp_disp_layer_release_dma - Release DMA channels for a layer + * @disp: Display subsystem + * @layer: layer to release DMA channels + * + * Release the dma channels associated with @layer. + */ +static void zynqmp_disp_layer_release_dma(struct zynqmp_disp *disp, + struct zynqmp_disp_layer *layer) +{ + unsigned int i; + + for (i = 0; i < layer->num_chan; i++) { + if (layer->dma[i].chan) { + /* Make sure the channel is terminated before release */ + dmaengine_terminate_all(layer->dma[i].chan); + dma_release_channel(layer->dma[i].chan); + } + } +} + +/** + * zynqmp_disp_layer_is_live - if any layer is live + * @disp: Display subsystem + * + * Return: true if any layer is live + */ +static bool zynqmp_disp_layer_is_live(struct zynqmp_disp *disp) +{ + unsigned int i; + + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { + if (disp->layers[i].enabled && + disp->layers[i].mode == ZYNQMP_DISP_LAYER_LIVE) + return true; + } + + return false; +} + +/** + * zynqmp_disp_layer_is_enabled - if any layer is enabled + * @disp: Display subsystem + * + * Return: true if any layer is enabled + */ +static bool zynqmp_disp_layer_is_enabled(struct zynqmp_disp *disp) +{ + unsigned int i; + + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) + if (disp->layers[i].enabled) + return true; + + return false; +} + +/** + * zynqmp_disp_layer_destroy - Destroy all layers + * @disp: Display subsystem + * + * Destroy all layers. + */ +static void zynqmp_disp_layer_destroy(struct zynqmp_disp *disp) +{ + unsigned int i; + + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { + zynqmp_disp_layer_release_dma(disp, &disp->layers[i]); + if (disp->layers[i].of_node) + of_node_put(disp->layers[i].of_node); + } +} + +/** + * zynqmp_disp_layer_create - Create all layers + * @disp: Display subsystem + * + * Create all layers. + * + * Return: 0 on success, otherwise error code from failed function + */ +static int zynqmp_disp_layer_create(struct zynqmp_disp *disp) +{ + struct zynqmp_disp_layer *layer; + unsigned int i; + int num_chans[ZYNQMP_DISP_NUM_LAYERS] = { 3, 1 }; + const char * const dma_name[] = { "vid", "gfx" }; + int ret; + + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { + layer = &disp->layers[i]; + layer->id = i; + layer->offset = i * 4; + layer->other = &disp->layers[!i]; + layer->num_chan = num_chans[i]; + layer->of_node = disp->dev->of_node; + ret = zynqmp_disp_layer_request_dma(disp, layer, dma_name[i]); + if (ret) + goto err; + layer->disp = disp; + } + + return 0; + +err: + zynqmp_disp_layer_destroy(disp); + return ret; +} + +/* + * ZynqMP Display internal functions + */ + +/* + * Output format enumeration. + * The ID should be aligned with blend_output_fmts. + * The string should be aligned with how zynqmp_dp_set_color() decodes. + */ +static struct drm_prop_enum_list zynqmp_disp_color_enum[] = { + { 0, "rgb" }, + { 1, "ycrcb444" }, + { 2, "ycrcb422" }, + { 3, "yonly" }, +}; + +/** + * zynqmp_disp_set_output_fmt - Set the output format + * @disp: Display subsystem + * @id: the format ID. Refer to zynqmp_disp_color_enum[]. + * + * This function sets the output format of the display / blender as well as + * the format of DP controller. The @id should be aligned with + * zynqmp_disp_color_enum. + */ +static void +zynqmp_disp_set_output_fmt(struct zynqmp_disp *disp, unsigned int id) +{ + const struct zynqmp_disp_fmt *fmt = &blend_output_fmts[id]; + + zynqmp_dp_set_color(disp->dpsub->dp, zynqmp_disp_color_enum[id].name); + zynqmp_disp_blend_set_output_fmt(&disp->blend, fmt->disp_fmt); +} + +/** + * zynqmp_disp_set_bg_color - Set the background color + * @disp: Display subsystem + * @c0: color component 0 + * @c1: color component 1 + * @c2: color component 2 + * + * Set the background color with given color components (@c0, @c1, @c2). + */ +static void zynqmp_disp_set_bg_color(struct zynqmp_disp *disp, + u32 c0, u32 c1, u32 c2) +{ + zynqmp_disp_blend_set_bg_color(&disp->blend, c0, c1, c2); +} + +/** + * zynqmp_disp_set_alpha - Set the alpha value + * @disp: Display subsystem + * @alpha: alpha value to set + * + * Set the alpha value for blending. + */ +static void zynqmp_disp_set_alpha(struct zynqmp_disp *disp, u32 alpha) +{ + disp->alpha = alpha; + zynqmp_disp_blend_set_alpha(&disp->blend, alpha); +} + +/** + * zynqmp_disp_set_g_alpha - Enable/disable the global alpha blending + * @disp: Display subsystem + * @enable: flag to enable or disable alpha blending + * + * Set the alpha value for blending. + */ +static void zynqmp_disp_set_g_alpha(struct zynqmp_disp *disp, bool enable) +{ + disp->alpha_en = enable; + zynqmp_disp_blend_enable_alpha(&disp->blend, enable); +} + +/** + * zynqmp_disp_enable - Enable the Display subsystem + * @disp: Display subsystem + * + * Enable the Display subsystem. + */ +static void zynqmp_disp_enable(struct zynqmp_disp *disp) +{ + bool live; + + if (disp->enabled) + return; + + zynqmp_disp_av_buf_enable(&disp->av_buf); + /* Choose clock source based on the DT clock handle */ + zynqmp_disp_av_buf_set_vid_clock_src(&disp->av_buf, !!disp->_ps_pclk); + zynqmp_disp_av_buf_set_aud_clock_src(&disp->av_buf, !!disp->_ps_audclk); + live = zynqmp_disp_layer_is_live(disp); + zynqmp_disp_av_buf_set_vid_timing_src(&disp->av_buf, !live); + zynqmp_disp_av_buf_enable_buf(&disp->av_buf); + zynqmp_disp_av_buf_enable_aud(&disp->av_buf); + zynqmp_disp_aud_init(&disp->aud); + disp->enabled = true; +} + +/** + * zynqmp_disp_disable - Disable the Display subsystem + * @disp: Display subsystem + * @force: flag to disable forcefully + * + * Disable the Display subsystem. + */ +static void zynqmp_disp_disable(struct zynqmp_disp *disp, bool force) +{ + struct drm_crtc *crtc = &disp->xlnx_crtc.crtc; + + if (!force && (!disp->enabled || zynqmp_disp_layer_is_enabled(disp))) + return; + + zynqmp_disp_aud_deinit(&disp->aud); + zynqmp_disp_av_buf_disable_aud(&disp->av_buf); + zynqmp_disp_av_buf_disable_buf(&disp->av_buf); + zynqmp_disp_av_buf_disable(&disp->av_buf); + + /* Mark the flip is done as crtc is disabled anyway */ + if (crtc->state->event) { + complete_all(crtc->state->event->base.completion); + crtc->state->event = NULL; + } + + disp->enabled = false; +} + +/* + * ZynqMP Display external functions for zynqmp_dp + */ + +/** + * zynqmp_disp_handle_vblank - Handle the vblank event + * @disp: Display subsystem + * + * This function handles the vblank interrupt, and sends an event to + * CRTC object. This will be called by the DP vblank interrupt handler. + */ +void zynqmp_disp_handle_vblank(struct zynqmp_disp *disp) +{ + struct drm_crtc *crtc = &disp->xlnx_crtc.crtc; + + drm_crtc_handle_vblank(crtc); +} + +/** + * zynqmp_disp_get_apb_clk_rate - Get the current APB clock rate + * @disp: Display subsystem + * + * Return: the current APB clock rate. + */ +unsigned int zynqmp_disp_get_apb_clk_rate(struct zynqmp_disp *disp) +{ + return clk_get_rate(disp->aclk); +} + +/** + * zynqmp_disp_aud_enabled - If the audio is enabled + * @disp: Display subsystem + * + * Return if the audio is enabled depending on the audio clock. + * + * Return: true if audio is enabled, or false. + */ +bool zynqmp_disp_aud_enabled(struct zynqmp_disp *disp) +{ + return !!disp->audclk; +} + +/** + * zynqmp_disp_get_aud_clk_rate - Get the current audio clock rate + * @disp: Display subsystem + * + * Return: the current audio clock rate. + */ +unsigned int zynqmp_disp_get_aud_clk_rate(struct zynqmp_disp *disp) +{ + if (zynqmp_disp_aud_enabled(disp)) + return 0; + return clk_get_rate(disp->aclk); +} + +/** + * zynqmp_disp_get_crtc_mask - Return the CRTC bit mask + * @disp: Display subsystem + * + * Return: the crtc mask of the zyqnmp_disp CRTC. + */ +uint32_t zynqmp_disp_get_crtc_mask(struct zynqmp_disp *disp) +{ + return drm_crtc_mask(&disp->xlnx_crtc.crtc); +} + +/* + * DRM plane functions + */ + +static inline struct zynqmp_disp_layer *plane_to_layer(struct drm_plane *plane) +{ + return container_of(plane, struct zynqmp_disp_layer, plane); +} + +static int zynqmp_disp_plane_enable(struct drm_plane *plane) +{ + struct zynqmp_disp_layer *layer = plane_to_layer(plane); + struct zynqmp_disp *disp = layer->disp; + int ret; + + zynqmp_disp_set_g_alpha(disp, disp->alpha_en); + zynqmp_disp_set_alpha(disp, disp->alpha); + ret = zynqmp_disp_layer_enable(layer->disp, layer, + ZYNQMP_DISP_LAYER_NONLIVE); + if (ret) + return ret; + + if (layer->id == ZYNQMP_DISP_LAYER_GFX && disp->tpg_on) { + layer = &disp->layers[ZYNQMP_DISP_LAYER_VID]; + zynqmp_disp_layer_set_tpg(disp, layer, disp->tpg_on); + } + + return 0; +} + +static int zynqmp_disp_plane_disable(struct drm_plane *plane) +{ + struct zynqmp_disp_layer *layer = plane_to_layer(plane); + struct zynqmp_disp *disp = layer->disp; + + zynqmp_disp_layer_disable(disp, layer, ZYNQMP_DISP_LAYER_NONLIVE); + if (layer->id == ZYNQMP_DISP_LAYER_VID && disp->tpg_on) + zynqmp_disp_layer_set_tpg(disp, layer, disp->tpg_on); + + return 0; +} + +static int zynqmp_disp_plane_mode_set(struct drm_plane *plane, + struct drm_framebuffer *fb, + int crtc_x, int crtc_y, + unsigned int crtc_w, unsigned int crtc_h, + u32 src_x, u32 src_y, + u32 src_w, u32 src_h) +{ + struct zynqmp_disp_layer *layer = plane_to_layer(plane); + const struct drm_format_info *info = fb->format; + struct drm_format_name_buf format_name; + struct device *dev = layer->disp->dev; + dma_addr_t paddr; + unsigned int i; + int ret; + + if (!info) { + dev_err(dev, "unsupported framebuffer format %s\n", + drm_get_format_name(info->format, &format_name)); + return -EINVAL; + } + + ret = zynqmp_disp_layer_check_size(layer->disp, layer, src_w, src_h); + if (ret) + return ret; + + for (i = 0; i < info->num_planes; i++) { + unsigned int width = src_w / (i ? info->hsub : 1); + unsigned int height = src_h / (i ? info->vsub : 1); + + paddr = drm_fb_cma_get_gem_addr(fb, plane->state, i); + if (!paddr) { + dev_err(dev, "failed to get a paddr\n"); + return -EINVAL; + } + + layer->dma[i].xt.numf = height; + layer->dma[i].sgl[0].size = width * info->cpp[i]; + layer->dma[i].sgl[0].icg = fb->pitches[i] - + layer->dma[i].sgl[0].size; + layer->dma[i].xt.src_start = paddr; + layer->dma[i].xt.frame_size = 1; + layer->dma[i].xt.dir = DMA_MEM_TO_DEV; + layer->dma[i].xt.src_sgl = true; + layer->dma[i].xt.dst_sgl = false; + layer->dma[i].is_active = true; + } + + for (; i < ZYNQMP_DISP_MAX_NUM_SUB_PLANES; i++) + layer->dma[i].is_active = false; + + ret = zynqmp_disp_layer_set_fmt(layer->disp, layer, info->format); + if (ret) + dev_err(dev, "failed to set dp_sub layer fmt\n"); + + return ret; +} + +static void zynqmp_disp_plane_destroy(struct drm_plane *plane) +{ + drm_plane_cleanup(plane); +} + +static int +zynqmp_disp_plane_atomic_update_plane(struct drm_plane *plane, + struct drm_crtc *crtc, + struct drm_framebuffer *fb, + int crtc_x, int crtc_y, + unsigned int crtc_w, unsigned int crtc_h, + u32 src_x, u32 src_y, + u32 src_w, u32 src_h, + struct drm_modeset_acquire_ctx *ctx) +{ + struct drm_atomic_state *state; + struct drm_plane_state *plane_state; + int ret; + + state = drm_atomic_state_alloc(plane->dev); + if (!state) + return -ENOMEM; + + state->acquire_ctx = ctx; + plane_state = drm_atomic_get_plane_state(state, plane); + if (IS_ERR(plane_state)) { + ret = PTR_ERR(plane_state); + goto fail; + } + + ret = drm_atomic_set_crtc_for_plane(plane_state, crtc); + if (ret) + goto fail; + drm_atomic_set_fb_for_plane(plane_state, fb); + plane_state->crtc_x = crtc_x; + plane_state->crtc_y = crtc_y; + plane_state->crtc_w = crtc_w; + plane_state->crtc_h = crtc_h; + plane_state->src_x = src_x; + plane_state->src_y = src_y; + plane_state->src_w = src_w; + plane_state->src_h = src_h; + + if (plane == crtc->cursor) + state->legacy_cursor_update = true; + + /* Do async-update if possible */ + state->async_update = !drm_atomic_helper_async_check(plane->dev, state); + ret = drm_atomic_commit(state); +fail: + drm_atomic_state_put(state); + return ret; +} + +static const struct drm_plane_funcs zynqmp_disp_plane_funcs = { + .update_plane = zynqmp_disp_plane_atomic_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = zynqmp_disp_plane_destroy, + .reset = drm_atomic_helper_plane_reset, + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, +}; + +static void +zynqmp_disp_plane_atomic_update(struct drm_plane *plane, + struct drm_plane_state *old_state) +{ + int ret; + + if (!plane->state->crtc || !plane->state->fb) + return; + + if (old_state->fb && + old_state->fb->format->format != plane->state->fb->format->format) + zynqmp_disp_plane_disable(plane); + + ret = zynqmp_disp_plane_mode_set(plane, plane->state->fb, + plane->state->crtc_x, + plane->state->crtc_y, + plane->state->crtc_w, + plane->state->crtc_h, + plane->state->src_x >> 16, + plane->state->src_y >> 16, + plane->state->src_w >> 16, + plane->state->src_h >> 16); + if (ret) + return; + + zynqmp_disp_plane_enable(plane); +} + +static void +zynqmp_disp_plane_atomic_disable(struct drm_plane *plane, + struct drm_plane_state *old_state) +{ + zynqmp_disp_plane_disable(plane); +} + +static int zynqmp_disp_plane_atomic_async_check(struct drm_plane *plane, + struct drm_plane_state *state) +{ + return 0; +} + +static void +zynqmp_disp_plane_atomic_async_update(struct drm_plane *plane, + struct drm_plane_state *new_state) +{ + struct drm_plane_state *old_state = + drm_atomic_get_old_plane_state(new_state->state, plane); + + if (plane->state->fb == new_state->fb) + return; + + /* Update the current state with new configurations */ + drm_atomic_set_fb_for_plane(plane->state, new_state->fb); + plane->state->crtc = new_state->crtc; + plane->state->crtc_x = new_state->crtc_x; + plane->state->crtc_y = new_state->crtc_y; + plane->state->crtc_w = new_state->crtc_w; + plane->state->crtc_h = new_state->crtc_h; + plane->state->src_x = new_state->src_x; + plane->state->src_y = new_state->src_y; + plane->state->src_w = new_state->src_w; + plane->state->src_h = new_state->src_h; + plane->state->state = new_state->state; + + zynqmp_disp_plane_atomic_update(plane, old_state); +} + +static const struct drm_plane_helper_funcs zynqmp_disp_plane_helper_funcs = { + .atomic_update = zynqmp_disp_plane_atomic_update, + .atomic_disable = zynqmp_disp_plane_atomic_disable, + .atomic_async_check = zynqmp_disp_plane_atomic_async_check, + .atomic_async_update = zynqmp_disp_plane_atomic_async_update, +}; + +static int zynqmp_disp_create_plane(struct zynqmp_disp *disp) +{ + struct zynqmp_disp_layer *layer; + unsigned int i; + u32 *fmts = NULL; + unsigned int num_fmts = 0; + enum drm_plane_type type; + int ret; + + /* graphics layer is primary, and video layer is overaly */ + type = DRM_PLANE_TYPE_OVERLAY; + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { + layer = &disp->layers[i]; + zynqmp_disp_layer_get_fmts(disp, layer, &fmts, &num_fmts); + ret = drm_universal_plane_init(disp->drm, &layer->plane, 0, + &zynqmp_disp_plane_funcs, fmts, + num_fmts, NULL, type, NULL); + if (ret) + goto err_plane; + drm_plane_helper_add(&layer->plane, + &zynqmp_disp_plane_helper_funcs); + type = DRM_PLANE_TYPE_PRIMARY; + } + + return ret; + +err_plane: + if (i) + drm_plane_cleanup(&disp->layers[0].plane); + return ret; +} + +static void zynqmp_disp_destroy_plane(struct zynqmp_disp *disp) +{ + unsigned int i; + + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) + zynqmp_disp_plane_destroy(&disp->layers[i].plane); +} + +/* + * Xlnx crtc functions + */ + +static inline struct zynqmp_disp *xlnx_crtc_to_disp(struct xlnx_crtc *xlnx_crtc) +{ + return container_of(xlnx_crtc, struct zynqmp_disp, xlnx_crtc); +} + +static int zynqmp_disp_get_max_width(struct xlnx_crtc *xlnx_crtc) +{ + return ZYNQMP_DISP_MAX_WIDTH; +} + +static int zynqmp_disp_get_max_height(struct xlnx_crtc *xlnx_crtc) +{ + return ZYNQMP_DISP_MAX_HEIGHT; +} + +static uint32_t zynqmp_disp_get_format(struct xlnx_crtc *xlnx_crtc) +{ + struct zynqmp_disp *disp = xlnx_crtc_to_disp(xlnx_crtc); + + return disp->layers[ZYNQMP_DISP_LAYER_GFX].fmt->drm_fmt; +} + +static unsigned int zynqmp_disp_get_align(struct xlnx_crtc *xlnx_crtc) +{ + struct zynqmp_disp *disp = xlnx_crtc_to_disp(xlnx_crtc); + struct zynqmp_disp_layer *layer = &disp->layers[ZYNQMP_DISP_LAYER_VID]; + + return 1 << layer->dma->chan->device->copy_align; +} + +static u64 zynqmp_disp_get_dma_mask(struct xlnx_crtc *xlnx_crtc) +{ + return DMA_BIT_MASK(ZYNQMP_DISP_MAX_DMA_BIT); +} + +/* + * DRM crtc functions + */ + +static inline struct zynqmp_disp *crtc_to_disp(struct drm_crtc *crtc) +{ + struct xlnx_crtc *xlnx_crtc = to_xlnx_crtc(crtc); + + return xlnx_crtc_to_disp(xlnx_crtc); +} + +static int zynqmp_disp_crtc_mode_set(struct drm_crtc *crtc, + struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode, + int x, int y, + struct drm_framebuffer *old_fb) +{ + struct zynqmp_disp *disp = crtc_to_disp(crtc); + unsigned long rate; + long diff; + int ret; + + zynqmp_disp_clk_disable(disp->pclk, &disp->pclk_en); + ret = clk_set_rate(disp->pclk, adjusted_mode->clock * 1000); + if (ret) { + dev_err(disp->dev, "failed to set a pixel clock\n"); + return ret; + } + + rate = clk_get_rate(disp->pclk); + diff = rate - adjusted_mode->clock * 1000; + if (abs(diff) > (adjusted_mode->clock * 1000) / 20) { + dev_info(disp->dev, "request pixel rate: %d actual rate: %lu\n", + adjusted_mode->clock, rate); + } else { + dev_dbg(disp->dev, "request pixel rate: %d actual rate: %lu\n", + adjusted_mode->clock, rate); + } + + /* The timing register should be programmed always */ + zynqmp_dp_encoder_mode_set_stream(disp->dpsub->dp, adjusted_mode); + + return 0; +} + +static void +zynqmp_disp_crtc_atomic_enable(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) +{ + struct zynqmp_disp *disp = crtc_to_disp(crtc); + struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode; + int ret, vrefresh; + + zynqmp_disp_crtc_mode_set(crtc, &crtc->state->mode, + adjusted_mode, crtc->x, crtc->y, NULL); + + pm_runtime_get_sync(disp->dev); + ret = zynqmp_disp_clk_enable(disp->pclk, &disp->pclk_en); + if (ret) { + dev_err(disp->dev, "failed to enable a pixel clock\n"); + return; + } + zynqmp_disp_set_output_fmt(disp, disp->color); + zynqmp_disp_set_bg_color(disp, disp->bg_c0, disp->bg_c1, disp->bg_c2); + zynqmp_disp_enable(disp); + /* Delay of 3 vblank intervals for timing gen to be stable */ + vrefresh = (adjusted_mode->clock * 1000) / + (adjusted_mode->vtotal * adjusted_mode->htotal); + msleep(3 * 1000 / vrefresh); +} + +static void +zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) +{ + struct zynqmp_disp *disp = crtc_to_disp(crtc); + + zynqmp_disp_clk_disable(disp->pclk, &disp->pclk_en); + zynqmp_disp_plane_disable(crtc->primary); + zynqmp_disp_disable(disp, true); + pm_runtime_put_sync(disp->dev); +} + +static int zynqmp_disp_crtc_atomic_check(struct drm_crtc *crtc, + struct drm_crtc_state *state) +{ + return drm_atomic_add_affected_planes(state->state, crtc); +} + +static void +zynqmp_disp_crtc_atomic_begin(struct drm_crtc *crtc, + struct drm_crtc_state *old_crtc_state) +{ + /* Don't rely on vblank when disabling crtc */ + spin_lock_irq(&crtc->dev->event_lock); + if (crtc->primary->state->fb && crtc->state->event) { + /* Consume the flip_done event from atomic helper */ + crtc->state->event->pipe = drm_crtc_index(crtc); + WARN_ON(drm_crtc_vblank_get(crtc) != 0); + drm_crtc_arm_vblank_event(crtc, crtc->state->event); + crtc->state->event = NULL; + } + spin_unlock_irq(&crtc->dev->event_lock); +} + +static const struct drm_crtc_helper_funcs zynqmp_disp_crtc_helper_funcs = { + .atomic_enable = zynqmp_disp_crtc_atomic_enable, + .atomic_disable = zynqmp_disp_crtc_atomic_disable, + .atomic_check = zynqmp_disp_crtc_atomic_check, + .atomic_begin = zynqmp_disp_crtc_atomic_begin, +}; + +static void zynqmp_disp_crtc_destroy(struct drm_crtc *crtc) +{ + zynqmp_disp_crtc_atomic_disable(crtc, NULL); + drm_crtc_cleanup(crtc); +} + +static int zynqmp_disp_crtc_enable_vblank(struct drm_crtc *crtc) +{ + struct zynqmp_disp *disp = crtc_to_disp(crtc); + + zynqmp_dp_enable_vblank(disp->dpsub->dp); + + return 0; +} + +static void zynqmp_disp_crtc_disable_vblank(struct drm_crtc *crtc) +{ + struct zynqmp_disp *disp = crtc_to_disp(crtc); + + zynqmp_dp_disable_vblank(disp->dpsub->dp); +} + +static const struct drm_crtc_funcs zynqmp_disp_crtc_funcs = { + .destroy = zynqmp_disp_crtc_destroy, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .reset = drm_atomic_helper_crtc_reset, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = zynqmp_disp_crtc_enable_vblank, + .disable_vblank = zynqmp_disp_crtc_disable_vblank, +}; + +static const struct xlnx_crtc_ops zynqmp_disp_xlnx_crtc_ops = { + .get_max_width = &zynqmp_disp_get_max_width, + .get_max_height = &zynqmp_disp_get_max_height, + .get_format = &zynqmp_disp_get_format, + .get_align = &zynqmp_disp_get_align, + .get_dma_mask = &zynqmp_disp_get_dma_mask, +}; + +static void zynqmp_disp_create_crtc(struct zynqmp_disp *disp) +{ + struct drm_plane *plane = &disp->layers[ZYNQMP_DISP_LAYER_GFX].plane; + int ret; + + ret = drm_crtc_init_with_planes(disp->drm, &disp->xlnx_crtc.crtc, plane, + NULL, &zynqmp_disp_crtc_funcs, NULL); + drm_crtc_helper_add(&disp->xlnx_crtc.crtc, + &zynqmp_disp_crtc_helper_funcs); + + disp->xlnx_crtc.ops = &zynqmp_disp_xlnx_crtc_ops; + xlnx_crtc_register(disp->drm, &disp->xlnx_crtc); +} + +static void zynqmp_disp_destroy_crtc(struct zynqmp_disp *disp) +{ + xlnx_crtc_unregister(disp->drm, &disp->xlnx_crtc); + zynqmp_disp_crtc_destroy(&disp->xlnx_crtc.crtc); +} + +static void zynqmp_disp_map_crtc_to_plane(struct zynqmp_disp *disp) +{ + u32 possible_crtcs = drm_crtc_mask(&disp->xlnx_crtc.crtc); + unsigned int i; + + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) + disp->layers[i].plane.possible_crtcs = possible_crtcs; +} + +/* + * Component functions + */ + +int zynqmp_disp_bind(struct device *dev, struct device *master, void *data) +{ + struct zynqmp_dpsub *dpsub = dev_get_drvdata(dev); + struct zynqmp_disp *disp = dpsub->disp; + struct drm_device *drm = data; + int ret; + + disp->drm = drm; + + ret = zynqmp_disp_create_plane(disp); + if (ret) + return ret; + zynqmp_disp_create_crtc(disp); + zynqmp_disp_map_crtc_to_plane(disp); + + return 0; +} + +void zynqmp_disp_unbind(struct device *dev, struct device *master, void *data) +{ + struct zynqmp_dpsub *dpsub = dev_get_drvdata(dev); + struct zynqmp_disp *disp = dpsub->disp; + + zynqmp_disp_destroy_crtc(disp); + zynqmp_disp_destroy_plane(disp); +} + +/* + * Platform initialization functions + */ + +static int zynqmp_disp_enumerate_fmts(struct zynqmp_disp *disp) +{ + struct zynqmp_disp_layer *layer; + u32 *bus_fmts; + u32 i, size, num_bus_fmts; + u32 gfx_fmt = ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565; + + num_bus_fmts = ARRAY_SIZE(av_buf_live_fmts); + bus_fmts = devm_kzalloc(disp->dev, sizeof(*bus_fmts) * num_bus_fmts, + GFP_KERNEL); + if (!bus_fmts) + return -ENOMEM; + for (i = 0; i < num_bus_fmts; i++) + bus_fmts[i] = av_buf_live_fmts[i].bus_fmt; + + layer = &disp->layers[ZYNQMP_DISP_LAYER_VID]; + layer->num_bus_fmts = num_bus_fmts; + layer->bus_fmts = bus_fmts; + size = ARRAY_SIZE(av_buf_vid_fmts); + layer->num_fmts = size; + layer->drm_fmts = devm_kzalloc(disp->dev, + sizeof(*layer->drm_fmts) * size, + GFP_KERNEL); + if (!layer->drm_fmts) + return -ENOMEM; + for (i = 0; i < layer->num_fmts; i++) + layer->drm_fmts[i] = av_buf_vid_fmts[i].drm_fmt; + layer->fmt = &av_buf_vid_fmts[ZYNQMP_DISP_AV_BUF_VID_FMT_YUYV]; + + layer = &disp->layers[ZYNQMP_DISP_LAYER_GFX]; + layer->num_bus_fmts = num_bus_fmts; + layer->bus_fmts = bus_fmts; + size = ARRAY_SIZE(av_buf_gfx_fmts); + layer->num_fmts = size; + layer->drm_fmts = devm_kzalloc(disp->dev, + sizeof(*layer->drm_fmts) * size, + GFP_KERNEL); + if (!layer->drm_fmts) + return -ENOMEM; + + for (i = 0; i < layer->num_fmts; i++) + layer->drm_fmts[i] = av_buf_gfx_fmts[i].drm_fmt; + if (zynqmp_disp_gfx_init_fmt < ARRAY_SIZE(zynqmp_disp_gfx_init_fmts)) + gfx_fmt = zynqmp_disp_gfx_init_fmts[zynqmp_disp_gfx_init_fmt]; + layer->fmt = &av_buf_gfx_fmts[gfx_fmt]; + + return 0; +} + +int zynqmp_disp_probe(struct platform_device *pdev) +{ + struct zynqmp_dpsub *dpsub; + struct zynqmp_disp *disp; + struct resource *res; + int ret; + + disp = devm_kzalloc(&pdev->dev, sizeof(*disp), GFP_KERNEL); + if (!disp) + return -ENOMEM; + disp->dev = &pdev->dev; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "blend"); + disp->blend.base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(disp->blend.base)) + return PTR_ERR(disp->blend.base); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "av_buf"); + disp->av_buf.base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(disp->av_buf.base)) + return PTR_ERR(disp->av_buf.base); + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aud"); + disp->aud.base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(disp->aud.base)) + return PTR_ERR(disp->aud.base); + + dpsub = platform_get_drvdata(pdev); + dpsub->disp = disp; + disp->dpsub = dpsub; + + ret = zynqmp_disp_enumerate_fmts(disp); + if (ret) + return ret; + + /* Try the live PL video clock */ + disp->_pl_pclk = devm_clk_get(disp->dev, "dp_live_video_in_clk"); + if (!IS_ERR(disp->_pl_pclk)) { + disp->pclk = disp->_pl_pclk; + ret = zynqmp_disp_clk_enable_disable(disp->pclk, + &disp->pclk_en); + if (ret) + disp->pclk = NULL; + } else if (PTR_ERR(disp->_pl_pclk) == -EPROBE_DEFER) { + return PTR_ERR(disp->_pl_pclk); + } + + /* If the live PL video clock is not valid, fall back to PS clock */ + if (!disp->pclk) { + disp->_ps_pclk = devm_clk_get(disp->dev, "dp_vtc_pixel_clk_in"); + if (IS_ERR(disp->_ps_pclk)) { + dev_err(disp->dev, "failed to init any video clock\n"); + return PTR_ERR(disp->_ps_pclk); + } + disp->pclk = disp->_ps_pclk; + ret = zynqmp_disp_clk_enable_disable(disp->pclk, + &disp->pclk_en); + if (ret) { + dev_err(disp->dev, "failed to init any video clock\n"); + return ret; + } + } + + disp->aclk = devm_clk_get(disp->dev, "dp_apb_clk"); + if (IS_ERR(disp->aclk)) + return PTR_ERR(disp->aclk); + ret = zynqmp_disp_clk_enable(disp->aclk, &disp->aclk_en); + if (ret) { + dev_err(disp->dev, "failed to enable the APB clk\n"); + return ret; + } + + /* Try the live PL audio clock */ + disp->_pl_audclk = devm_clk_get(disp->dev, "dp_live_audio_aclk"); + if (!IS_ERR(disp->_pl_audclk)) { + disp->audclk = disp->_pl_audclk; + ret = zynqmp_disp_clk_enable_disable(disp->audclk, + &disp->audclk_en); + if (ret) + disp->audclk = NULL; + } + + /* If the live PL audio clock is not valid, fall back to PS clock */ + if (!disp->audclk) { + disp->_ps_audclk = devm_clk_get(disp->dev, "dp_aud_clk"); + if (!IS_ERR(disp->_ps_audclk)) { + disp->audclk = disp->_ps_audclk; + ret = zynqmp_disp_clk_enable_disable(disp->audclk, + &disp->audclk_en); + if (ret) + disp->audclk = NULL; + } + + if (!disp->audclk) { + dev_err(disp->dev, + "audio is disabled due to clock failure\n"); + } + } + + ret = zynqmp_disp_layer_create(disp); + if (ret) + goto error_aclk; + + return 0; + +error_aclk: + zynqmp_disp_clk_disable(disp->aclk, &disp->aclk_en); + return ret; +} + +int zynqmp_disp_remove(struct platform_device *pdev) +{ + struct zynqmp_dpsub *dpsub = platform_get_drvdata(pdev); + struct zynqmp_disp *disp = dpsub->disp; + + zynqmp_disp_layer_destroy(disp); + if (disp->audclk) + zynqmp_disp_clk_disable(disp->audclk, &disp->audclk_en); + zynqmp_disp_clk_disable(disp->aclk, &disp->aclk_en); + zynqmp_disp_clk_disable(disp->pclk, &disp->pclk_en); + dpsub->disp = NULL; + + return 0; +} diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.h b/drivers/gpu/drm/xlnx/zynqmp_disp.h new file mode 100644 index 0000000..954cc78 --- /dev/null +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.h @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ZynqMP Display Driver + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#ifndef _ZYNQMP_DISP_H_ +#define _ZYNQMP_DISP_H_ + +struct device; +struct platform_device; +struct zynqmp_disp; + +void zynqmp_disp_handle_vblank(struct zynqmp_disp *disp); +unsigned int zynqmp_disp_get_apb_clk_rate(struct zynqmp_disp *disp); +bool zynqmp_disp_aud_enabled(struct zynqmp_disp *disp); +unsigned int zynqmp_disp_get_aud_clk_rate(struct zynqmp_disp *disp); +uint32_t zynqmp_disp_get_crtc_mask(struct zynqmp_disp *disp); + +int zynqmp_disp_bind(struct device *dev, struct device *master, void *data); +void zynqmp_disp_unbind(struct device *dev, struct device *master, void *data); + +int zynqmp_disp_probe(struct platform_device *pdev); +int zynqmp_disp_remove(struct platform_device *pdev); + +#endif /* _ZYNQMP_DISP_H_ */ -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v8 3/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DP subsystem display 2018-07-08 2:05 ` [PATCH v8 3/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DP subsystem display Hyun Kwon @ 2019-02-17 23:34 ` Laurent Pinchart 0 siblings, 0 replies; 10+ messages in thread From: Laurent Pinchart @ 2019-02-17 23:34 UTC (permalink / raw) To: Hyun Kwon; +Cc: devicetree, Rob Herring, Michal Simek, dri-devel, Daniel Vetter Hi Hyun, Thank you for the patch. On Sat, Jul 07, 2018 at 07:05:36PM -0700, Hyun Kwon wrote: > Xilinx ZynqMP has a hardened display pipeline. The pipeline can > be logically partitioned into 2 parts: display controller and > DisplayPort encoder / transmitter. This driver handles the display > controller part of the pipeline that handles buffer management and > blending. > > Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > v8 > - Added a module param to specify the initial format for fbdev > - Don't update the plane for the same fb > v7 > - Disable a plane when the fb format changes > - Update planes asynchronously in the legacy set plane entry > v6 > - Use the new crtc op struct > - Clean up the duplicated license paragraphs > - Declare function pointer structures as static const > - Do complete forward declaration in headers > v4 > - Use drm_crtc_funcs for vblank > - Remove child nodes for layer > v3 > - Fix a small typo > v2 > - Use drm_fb_cma_get_gem_addr() > - Use drm_crtc_arm_vblank_event() > - Split drm properties into a separate patch > - Remove dummy funcs > - Don't add offset as it's already done by a new helper > - Change the SPDX identifier format > - Minor change of a commit message > --- > --- > drivers/gpu/drm/xlnx/zynqmp_disp.c | 2777 ++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/xlnx/zynqmp_disp.h | 29 + > 2 files changed, 2806 insertions(+) > create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.c > create mode 100644 drivers/gpu/drm/xlnx/zynqmp_disp.h > > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.c b/drivers/gpu/drm/xlnx/zynqmp_disp.c > new file mode 100644 > index 0000000..de5c4a2 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.c > @@ -0,0 +1,2777 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * ZynqMP Display Controller Driver > + * > + * Copyright (C) 2017 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#include <drm/drmP.h> > +#include <drm/drm_atomic.h> > +#include <drm/drm_atomic_helper.h> > +#include <drm/drm_crtc.h> > +#include <drm/drm_crtc_helper.h> > +#include <drm/drm_fb_cma_helper.h> > +#include <drm/drm_fourcc.h> > +#include <drm/drm_plane_helper.h> > + > +#include <linux/clk.h> > +#include <linux/device.h> > +#include <linux/dmaengine.h> > +#include <linux/interrupt.h> > +#include <linux/irqreturn.h> > +#include <linux/list.h> > +#include <linux/module.h> > +#include <linux/mutex.h> > +#include <linux/of.h> > +#include <linux/of_dma.h> > +#include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > +#include <linux/spinlock.h> > +#include <linux/uaccess.h> > + > +#include "xlnx_crtc.h" > +#include "xlnx_fb.h" > +#include "zynqmp_disp.h" > +#include "zynqmp_dp.h" > +#include "zynqmp_dpsub.h" > + > +/* > + * Overview > + * -------- > + * > + * The display part of ZynqMP DP subsystem. Internally, the device > + * is partitioned into 3 blocks: AV buffer manager, Blender, Audio. > + * The driver creates the DRM crtc and plane objectes and maps the DRM > + * interface into those 3 blocks. In high level, the driver is layered > + * in the following way: > + * > + * zynqmp_disp_crtc & zynqmp_disp_plane > + * |->zynqmp_disp > + * |->zynqmp_disp_aud > + * |->zynqmp_disp_blend > + * |->zynqmp_disp_av_buf > + * > + * The driver APIs are used externally by > + * - zynqmp_dpsub: Top level ZynqMP DP subsystem driver > + * - zynqmp_dp: ZynqMP DP driver > + * - xlnx_crtc: Xilinx DRM specific crtc functions > + */ > + > +/* The default value is ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565 */ > +static uint zynqmp_disp_gfx_init_fmt; > +module_param_named(gfx_init_fmt, zynqmp_disp_gfx_init_fmt, uint, 0444); > +MODULE_PARM_DESC(gfx_init_fmt, "The initial format of the graphics layer\n" > + "\t\t0 = rgb565 (default)\n" > + "\t\t1 = rgb888\n" > + "\t\t2 = argb8888\n"); Given that this is set by userspace, why do you need a module parameter ? Won't the format always been set anyway, overriding the default ? > +/* These value should be mapped to index of av_buf_gfx_fmts[] */ > +#define ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565 10 > +#define ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB888 5 > +#define ZYNQMP_DISP_AV_BUF_GFX_FMT_ARGB8888 1 > +static const u32 zynqmp_disp_gfx_init_fmts[] = { > + ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565, > + ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB888, > + ZYNQMP_DISP_AV_BUF_GFX_FMT_ARGB8888, > +}; > + > +/* Blender registers */ > +#define ZYNQMP_DISP_V_BLEND_BG_CLR_0 0x0 > +#define ZYNQMP_DISP_V_BLEND_BG_CLR_1 0x4 > +#define ZYNQMP_DISP_V_BLEND_BG_CLR_2 0x8 > +#define ZYNQMP_DISP_V_BLEND_BG_MAX 0xfff > +#define ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA 0xc > +#define ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA_MASK 0x1fe > +#define ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA_MAX 0xff > +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT 0x14 > +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_RGB 0x0 > +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR444 0x1 > +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR422 0x2 > +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YONLY 0x3 > +#define ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_XVYCC 0x4 > +#define ZYNQMP_DISP_V_BLEND_OUTPUT_EN_DOWNSAMPLE BIT(4) > +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL 0x18 > +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_EN_US BIT(0) > +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_RGB BIT(1) > +#define ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_BYPASS BIT(8) > +#define ZYNQMP_DISP_V_BLEND_NUM_COEFF 9 > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF0 0x20 > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF1 0x24 > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF2 0x28 > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF3 0x2c > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF4 0x30 > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF5 0x34 > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF6 0x38 > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF7 0x3c > +#define ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF8 0x40 > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF0 0x44 > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF1 0x48 > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF2 0x4c > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF3 0x50 > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF4 0x54 > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF5 0x58 > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF6 0x5c > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF7 0x60 > +#define ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF8 0x64 > +#define ZYNQMP_DISP_V_BLEND_NUM_OFFSET 3 > +#define ZYNQMP_DISP_V_BLEND_LUMA_IN1CSC_OFFSET 0x68 > +#define ZYNQMP_DISP_V_BLEND_CR_IN1CSC_OFFSET 0x6c > +#define ZYNQMP_DISP_V_BLEND_CB_IN1CSC_OFFSET 0x70 > +#define ZYNQMP_DISP_V_BLEND_LUMA_OUTCSC_OFFSET 0x74 > +#define ZYNQMP_DISP_V_BLEND_CR_OUTCSC_OFFSET 0x78 > +#define ZYNQMP_DISP_V_BLEND_CB_OUTCSC_OFFSET 0x7c > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF0 0x80 > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF1 0x84 > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF2 0x88 > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF3 0x8c > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF4 0x90 > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF5 0x94 > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF6 0x98 > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF7 0x9c > +#define ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF8 0xa0 > +#define ZYNQMP_DISP_V_BLEND_LUMA_IN2CSC_OFFSET 0xa4 > +#define ZYNQMP_DISP_V_BLEND_CR_IN2CSC_OFFSET 0xa8 > +#define ZYNQMP_DISP_V_BLEND_CB_IN2CSC_OFFSET 0xac > +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_ENABLE 0x1d0 > +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_COMP1 0x1d4 > +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_COMP2 0x1d8 > +#define ZYNQMP_DISP_V_BLEND_CHROMA_KEY_COMP3 0x1dc > + > +/* AV buffer manager registers */ > +#define ZYNQMP_DISP_AV_BUF_FMT 0x0 > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_SHIFT 0 > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK (0x1f << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_UYVY (0 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_VYUY (1 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YVYU (2 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUYV (3 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16 (4 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24 (5 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI (6 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MONO (7 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2 (8 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUV444 (9 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888 (10 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGBA8880 (11 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888_10 (12 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUV444_10 (13 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2_10 (14 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_10 (15 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_10 (16 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24_10 (17 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YONLY_10 (18 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420 (19 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420 (20 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2_420 (21 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420_10 (22 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420_10 (23 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI2_420_10 (24 << 0) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_SHIFT 8 > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK (0xf << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA8888 (0 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_ABGR8888 (1 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB888 (2 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_BGR888 (3 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA5551 (4 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA4444 (5 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB565 (6 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_8BPP (7 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_4BPP (8 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_2BPP (9 << 8) > +#define ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_1BPP (10 << 8) > +#define ZYNQMP_DISP_AV_BUF_NON_LIVE_LATENCY 0x8 > +#define ZYNQMP_DISP_AV_BUF_CHBUF 0x10 > +#define ZYNQMP_DISP_AV_BUF_CHBUF_EN BIT(0) > +#define ZYNQMP_DISP_AV_BUF_CHBUF_FLUSH BIT(1) > +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_SHIFT 2 > +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_MASK (0xf << 2) > +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_MAX 0xf > +#define ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_AUD_MAX 0x3 > +#define ZYNQMP_DISP_AV_BUF_STATUS 0x28 > +#define ZYNQMP_DISP_AV_BUF_STC_CTRL 0x2c > +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EN BIT(0) > +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_SHIFT 1 > +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_EX_VSYNC 0 > +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_EX_VID 1 > +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_EX_AUD 2 > +#define ZYNQMP_DISP_AV_BUF_STC_CTRL_EVENT_INT_VSYNC 3 > +#define ZYNQMP_DISP_AV_BUF_STC_INIT_VALUE0 0x30 > +#define ZYNQMP_DISP_AV_BUF_STC_INIT_VALUE1 0x34 > +#define ZYNQMP_DISP_AV_BUF_STC_ADJ 0x38 > +#define ZYNQMP_DISP_AV_BUF_STC_VID_VSYNC_TS0 0x3c > +#define ZYNQMP_DISP_AV_BUF_STC_VID_VSYNC_TS1 0x40 > +#define ZYNQMP_DISP_AV_BUF_STC_EXT_VSYNC_TS0 0x44 > +#define ZYNQMP_DISP_AV_BUF_STC_EXT_VSYNC_TS1 0x48 > +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT_TS0 0x4c > +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT_TS1 0x50 > +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT2_TS0 0x54 > +#define ZYNQMP_DISP_AV_BUF_STC_CUSTOM_EVENT2_TS1 0x58 > +#define ZYNQMP_DISP_AV_BUF_STC_SNAPSHOT0 0x60 > +#define ZYNQMP_DISP_AV_BUF_STC_SNAPSHOT1 0x64 > +#define ZYNQMP_DISP_AV_BUF_OUTPUT 0x70 > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_SHIFT 0 > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK (0x3 << 0) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE (0 << 0) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM (1 << 0) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN (2 << 0) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE (3 << 0) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_SHIFT 2 > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK (0x3 << 2) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE (0 << 2) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM (1 << 2) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE (2 << 2) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_NONE (3 << 2) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_SHIFT 4 > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK (0x3 << 4) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PL (0 << 4) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM (1 << 4) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_PATTERN (2 << 4) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE (3 << 4) > +#define ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN BIT(6) > +#define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT0 0x74 > +#define ZYNQMP_DISP_AV_BUF_HCOUNT_VCOUNT_INT1 0x78 > +#define ZYNQMP_DISP_AV_BUF_PATTERN_GEN_SELECT 0x100 > +#define ZYNQMP_DISP_AV_BUF_CLK_SRC 0x120 > +#define ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_FROM_PS BIT(0) > +#define ZYNQMP_DISP_AV_BUF_CLK_SRC_AUD_FROM_PS BIT(1) > +#define ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_INTERNAL_TIMING BIT(2) > +#define ZYNQMP_DISP_AV_BUF_SRST_REG 0x124 > +#define ZYNQMP_DISP_AV_BUF_SRST_REG_VID_RST BIT(1) > +#define ZYNQMP_DISP_AV_BUF_AUDIO_CH_CONFIG 0x12c > +#define ZYNQMP_DISP_AV_BUF_GFX_COMP0_SF 0x200 > +#define ZYNQMP_DISP_AV_BUF_GFX_COMP1_SF 0x204 > +#define ZYNQMP_DISP_AV_BUF_GFX_COMP2_SF 0x208 > +#define ZYNQMP_DISP_AV_BUF_VID_COMP0_SF 0x20c > +#define ZYNQMP_DISP_AV_BUF_VID_COMP1_SF 0x210 > +#define ZYNQMP_DISP_AV_BUF_VID_COMP2_SF 0x214 > +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_COMP0_SF 0x218 > +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_COMP1_SF 0x21c > +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_COMP2_SF 0x220 > +#define ZYNQMP_DISP_AV_BUF_LIVE_VID_CONFIG 0x224 > +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_COMP0_SF 0x228 > +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_COMP1_SF 0x22c > +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_COMP2_SF 0x230 > +#define ZYNQMP_DISP_AV_BUF_LIVE_GFX_CONFIG 0x234 > +#define ZYNQMP_DISP_AV_BUF_4BIT_SF 0x11111 > +#define ZYNQMP_DISP_AV_BUF_5BIT_SF 0x10842 > +#define ZYNQMP_DISP_AV_BUF_6BIT_SF 0x10410 > +#define ZYNQMP_DISP_AV_BUF_8BIT_SF 0x10101 > +#define ZYNQMP_DISP_AV_BUF_10BIT_SF 0x10040 > +#define ZYNQMP_DISP_AV_BUF_NULL_SF 0 > +#define ZYNQMP_DISP_AV_BUF_NUM_SF 3 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_6 0x0 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 0x1 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_10 0x2 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_12 0x3 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_MASK GENMASK(2, 0) > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_RGB 0x0 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV444 0x1 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV422 0x2 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YONLY 0x3 > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_MASK GENMASK(5, 4) > +#define ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_CB_FIRST BIT(8) > +#define ZYNQMP_DISP_AV_BUF_PALETTE_MEMORY 0x400 > + > +/* Audio registers */ > +#define ZYNQMP_DISP_AUD_MIXER_VOLUME 0x0 > +#define ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE 0x20002000 > +#define ZYNQMP_DISP_AUD_MIXER_META_DATA 0x4 > +#define ZYNQMP_DISP_AUD_CH_STATUS0 0x8 > +#define ZYNQMP_DISP_AUD_CH_STATUS1 0xc > +#define ZYNQMP_DISP_AUD_CH_STATUS2 0x10 > +#define ZYNQMP_DISP_AUD_CH_STATUS3 0x14 > +#define ZYNQMP_DISP_AUD_CH_STATUS4 0x18 > +#define ZYNQMP_DISP_AUD_CH_STATUS5 0x1c > +#define ZYNQMP_DISP_AUD_CH_A_DATA0 0x20 > +#define ZYNQMP_DISP_AUD_CH_A_DATA1 0x24 > +#define ZYNQMP_DISP_AUD_CH_A_DATA2 0x28 > +#define ZYNQMP_DISP_AUD_CH_A_DATA3 0x2c > +#define ZYNQMP_DISP_AUD_CH_A_DATA4 0x30 > +#define ZYNQMP_DISP_AUD_CH_A_DATA5 0x34 > +#define ZYNQMP_DISP_AUD_CH_B_DATA0 0x38 > +#define ZYNQMP_DISP_AUD_CH_B_DATA1 0x3c > +#define ZYNQMP_DISP_AUD_CH_B_DATA2 0x40 > +#define ZYNQMP_DISP_AUD_CH_B_DATA3 0x44 > +#define ZYNQMP_DISP_AUD_CH_B_DATA4 0x48 > +#define ZYNQMP_DISP_AUD_CH_B_DATA5 0x4c > +#define ZYNQMP_DISP_AUD_SOFT_RESET 0xc00 > +#define ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST BIT(0) > + You could split register definitions to a separate file to make this one more readable. Up to you. > +#define ZYNQMP_DISP_AV_BUF_NUM_VID_GFX_BUFFERS 4 > +#define ZYNQMP_DISP_AV_BUF_NUM_BUFFERS 6 > + > +#define ZYNQMP_DISP_NUM_LAYERS 2 > +#define ZYNQMP_DISP_MAX_NUM_SUB_PLANES 3 > +/* > + * 3840x2160 is advertised max resolution, but almost any resolutions under > + * 300Mhz pixel rate would work. Thus put 4096 as maximum width and height. > + */ > +#define ZYNQMP_DISP_MAX_WIDTH 4096 > +#define ZYNQMP_DISP_MAX_HEIGHT 4096 > +/* 44 bit addressing. This is acutally DPDMA limitation */ s/acutally/actually/ > +#define ZYNQMP_DISP_MAX_DMA_BIT 44 > + > +/** > + * enum zynqmp_disp_layer_type - Layer type (can be used for hw ID) > + * @ZYNQMP_DISP_LAYER_VID: Video layer > + * @ZYNQMP_DISP_LAYER_GFX: Graphics layer > + */ > +enum zynqmp_disp_layer_type { > + ZYNQMP_DISP_LAYER_VID, > + ZYNQMP_DISP_LAYER_GFX > +}; > + > +/** > + * enum zynqmp_disp_layer_mode - Layer mode > + * @ZYNQMP_DISP_LAYER_NONLIVE: non-live (memory) mode > + * @ZYNQMP_DISP_LAYER_LIVE: live (stream) mode > + */ > +enum zynqmp_disp_layer_mode { > + ZYNQMP_DISP_LAYER_NONLIVE, > + ZYNQMP_DISP_LAYER_LIVE > +}; > + > +/** > + * struct zynqmp_disp_layer_dma - struct for DMA engine > + * @chan: DMA channel > + * @is_active: flag if the DMA is active > + * @xt: Interleaved desc config container > + * @sgl: Data chunk for dma_interleaved_template > + */ > +struct zynqmp_disp_layer_dma { > + struct dma_chan *chan; > + bool is_active; > + struct dma_interleaved_template xt; > + struct data_chunk sgl[1]; > +}; > + > +/** > + * struct zynqmp_disp_layer - Display subsystem layer > + * @plane: DRM plane > + * @of_node: device node > + * @dma: struct for DMA engine > + * @num_chan: Number of DMA channel This is the number of DMA channels, not the number of the DMA channel. Let's renamed it to num_channels (or channels_count if you prefer), and s/DMA channel/DMA channels/. > + * @id: Layer ID > + * @offset: Layer offset in the register space > + * @enabled: flag if enabled > + * @fmt: Current format descriptor > + * @drm_fmts: Array of supported DRM formats > + * @num_fmts: Number of supported DRM formats > + * @bus_fmts: Array of supported bus formats > + * @num_bus_fmts: Number of supported bus formats > + * @w: Width > + * @h: Height > + * @mode: the operation mode > + * @other: other layer > + * @disp: back pointer to struct zynqmp_disp > + */ > +struct zynqmp_disp_layer { > + struct drm_plane plane; > + struct device_node *of_node; There's no per-layer OF node, is there ? Shouldn't you use disp->dev->of_node directly in the code ? > + struct zynqmp_disp_layer_dma dma[ZYNQMP_DISP_MAX_NUM_SUB_PLANES]; > + unsigned int num_chan; > + enum zynqmp_disp_layer_type id; This isn't an ID but a type, you can rename id to type. > + u32 offset; I think your code would look simpler if you created helper functions to read/write layer registers, and stored here the void __iomem *base instead of the offset. > + u8 enabled; Maybe bool as it can only be true or false ? > + const struct zynqmp_disp_fmt *fmt; > + u32 *drm_fmts; > + unsigned int num_fmts; > + u32 *bus_fmts; I'd make drm_fmts and bus_fmts const u32 * to emphasize that they are never modified after being initialized. > + unsigned int num_bus_fmts; > + u32 w; > + u32 h; How about spelling width and height in full to increase readability ? > + enum zynqmp_disp_layer_mode mode; > + struct zynqmp_disp_layer *other; > + struct zynqmp_disp *disp; > +}; > + > +/** > + * struct zynqmp_disp_blend - Blender > + * @base: Base address offset > + */ > +struct zynqmp_disp_blend { > + void __iomem *base; > +}; > + > +/** > + * struct zynqmp_disp_av_buf - AV buffer manager > + * @base: Base address offset > + */ > +struct zynqmp_disp_av_buf { > + void __iomem *base; > +}; > + > +/** > + * struct zynqmp_disp_aud - Audio > + * @base: Base address offset > + */ > +struct zynqmp_disp_aud { > + void __iomem *base; > +}; > + To simplify the code, how about dropping those three structures as they contain a single field, and adding blend_base, av_buf_base and aud_base to struct zynqmp_disp ? I would also create read/write inline helpers for those three. > +/** > + * struct zynqmp_disp - Display subsystem > + * @xlnx_crtc: Xilinx DRM crtc > + * @dev: device structure > + * @dpsub: Display subsystem > + * @drm: DRM core > + * @enabled: flag if enabled > + * @blend: Blender block > + * @av_buf: AV buffer manager block > + * @aud:Audio block > + * @layers: layers > + * @alpha: current global alpha value > + * @alpha_en: flag if the global alpha is enabled > + * @color: current output color value > + * @bg_c0: current value of 1st background color component > + * @bg_c1: current value of 2nd background color component > + * @bg_c2: current value of 3rd background color component > + * @tpg_on: current TPG mode state > + * @event: pending vblank event request > + * @_ps_pclk: Pixel clock from PS > + * @_pl_pclk: Pixel clock from PL > + * @pclk: Pixel clock > + * @pclk_en: Flag if the pixel clock is enabled > + * @_ps_audclk: Audio clock from PS > + * @_pl_audclk: Audio clock from PL > + * @audclk: Audio clock > + * @audclk_en: Flag if the audio clock is enabled > + * @aclk: APB clock > + * @aclk_en: Flag if the APB clock is enabled > + */ > +struct zynqmp_disp { > + struct xlnx_crtc xlnx_crtc; > + struct device *dev; > + struct zynqmp_dpsub *dpsub; > + struct drm_device *drm; > + bool enabled; > + struct zynqmp_disp_blend blend; > + struct zynqmp_disp_av_buf av_buf; > + struct zynqmp_disp_aud aud; > + struct zynqmp_disp_layer layers[ZYNQMP_DISP_NUM_LAYERS]; > + u32 alpha; > + bool alpha_en; > + unsigned int color; > + u32 bg_c0; > + u32 bg_c1; > + u32 bg_c2; > + bool tpg_on; > + struct drm_pending_vblank_event *event; This is never used. > + /* Don't operate directly on _ps_ */ > + struct clk *_ps_pclk; > + struct clk *_pl_pclk; Why the initial _ ? > + struct clk *pclk; > + bool pclk_en; > + struct clk *_ps_audclk; > + struct clk *_pl_audclk; Same here. > + struct clk *audclk; > + bool audclk_en; > + struct clk *aclk; > + bool aclk_en; > +}; > + > +/** > + * struct zynqmp_disp_fmt - Display subsystem format mapping > + * @drm_fmt: drm format > + * @disp_fmt: Display subsystem format > + * @bus_fmt: Bus formats (live formats) > + * @rgb: flag for RGB formats > + * @swap: flag to swap r & b for rgb formats, and u & v for yuv formats > + * @chroma_sub: flag for chroma subsampled formats > + * @sf: scaling factors for upto 3 color components > + */ > +struct zynqmp_disp_fmt { > + u32 drm_fmt; > + u32 disp_fmt; > + u32 bus_fmt; > + bool rgb; > + bool swap; > + bool chroma_sub; > + u32 sf[3]; > +}; > + > +static void zynqmp_disp_write(void __iomem *base, int offset, u32 val) > +{ > + writel(val, base + offset); > +} > + > +static u32 zynqmp_disp_read(void __iomem *base, int offset) > +{ > + return readl(base + offset); > +} > + > +static void zynqmp_disp_clr(void __iomem *base, int offset, u32 clr) > +{ > + zynqmp_disp_write(base, offset, zynqmp_disp_read(base, offset) & ~clr); > +} > + > +static void zynqmp_disp_set(void __iomem *base, int offset, u32 set) > +{ > + zynqmp_disp_write(base, offset, zynqmp_disp_read(base, offset) | set); > +} > + > +/* > + * Clock functions > + */ > + > +/** > + * zynqmp_disp_clk_enable - Enable the clock if needed > + * @clk: clk device > + * @flag: flag if the clock is enabled > + * > + * Enable the clock only if it's not enabled @flag. > + * > + * Return: value from clk_prepare_enable(). > + */ > +static int zynqmp_disp_clk_enable(struct clk *clk, bool *flag) > +{ > + int ret = 0; > + > + if (!*flag) { > + ret = clk_prepare_enable(clk); > + if (!ret) > + *flag = true; > + } > + > + return ret; No need for this complex flag dance. clk_prepare_enable() and clk_disable_unprepare() are reference-counted, you can call them directly, only the first clk_prepare_enable() will enable the clock, and only the last clk_disable_unprepare() will disable it. > +} > + > +/** > + * zynqmp_disp_clk_enable - Enable the clock if needed Wrong function name, but a you can call clk_disable_unprepare() directly, I expect this function to disappear (and the clock enable flags to be removed). > + * @clk: clk device > + * @flag: flag if the clock is enabled > + * > + * Disable the clock only if it's enabled @flag. > + */ > +static void zynqmp_disp_clk_disable(struct clk *clk, bool *flag) > +{ > + if (*flag) { > + clk_disable_unprepare(clk); > + *flag = false; > + } > +} > + > +/** > + * zynqmp_disp_clk_enable - Enable and disable the clock > + * @clk: clk device > + * @flag: flag if the clock is enabled > + * > + * This is to ensure the clock is disabled. The initial hardware state is > + * unknown, and this makes sure that the clock is disabled. This seems like a problem in the clock driver. Is it impossible to read the clock status from the device in the clock driver ? > + * > + * Return: value from clk_prepare_enable(). > + */ > +static int zynqmp_disp_clk_enable_disable(struct clk *clk, bool *flag) > +{ > + int ret = 0; > + > + if (!*flag) { As this is done at probe time only when the flag is false, there's no need to check the flag. > + ret = clk_prepare_enable(clk); > + clk_disable_unprepare(clk); Don't call disable if enable failed. > + } > + > + return ret; > +} > + > +/* > + * Blender functions > + */ > + > +/** > + * zynqmp_disp_blend_set_output_fmt - Set the output format of the blend > + * @blend: blend object > + * @fmt: output format > + * > + * Set the output format to @fmt. > + */ > +static void > +zynqmp_disp_blend_set_output_fmt(struct zynqmp_disp_blend *blend, u32 fmt) > +{ > + u16 reset_coeffs[] = { 0x1000, 0x0, 0x0, > + 0x0, 0x1000, 0x0, > + 0x0, 0x0, 0x1000 }; > + u32 reset_offsets[] = { 0x0, 0x0, 0x0 }; > + u16 sdtv_coeffs[] = { 0x4c9, 0x864, 0x1d3, > + 0x7d4d, 0x7ab3, 0x800, > + 0x800, 0x794d, 0x7eb3 }; > + u32 full_range_offsets[] = { 0x0, 0x8000000, 0x8000000 }; > + u16 *coeffs; > + u32 *offsets; The arrays and pointers can be const, and the arrays can be static. Same comment for the other functions below where applicable. > + u32 offset, i; > + > + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT, fmt); > + if (fmt == ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_RGB) { > + coeffs = reset_coeffs; > + offsets = reset_offsets; > + } else { > + /* Hardcode Full-range SDTV values. Can be runtime config */ > + coeffs = sdtv_coeffs; > + offsets = full_range_offsets; > + } > + > + offset = ZYNQMP_DISP_V_BLEND_RGB2YCBCR_COEFF0; > + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_COEFF; i++) > + zynqmp_disp_write(blend->base, offset + i * 4, coeffs[i]); > + > + offset = ZYNQMP_DISP_V_BLEND_LUMA_OUTCSC_OFFSET; > + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) > + zynqmp_disp_write(blend->base, offset + i * 4, offsets[i]); > +} > + > +/** > + * zynqmp_disp_blend_layer_enable - Enable a layer > + * @blend: blend object > + * @layer: layer to enable > + * > + * Enable a layer @layer. > + */ > +static void zynqmp_disp_blend_layer_enable(struct zynqmp_disp_blend *blend, > + struct zynqmp_disp_layer *layer) > +{ > + u32 reg, offset, i, s0, s1; > + u16 sdtv_coeffs[] = { 0x1000, 0x166f, 0x0, > + 0x1000, 0x7483, 0x7a7f, > + 0x1000, 0x0, 0x1c5a }; > + u16 swap_coeffs[] = { 0x1000, 0x0, 0x0, > + 0x0, 0x1000, 0x0, > + 0x0, 0x0, 0x1000 }; > + u16 *coeffs; > + u32 offsets[] = { 0x0, 0x1800, 0x1800 }; > + > + reg = layer->fmt->rgb ? ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_RGB : 0; > + reg |= layer->fmt->chroma_sub ? > + ZYNQMP_DISP_V_BLEND_LAYER_CONTROL_EN_US : 0; > + > + zynqmp_disp_write(blend->base, > + ZYNQMP_DISP_V_BLEND_LAYER_CONTROL + layer->offset, > + reg); > + Shouldn't you write the control register after writing all the coefficients, to avoid the risk of previous coefficients being used ? > + if (layer->id == ZYNQMP_DISP_LAYER_VID) > + offset = ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF0; > + else > + offset = ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF0; > + > + if (!layer->fmt->rgb) { > + coeffs = sdtv_coeffs; > + s0 = 1; > + s1 = 2; > + } else { > + coeffs = swap_coeffs; > + s0 = 0; > + s1 = 2; > + > + /* No offset for RGB formats */ > + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) > + offsets[i] = 0; > + } > + > + if (layer->fmt->swap) { > + for (i = 0; i < 3; i++) { > + coeffs[i * 3 + s0] ^= coeffs[i * 3 + s1]; > + coeffs[i * 3 + s1] ^= coeffs[i * 3 + s0]; > + coeffs[i * 3 + s0] ^= coeffs[i * 3 + s1]; Don't try to be too clever, there's a swap() macro in linux/kernel.h. Even better would be to handle this when writing the coefficients to be able to make the arrays static const. > + } > + } > + > + /* Program coefficients. Can be runtime configurable */ > + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_COEFF; i++) > + zynqmp_disp_write(blend->base, offset + i * 4, coeffs[i]); > + > + if (layer->id == ZYNQMP_DISP_LAYER_VID) > + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN1CSC_OFFSET; > + else > + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN2CSC_OFFSET; > + > + /* Program offsets. Can be runtime configurable */ > + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) > + zynqmp_disp_write(blend->base, offset + i * 4, offsets[i]); > +} > + > +/** > + * zynqmp_disp_blend_layer_disable - Disable a layer > + * @blend: blend object > + * @layer: layer to disable > + * > + * Disable a layer @layer. > + */ > +static void zynqmp_disp_blend_layer_disable(struct zynqmp_disp_blend *blend, > + struct zynqmp_disp_layer *layer) > +{ > + u32 offset; > + unsigned int i; > + > + zynqmp_disp_write(blend->base, > + ZYNQMP_DISP_V_BLEND_LAYER_CONTROL + layer->offset, 0); > + > + if (layer->id == ZYNQMP_DISP_LAYER_VID) > + offset = ZYNQMP_DISP_V_BLEND_IN1CSC_COEFF0; > + else > + offset = ZYNQMP_DISP_V_BLEND_IN2CSC_COEFF0; > + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_COEFF; i++) > + zynqmp_disp_write(blend->base, offset + i * 4, 0); > + > + if (layer->id == ZYNQMP_DISP_LAYER_VID) > + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN1CSC_OFFSET; > + else > + offset = ZYNQMP_DISP_V_BLEND_LUMA_IN2CSC_OFFSET; > + > + for (i = 0; i < ZYNQMP_DISP_V_BLEND_NUM_OFFSET; i++) > + zynqmp_disp_write(blend->base, offset + i * 4, 0); Do you need to write all coefficients to 0, isn't it enough to disable the layer in ZYNQMP_DISP_V_BLEND_LAYER_CONTROL ? > +} > + > +/** > + * zynqmp_disp_blend_set_bg_color - Set the background color > + * @blend: blend object > + * @c0: color component 0 > + * @c1: color component 1 > + * @c2: color component 2 > + * > + * Set the background color. > + */ > +static void zynqmp_disp_blend_set_bg_color(struct zynqmp_disp_blend *blend, > + u32 c0, u32 c1, u32 c2) > +{ > + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_BG_CLR_0, c0); > + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_BG_CLR_1, c1); > + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_BG_CLR_2, c2); > +} > + > +/** > + * zynqmp_disp_blend_set_alpha - Set the alpha for blending > + * @blend: blend object > + * @alpha: alpha value to be used > + * > + * Set the alpha for blending. > + */ > +static void > +zynqmp_disp_blend_set_alpha(struct zynqmp_disp_blend *blend, u32 alpha) > +{ > + u32 reg; > + > + reg = zynqmp_disp_read(blend->base, > + ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA); > + reg &= ~ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA_MASK; > + reg |= alpha << 1; > + zynqmp_disp_write(blend->base, ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA, > + reg); > +} > + > +/** > + * zynqmp_disp_blend_enable_alpha - Enable/disable the global alpha > + * @blend: blend object > + * @enable: flag to enable or disable alpha blending > + * > + * Enable/disable the global alpha blending based on @enable. > + */ > +static void > +zynqmp_disp_blend_enable_alpha(struct zynqmp_disp_blend *blend, bool enable) > +{ > + if (enable) > + zynqmp_disp_set(blend->base, > + ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA, BIT(0)); > + else > + zynqmp_disp_clr(blend->base, > + ZYNQMP_DISP_V_BLEND_SET_GLOBAL_ALPHA, BIT(0)); > +} > + > +/* List of blend output formats */ > +/* The id / order should be aligned with zynqmp_disp_color_enum */ > +static const struct zynqmp_disp_fmt blend_output_fmts[] = { > + { > + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_RGB, > + }, { > + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR444, > + }, { > + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YCBCR422, > + }, { > + .disp_fmt = ZYNQMP_DISP_V_BLEND_OUTPUT_VID_FMT_YONLY, > + } As you only use the .disp_fmt field, how about making an array of u32 to avoid wasting memory ? > +}; > + > +/* > + * AV buffer manager functions > + */ > + > +/* List of video layer formats */ > +#define ZYNQMP_DISP_AV_BUF_VID_FMT_YUYV 2 > +static const struct zynqmp_disp_fmt av_buf_vid_fmts[] = { > + { > + .drm_fmt = DRM_FORMAT_VYUY, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_VYUY, > + .rgb = false, > + .swap = true, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_UYVY, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_VYUY, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YUYV, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUYV, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YVYU, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YUYV, > + .rgb = false, > + .swap = true, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YUV422, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YVU422, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16, > + .rgb = false, > + .swap = true, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YUV444, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24, > + .rgb = false, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YVU444, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV24, > + .rgb = false, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_NV16, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_NV61, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI, > + .rgb = false, > + .swap = true, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_BGR888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_RGB888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_XBGR8888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGBA8880, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_XRGB8888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGBA8880, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_XBGR2101010, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888_10, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_XRGB2101010, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_RGB888_10, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YUV420, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_YVU420, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16_420, > + .rgb = false, > + .swap = true, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_NV12, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_NV21, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_VID_YV16CI_420, > + .rgb = false, > + .swap = true, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + } > +}; > + > +/* List of graphics layer formats */ > +static const struct zynqmp_disp_fmt av_buf_gfx_fmts[] = { > + { > + .drm_fmt = DRM_FORMAT_ABGR8888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA8888, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_ARGB8888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA8888, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_RGBA8888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_ABGR8888, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_BGRA8888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_ABGR8888, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_BGR888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB888, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_RGB888, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_BGR888, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_RGBA5551, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA5551, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_BGRA5551, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA5551, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_RGBA4444, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA4444, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_4BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_4BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_4BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_BGRA4444, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGBA4444, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_4BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_4BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_4BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_RGB565, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB565, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_6BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + }, { > + .drm_fmt = DRM_FORMAT_BGR565, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_RGB565, > + .rgb = true, > + .swap = true, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_6BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_5BIT_SF, > + } > +}; > + > +/* List of live formats */ > +/* Format can be combination of color, bpc, and cb-cr order. For multiline comments the prefered format is to have /* on its own line. > + * - Color: RGB / YUV444 / YUV422 / Y only > + * - BPC: 6, 8, 10, 12 > + * - Swap: Cb and Cr swap > + * which can be 32 bus formats. Only list the subset of those for now. > + */ > +static const struct zynqmp_disp_fmt av_buf_live_fmts[] = { > + { > + .bus_fmt = MEDIA_BUS_FMT_RGB666_1X18, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_6 || > + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_RGB, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_6BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_6BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_6BIT_SF, > + }, { > + .bus_fmt = MEDIA_BUS_FMT_RBG888_1X24, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 || > + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_RGB, > + .rgb = true, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .bus_fmt = MEDIA_BUS_FMT_UYVY8_1X16, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 || > + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV422, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .bus_fmt = MEDIA_BUS_FMT_VUY8_1X24, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_8 || > + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV444, > + .rgb = false, > + .swap = false, > + .chroma_sub = false, > + .sf[0] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_8BIT_SF, > + }, { > + .bus_fmt = MEDIA_BUS_FMT_UYVY10_1X20, > + .disp_fmt = ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_BPC_10 || > + ZYNQMP_DISP_AV_BUF_LIVE_CONFIG_FMT_YUV422, > + .rgb = false, > + .swap = false, > + .chroma_sub = true, > + .sf[0] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + .sf[1] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + .sf[2] = ZYNQMP_DISP_AV_BUF_10BIT_SF, > + } > +}; > + > +/** > + * zynqmp_disp_av_buf_set_fmt - Set the input formats > + * @av_buf: av buffer manager > + * @fmt: formats > + * > + * Set the av buffer manager format to @fmt. @fmt should have valid values > + * for both video and graphics layer. > + */ > +static void > +zynqmp_disp_av_buf_set_fmt(struct zynqmp_disp_av_buf *av_buf, u32 fmt) > +{ > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_FMT, fmt); > +} > + > +/** > + * zynqmp_disp_av_buf_get_fmt - Get the input formats > + * @av_buf: av buffer manager > + * > + * Get the input formats (which include video and graphics) of > + * av buffer manager. > + * > + * Return: value of ZYNQMP_DISP_AV_BUF_FMT register. > + */ > +static u32 > +zynqmp_disp_av_buf_get_fmt(struct zynqmp_disp_av_buf *av_buf) > +{ > + return zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_FMT); > +} > + > +/** > + * zynqmp_disp_av_buf_set_vid_clock_src - Set the video clock source > + * @av_buf: av buffer manager > + * @from_ps: flag if the video clock is from ps > + * > + * Set the video clock source based on @from_ps. It can come from either PS or > + * PL. > + */ > +static void > +zynqmp_disp_av_buf_set_vid_clock_src(struct zynqmp_disp_av_buf *av_buf, > + bool from_ps) > +{ > + u32 reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC); Read-modify-write isn't nice. Just combine this and the next two functions into a single function that configures all clock sources. > + > + if (from_ps) > + reg |= ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_FROM_PS; > + else > + reg &= ~ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_FROM_PS; > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_set_vid_timing_src - Set the video timing source > + * @av_buf: av buffer manager > + * @internal: flag if the video timing is generated internally > + * > + * Set the video timing source based on @internal. It can come externally or > + * be generated internally. > + */ > +static void > +zynqmp_disp_av_buf_set_vid_timing_src(struct zynqmp_disp_av_buf *av_buf, > + bool internal) > +{ > + u32 reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC); > + > + if (internal) > + reg |= ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_INTERNAL_TIMING; > + else > + reg &= ~ZYNQMP_DISP_AV_BUF_CLK_SRC_VID_INTERNAL_TIMING; > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_set_aud_clock_src - Set the audio clock source > + * @av_buf: av buffer manager > + * @from_ps: flag if the video clock is from ps > + * > + * Set the audio clock source based on @from_ps. It can come from either PS or > + * PL. > + */ > +static void > +zynqmp_disp_av_buf_set_aud_clock_src(struct zynqmp_disp_av_buf *av_buf, > + bool from_ps) > +{ > + u32 reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC); > + > + if (from_ps) > + reg |= ZYNQMP_DISP_AV_BUF_CLK_SRC_AUD_FROM_PS; > + else > + reg &= ~ZYNQMP_DISP_AV_BUF_CLK_SRC_AUD_FROM_PS; > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_CLK_SRC, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_enable_buf - Enable buffers > + * @av_buf: av buffer manager > + * > + * Enable all (video and audio) buffers. > + */ > +static void > +zynqmp_disp_av_buf_enable_buf(struct zynqmp_disp_av_buf *av_buf) > +{ > + u32 reg, i; > + > + reg = ZYNQMP_DISP_AV_BUF_CHBUF_EN; > + reg |= ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_MAX << > + ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_SHIFT; > + > + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_VID_GFX_BUFFERS; i++) > + zynqmp_disp_write(av_buf->base, > + ZYNQMP_DISP_AV_BUF_CHBUF + i * 4, reg); > + > + reg = ZYNQMP_DISP_AV_BUF_CHBUF_EN; > + reg |= ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_AUD_MAX << > + ZYNQMP_DISP_AV_BUF_CHBUF_BURST_LEN_SHIFT; > + > + for (; i < ZYNQMP_DISP_AV_BUF_NUM_BUFFERS; i++) > + zynqmp_disp_write(av_buf->base, > + ZYNQMP_DISP_AV_BUF_CHBUF + i * 4, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_disable_buf - Disable buffers > + * @av_buf: av buffer manager > + * > + * Disable all (video and audio) buffers. > + */ > +static void > +zynqmp_disp_av_buf_disable_buf(struct zynqmp_disp_av_buf *av_buf) > +{ > + u32 reg, i; > + > + reg = ZYNQMP_DISP_AV_BUF_CHBUF_FLUSH & ~ZYNQMP_DISP_AV_BUF_CHBUF_EN; > + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_BUFFERS; i++) > + zynqmp_disp_write(av_buf->base, > + ZYNQMP_DISP_AV_BUF_CHBUF + i * 4, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_enable_aud - Enable audio > + * @av_buf: av buffer manager > + * > + * Enable all audio buffers. > + */ > +static void > +zynqmp_disp_av_buf_enable_aud(struct zynqmp_disp_av_buf *av_buf) > +{ > + u32 reg; > + > + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); The same comment holds true here, I think your code is split in too many abstraction layers, it makes it more complex to read. Just create a function that configures the whole AV buffer manager and writes all registers directly, the code flow will be much simpler. > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MEM; > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_enable - Enable the video pipe > + * @av_buf: av buffer manager > + * > + * De-assert the video pipe reset > + */ > +static void > +zynqmp_disp_av_buf_enable(struct zynqmp_disp_av_buf *av_buf) > +{ > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_SRST_REG, 0); > +} > + > +/** > + * zynqmp_disp_av_buf_disable - Disable the video pipe > + * @av_buf: av buffer manager > + * > + * Assert the video pipe reset > + */ > +static void > +zynqmp_disp_av_buf_disable(struct zynqmp_disp_av_buf *av_buf) > +{ > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_SRST_REG, > + ZYNQMP_DISP_AV_BUF_SRST_REG_VID_RST); > +} > + > +/** > + * zynqmp_disp_av_buf_disable_aud - Disable audio > + * @av_buf: av buffer manager > + * > + * Disable all audio buffers. > + */ > +static void > +zynqmp_disp_av_buf_disable_aud(struct zynqmp_disp_av_buf *av_buf) > +{ > + u32 reg; > + > + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_MASK; > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_AUD1_DISABLE; > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_AUD2_EN; > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_set_tpg - Set TPG mode > + * @av_buf: av buffer manager > + * @tpg_on: if TPG should be on > + * > + * Set the TPG mode based on @tpg_on. > + */ > +static void zynqmp_disp_av_buf_set_tpg(struct zynqmp_disp_av_buf *av_buf, > + bool tpg_on) > +{ > + u32 reg; > + > + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > + if (tpg_on) > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN; > + else > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_PATTERN; > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_enable_vid - Enable the video layer buffer > + * @av_buf: av buffer manager > + * @layer: layer to enable > + * @mode: operation mode of layer > + * > + * Enable the video/graphics buffer for @layer. > + */ > +static void zynqmp_disp_av_buf_enable_vid(struct zynqmp_disp_av_buf *av_buf, > + struct zynqmp_disp_layer *layer, > + enum zynqmp_disp_layer_mode mode) > +{ > + u32 reg; > + > + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); > + if (layer->id == ZYNQMP_DISP_LAYER_VID) { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > + if (mode == ZYNQMP_DISP_LAYER_NONLIVE) > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MEM; > + else > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_LIVE; > + } else { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; > + if (mode == ZYNQMP_DISP_LAYER_NONLIVE) > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MEM; > + else > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_LIVE; > + } > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_disable_vid - Disable the video layer buffer > + * @av_buf: av buffer manager > + * @layer: layer to disable > + * > + * Disable the video/graphics buffer for @layer. > + */ > +static void > +zynqmp_disp_av_buf_disable_vid(struct zynqmp_disp_av_buf *av_buf, > + struct zynqmp_disp_layer *layer) > +{ > + u32 reg; > + > + reg = zynqmp_disp_read(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT); > + if (layer->id == ZYNQMP_DISP_LAYER_VID) { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_MASK; > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID1_NONE; > + } else { > + reg &= ~ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_MASK; > + reg |= ZYNQMP_DISP_AV_BUF_OUTPUT_VID2_DISABLE; > + } > + zynqmp_disp_write(av_buf->base, ZYNQMP_DISP_AV_BUF_OUTPUT, reg); > +} > + > +/** > + * zynqmp_disp_av_buf_init_sf - Initialize scaling factors > + * @av_buf: av buffer manager > + * @vid_fmt: video format descriptor > + * @gfx_fmt: graphics format descriptor > + * > + * Initialize scaling factors for both video and graphics layers. > + * If the format descriptor is NULL, the function skips the programming. > + */ > +static void zynqmp_disp_av_buf_init_sf(struct zynqmp_disp_av_buf *av_buf, > + const struct zynqmp_disp_fmt *vid_fmt, > + const struct zynqmp_disp_fmt *gfx_fmt) > +{ > + unsigned int i; > + u32 offset; > + > + if (gfx_fmt) { > + offset = ZYNQMP_DISP_AV_BUF_GFX_COMP0_SF; > + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) > + zynqmp_disp_write(av_buf->base, offset + i * 4, > + gfx_fmt->sf[i]); > + } > + > + if (vid_fmt) { > + offset = ZYNQMP_DISP_AV_BUF_VID_COMP0_SF; > + for (i = 0; i < ZYNQMP_DISP_AV_BUF_NUM_SF; i++) > + zynqmp_disp_write(av_buf->base, offset + i * 4, > + vid_fmt->sf[i]); > + } > +} > + > +/* > + * Audio functions > + */ > + > +/** > + * zynqmp_disp_aud_init - Initialize the audio > + * @aud: audio > + * > + * Initialize the audio with default mixer volume. The de-assertion will > + * initialize the audio states. > + */ > +static void zynqmp_disp_aud_init(struct zynqmp_disp_aud *aud) > +{ > + /* Clear the audio soft reset register as it's an non-reset flop */ > + zynqmp_disp_write(aud->base, ZYNQMP_DISP_AUD_SOFT_RESET, 0); > + zynqmp_disp_write(aud->base, ZYNQMP_DISP_AUD_MIXER_VOLUME, > + ZYNQMP_DISP_AUD_MIXER_VOLUME_NO_SCALE); > +} > + > +/** > + * zynqmp_disp_aud_deinit - De-initialize the audio > + * @aud: audio > + * > + * Put the audio in reset. > + */ > +static void zynqmp_disp_aud_deinit(struct zynqmp_disp_aud *aud) > +{ > + zynqmp_disp_set(aud->base, ZYNQMP_DISP_AUD_SOFT_RESET, > + ZYNQMP_DISP_AUD_SOFT_RESET_AUD_SRST); > +} > + > +/* > + * ZynqMP Display layer functions > + */ > + > +/** > + * zynqmp_disp_layer_check_size - Verify width and height for the layer > + * @disp: Display subsystem > + * @layer: layer > + * @width: width > + * @height: height > + * > + * The Display subsystem has the limitation that both layers should have > + * identical size. This function stores width and height of @layer, and verifies > + * if the size (width and height) is valid. > + * > + * Return: 0 on success, or -EINVAL if width or/and height is invalid. > + */ > +static int zynqmp_disp_layer_check_size(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer, > + u32 width, u32 height) > +{ > + struct zynqmp_disp_layer *other = layer->other; > + > + if (other->enabled && (other->w != width || other->h != height)) { > + dev_err(disp->dev, "Layer width:height must be %d:%d\n", > + other->w, other->h); It's not just about the two layers matching, they also need to cover the full screen, right ? You should compare the size to the CRTC mode (retrieved from the atomic state). There's no need to print an error message as this situation can be triggered from userspace, which would give userspace a way to flood the kernel log. You could use dev_dbg() if you wanted to help debugging failures. > + return -EINVAL; > + } > + > + layer->w = width; > + layer->h = height; If you compare the dimensions to the mode you can drop these two values as they're not used anywhere else. > + > + return 0; > +} > + > +/** > + * zynqmp_disp_map_fmt - Find the Display subsystem format for given drm format > + * @fmts: format table to look up > + * @size: size of the table @fmts > + * @drm_fmt: DRM format to search > + * > + * Search a Display subsystem format corresponding to the given DRM format > + * @drm_fmt, and return the format descriptor which contains the Display > + * subsystem format value. > + * > + * Return: a Display subsystem format descriptor on success, or NULL. > + */ > +static const struct zynqmp_disp_fmt * > +zynqmp_disp_map_fmt(const struct zynqmp_disp_fmt fmts[], > + unsigned int size, uint32_t drm_fmt) > +{ > + unsigned int i; > + > + for (i = 0; i < size; i++) > + if (fmts[i].drm_fmt == drm_fmt) > + return &fmts[i]; > + > + return NULL; > +} > + > +/** > + * zynqmp_disp_set_fmt - Set the format of the layer > + * @disp: Display subsystem > + * @layer: layer to set the format > + * @drm_fmt: DRM format to set > + * > + * Set the format of the given layer to @drm_fmt. > + * > + * Return: 0 on success. -EINVAL if @drm_fmt is not supported by the layer. > + */ > +static int zynqmp_disp_layer_set_fmt(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer, > + uint32_t drm_fmt) > +{ > + const struct zynqmp_disp_fmt *fmt; > + const struct zynqmp_disp_fmt *vid_fmt = NULL, *gfx_fmt = NULL; > + u32 size, fmts, mask; > + > + if (layer->id == ZYNQMP_DISP_LAYER_VID) { > + size = ARRAY_SIZE(av_buf_vid_fmts); > + mask = ~ZYNQMP_DISP_AV_BUF_FMT_NL_VID_MASK; > + fmt = zynqmp_disp_map_fmt(av_buf_vid_fmts, size, drm_fmt); > + vid_fmt = fmt; > + } else { > + size = ARRAY_SIZE(av_buf_gfx_fmts); > + mask = ~ZYNQMP_DISP_AV_BUF_FMT_NL_GFX_MASK; > + fmt = zynqmp_disp_map_fmt(av_buf_gfx_fmts, size, drm_fmt); > + gfx_fmt = fmt; > + } > + > + if (!fmt) > + return -EINVAL; > + > + fmts = zynqmp_disp_av_buf_get_fmt(&disp->av_buf); > + fmts &= mask; > + fmts |= fmt->disp_fmt; > + zynqmp_disp_av_buf_set_fmt(&disp->av_buf, fmts); The code would be simpler if you moved the read-update-write sequence to zynqmp_disp_av_buf_set_fmt() and dropped zynqmp_disp_av_buf_get_fmt(). > + zynqmp_disp_av_buf_init_sf(&disp->av_buf, vid_fmt, gfx_fmt); > + layer->fmt = fmt; > + > + return 0; > +} > + > +/** > + * zynqmp_disp_set_tpg - Enable or disable TPG > + * @disp: Display subsystem > + * @layer: Video layer > + * @tpg_on: flag if TPG needs to be enabled or disabled > + * > + * Enable / disable the TPG mode on the video layer @layer depending on > + * @tpg_on. The video layer should be disabled prior to enable request. > + * > + * Return: 0 on success. -ENODEV if it's not video layer. -EIO if > + * the video layer is enabled. > + */ > +static int zynqmp_disp_layer_set_tpg(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer, > + bool tpg_on) > +{ > + if (layer->id != ZYNQMP_DISP_LAYER_VID) { > + dev_err(disp->dev, > + "only the video layer has the tpg mode\n"); > + return -ENODEV; > + } You can drop this check, the caller already ensures this. > + > + if (layer->enabled) { > + dev_err(disp->dev, > + "the video layer should be disabled for tpg mode\n"); > + return -EIO; > + } You should make sure the error never occurs and remove the check. > + > + zynqmp_disp_av_buf_set_tpg(&disp->av_buf, tpg_on); > + disp->tpg_on = tpg_on; > + > + return 0; > +} > + > +/** > + * zynqmp_disp_get_fmt - Get the supported DRM formats of the layer > + * @disp: Display subsystem > + * @layer: layer to get the formats > + * @drm_fmts: pointer to array of DRM format strings > + * @num_fmts: pointer to number of returned DRM formats > + * > + * Get the supported DRM formats of the given layer. > + */ > +static void zynqmp_disp_layer_get_fmts(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer, > + u32 **drm_fmts, unsigned int *num_fmts) > +{ > + *drm_fmts = layer->drm_fmts; > + *num_fmts = layer->num_fmts; Just inline this in the caller, it's not worth a function. > +} > + > +/** > + * zynqmp_disp_layer_enable - Enable the layer > + * @disp: Display subsystem > + * @layer: layer to esable s/esable/enable/ > + * @mode: operation mode > + * > + * Enable the layer @layer. > + * > + * Return: 0 on success, otherwise error code. > + */ > +static int zynqmp_disp_layer_enable(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer, > + enum zynqmp_disp_layer_mode mode) > +{ > + struct device *dev = disp->dev; > + struct dma_async_tx_descriptor *desc; > + enum dma_ctrl_flags flags; > + unsigned int i; > + > + if (layer->enabled && layer->mode != mode) { > + dev_err(dev, "layer is already enabled in different mode\n"); > + return -EBUSY; > + } Can this happen ? If so it should be checked at .atomic_check() time, otherwise you should remove the check. > + > + zynqmp_disp_av_buf_enable_vid(&disp->av_buf, layer, mode); > + zynqmp_disp_blend_layer_enable(&disp->blend, layer); > + > + layer->enabled = true; > + layer->mode = mode; > + > + if (mode == ZYNQMP_DISP_LAYER_LIVE) > + return 0; > + > + for (i = 0; i < ZYNQMP_DISP_MAX_NUM_SUB_PLANES; i++) { > + struct zynqmp_disp_layer_dma *dma = &layer->dma[i]; > + > + if (dma->chan && dma->is_active) { > + flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT; > + desc = dmaengine_prep_interleaved_dma(dma->chan, > + &dma->xt, flags); > + if (!desc) { > + dev_err(dev, "failed to prep DMA descriptor\n"); > + return -ENOMEM; > + } > + > + dmaengine_submit(desc); > + dma_async_issue_pending(dma->chan); > + } > + } > + > + return 0; > +} > + > +/** > + * zynqmp_disp_layer_disable - Disable the layer > + * @disp: Display subsystem > + * @layer: layer to disable > + * @mode: operation mode > + * > + * Disable the layer @layer. > + * > + * Return: 0 on success, or -EBUSY if the layer is in different mode. > + */ > +static int zynqmp_disp_layer_disable(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer, > + enum zynqmp_disp_layer_mode mode) > +{ > + struct device *dev = disp->dev; > + unsigned int i; > + > + if (layer->mode != mode) { > + dev_err(dev, "the layer is operating in different mode\n"); > + return -EBUSY; > + } > + Same comment here. > + for (i = 0; i < ZYNQMP_DISP_MAX_NUM_SUB_PLANES; i++) > + if (layer->dma[i].chan && layer->dma[i].is_active) > + dmaengine_terminate_sync(layer->dma[i].chan); > + > + zynqmp_disp_av_buf_disable_vid(&disp->av_buf, layer); > + zynqmp_disp_blend_layer_disable(&disp->blend, layer); > + layer->enabled = false; > + > + return 0; > +} > + > +/** > + * zynqmp_disp_layer_request_dma - Request DMA channels for a layer > + * @disp: Display subsystem > + * @layer: layer to request DMA channels > + * @name: identifier string for layer type > + * > + * Request DMA engine channels for corresponding layer. > + * > + * Return: 0 on success, or err value from of_dma_request_slave_channel(). > + */ > +static int > +zynqmp_disp_layer_request_dma(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer, const char *name) I'd pass the plane type instead of the name and convert it to a name inside this function, to have all the information required to make sure we never overflow the sprintf buffer in the same place. > +{ > + struct zynqmp_disp_layer_dma *dma; > + unsigned int i; > + int ret; > + > + for (i = 0; i < layer->num_chan; i++) { > + char temp[16]; Please avoid temp for variable names, you should use something more descriptive, such as dma_channel_name for instance. > + > + dma = &layer->dma[i]; > + snprintf(temp, sizeof(temp), "%s%d", name, i); i is unsigned, you should use %u instead of %d. > + dma->chan = of_dma_request_slave_channel(layer->of_node, > + temp); > + if (IS_ERR(dma->chan)) { > + dev_err(disp->dev, "failed to request dma channel\n"); > + ret = PTR_ERR(dma->chan); > + dma->chan = NULL; > + return ret; > + } > + } > + > + return 0; > +} > + > +/** > + * zynqmp_disp_layer_release_dma - Release DMA channels for a layer > + * @disp: Display subsystem > + * @layer: layer to release DMA channels > + * > + * Release the dma channels associated with @layer. > + */ > +static void zynqmp_disp_layer_release_dma(struct zynqmp_disp *disp, > + struct zynqmp_disp_layer *layer) > +{ > + unsigned int i; > + > + for (i = 0; i < layer->num_chan; i++) { > + if (layer->dma[i].chan) { > + /* Make sure the channel is terminated before release */ > + dmaengine_terminate_all(layer->dma[i].chan); > + dma_release_channel(layer->dma[i].chan); > + } > + } > +} > + > +/** > + * zynqmp_disp_layer_is_live - if any layer is live > + * @disp: Display subsystem > + * > + * Return: true if any layer is live > + */ > +static bool zynqmp_disp_layer_is_live(struct zynqmp_disp *disp) > +{ > + unsigned int i; > + > + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { > + if (disp->layers[i].enabled && > + disp->layers[i].mode == ZYNQMP_DISP_LAYER_LIVE) > + return true; > + } > + > + return false; > +} > + > +/** > + * zynqmp_disp_layer_is_enabled - if any layer is enabled > + * @disp: Display subsystem > + * > + * Return: true if any layer is enabled > + */ > +static bool zynqmp_disp_layer_is_enabled(struct zynqmp_disp *disp) > +{ > + unsigned int i; > + > + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) > + if (disp->layers[i].enabled) > + return true; > + > + return false; > +} > + > +/** > + * zynqmp_disp_layer_destroy - Destroy all layers > + * @disp: Display subsystem > + * > + * Destroy all layers. > + */ > +static void zynqmp_disp_layer_destroy(struct zynqmp_disp *disp) > +{ > + unsigned int i; > + > + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { > + zynqmp_disp_layer_release_dma(disp, &disp->layers[i]); > + if (disp->layers[i].of_node) > + of_node_put(disp->layers[i].of_node); You don't increase the refcount to of_node in zynqmp_disp_layer_create(), there's a refcount imbalance here. > + } > +} > + > +/** > + * zynqmp_disp_layer_create - Create all layers > + * @disp: Display subsystem > + * > + * Create all layers. > + * > + * Return: 0 on success, otherwise error code from failed function > + */ > +static int zynqmp_disp_layer_create(struct zynqmp_disp *disp) > +{ > + struct zynqmp_disp_layer *layer; > + unsigned int i; > + int num_chans[ZYNQMP_DISP_NUM_LAYERS] = { 3, 1 }; > + const char * const dma_name[] = { "vid", "gfx" }; > + int ret; > + > + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { > + layer = &disp->layers[i]; > + layer->id = i; > + layer->offset = i * 4; > + layer->other = &disp->layers[!i]; > + layer->num_chan = num_chans[i]; > + layer->of_node = disp->dev->of_node; > + ret = zynqmp_disp_layer_request_dma(disp, layer, dma_name[i]); > + if (ret) > + goto err; > + layer->disp = disp; > + } > + > + return 0; > + > +err: > + zynqmp_disp_layer_destroy(disp); > + return ret; > +} > + Wouldn't it make sense to split the layer handling to a separate file ? This one is getting quite long. Given that the DRM plane handling goes through operation callbacks, the layer API you need to expose to the disp would be pretty small I think. You should move both the layer-related code above, and the plane-related code below. > +/* > + * ZynqMP Display internal functions > + */ > + > +/* > + * Output format enumeration. > + * The ID should be aligned with blend_output_fmts. > + * The string should be aligned with how zynqmp_dp_set_color() decodes. > + */ > +static struct drm_prop_enum_list zynqmp_disp_color_enum[] = { > + { 0, "rgb" }, > + { 1, "ycrcb444" }, > + { 2, "ycrcb422" }, > + { 3, "yonly" }, > +}; > + > +/** > + * zynqmp_disp_set_output_fmt - Set the output format > + * @disp: Display subsystem > + * @id: the format ID. Refer to zynqmp_disp_color_enum[]. > + * > + * This function sets the output format of the display / blender as well as > + * the format of DP controller. The @id should be aligned with > + * zynqmp_disp_color_enum. > + */ > +static void > +zynqmp_disp_set_output_fmt(struct zynqmp_disp *disp, unsigned int id) > +{ > + const struct zynqmp_disp_fmt *fmt = &blend_output_fmts[id]; > + > + zynqmp_dp_set_color(disp->dpsub->dp, zynqmp_disp_color_enum[id].name); Shouldn't this be part of the drm_encoder mode set operation ? You should limit direct calls from the CRTC/plane code to the encoder/connector code. > + zynqmp_disp_blend_set_output_fmt(&disp->blend, fmt->disp_fmt); > +} > + > +/** > + * zynqmp_disp_set_bg_color - Set the background color > + * @disp: Display subsystem > + * @c0: color component 0 > + * @c1: color component 1 > + * @c2: color component 2 > + * > + * Set the background color with given color components (@c0, @c1, @c2). > + */ > +static void zynqmp_disp_set_bg_color(struct zynqmp_disp *disp, > + u32 c0, u32 c1, u32 c2) > +{ > + zynqmp_disp_blend_set_bg_color(&disp->blend, c0, c1, c2); This kind of wrapper is overkill, just call zynqmp_disp_blend_set_bg_color() directly in the caller. Same for the next two functions. > +} > + > +/** > + * zynqmp_disp_set_alpha - Set the alpha value > + * @disp: Display subsystem > + * @alpha: alpha value to set > + * > + * Set the alpha value for blending. > + */ > +static void zynqmp_disp_set_alpha(struct zynqmp_disp *disp, u32 alpha) > +{ > + disp->alpha = alpha; > + zynqmp_disp_blend_set_alpha(&disp->blend, alpha); > +} > + > +/** > + * zynqmp_disp_set_g_alpha - Enable/disable the global alpha blending > + * @disp: Display subsystem > + * @enable: flag to enable or disable alpha blending > + * > + * Set the alpha value for blending. > + */ > +static void zynqmp_disp_set_g_alpha(struct zynqmp_disp *disp, bool enable) > +{ > + disp->alpha_en = enable; > + zynqmp_disp_blend_enable_alpha(&disp->blend, enable); > +} > + > +/** > + * zynqmp_disp_enable - Enable the Display subsystem > + * @disp: Display subsystem > + * > + * Enable the Display subsystem. > + */ > +static void zynqmp_disp_enable(struct zynqmp_disp *disp) > +{ > + bool live; > + > + if (disp->enabled) > + return; > + > + zynqmp_disp_av_buf_enable(&disp->av_buf); > + /* Choose clock source based on the DT clock handle */ > + zynqmp_disp_av_buf_set_vid_clock_src(&disp->av_buf, !!disp->_ps_pclk); > + zynqmp_disp_av_buf_set_aud_clock_src(&disp->av_buf, !!disp->_ps_audclk); > + live = zynqmp_disp_layer_is_live(disp); > + zynqmp_disp_av_buf_set_vid_timing_src(&disp->av_buf, !live); Planes can be enabled or disabled at runtime while the display is active. The value of the live flag may thus change at runtime, and I assume that will be an issue. > + zynqmp_disp_av_buf_enable_buf(&disp->av_buf); > + zynqmp_disp_av_buf_enable_aud(&disp->av_buf); > + zynqmp_disp_aud_init(&disp->aud); > + disp->enabled = true; > +} > + > +/** > + * zynqmp_disp_disable - Disable the Display subsystem > + * @disp: Display subsystem > + * @force: flag to disable forcefully > + * > + * Disable the Display subsystem. > + */ > +static void zynqmp_disp_disable(struct zynqmp_disp *disp, bool force) > +{ > + struct drm_crtc *crtc = &disp->xlnx_crtc.crtc; > + > + if (!force && (!disp->enabled || zynqmp_disp_layer_is_enabled(disp))) > + return; The DRM atomic helpers ensure that the CRTC .atomic_disable() function will only be called when the CRTC is enabled. You can remove the force flag and drop this check (especially given that you hardcode force to true in the only caller). > + > + zynqmp_disp_aud_deinit(&disp->aud); > + zynqmp_disp_av_buf_disable_aud(&disp->av_buf); > + zynqmp_disp_av_buf_disable_buf(&disp->av_buf); > + zynqmp_disp_av_buf_disable(&disp->av_buf); > + > + /* Mark the flip is done as crtc is disabled anyway */ > + if (crtc->state->event) { > + complete_all(crtc->state->event->base.completion); > + crtc->state->event = NULL; > + } > + > + disp->enabled = false; As the DRM atomic helpers manage the enabled state for you, storing this internally is either unneeded, or a sign that something is wrong. > +} > + > +/* > + * ZynqMP Display external functions for zynqmp_dp > + */ > + > +/** > + * zynqmp_disp_handle_vblank - Handle the vblank event > + * @disp: Display subsystem > + * > + * This function handles the vblank interrupt, and sends an event to > + * CRTC object. This will be called by the DP vblank interrupt handler. > + */ > +void zynqmp_disp_handle_vblank(struct zynqmp_disp *disp) > +{ > + struct drm_crtc *crtc = &disp->xlnx_crtc.crtc; > + > + drm_crtc_handle_vblank(crtc); > +} > + > +/** > + * zynqmp_disp_get_apb_clk_rate - Get the current APB clock rate > + * @disp: Display subsystem > + * > + * Return: the current APB clock rate. > + */ > +unsigned int zynqmp_disp_get_apb_clk_rate(struct zynqmp_disp *disp) > +{ > + return clk_get_rate(disp->aclk); > +} > + > +/** > + * zynqmp_disp_aud_enabled - If the audio is enabled > + * @disp: Display subsystem > + * > + * Return if the audio is enabled depending on the audio clock. > + * > + * Return: true if audio is enabled, or false. > + */ > +bool zynqmp_disp_aud_enabled(struct zynqmp_disp *disp) > +{ > + return !!disp->audclk; > +} > + > +/** > + * zynqmp_disp_get_aud_clk_rate - Get the current audio clock rate > + * @disp: Display subsystem > + * > + * Return: the current audio clock rate. > + */ > +unsigned int zynqmp_disp_get_aud_clk_rate(struct zynqmp_disp *disp) > +{ > + if (zynqmp_disp_aud_enabled(disp)) > + return 0; > + return clk_get_rate(disp->aclk); > +} > + > +/** > + * zynqmp_disp_get_crtc_mask - Return the CRTC bit mask > + * @disp: Display subsystem > + * > + * Return: the crtc mask of the zyqnmp_disp CRTC. > + */ > +uint32_t zynqmp_disp_get_crtc_mask(struct zynqmp_disp *disp) > +{ > + return drm_crtc_mask(&disp->xlnx_crtc.crtc); > +} > + > +/* > + * DRM plane functions > + */ > + > +static inline struct zynqmp_disp_layer *plane_to_layer(struct drm_plane *plane) > +{ > + return container_of(plane, struct zynqmp_disp_layer, plane); > +} > + > +static int zynqmp_disp_plane_enable(struct drm_plane *plane) > +{ > + struct zynqmp_disp_layer *layer = plane_to_layer(plane); > + struct zynqmp_disp *disp = layer->disp; > + int ret; > + > + zynqmp_disp_set_g_alpha(disp, disp->alpha_en); > + zynqmp_disp_set_alpha(disp, disp->alpha); Don't split alpha setting in two functions that need to perform read/modify/write cycles, just create a single function to configure all apha-related parameters. > + ret = zynqmp_disp_layer_enable(layer->disp, layer, > + ZYNQMP_DISP_LAYER_NONLIVE); > + if (ret) > + return ret; > + > + if (layer->id == ZYNQMP_DISP_LAYER_GFX && disp->tpg_on) { > + layer = &disp->layers[ZYNQMP_DISP_LAYER_VID]; > + zynqmp_disp_layer_set_tpg(disp, layer, disp->tpg_on); > + } > + > + return 0; > +} > + > +static int zynqmp_disp_plane_disable(struct drm_plane *plane) > +{ > + struct zynqmp_disp_layer *layer = plane_to_layer(plane); > + struct zynqmp_disp *disp = layer->disp; > + > + zynqmp_disp_layer_disable(disp, layer, ZYNQMP_DISP_LAYER_NONLIVE); > + if (layer->id == ZYNQMP_DISP_LAYER_VID && disp->tpg_on) > + zynqmp_disp_layer_set_tpg(disp, layer, disp->tpg_on); > + > + return 0; > +} > + > +static int zynqmp_disp_plane_mode_set(struct drm_plane *plane, > + struct drm_framebuffer *fb, > + int crtc_x, int crtc_y, > + unsigned int crtc_w, unsigned int crtc_h, > + u32 src_x, u32 src_y, > + u32 src_w, u32 src_h) > +{ > + struct zynqmp_disp_layer *layer = plane_to_layer(plane); > + const struct drm_format_info *info = fb->format; > + struct drm_format_name_buf format_name; > + struct device *dev = layer->disp->dev; > + dma_addr_t paddr; > + unsigned int i; > + int ret; > + > + if (!info) { > + dev_err(dev, "unsupported framebuffer format %s\n", > + drm_get_format_name(info->format, &format_name)); > + return -EINVAL; > + } > + > + ret = zynqmp_disp_layer_check_size(layer->disp, layer, src_w, src_h); > + if (ret) > + return ret; > + These checks should be moved to the plane .atomic_check() implementation. .atomic_update() must not fail except in extreme cases, any incorrect parameter must be caught at .atomic_check() time. > + for (i = 0; i < info->num_planes; i++) { > + unsigned int width = src_w / (i ? info->hsub : 1); > + unsigned int height = src_h / (i ? info->vsub : 1); > + > + paddr = drm_fb_cma_get_gem_addr(fb, plane->state, i); > + if (!paddr) { > + dev_err(dev, "failed to get a paddr\n"); > + return -EINVAL; > + } > + > + layer->dma[i].xt.numf = height; > + layer->dma[i].sgl[0].size = width * info->cpp[i]; > + layer->dma[i].sgl[0].icg = fb->pitches[i] - > + layer->dma[i].sgl[0].size; > + layer->dma[i].xt.src_start = paddr; > + layer->dma[i].xt.frame_size = 1; > + layer->dma[i].xt.dir = DMA_MEM_TO_DEV; > + layer->dma[i].xt.src_sgl = true; > + layer->dma[i].xt.dst_sgl = false; > + layer->dma[i].is_active = true; > + } > + > + for (; i < ZYNQMP_DISP_MAX_NUM_SUB_PLANES; i++) > + layer->dma[i].is_active = false; > + > + ret = zynqmp_disp_layer_set_fmt(layer->disp, layer, info->format); > + if (ret) > + dev_err(dev, "failed to set dp_sub layer fmt\n"); To avoid failures the zynqmp_disp_map_fmt() part of zynqmp_disp_layer_set_fmt() must be performed at .atomic_check() time and stored in the plane state. You need to subclass the DRM plane state into your own structure to do that, and you can then use information from the custom state in .atomic_update(). > + return ret; > +} > + > +static void zynqmp_disp_plane_destroy(struct drm_plane *plane) > +{ > + drm_plane_cleanup(plane); Just plug drm_plane_cleanup() as the .destroy() handler and drop this function. > +} > + > +static int > +zynqmp_disp_plane_atomic_update_plane(struct drm_plane *plane, > + struct drm_crtc *crtc, > + struct drm_framebuffer *fb, > + int crtc_x, int crtc_y, > + unsigned int crtc_w, unsigned int crtc_h, > + u32 src_x, u32 src_y, > + u32 src_w, u32 src_h, > + struct drm_modeset_acquire_ctx *ctx) > +{ > + struct drm_atomic_state *state; > + struct drm_plane_state *plane_state; > + int ret; > + > + state = drm_atomic_state_alloc(plane->dev); > + if (!state) > + return -ENOMEM; > + > + state->acquire_ctx = ctx; > + plane_state = drm_atomic_get_plane_state(state, plane); > + if (IS_ERR(plane_state)) { > + ret = PTR_ERR(plane_state); > + goto fail; > + } > + > + ret = drm_atomic_set_crtc_for_plane(plane_state, crtc); > + if (ret) > + goto fail; > + drm_atomic_set_fb_for_plane(plane_state, fb); > + plane_state->crtc_x = crtc_x; > + plane_state->crtc_y = crtc_y; > + plane_state->crtc_w = crtc_w; > + plane_state->crtc_h = crtc_h; > + plane_state->src_x = src_x; > + plane_state->src_y = src_y; > + plane_state->src_w = src_w; > + plane_state->src_h = src_h; > + > + if (plane == crtc->cursor) > + state->legacy_cursor_update = true; > + > + /* Do async-update if possible */ > + state->async_update = !drm_atomic_helper_async_check(plane->dev, state); > + ret = drm_atomic_commit(state); This seems like something that should be fixed in the DRM core, duplicating the implementation of drm_atomic_helper_update_plane() isn't very nice :-( > +fail: > + drm_atomic_state_put(state); > + return ret; > +} > + > +static const struct drm_plane_funcs zynqmp_disp_plane_funcs = { > + .update_plane = zynqmp_disp_plane_atomic_update_plane, > + .disable_plane = drm_atomic_helper_disable_plane, > + .destroy = zynqmp_disp_plane_destroy, > + .reset = drm_atomic_helper_plane_reset, > + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, > +}; > + > +static void > +zynqmp_disp_plane_atomic_update(struct drm_plane *plane, > + struct drm_plane_state *old_state) > +{ > + int ret; > + > + if (!plane->state->crtc || !plane->state->fb) > + return; > + > + if (old_state->fb && > + old_state->fb->format->format != plane->state->fb->format->format) > + zynqmp_disp_plane_disable(plane); > + > + ret = zynqmp_disp_plane_mode_set(plane, plane->state->fb, > + plane->state->crtc_x, > + plane->state->crtc_y, > + plane->state->crtc_w, > + plane->state->crtc_h, > + plane->state->src_x >> 16, > + plane->state->src_y >> 16, > + plane->state->src_w >> 16, > + plane->state->src_h >> 16); You should pass the state pointer to zynqmp_disp_plane_mode_set(), it will make the function simpler. I would also rename that function to zynqmp_disp_plane_setup(), and it doesn't perform a mode set. > + if (ret) > + return; > + > + zynqmp_disp_plane_enable(plane); > +} > + > +static void > +zynqmp_disp_plane_atomic_disable(struct drm_plane *plane, > + struct drm_plane_state *old_state) > +{ > + zynqmp_disp_plane_disable(plane); > +} > + > +static int zynqmp_disp_plane_atomic_async_check(struct drm_plane *plane, > + struct drm_plane_state *state) > +{ > + return 0; > +} > + > +static void > +zynqmp_disp_plane_atomic_async_update(struct drm_plane *plane, > + struct drm_plane_state *new_state) > +{ > + struct drm_plane_state *old_state = > + drm_atomic_get_old_plane_state(new_state->state, plane); > + > + if (plane->state->fb == new_state->fb) > + return; > + > + /* Update the current state with new configurations */ > + drm_atomic_set_fb_for_plane(plane->state, new_state->fb); > + plane->state->crtc = new_state->crtc; > + plane->state->crtc_x = new_state->crtc_x; > + plane->state->crtc_y = new_state->crtc_y; > + plane->state->crtc_w = new_state->crtc_w; > + plane->state->crtc_h = new_state->crtc_h; > + plane->state->src_x = new_state->src_x; > + plane->state->src_y = new_state->src_y; > + plane->state->src_w = new_state->src_w; > + plane->state->src_h = new_state->src_h; > + plane->state->state = new_state->state; > + > + zynqmp_disp_plane_atomic_update(plane, old_state); > +} > + > +static const struct drm_plane_helper_funcs zynqmp_disp_plane_helper_funcs = { > + .atomic_update = zynqmp_disp_plane_atomic_update, > + .atomic_disable = zynqmp_disp_plane_atomic_disable, > + .atomic_async_check = zynqmp_disp_plane_atomic_async_check, > + .atomic_async_update = zynqmp_disp_plane_atomic_async_update, > +}; > + > +static int zynqmp_disp_create_plane(struct zynqmp_disp *disp) > +{ > + struct zynqmp_disp_layer *layer; > + unsigned int i; > + u32 *fmts = NULL; > + unsigned int num_fmts = 0; No need to initialize those variables. > + enum drm_plane_type type; > + int ret; > + > + /* graphics layer is primary, and video layer is overaly */ s/overaly/overlay/ > + type = DRM_PLANE_TYPE_OVERLAY; > + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) { > + layer = &disp->layers[i]; > + zynqmp_disp_layer_get_fmts(disp, layer, &fmts, &num_fmts); > + ret = drm_universal_plane_init(disp->drm, &layer->plane, 0, > + &zynqmp_disp_plane_funcs, fmts, > + num_fmts, NULL, type, NULL); > + if (ret) > + goto err_plane; > + drm_plane_helper_add(&layer->plane, > + &zynqmp_disp_plane_helper_funcs); > + type = DRM_PLANE_TYPE_PRIMARY; > + } > + > + return ret; > + > +err_plane: > + if (i) > + drm_plane_cleanup(&disp->layers[0].plane); I'd write for (; i > 0; i--) drm_plane_cleanup(&disp->layers[i-1].plane); to make it a bit more generic. > + return ret; > +} > + > +static void zynqmp_disp_destroy_plane(struct zynqmp_disp *disp) > +{ > + unsigned int i; > + > + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) > + zynqmp_disp_plane_destroy(&disp->layers[i].plane); > +} > + > +/* > + * Xlnx crtc functions > + */ > + > +static inline struct zynqmp_disp *xlnx_crtc_to_disp(struct xlnx_crtc *xlnx_crtc) > +{ > + return container_of(xlnx_crtc, struct zynqmp_disp, xlnx_crtc); > +} > + > +static int zynqmp_disp_get_max_width(struct xlnx_crtc *xlnx_crtc) > +{ > + return ZYNQMP_DISP_MAX_WIDTH; > +} > + > +static int zynqmp_disp_get_max_height(struct xlnx_crtc *xlnx_crtc) > +{ > + return ZYNQMP_DISP_MAX_HEIGHT; > +} > + > +static uint32_t zynqmp_disp_get_format(struct xlnx_crtc *xlnx_crtc) > +{ > + struct zynqmp_disp *disp = xlnx_crtc_to_disp(xlnx_crtc); > + > + return disp->layers[ZYNQMP_DISP_LAYER_GFX].fmt->drm_fmt; > +} > + > +static unsigned int zynqmp_disp_get_align(struct xlnx_crtc *xlnx_crtc) > +{ > + struct zynqmp_disp *disp = xlnx_crtc_to_disp(xlnx_crtc); > + struct zynqmp_disp_layer *layer = &disp->layers[ZYNQMP_DISP_LAYER_VID]; > + > + return 1 << layer->dma->chan->device->copy_align; > +} > + > +static u64 zynqmp_disp_get_dma_mask(struct xlnx_crtc *xlnx_crtc) > +{ > + return DMA_BIT_MASK(ZYNQMP_DISP_MAX_DMA_BIT); > +} > + > +/* > + * DRM crtc functions > + */ > + > +static inline struct zynqmp_disp *crtc_to_disp(struct drm_crtc *crtc) > +{ > + struct xlnx_crtc *xlnx_crtc = to_xlnx_crtc(crtc); > + > + return xlnx_crtc_to_disp(xlnx_crtc); > +} > + > +static int zynqmp_disp_crtc_mode_set(struct drm_crtc *crtc, > + struct drm_display_mode *mode, > + struct drm_display_mode *adjusted_mode, > + int x, int y, > + struct drm_framebuffer *old_fb) > +{ > + struct zynqmp_disp *disp = crtc_to_disp(crtc); > + unsigned long rate; > + long diff; > + int ret; > + > + zynqmp_disp_clk_disable(disp->pclk, &disp->pclk_en); Can the clock be enable here ? The DRM atomic helpers should guarantee that this function will only be called when the CRTC is disabled. > + ret = clk_set_rate(disp->pclk, adjusted_mode->clock * 1000); > + if (ret) { > + dev_err(disp->dev, "failed to set a pixel clock\n"); > + return ret; > + } > + > + rate = clk_get_rate(disp->pclk); > + diff = rate - adjusted_mode->clock * 1000; > + if (abs(diff) > (adjusted_mode->clock * 1000) / 20) { > + dev_info(disp->dev, "request pixel rate: %d actual rate: %lu\n", > + adjusted_mode->clock, rate); Is it worth a dev_info(), given that it can be triggered from userspace ? > + } else { > + dev_dbg(disp->dev, "request pixel rate: %d actual rate: %lu\n", > + adjusted_mode->clock, rate); > + } > + > + /* The timing register should be programmed always */ > + zynqmp_dp_encoder_mode_set_stream(disp->dpsub->dp, adjusted_mode); This should also be moved to the drm_encoder mode set handler. > + > + return 0; > +} > + > +static void > +zynqmp_disp_crtc_atomic_enable(struct drm_crtc *crtc, > + struct drm_crtc_state *old_crtc_state) > +{ > + struct zynqmp_disp *disp = crtc_to_disp(crtc); > + struct drm_display_mode *adjusted_mode = &crtc->state->adjusted_mode; > + int ret, vrefresh; > + > + zynqmp_disp_crtc_mode_set(crtc, &crtc->state->mode, > + adjusted_mode, crtc->x, crtc->y, NULL); > + > + pm_runtime_get_sync(disp->dev); This should be moved to the first line of the function, as zynqmp_disp_crtc_mode_set() may write registers. > + ret = zynqmp_disp_clk_enable(disp->pclk, &disp->pclk_en); > + if (ret) { > + dev_err(disp->dev, "failed to enable a pixel clock\n"); > + return; > + } > + zynqmp_disp_set_output_fmt(disp, disp->color); > + zynqmp_disp_set_bg_color(disp, disp->bg_c0, disp->bg_c1, disp->bg_c2); > + zynqmp_disp_enable(disp); > + /* Delay of 3 vblank intervals for timing gen to be stable */ > + vrefresh = (adjusted_mode->clock * 1000) / > + (adjusted_mode->vtotal * adjusted_mode->htotal); > + msleep(3 * 1000 / vrefresh); Ouch ! msleep() isn't very accurate. What happens if we proceed before the timing generator is stable ? Can't we instead wait for three vblank interrupts, if this is really needed ? > +} > + > +static void > +zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc, > + struct drm_crtc_state *old_crtc_state) > +{ > + struct zynqmp_disp *disp = crtc_to_disp(crtc); > + > + zynqmp_disp_clk_disable(disp->pclk, &disp->pclk_en); > + zynqmp_disp_plane_disable(crtc->primary); > + zynqmp_disp_disable(disp, true); > + pm_runtime_put_sync(disp->dev); > +} > + > +static int zynqmp_disp_crtc_atomic_check(struct drm_crtc *crtc, > + struct drm_crtc_state *state) > +{ > + return drm_atomic_add_affected_planes(state->state, crtc); > +} > + > +static void > +zynqmp_disp_crtc_atomic_begin(struct drm_crtc *crtc, > + struct drm_crtc_state *old_crtc_state) > +{ > + /* Don't rely on vblank when disabling crtc */ > + spin_lock_irq(&crtc->dev->event_lock); > + if (crtc->primary->state->fb && crtc->state->event) { > + /* Consume the flip_done event from atomic helper */ > + crtc->state->event->pipe = drm_crtc_index(crtc); > + WARN_ON(drm_crtc_vblank_get(crtc) != 0); > + drm_crtc_arm_vblank_event(crtc, crtc->state->event); > + crtc->state->event = NULL; > + } > + spin_unlock_irq(&crtc->dev->event_lock); > +} > + > +static const struct drm_crtc_helper_funcs zynqmp_disp_crtc_helper_funcs = { > + .atomic_enable = zynqmp_disp_crtc_atomic_enable, > + .atomic_disable = zynqmp_disp_crtc_atomic_disable, > + .atomic_check = zynqmp_disp_crtc_atomic_check, > + .atomic_begin = zynqmp_disp_crtc_atomic_begin, > +}; > + > +static void zynqmp_disp_crtc_destroy(struct drm_crtc *crtc) > +{ > + zynqmp_disp_crtc_atomic_disable(crtc, NULL); I don't think this is needed. You could then remove this function and plug drm_crtc_cleanup() in zynqmp_disp_crtc_funcs. > + drm_crtc_cleanup(crtc); > +} > + > +static int zynqmp_disp_crtc_enable_vblank(struct drm_crtc *crtc) > +{ > + struct zynqmp_disp *disp = crtc_to_disp(crtc); > + > + zynqmp_dp_enable_vblank(disp->dpsub->dp); > + > + return 0; > +} > + > +static void zynqmp_disp_crtc_disable_vblank(struct drm_crtc *crtc) > +{ > + struct zynqmp_disp *disp = crtc_to_disp(crtc); > + > + zynqmp_dp_disable_vblank(disp->dpsub->dp); > +} > + > +static const struct drm_crtc_funcs zynqmp_disp_crtc_funcs = { > + .destroy = zynqmp_disp_crtc_destroy, > + .set_config = drm_atomic_helper_set_config, > + .page_flip = drm_atomic_helper_page_flip, > + .reset = drm_atomic_helper_crtc_reset, > + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, > + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, > + .enable_vblank = zynqmp_disp_crtc_enable_vblank, > + .disable_vblank = zynqmp_disp_crtc_disable_vblank, > +}; > + > +static const struct xlnx_crtc_ops zynqmp_disp_xlnx_crtc_ops = { > + .get_max_width = &zynqmp_disp_get_max_width, > + .get_max_height = &zynqmp_disp_get_max_height, > + .get_format = &zynqmp_disp_get_format, > + .get_align = &zynqmp_disp_get_align, > + .get_dma_mask = &zynqmp_disp_get_dma_mask, > +}; > + > +static void zynqmp_disp_create_crtc(struct zynqmp_disp *disp) > +{ > + struct drm_plane *plane = &disp->layers[ZYNQMP_DISP_LAYER_GFX].plane; > + int ret; > + > + ret = drm_crtc_init_with_planes(disp->drm, &disp->xlnx_crtc.crtc, plane, > + NULL, &zynqmp_disp_crtc_funcs, NULL); > + drm_crtc_helper_add(&disp->xlnx_crtc.crtc, > + &zynqmp_disp_crtc_helper_funcs); > + > + disp->xlnx_crtc.ops = &zynqmp_disp_xlnx_crtc_ops; > + xlnx_crtc_register(disp->drm, &disp->xlnx_crtc); > +} > + > +static void zynqmp_disp_destroy_crtc(struct zynqmp_disp *disp) > +{ > + xlnx_crtc_unregister(disp->drm, &disp->xlnx_crtc); > + zynqmp_disp_crtc_destroy(&disp->xlnx_crtc.crtc); > +} > + > +static void zynqmp_disp_map_crtc_to_plane(struct zynqmp_disp *disp) > +{ > + u32 possible_crtcs = drm_crtc_mask(&disp->xlnx_crtc.crtc); > + unsigned int i; > + > + for (i = 0; i < ZYNQMP_DISP_NUM_LAYERS; i++) > + disp->layers[i].plane.possible_crtcs = possible_crtcs; > +} > + > +/* > + * Component functions > + */ This isn't a component driver (see comments to patch 5/5). > + > +int zynqmp_disp_bind(struct device *dev, struct device *master, void *data) > +{ > + struct zynqmp_dpsub *dpsub = dev_get_drvdata(dev); > + struct zynqmp_disp *disp = dpsub->disp; > + struct drm_device *drm = data; > + int ret; > + > + disp->drm = drm; > + > + ret = zynqmp_disp_create_plane(disp); > + if (ret) > + return ret; > + zynqmp_disp_create_crtc(disp); > + zynqmp_disp_map_crtc_to_plane(disp); > + > + return 0; > +} > + > +void zynqmp_disp_unbind(struct device *dev, struct device *master, void *data) > +{ > + struct zynqmp_dpsub *dpsub = dev_get_drvdata(dev); > + struct zynqmp_disp *disp = dpsub->disp; > + > + zynqmp_disp_destroy_crtc(disp); > + zynqmp_disp_destroy_plane(disp); > +} > + > +/* > + * Platform initialization functions > + */ > + > +static int zynqmp_disp_enumerate_fmts(struct zynqmp_disp *disp) > +{ > + struct zynqmp_disp_layer *layer; > + u32 *bus_fmts; > + u32 i, size, num_bus_fmts; > + u32 gfx_fmt = ZYNQMP_DISP_AV_BUF_GFX_FMT_RGB565; > + > + num_bus_fmts = ARRAY_SIZE(av_buf_live_fmts); > + bus_fmts = devm_kzalloc(disp->dev, sizeof(*bus_fmts) * num_bus_fmts, > + GFP_KERNEL); > + if (!bus_fmts) > + return -ENOMEM; > + for (i = 0; i < num_bus_fmts; i++) > + bus_fmts[i] = av_buf_live_fmts[i].bus_fmt; > + > + layer = &disp->layers[ZYNQMP_DISP_LAYER_VID]; > + layer->num_bus_fmts = num_bus_fmts; > + layer->bus_fmts = bus_fmts; > + size = ARRAY_SIZE(av_buf_vid_fmts); > + layer->num_fmts = size; > + layer->drm_fmts = devm_kzalloc(disp->dev, > + sizeof(*layer->drm_fmts) * size, > + GFP_KERNEL); > + if (!layer->drm_fmts) > + return -ENOMEM; > + for (i = 0; i < layer->num_fmts; i++) > + layer->drm_fmts[i] = av_buf_vid_fmts[i].drm_fmt; > + layer->fmt = &av_buf_vid_fmts[ZYNQMP_DISP_AV_BUF_VID_FMT_YUYV]; > + > + layer = &disp->layers[ZYNQMP_DISP_LAYER_GFX]; > + layer->num_bus_fmts = num_bus_fmts; > + layer->bus_fmts = bus_fmts; > + size = ARRAY_SIZE(av_buf_gfx_fmts); > + layer->num_fmts = size; > + layer->drm_fmts = devm_kzalloc(disp->dev, > + sizeof(*layer->drm_fmts) * size, > + GFP_KERNEL); > + if (!layer->drm_fmts) > + return -ENOMEM; > + > + for (i = 0; i < layer->num_fmts; i++) > + layer->drm_fmts[i] = av_buf_gfx_fmts[i].drm_fmt; Any chance to factor out code to a separate function to initialize the layers ? There seems to be quite a bit of duplication here. > + if (zynqmp_disp_gfx_init_fmt < ARRAY_SIZE(zynqmp_disp_gfx_init_fmts)) > + gfx_fmt = zynqmp_disp_gfx_init_fmts[zynqmp_disp_gfx_init_fmt]; > + layer->fmt = &av_buf_gfx_fmts[gfx_fmt]; > + > + return 0; > +} > + > +int zynqmp_disp_probe(struct platform_device *pdev) > +{ > + struct zynqmp_dpsub *dpsub; > + struct zynqmp_disp *disp; > + struct resource *res; > + int ret; > + > + disp = devm_kzalloc(&pdev->dev, sizeof(*disp), GFP_KERNEL); > + if (!disp) > + return -ENOMEM; > + disp->dev = &pdev->dev; > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "blend"); > + disp->blend.base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(disp->blend.base)) > + return PTR_ERR(disp->blend.base); > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "av_buf"); > + disp->av_buf.base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(disp->av_buf.base)) > + return PTR_ERR(disp->av_buf.base); > + > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "aud"); > + disp->aud.base = devm_ioremap_resource(&pdev->dev, res); > + if (IS_ERR(disp->aud.base)) > + return PTR_ERR(disp->aud.base); > + > + dpsub = platform_get_drvdata(pdev); > + dpsub->disp = disp; > + disp->dpsub = dpsub; > + > + ret = zynqmp_disp_enumerate_fmts(disp); > + if (ret) > + return ret; > + > + /* Try the live PL video clock */ > + disp->_pl_pclk = devm_clk_get(disp->dev, "dp_live_video_in_clk"); > + if (!IS_ERR(disp->_pl_pclk)) { > + disp->pclk = disp->_pl_pclk; > + ret = zynqmp_disp_clk_enable_disable(disp->pclk, > + &disp->pclk_en); > + if (ret) > + disp->pclk = NULL; > + } else if (PTR_ERR(disp->_pl_pclk) == -EPROBE_DEFER) { > + return PTR_ERR(disp->_pl_pclk); > + } > + > + /* If the live PL video clock is not valid, fall back to PS clock */ > + if (!disp->pclk) { > + disp->_ps_pclk = devm_clk_get(disp->dev, "dp_vtc_pixel_clk_in"); > + if (IS_ERR(disp->_ps_pclk)) { > + dev_err(disp->dev, "failed to init any video clock\n"); > + return PTR_ERR(disp->_ps_pclk); > + } > + disp->pclk = disp->_ps_pclk; > + ret = zynqmp_disp_clk_enable_disable(disp->pclk, > + &disp->pclk_en); > + if (ret) { > + dev_err(disp->dev, "failed to init any video clock\n"); > + return ret; > + } > + } > + > + disp->aclk = devm_clk_get(disp->dev, "dp_apb_clk"); > + if (IS_ERR(disp->aclk)) > + return PTR_ERR(disp->aclk); > + ret = zynqmp_disp_clk_enable(disp->aclk, &disp->aclk_en); > + if (ret) { > + dev_err(disp->dev, "failed to enable the APB clk\n"); > + return ret; > + } > + > + /* Try the live PL audio clock */ > + disp->_pl_audclk = devm_clk_get(disp->dev, "dp_live_audio_aclk"); > + if (!IS_ERR(disp->_pl_audclk)) { > + disp->audclk = disp->_pl_audclk; > + ret = zynqmp_disp_clk_enable_disable(disp->audclk, > + &disp->audclk_en); > + if (ret) > + disp->audclk = NULL; > + } > + > + /* If the live PL audio clock is not valid, fall back to PS clock */ > + if (!disp->audclk) { > + disp->_ps_audclk = devm_clk_get(disp->dev, "dp_aud_clk"); > + if (!IS_ERR(disp->_ps_audclk)) { > + disp->audclk = disp->_ps_audclk; > + ret = zynqmp_disp_clk_enable_disable(disp->audclk, > + &disp->audclk_en); > + if (ret) > + disp->audclk = NULL; > + } > + > + if (!disp->audclk) { > + dev_err(disp->dev, > + "audio is disabled due to clock failure\n"); > + } > + } > + > + ret = zynqmp_disp_layer_create(disp); > + if (ret) > + goto error_aclk; > + > + return 0; > + > +error_aclk: > + zynqmp_disp_clk_disable(disp->aclk, &disp->aclk_en); > + return ret; > +} > + > +int zynqmp_disp_remove(struct platform_device *pdev) > +{ > + struct zynqmp_dpsub *dpsub = platform_get_drvdata(pdev); > + struct zynqmp_disp *disp = dpsub->disp; > + > + zynqmp_disp_layer_destroy(disp); > + if (disp->audclk) > + zynqmp_disp_clk_disable(disp->audclk, &disp->audclk_en); > + zynqmp_disp_clk_disable(disp->aclk, &disp->aclk_en); > + zynqmp_disp_clk_disable(disp->pclk, &disp->pclk_en); > + dpsub->disp = NULL; > + > + return 0; > +} > diff --git a/drivers/gpu/drm/xlnx/zynqmp_disp.h b/drivers/gpu/drm/xlnx/zynqmp_disp.h > new file mode 100644 > index 0000000..954cc78 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/zynqmp_disp.h > @@ -0,0 +1,29 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * ZynqMP Display Driver > + * > + * Copyright (C) 2017 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#ifndef _ZYNQMP_DISP_H_ > +#define _ZYNQMP_DISP_H_ > + > +struct device; > +struct platform_device; > +struct zynqmp_disp; > + > +void zynqmp_disp_handle_vblank(struct zynqmp_disp *disp); > +unsigned int zynqmp_disp_get_apb_clk_rate(struct zynqmp_disp *disp); > +bool zynqmp_disp_aud_enabled(struct zynqmp_disp *disp); > +unsigned int zynqmp_disp_get_aud_clk_rate(struct zynqmp_disp *disp); > +uint32_t zynqmp_disp_get_crtc_mask(struct zynqmp_disp *disp); > + > +int zynqmp_disp_bind(struct device *dev, struct device *master, void *data); > +void zynqmp_disp_unbind(struct device *dev, struct device *master, void *data); > + > +int zynqmp_disp_probe(struct platform_device *pdev); > +int zynqmp_disp_remove(struct platform_device *pdev); > + > +#endif /* _ZYNQMP_DISP_H_ */ -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v8 4/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DisplayPort 2018-07-08 2:05 [PATCH v8 0/5] Xilinx ZynqMP DisplayPort KMS driver Hyun Kwon ` (2 preceding siblings ...) 2018-07-08 2:05 ` [PATCH v8 3/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DP subsystem display Hyun Kwon @ 2018-07-08 2:05 ` Hyun Kwon 2018-07-08 2:05 ` [PATCH v8 5/5] drm: xlnx: ZynqMP DP subsystem DRM KMS driver Hyun Kwon 4 siblings, 0 replies; 10+ messages in thread From: Hyun Kwon @ 2018-07-08 2:05 UTC (permalink / raw) To: dri-devel, devicetree, Laurent Pinchart Cc: Daniel Vetter, Rob Herring, Michal Simek, Hyun Kwon This driver creates DRM encoder and connector for ZynqMP DisplayPort. Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- v8 - Allow to initialize without any phy lane v7 - Use correct number of lanes v6 - Constify all function pointers - Clean up the duplicated license paragraphs - Do complete forward declaration in the header v2 - Change the SPDX identifier format - Split drm properties into a separate patch --- --- drivers/gpu/drm/xlnx/zynqmp_dp.c | 1756 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/xlnx/zynqmp_dp.h | 30 + 2 files changed, 1786 insertions(+) create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp.c create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dp.h diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.c b/drivers/gpu/drm/xlnx/zynqmp_dp.c new file mode 100644 index 0000000..e60f07b --- /dev/null +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.c @@ -0,0 +1,1756 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ZynqMP DisplayPort Driver + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_connector.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_dp_helper.h> +#include <drm/drm_of.h> + +#include <linux/delay.h> +#include <linux/device.h> +#include <linux/module.h> +#include <linux/mutex.h> +#include <linux/phy/phy.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> +#include <linux/uaccess.h> + +#include "zynqmp_disp.h" +#include "zynqmp_dpsub.h" + +static uint zynqmp_dp_aux_timeout_ms = 50; +module_param_named(aux_timeout_ms, zynqmp_dp_aux_timeout_ms, uint, 0444); +MODULE_PARM_DESC(aux_timeout_ms, "DP aux timeout value in msec (default: 50)"); + +/* + * Some sink requires a delay after power on request + */ +static uint zynqmp_dp_power_on_delay_ms = 4; +module_param_named(power_on_delay_ms, zynqmp_dp_power_on_delay_ms, uint, 0444); +MODULE_PARM_DESC(aux_timeout_ms, "DP power on delay in msec (default: 4)"); + +/* Link configuration registers */ +#define ZYNQMP_DP_TX_LINK_BW_SET 0x0 +#define ZYNQMP_DP_TX_LANE_CNT_SET 0x4 +#define ZYNQMP_DP_TX_ENHANCED_FRAME_EN 0x8 +#define ZYNQMP_DP_TX_TRAINING_PATTERN_SET 0xc +#define ZYNQMP_DP_TX_SCRAMBLING_DISABLE 0x14 +#define ZYNQMP_DP_TX_DOWNSPREAD_CTL 0x18 +#define ZYNQMP_DP_TX_SW_RESET 0x1c +#define ZYNQMP_DP_TX_SW_RESET_STREAM1 BIT(0) +#define ZYNQMP_DP_TX_SW_RESET_STREAM2 BIT(1) +#define ZYNQMP_DP_TX_SW_RESET_STREAM3 BIT(2) +#define ZYNQMP_DP_TX_SW_RESET_STREAM4 BIT(3) +#define ZYNQMP_DP_TX_SW_RESET_AUX BIT(7) +#define ZYNQMP_DP_TX_SW_RESET_ALL (ZYNQMP_DP_TX_SW_RESET_STREAM1 | \ + ZYNQMP_DP_TX_SW_RESET_STREAM2 | \ + ZYNQMP_DP_TX_SW_RESET_STREAM3 | \ + ZYNQMP_DP_TX_SW_RESET_STREAM4 | \ + ZYNQMP_DP_TX_SW_RESET_AUX) + +/* Core enable registers */ +#define ZYNQMP_DP_TX_ENABLE 0x80 +#define ZYNQMP_DP_TX_ENABLE_MAIN_STREAM 0x84 +#define ZYNQMP_DP_TX_FORCE_SCRAMBLER_RESET 0xc0 +#define ZYNQMP_DP_TX_VERSION 0xf8 +#define ZYNQMP_DP_TX_VERSION_MAJOR_MASK GENMASK(31, 24) +#define ZYNQMP_DP_TX_VERSION_MAJOR_SHIFT 24 +#define ZYNQMP_DP_TX_VERSION_MINOR_MASK GENMASK(23, 16) +#define ZYNQMP_DP_TX_VERSION_MINOR_SHIFT 16 +#define ZYNQMP_DP_TX_VERSION_REVISION_MASK GENMASK(15, 12) +#define ZYNQMP_DP_TX_VERSION_REVISION_SHIFT 12 +#define ZYNQMP_DP_TX_VERSION_PATCH_MASK GENMASK(11, 8) +#define ZYNQMP_DP_TX_VERSION_PATCH_SHIFT 8 +#define ZYNQMP_DP_TX_VERSION_INTERNAL_MASK GENMASK(7, 0) +#define ZYNQMP_DP_TX_VERSION_INTERNAL_SHIFT 0 + +/* Core ID registers */ +#define ZYNQMP_DP_TX_CORE_ID 0xfc +#define ZYNQMP_DP_TX_CORE_ID_MAJOR_MASK GENMASK(31, 24) +#define ZYNQMP_DP_TX_CORE_ID_MAJOR_SHIFT 24 +#define ZYNQMP_DP_TX_CORE_ID_MINOR_MASK GENMASK(23, 16) +#define ZYNQMP_DP_TX_CORE_ID_MINOR_SHIFT 16 +#define ZYNQMP_DP_TX_CORE_ID_REVISION_MASK GENMASK(15, 8) +#define ZYNQMP_DP_TX_CORE_ID_REVISION_SHIFT 8 +#define ZYNQMP_DP_TX_CORE_ID_DIRECTION GENMASK(1) + +/* AUX channel interface registers */ +#define ZYNQMP_DP_TX_AUX_COMMAND 0x100 +#define ZYNQMP_DP_TX_AUX_COMMAND_CMD_SHIFT 8 +#define ZYNQMP_DP_TX_AUX_COMMAND_ADDRESS_ONLY BIT(12) +#define ZYNQMP_DP_TX_AUX_COMMAND_BYTES_SHIFT 0 +#define ZYNQMP_DP_TX_AUX_WRITE_FIFO 0x104 +#define ZYNQMP_DP_TX_AUX_ADDRESS 0x108 +#define ZYNQMP_DP_TX_CLK_DIVIDER 0x10c +#define ZYNQMP_DP_TX_CLK_DIVIDER_MHZ 1000000 +#define ZYNQMP_DP_TX_CLK_DIVIDER_AUX_FILTER_SHIFT 8 +#define ZYNQMP_DP_TX_INTR_SIGNAL_STATE 0x130 +#define ZYNQMP_DP_TX_INTR_SIGNAL_STATE_HPD BIT(0) +#define ZYNQMP_DP_TX_INTR_SIGNAL_STATE_REQUEST BIT(1) +#define ZYNQMP_DP_TX_INTR_SIGNAL_STATE_REPLY BIT(2) +#define ZYNQMP_DP_TX_INTR_SIGNAL_STATE_REPLY_TIMEOUT BIT(3) +#define ZYNQMP_DP_TX_AUX_REPLY_DATA 0x134 +#define ZYNQMP_DP_TX_AUX_REPLY_CODE 0x138 +#define ZYNQMP_DP_TX_AUX_REPLY_CODE_AUX_ACK (0) +#define ZYNQMP_DP_TX_AUX_REPLY_CODE_AUX_NACK BIT(0) +#define ZYNQMP_DP_TX_AUX_REPLY_CODE_AUX_DEFER BIT(1) +#define ZYNQMP_DP_TX_AUX_REPLY_CODE_I2C_ACK (0) +#define ZYNQMP_DP_TX_AUX_REPLY_CODE_I2C_NACK BIT(2) +#define ZYNQMP_DP_TX_AUX_REPLY_CODE_I2C_DEFER BIT(3) +#define ZYNQMP_DP_TX_AUX_REPLY_CNT 0x13c +#define ZYNQMP_DP_TX_AUX_REPLY_CNT_MASK 0xff +#define ZYNQMP_DP_TX_INTR_STATUS 0x140 +#define ZYNQMP_DP_TX_INTR_MASK 0x144 +#define ZYNQMP_DP_TX_INTR_HPD_IRQ BIT(0) +#define ZYNQMP_DP_TX_INTR_HPD_EVENT BIT(1) +#define ZYNQMP_DP_TX_INTR_REPLY_RECV BIT(2) +#define ZYNQMP_DP_TX_INTR_REPLY_TIMEOUT BIT(3) +#define ZYNQMP_DP_TX_INTR_HPD_PULSE BIT(4) +#define ZYNQMP_DP_TX_INTR_EXT_PKT_TXD BIT(5) +#define ZYNQMP_DP_TX_INTR_LIV_ABUF_UNDRFLW BIT(12) +#define ZYNQMP_DP_TX_INTR_VBLANK_START BIT(13) +#define ZYNQMP_DP_TX_INTR_PIXEL0_MATCH BIT(14) +#define ZYNQMP_DP_TX_INTR_PIXEL1_MATCH BIT(15) +#define ZYNQMP_DP_TX_INTR_CHBUF_UNDERFLW_MASK 0x3f0000 +#define ZYNQMP_DP_TX_INTR_CHBUF_OVERFLW_MASK 0xfc00000 +#define ZYNQMP_DP_TX_INTR_CUST_TS_2 BIT(28) +#define ZYNQMP_DP_TX_INTR_CUST_TS BIT(29) +#define ZYNQMP_DP_TX_INTR_EXT_VSYNC_TS BIT(30) +#define ZYNQMP_DP_TX_INTR_VSYNC_TS BIT(31) +#define ZYNQMP_DP_TX_INTR_ALL (ZYNQMP_DP_TX_INTR_HPD_IRQ | \ + ZYNQMP_DP_TX_INTR_HPD_EVENT | \ + ZYNQMP_DP_TX_INTR_REPLY_RECV | \ + ZYNQMP_DP_TX_INTR_REPLY_TIMEOUT | \ + ZYNQMP_DP_TX_INTR_HPD_PULSE | \ + ZYNQMP_DP_TX_INTR_EXT_PKT_TXD | \ + ZYNQMP_DP_TX_INTR_LIV_ABUF_UNDRFLW | \ + ZYNQMP_DP_TX_INTR_CHBUF_UNDERFLW_MASK | \ + ZYNQMP_DP_TX_INTR_CHBUF_OVERFLW_MASK) +#define ZYNQMP_DP_TX_NO_INTR_ALL (ZYNQMP_DP_TX_INTR_PIXEL0_MATCH | \ + ZYNQMP_DP_TX_INTR_PIXEL1_MATCH | \ + ZYNQMP_DP_TX_INTR_CUST_TS_2 | \ + ZYNQMP_DP_TX_INTR_CUST_TS | \ + ZYNQMP_DP_TX_INTR_EXT_VSYNC_TS | \ + ZYNQMP_DP_TX_INTR_VSYNC_TS) +#define ZYNQMP_DP_TX_REPLY_DATA_CNT 0x148 +#define ZYNQMP_DP_SUB_TX_INTR_STATUS 0x3a0 +#define ZYNQMP_DP_SUB_TX_INTR_MASK 0x3a4 +#define ZYNQMP_DP_SUB_TX_INTR_EN 0x3a8 +#define ZYNQMP_DP_SUB_TX_INTR_DS 0x3ac + +/* Main stream attribute registers */ +#define ZYNQMP_DP_TX_MAIN_STREAM_HTOTAL 0x180 +#define ZYNQMP_DP_TX_MAIN_STREAM_VTOTAL 0x184 +#define ZYNQMP_DP_TX_MAIN_STREAM_POLARITY 0x188 +#define ZYNQMP_DP_TX_MAIN_STREAM_POLARITY_HSYNC_SHIFT 0 +#define ZYNQMP_DP_TX_MAIN_STREAM_POLARITY_VSYNC_SHIFT 1 +#define ZYNQMP_DP_TX_MAIN_STREAM_HSWIDTH 0x18c +#define ZYNQMP_DP_TX_MAIN_STREAM_VSWIDTH 0x190 +#define ZYNQMP_DP_TX_MAIN_STREAM_HRES 0x194 +#define ZYNQMP_DP_TX_MAIN_STREAM_VRES 0x198 +#define ZYNQMP_DP_TX_MAIN_STREAM_HSTART 0x19c +#define ZYNQMP_DP_TX_MAIN_STREAM_VSTART 0x1a0 +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0 0x1a4 +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0_SYNC BIT(0) +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0_FORMAT_SHIFT 1 +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0_DYNAMIC_RANGE BIT(3) +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0_YCBCR_COLRIMETRY BIT(4) +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0_BPC_SHIFT 5 +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC1 0x1a8 +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0_INTERLACED_VERT BIT(0) +#define ZYNQMP_DP_TX_MAIN_STREAM_MISC0_STEREO_VID_SHIFT 1 +#define ZYNQMP_DP_TX_M_VID 0x1ac +#define ZYNQMP_DP_TX_TRANSFER_UNIT_SIZE 0x1b0 +#define ZYNQMP_DP_TX_DEF_TRANSFER_UNIT_SIZE 64 +#define ZYNQMP_DP_TX_N_VID 0x1b4 +#define ZYNQMP_DP_TX_USER_PIXEL_WIDTH 0x1b8 +#define ZYNQMP_DP_TX_USER_DATA_CNT_PER_LANE 0x1bc +#define ZYNQMP_DP_TX_MIN_BYTES_PER_TU 0x1c4 +#define ZYNQMP_DP_TX_FRAC_BYTES_PER_TU 0x1c8 +#define ZYNQMP_DP_TX_INIT_WAIT 0x1cc + +/* PHY configuration and status registers */ +#define ZYNQMP_DP_TX_PHY_CONFIG 0x200 +#define ZYNQMP_DP_TX_PHY_CONFIG_PHY_RESET BIT(0) +#define ZYNQMP_DP_TX_PHY_CONFIG_GTTX_RESET BIT(1) +#define ZYNQMP_DP_TX_PHY_CONFIG_PHY_PMA_RESET BIT(8) +#define ZYNQMP_DP_TX_PHY_CONFIG_PHY_PCS_RESET BIT(9) +#define ZYNQMP_DP_TX_PHY_CONFIG_ALL_RESET (ZYNQMP_DP_TX_PHY_CONFIG_PHY_RESET | \ + ZYNQMP_DP_TX_PHY_CONFIG_GTTX_RESET | \ + ZYNQMP_DP_TX_PHY_CONFIG_PHY_PMA_RESET | \ + ZYNQMP_DP_TX_PHY_CONFIG_PHY_PCS_RESET) +#define ZYNQMP_DP_TX_PHY_PREEMPHASIS_LANE_0 0x210 +#define ZYNQMP_DP_TX_PHY_PREEMPHASIS_LANE_1 0x214 +#define ZYNQMP_DP_TX_PHY_PREEMPHASIS_LANE_2 0x218 +#define ZYNQMP_DP_TX_PHY_PREEMPHASIS_LANE_3 0x21c +#define ZYNQMP_DP_TX_PHY_VOLTAGE_DIFF_LANE_0 0x220 +#define ZYNQMP_DP_TX_PHY_VOLTAGE_DIFF_LANE_1 0x224 +#define ZYNQMP_DP_TX_PHY_VOLTAGE_DIFF_LANE_2 0x228 +#define ZYNQMP_DP_TX_PHY_VOLTAGE_DIFF_LANE_3 0x22c +#define ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING 0x234 +#define ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING_162 0x1 +#define ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING_270 0x3 +#define ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING_540 0x5 +#define ZYNQMP_DP_TX_PHY_POWER_DOWN 0x238 +#define ZYNQMP_DP_TX_PHY_POWER_DOWN_LANE_0 BIT(0) +#define ZYNQMP_DP_TX_PHY_POWER_DOWN_LANE_1 BIT(1) +#define ZYNQMP_DP_TX_PHY_POWER_DOWN_LANE_2 BIT(2) +#define ZYNQMP_DP_TX_PHY_POWER_DOWN_LANE_3 BIT(3) +#define ZYNQMP_DP_TX_PHY_POWER_DOWN_ALL 0xf +#define ZYNQMP_DP_TX_PHY_PRECURSOR_LANE_0 0x23c +#define ZYNQMP_DP_TX_PHY_PRECURSOR_LANE_1 0x240 +#define ZYNQMP_DP_TX_PHY_PRECURSOR_LANE_2 0x244 +#define ZYNQMP_DP_TX_PHY_PRECURSOR_LANE_3 0x248 +#define ZYNQMP_DP_TX_PHY_POSTCURSOR_LANE_0 0x24c +#define ZYNQMP_DP_TX_PHY_POSTCURSOR_LANE_1 0x250 +#define ZYNQMP_DP_TX_PHY_POSTCURSOR_LANE_2 0x254 +#define ZYNQMP_DP_TX_PHY_POSTCURSOR_LANE_3 0x258 +#define ZYNQMP_DP_SUB_TX_PHY_PRECURSOR_LANE_0 0x24c +#define ZYNQMP_DP_SUB_TX_PHY_PRECURSOR_LANE_1 0x250 +#define ZYNQMP_DP_TX_PHY_STATUS 0x280 +#define ZYNQMP_DP_TX_PHY_STATUS_PLL_LOCKED_SHIFT 4 +#define ZYNQMP_DP_TX_PHY_STATUS_FPGA_PLL_LOCKED BIT(6) + +/* Audio registers */ +#define ZYNQMP_DP_TX_AUDIO_CONTROL 0x300 +#define ZYNQMP_DP_TX_AUDIO_CHANNELS 0x304 +#define ZYNQMP_DP_TX_AUDIO_INFO_DATA 0x308 +#define ZYNQMP_DP_TX_AUDIO_M_AUD 0x328 +#define ZYNQMP_DP_TX_AUDIO_N_AUD 0x32c +#define ZYNQMP_DP_TX_AUDIO_EXT_DATA 0x330 + +#define ZYNQMP_DP_MISC0_RGB (0) +#define ZYNQMP_DP_MISC0_YCRCB_422 (5 << 1) +#define ZYNQMP_DP_MISC0_YCRCB_444 (6 << 1) +#define ZYNQMP_DP_MISC0_FORMAT_MASK 0xe +#define ZYNQMP_DP_MISC0_BPC_6 (0 << 5) +#define ZYNQMP_DP_MISC0_BPC_8 (1 << 5) +#define ZYNQMP_DP_MISC0_BPC_10 (2 << 5) +#define ZYNQMP_DP_MISC0_BPC_12 (3 << 5) +#define ZYNQMP_DP_MISC0_BPC_16 (4 << 5) +#define ZYNQMP_DP_MISC0_BPC_MASK 0xe0 +#define ZYNQMP_DP_MISC1_Y_ONLY (1 << 7) + +#define ZYNQMP_DP_MAX_LANES 2 +#define ZYNQMP_MAX_FREQ 3000000 + +#define DP_REDUCED_BIT_RATE 162000 +#define DP_HIGH_BIT_RATE 270000 +#define DP_HIGH_BIT_RATE2 540000 +#define DP_MAX_TRAINING_TRIES 5 +#define DP_V1_2 0x12 + +/** + * struct zynqmp_dp_link_config - Common link config between source and sink + * @max_rate: maximum link rate + * @max_lanes: maximum number of lanes + */ +struct zynqmp_dp_link_config { + int max_rate; + u8 max_lanes; +}; + +/** + * struct zynqmp_dp_mode - Configured mode of DisplayPort + * @bw_code: code for bandwidth(link rate) + * @lane_cnt: number of lanes + * @pclock: pixel clock frequency of current mode + * @fmt: format identifier string + */ +struct zynqmp_dp_mode { + u8 bw_code; + u8 lane_cnt; + int pclock; + const char *fmt; +}; + +/** + * struct zynqmp_dp_config - Configuration of DisplayPort from DTS + * @misc0: misc0 configuration (per DP v1.2 spec) + * @misc1: misc1 configuration (per DP v1.2 spec) + * @bpp: bits per pixel + * @bpc: bits per component + * @num_colors: number of color components + */ +struct zynqmp_dp_config { + u8 misc0; + u8 misc1; + u8 bpp; + u8 bpc; + u8 num_colors; +}; + +/** + * struct zynqmp_dp - Xilinx DisplayPort core + * @encoder: the drm encoder structure + * @connector: the drm connector structure + * @dev: device structure + * @dpsub: Display subsystem + * @drm: DRM core + * @iomem: device I/O memory for register access + * @irq: irq + * @config: IP core configuration from DTS + * @aux: aux channel + * @phy: PHY handles for DP lanes + * @num_lanes: number of enabled phy lanes + * @hpd_work: hot plug detection worker + * @status: connection status + * @enabled: flag to indicate if the device is enabled + * @dpms: current dpms state + * @dpcd: DP configuration data from currently connected sink device + * @link_config: common link configuration between IP core and sink device + * @mode: current mode between IP core and sink device + * @train_set: set of training data + */ +struct zynqmp_dp { + struct drm_encoder encoder; + struct drm_connector connector; + struct device *dev; + struct zynqmp_dpsub *dpsub; + struct drm_device *drm; + void __iomem *iomem; + int irq; + + struct zynqmp_dp_config config; + struct drm_dp_aux aux; + struct phy *phy[ZYNQMP_DP_MAX_LANES]; + u8 num_lanes; + struct delayed_work hpd_work; + enum drm_connector_status status; + bool enabled; + + int dpms; + u8 dpcd[DP_RECEIVER_CAP_SIZE]; + struct zynqmp_dp_link_config link_config; + struct zynqmp_dp_mode mode; + u8 train_set[ZYNQMP_DP_MAX_LANES]; +}; + +static inline struct zynqmp_dp *encoder_to_dp(struct drm_encoder *encoder) +{ + return container_of(encoder, struct zynqmp_dp, encoder); +} + +static inline struct zynqmp_dp *connector_to_dp(struct drm_connector *connector) +{ + return container_of(connector, struct zynqmp_dp, connector); +} + +static void zynqmp_dp_write(void __iomem *base, int offset, u32 val) +{ + writel(val, base + offset); +} + +static u32 zynqmp_dp_read(void __iomem *base, int offset) +{ + return readl(base + offset); +} + +static void zynqmp_dp_clr(void __iomem *base, int offset, u32 clr) +{ + zynqmp_dp_write(base, offset, zynqmp_dp_read(base, offset) & ~clr); +} + +static void zynqmp_dp_set(void __iomem *base, int offset, u32 set) +{ + zynqmp_dp_write(base, offset, zynqmp_dp_read(base, offset) | set); +} + +/* + * Internal functions: used by zynqmp_disp.c + */ + +/** + * zynqmp_dp_update_bpp - Update the current bpp config + * @dp: DisplayPort IP core structure + * + * Update the current bpp based on the color format: bpc & num_colors. + * Any function that changes bpc or num_colors should call this + * to keep the bpp value in sync. + */ +static void zynqmp_dp_update_bpp(struct zynqmp_dp *dp) +{ + struct zynqmp_dp_config *config = &dp->config; + + config->bpp = dp->config.bpc * dp->config.num_colors; +} + +/** + * zynqmp_dp_set_color - Set the color + * @dp: DisplayPort IP core structure + * @color: color string, from zynqmp_disp_color_enum + * + * Update misc register values based on @color string. + * + * Return: 0 on success, or -EINVAL. + */ +int zynqmp_dp_set_color(struct zynqmp_dp *dp, const char *color) +{ + struct zynqmp_dp_config *config = &dp->config; + + config->misc0 &= ~ZYNQMP_DP_MISC0_FORMAT_MASK; + config->misc1 &= ~ZYNQMP_DP_MISC1_Y_ONLY; + if (strcmp(color, "rgb") == 0) { + config->misc0 |= ZYNQMP_DP_MISC0_RGB; + config->num_colors = 3; + } else if (strcmp(color, "ycrcb422") == 0) { + config->misc0 |= ZYNQMP_DP_MISC0_YCRCB_422; + config->num_colors = 2; + } else if (strcmp(color, "ycrcb444") == 0) { + config->misc0 |= ZYNQMP_DP_MISC0_YCRCB_444; + config->num_colors = 3; + } else if (strcmp(color, "yonly") == 0) { + config->misc1 |= ZYNQMP_DP_MISC1_Y_ONLY; + config->num_colors = 1; + } else { + dev_err(dp->dev, "Invalid colormetry in DT\n"); + return -EINVAL; + } + zynqmp_dp_update_bpp(dp); + + return 0; +} + +/** + * zynqmp_dp_enable_vblank - Enable vblank + * @dp: DisplayPort IP core structure + * + * Enable vblank interrupt + */ +void zynqmp_dp_enable_vblank(struct zynqmp_dp *dp) +{ + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_EN, + ZYNQMP_DP_TX_INTR_VBLANK_START); +} + +/** + * zynqmp_dp_disable_vblank - Disable vblank + * @dp: DisplayPort IP core structure + * + * Disable vblank interrupt + */ +void zynqmp_dp_disable_vblank(struct zynqmp_dp *dp) +{ + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_DS, + ZYNQMP_DP_TX_INTR_VBLANK_START); +} + +/* + * DP PHY functions + */ + +/** + * zynqmp_dp_init_phy - Initialize the phy + * @dp: DisplayPort IP core structure + * + * Initialize the phy. + * + * Return: 0 if the phy instances are initialized correctly, or the error code + * returned from the callee functions. + */ +static int zynqmp_dp_init_phy(struct zynqmp_dp *dp) +{ + unsigned int i; + int ret; + + for (i = 0; i < dp->num_lanes; i++) { + ret = phy_init(dp->phy[i]); + if (ret) { + dev_err(dp->dev, "failed to init phy lane %d\n", i); + return ret; + } + } + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_DS, + ZYNQMP_DP_TX_INTR_ALL); + zynqmp_dp_clr(dp->iomem, ZYNQMP_DP_TX_PHY_CONFIG, + ZYNQMP_DP_TX_PHY_CONFIG_ALL_RESET); + + return 0; +} + +/** + * zynqmp_dp_exit_phy - Exit the phy + * @dp: DisplayPort IP core structure + * + * Exit the phy. + */ +static void zynqmp_dp_exit_phy(struct zynqmp_dp *dp) +{ + unsigned int i; + int ret; + + for (i = 0; i < dp->num_lanes; i++) { + ret = phy_exit(dp->phy[i]); + if (ret) + dev_err(dp->dev, "failed to exit phy(%d) %d\n", i, ret); + } +} + +/** + * zynqmp_dp_phy_ready - Check if PHY is ready + * @dp: DisplayPort IP core structure + * + * Check if PHY is ready. If PHY is not ready, wait 1ms to check for 100 times. + * This amount of delay was suggested by IP designer. + * + * Return: 0 if PHY is ready, or -ENODEV if PHY is not ready. + */ +static int zynqmp_dp_phy_ready(struct zynqmp_dp *dp) +{ + u32 i, reg, ready; + + ready = (1 << dp->num_lanes) - 1; + + /* Wait for 100 * 1ms. This should be enough time for PHY to be ready */ + for (i = 0; ; i++) { + reg = zynqmp_dp_read(dp->iomem, ZYNQMP_DP_TX_PHY_STATUS); + if ((reg & ready) == ready) + return 0; + + if (i == 100) { + dev_err(dp->dev, "PHY isn't ready\n"); + return -ENODEV; + } + + usleep_range(1000, 1100); + } + + return 0; +} + +/* + * DP functions + */ + +/** + * zynqmp_dp_max_rate - Calculate and return available max pixel clock + * @link_rate: link rate (Kilo-bytes / sec) + * @lane_num: number of lanes + * @bpp: bits per pixel + * + * Return: max pixel clock (KHz) supported by current link config. + */ +static inline int zynqmp_dp_max_rate(int link_rate, u8 lane_num, u8 bpp) +{ + return link_rate * lane_num * 8 / bpp; +} + +/** + * zynqmp_dp_mode_configure - Configure the link values + * @dp: DisplayPort IP core structure + * @pclock: pixel clock for requested display mode + * @current_bw: current link rate + * + * Find the link configuration values, rate and lane count for requested pixel + * clock @pclock. The @pclock is stored in the mode to be used in other + * functions later. The returned rate is downshifted from the current rate + * @current_bw. + * + * Return: Current link rate code, or -EINVAL. + */ +static int zynqmp_dp_mode_configure(struct zynqmp_dp *dp, int pclock, + u8 current_bw) +{ + int max_rate = dp->link_config.max_rate; + u8 bws[3] = { DP_LINK_BW_1_62, DP_LINK_BW_2_7, DP_LINK_BW_5_4 }; + u8 max_lanes = dp->link_config.max_lanes; + u8 max_link_rate_code = drm_dp_link_rate_to_bw_code(max_rate); + u8 bpp = dp->config.bpp; + u8 lane_cnt; + s8 i; + + if (current_bw == DP_LINK_BW_1_62) { + dev_err(dp->dev, "can't downshift. already lowest link rate\n"); + return -EINVAL; + } + + for (i = ARRAY_SIZE(bws) - 1; i >= 0; i--) { + if (current_bw && bws[i] >= current_bw) + continue; + + if (bws[i] <= max_link_rate_code) + break; + } + + for (lane_cnt = 1; lane_cnt <= max_lanes; lane_cnt <<= 1) { + int bw; + u32 rate; + + bw = drm_dp_bw_code_to_link_rate(bws[i]); + rate = zynqmp_dp_max_rate(bw, lane_cnt, bpp); + if (pclock <= rate) { + dp->mode.bw_code = bws[i]; + dp->mode.lane_cnt = lane_cnt; + dp->mode.pclock = pclock; + return dp->mode.bw_code; + } + } + + dev_err(dp->dev, "failed to configure link values\n"); + + return -EINVAL; +} + +/** + * zynqmp_dp_adjust_train - Adjust train values + * @dp: DisplayPort IP core structure + * @link_status: link status from sink which contains requested training values + */ +static void zynqmp_dp_adjust_train(struct zynqmp_dp *dp, + u8 link_status[DP_LINK_STATUS_SIZE]) +{ + u8 *train_set = dp->train_set; + u8 voltage = 0, preemphasis = 0; + u8 i; + + for (i = 0; i < dp->mode.lane_cnt; i++) { + u8 v = drm_dp_get_adjust_request_voltage(link_status, i); + u8 p = drm_dp_get_adjust_request_pre_emphasis(link_status, i); + + if (v > voltage) + voltage = v; + + if (p > preemphasis) + preemphasis = p; + } + + if (voltage >= DP_TRAIN_VOLTAGE_SWING_LEVEL_3) + voltage |= DP_TRAIN_MAX_SWING_REACHED; + + if (preemphasis >= DP_TRAIN_PRE_EMPH_LEVEL_2) + preemphasis |= DP_TRAIN_MAX_PRE_EMPHASIS_REACHED; + + for (i = 0; i < dp->mode.lane_cnt; i++) + train_set[i] = voltage | preemphasis; +} + +/** + * zynqmp_dp_update_vs_emph - Update the training values + * @dp: DisplayPort IP core structure + * + * Update the training values based on the request from sink. The mapped values + * are predefined, and values(vs, pe, pc) are from the device manual. + * + * Return: 0 if vs and emph are updated successfully, or the error code returned + * by drm_dp_dpcd_write(). + */ +static int zynqmp_dp_update_vs_emph(struct zynqmp_dp *dp) +{ + u8 *train_set = dp->train_set; + u8 i, v_level, p_level; + int ret; + + ret = drm_dp_dpcd_write(&dp->aux, DP_TRAINING_LANE0_SET, train_set, + dp->mode.lane_cnt); + if (ret < 0) + return ret; + + for (i = 0; i < dp->mode.lane_cnt; i++) { + u32 reg = ZYNQMP_DP_SUB_TX_PHY_PRECURSOR_LANE_0 + i * 4; + + v_level = (train_set[i] & DP_TRAIN_VOLTAGE_SWING_MASK) >> + DP_TRAIN_VOLTAGE_SWING_SHIFT; + p_level = (train_set[i] & DP_TRAIN_PRE_EMPHASIS_MASK) >> + DP_TRAIN_PRE_EMPHASIS_SHIFT; + + zynqmp_dp_write(dp->iomem, reg, 0x2); + } + + return 0; +} + +/** + * zynqmp_dp_link_train_cr - Train clock recovery + * @dp: DisplayPort IP core structure + * + * Return: 0 if clock recovery train is done successfully, or corresponding + * error code. + */ +static int zynqmp_dp_link_train_cr(struct zynqmp_dp *dp) +{ + u8 link_status[DP_LINK_STATUS_SIZE]; + u8 lane_cnt = dp->mode.lane_cnt; + u8 vs = 0, tries = 0; + u16 max_tries, i; + bool cr_done; + int ret; + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_TRAINING_PATTERN_SET, + DP_TRAINING_PATTERN_1); + ret = drm_dp_dpcd_writeb(&dp->aux, DP_TRAINING_PATTERN_SET, + DP_TRAINING_PATTERN_1 | + DP_LINK_SCRAMBLING_DISABLE); + if (ret < 0) + return ret; + + /* + * 256 loops should be maximum iterations for 4 lanes and 4 values. + * So, This loop should exit before 512 iterations + */ + for (max_tries = 0; max_tries < 512; max_tries++) { + ret = zynqmp_dp_update_vs_emph(dp); + if (ret) + return ret; + + drm_dp_link_train_clock_recovery_delay(dp->dpcd); + ret = drm_dp_dpcd_read_link_status(&dp->aux, link_status); + if (ret < 0) + return ret; + + cr_done = drm_dp_clock_recovery_ok(link_status, lane_cnt); + if (cr_done) + break; + + for (i = 0; i < lane_cnt; i++) + if (!(dp->train_set[i] & DP_TRAIN_MAX_SWING_REACHED)) + break; + if (i == lane_cnt) + break; + + if ((dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK) == vs) + tries++; + else + tries = 0; + + if (tries == DP_MAX_TRAINING_TRIES) + break; + + vs = dp->train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK; + zynqmp_dp_adjust_train(dp, link_status); + } + + if (!cr_done) + return -EIO; + + return 0; +} + +/** + * zynqmp_dp_link_train_ce - Train channel equalization + * @dp: DisplayPort IP core structure + * + * Return: 0 if channel equalization train is done successfully, or + * corresponding error code. + */ +static int zynqmp_dp_link_train_ce(struct zynqmp_dp *dp) +{ + u8 link_status[DP_LINK_STATUS_SIZE]; + u8 lane_cnt = dp->mode.lane_cnt; + u32 pat, tries; + int ret; + bool ce_done; + + if (dp->dpcd[DP_DPCD_REV] >= DP_V1_2 && + dp->dpcd[DP_MAX_LANE_COUNT] & DP_TPS3_SUPPORTED) + pat = DP_TRAINING_PATTERN_3; + else + pat = DP_TRAINING_PATTERN_2; + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_TRAINING_PATTERN_SET, pat); + ret = drm_dp_dpcd_writeb(&dp->aux, DP_TRAINING_PATTERN_SET, + pat | DP_LINK_SCRAMBLING_DISABLE); + if (ret < 0) + return ret; + + for (tries = 0; tries < DP_MAX_TRAINING_TRIES; tries++) { + ret = zynqmp_dp_update_vs_emph(dp); + if (ret) + return ret; + + drm_dp_link_train_channel_eq_delay(dp->dpcd); + ret = drm_dp_dpcd_read_link_status(&dp->aux, link_status); + if (ret < 0) + return ret; + + ce_done = drm_dp_channel_eq_ok(link_status, lane_cnt); + if (ce_done) + break; + + zynqmp_dp_adjust_train(dp, link_status); + } + + if (!ce_done) + return -EIO; + + return 0; +} + +/** + * zynqmp_dp_link_train - Train the link + * @dp: DisplayPort IP core structure + * + * Return: 0 if all trains are done successfully, or corresponding error code. + */ +static int zynqmp_dp_train(struct zynqmp_dp *dp) +{ + u32 reg; + u8 bw_code = dp->mode.bw_code; + u8 lane_cnt = dp->mode.lane_cnt; + u8 aux_lane_cnt = lane_cnt; + bool enhanced; + int ret; + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_LANE_CNT_SET, lane_cnt); + enhanced = drm_dp_enhanced_frame_cap(dp->dpcd); + if (enhanced) { + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_ENHANCED_FRAME_EN, 1); + aux_lane_cnt |= DP_LANE_COUNT_ENHANCED_FRAME_EN; + } + + if (dp->dpcd[3] & 0x1) { + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_DOWNSPREAD_CTL, 1); + drm_dp_dpcd_writeb(&dp->aux, DP_DOWNSPREAD_CTRL, + DP_SPREAD_AMP_0_5); + } else { + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_DOWNSPREAD_CTL, 0); + drm_dp_dpcd_writeb(&dp->aux, DP_DOWNSPREAD_CTRL, 0); + } + + ret = drm_dp_dpcd_writeb(&dp->aux, DP_LANE_COUNT_SET, aux_lane_cnt); + if (ret < 0) { + dev_err(dp->dev, "failed to set lane count\n"); + return ret; + } + + ret = drm_dp_dpcd_writeb(&dp->aux, DP_MAIN_LINK_CHANNEL_CODING_SET, + DP_SET_ANSI_8B10B); + if (ret < 0) { + dev_err(dp->dev, "failed to set ANSI 8B/10B encoding\n"); + return ret; + } + + ret = drm_dp_dpcd_writeb(&dp->aux, DP_LINK_BW_SET, bw_code); + if (ret < 0) { + dev_err(dp->dev, "failed to set DP bandwidth\n"); + return ret; + } + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_LINK_BW_SET, bw_code); + switch (bw_code) { + case DP_LINK_BW_1_62: + reg = ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING_162; + break; + case DP_LINK_BW_2_7: + reg = ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING_270; + break; + case DP_LINK_BW_5_4: + default: + reg = ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING_540; + break; + } + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_PHY_CLOCK_FEEDBACK_SETTING, + reg); + ret = zynqmp_dp_phy_ready(dp); + if (ret < 0) + return ret; + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_SCRAMBLING_DISABLE, 1); + memset(dp->train_set, 0, 4); + ret = zynqmp_dp_link_train_cr(dp); + if (ret) + return ret; + + ret = zynqmp_dp_link_train_ce(dp); + if (ret) + return ret; + + ret = drm_dp_dpcd_writeb(&dp->aux, DP_TRAINING_PATTERN_SET, + DP_TRAINING_PATTERN_DISABLE); + if (ret < 0) { + dev_err(dp->dev, "failed to disable training pattern\n"); + return ret; + } + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_TRAINING_PATTERN_SET, + DP_TRAINING_PATTERN_DISABLE); + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_SCRAMBLING_DISABLE, 0); + + return 0; +} + +/** + * zynqmp_dp_train_loop - Downshift the link rate during training + * @dp: DisplayPort IP core structure + * + * Train the link by downshifting the link rate if training is not successful. + */ +static void zynqmp_dp_train_loop(struct zynqmp_dp *dp) +{ + struct zynqmp_dp_mode *mode = &dp->mode; + u8 bw = mode->bw_code; + int ret; + + do { + if (dp->status == connector_status_disconnected || + !dp->enabled) + return; + + ret = zynqmp_dp_train(dp); + if (!ret) + return; + + ret = zynqmp_dp_mode_configure(dp, mode->pclock, bw); + if (ret < 0) + goto err_out; + + bw = ret; + } while (bw >= DP_LINK_BW_1_62); + +err_out: + dev_err(dp->dev, "failed to train the DP link\n"); +} + +/* + * DP Aux functions + */ + +#define AUX_READ_BIT 0x1 + +/** + * zynqmp_dp_aux_cmd_submit - Submit aux command + * @dp: DisplayPort IP core structure + * @cmd: aux command + * @addr: aux address + * @buf: buffer for command data + * @bytes: number of bytes for @buf + * @reply: reply code to be returned + * + * Submit an aux command. All aux related commands, native or i2c aux + * read/write, are submitted through this function. The function is mapped to + * the transfer function of struct drm_dp_aux. This function involves in + * multiple register reads/writes, thus synchronization is needed, and it is + * done by drm_dp_helper using @hw_mutex. The calling thread goes into sleep + * if there's no immediate reply to the command submission. The reply code is + * returned at @reply if @reply != NULL. + * + * Return: 0 if the command is submitted properly, or corresponding error code: + * -EBUSY when there is any request already being processed + * -ETIMEDOUT when receiving reply is timed out + * -EIO when received bytes are less than requested + */ +static int zynqmp_dp_aux_cmd_submit(struct zynqmp_dp *dp, u32 cmd, u16 addr, + u8 *buf, u8 bytes, u8 *reply) +{ + bool is_read = (cmd & AUX_READ_BIT) ? true : false; + void __iomem *iomem = dp->iomem; + u32 reg, i; + + reg = zynqmp_dp_read(iomem, ZYNQMP_DP_TX_INTR_SIGNAL_STATE); + if (reg & ZYNQMP_DP_TX_INTR_SIGNAL_STATE_REQUEST) + return -EBUSY; + + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUX_ADDRESS, addr); + if (!is_read) + for (i = 0; i < bytes; i++) + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUX_WRITE_FIFO, + buf[i]); + + reg = cmd << ZYNQMP_DP_TX_AUX_COMMAND_CMD_SHIFT; + if (!buf || !bytes) + reg |= ZYNQMP_DP_TX_AUX_COMMAND_ADDRESS_ONLY; + else + reg |= (bytes - 1) << ZYNQMP_DP_TX_AUX_COMMAND_BYTES_SHIFT; + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUX_COMMAND, reg); + + /* Wait for reply to be delivered upto 2ms */ + for (i = 0; ; i++) { + reg = zynqmp_dp_read(iomem, ZYNQMP_DP_TX_INTR_SIGNAL_STATE); + if (reg & ZYNQMP_DP_TX_INTR_SIGNAL_STATE_REPLY) + break; + + if (reg & ZYNQMP_DP_TX_INTR_SIGNAL_STATE_REPLY_TIMEOUT || + i == 2) + return -ETIMEDOUT; + + usleep_range(1000, 1100); + } + + reg = zynqmp_dp_read(iomem, ZYNQMP_DP_TX_AUX_REPLY_CODE); + if (reply) + *reply = reg; + + if (is_read && + (reg == ZYNQMP_DP_TX_AUX_REPLY_CODE_AUX_ACK || + reg == ZYNQMP_DP_TX_AUX_REPLY_CODE_I2C_ACK)) { + reg = zynqmp_dp_read(iomem, ZYNQMP_DP_TX_REPLY_DATA_CNT); + if ((reg & ZYNQMP_DP_TX_AUX_REPLY_CNT_MASK) != bytes) + return -EIO; + + for (i = 0; i < bytes; i++) { + buf[i] = zynqmp_dp_read(iomem, + ZYNQMP_DP_TX_AUX_REPLY_DATA); + } + } + + return 0; +} + +static ssize_t +zynqmp_dp_aux_transfer(struct drm_dp_aux *aux, struct drm_dp_aux_msg *msg) +{ + struct zynqmp_dp *dp = container_of(aux, struct zynqmp_dp, aux); + int ret; + unsigned int i, iter; + + /* Number of loops = timeout in msec / aux delay (400 usec) */ + iter = zynqmp_dp_aux_timeout_ms * 1000 / 400; + iter = iter ? iter : 1; + + for (i = 0; i < iter; i++) { + ret = zynqmp_dp_aux_cmd_submit(dp, msg->request, msg->address, + msg->buffer, msg->size, + &msg->reply); + if (!ret) { + dev_dbg(dp->dev, "aux %d retries\n", i); + return msg->size; + } + + if (dp->status == connector_status_disconnected) { + dev_dbg(dp->dev, "no connected aux device\n"); + return -ENODEV; + } + + usleep_range(400, 500); + } + + dev_dbg(dp->dev, "failed to do aux transfer (%d)\n", ret); + + return ret; +} + +/** + * zynqmp_dp_init_aux - Initialize the DP aux + * @dp: DisplayPort IP core structure + * + * Initialize the DP aux. The aux clock is derived from the axi clock, so + * this function gets the axi clock frequency and calculates the filter + * value. Additionally, the interrupts and transmitter are enabled. + * + * Return: 0 on success, error value otherwise + */ +static int zynqmp_dp_init_aux(struct zynqmp_dp *dp) +{ + unsigned int rate; + u32 reg, w; + + rate = zynqmp_disp_get_apb_clk_rate(dp->dpsub->disp); + if (rate < ZYNQMP_DP_TX_CLK_DIVIDER_MHZ) { + dev_err(dp->dev, "aclk should be higher than 1MHz\n"); + return -EINVAL; + } + + /* Allowable values for this register are: 8, 16, 24, 32, 40, 48 */ + for (w = 8; w <= 48; w += 8) { + /* AUX pulse width should be between 0.4 to 0.6 usec */ + if (w >= (4 * rate / 10000000) && + w <= (6 * rate / 10000000)) + break; + } + + if (w > 48) { + dev_err(dp->dev, "aclk frequency too high\n"); + return -EINVAL; + } + reg = w << ZYNQMP_DP_TX_CLK_DIVIDER_AUX_FILTER_SHIFT; + reg |= rate / ZYNQMP_DP_TX_CLK_DIVIDER_MHZ; + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_CLK_DIVIDER, reg); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_EN, + ZYNQMP_DP_TX_INTR_ALL); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_DS, + ZYNQMP_DP_TX_NO_INTR_ALL); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_ENABLE, 1); + + return 0; +} + +/** + * zynqmp_dp_exit_aux - De-initialize the DP aux + * @dp: DisplayPort IP core structure + * + * De-initialize the DP aux. Disable all interrupts which are enabled + * through aux initialization, as well as the transmitter. + */ +static void zynqmp_dp_exit_aux(struct zynqmp_dp *dp) +{ + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_ENABLE, 0); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_DS, 0xffffffff); +} + +/* + * Generic DP functions + */ + +/** + * zynqmp_dp_update_misc - Write the misc registers + * @dp: DisplayPort IP core structure + * + * The misc register values are stored in the structure, and this + * function applies the values into the registers. + */ +static void zynqmp_dp_update_misc(struct zynqmp_dp *dp) +{ + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_MAIN_STREAM_MISC0, + dp->config.misc0); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_MAIN_STREAM_MISC1, + dp->config.misc1); +} + +/** + * zynqmp_dp_set_bpc - Set bpc value in software misc state + * @dp: DisplayPort IP core structure + * @bpc: bits per component + * + * Return: 0 on success, or the fallback bpc value + */ +static u8 zynqmp_dp_set_bpc(struct zynqmp_dp *dp, u8 bpc) +{ + struct zynqmp_dp_config *config = &dp->config; + u8 ret = 0; + + if (dp->connector.display_info.bpc && + dp->connector.display_info.bpc != bpc) { + dev_err(dp->dev, "requested bpc (%u) != display info (%u)\n", + bpc, dp->connector.display_info.bpc); + bpc = dp->connector.display_info.bpc; + } + + config->misc0 &= ~ZYNQMP_DP_MISC0_BPC_MASK; + switch (bpc) { + case 6: + config->misc0 |= ZYNQMP_DP_MISC0_BPC_6; + break; + case 8: + config->misc0 |= ZYNQMP_DP_MISC0_BPC_8; + break; + case 10: + config->misc0 |= ZYNQMP_DP_MISC0_BPC_10; + break; + case 12: + config->misc0 |= ZYNQMP_DP_MISC0_BPC_12; + break; + case 16: + config->misc0 |= ZYNQMP_DP_MISC0_BPC_16; + break; + default: + dev_err(dp->dev, "Not supported bpc (%u). fall back to 8bpc\n", + bpc); + config->misc0 |= ZYNQMP_DP_MISC0_BPC_8; + ret = 8; + break; + } + config->bpc = bpc; + zynqmp_dp_update_bpp(dp); + + return ret; +} + +/** + * zynqmp_dp_encoder_mode_set_transfer_unit - Set the transfer unit values + * @dp: DisplayPort IP core structure + * @mode: requested display mode + * + * Set the transfer unit, and caculate all transfer unit size related values. + * Calculation is based on DP and IP core specification. + */ +static void +zynqmp_dp_encoder_mode_set_transfer_unit(struct zynqmp_dp *dp, + struct drm_display_mode *mode) +{ + u32 tu = ZYNQMP_DP_TX_DEF_TRANSFER_UNIT_SIZE; + u32 bw, vid_kbytes, avg_bytes_per_tu, init_wait; + + /* Use the max transfer unit size (default) */ + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_TRANSFER_UNIT_SIZE, tu); + + vid_kbytes = mode->clock * (dp->config.bpp / 8); + bw = drm_dp_bw_code_to_link_rate(dp->mode.bw_code); + avg_bytes_per_tu = vid_kbytes * tu / (dp->mode.lane_cnt * bw / 1000); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_MIN_BYTES_PER_TU, + avg_bytes_per_tu / 1000); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_FRAC_BYTES_PER_TU, + avg_bytes_per_tu % 1000); + + /* Configure the initial wait cycle based on transfer unit size */ + if (tu < (avg_bytes_per_tu / 1000)) + init_wait = 0; + else if ((avg_bytes_per_tu / 1000) <= 4) + init_wait = tu; + else + init_wait = tu - avg_bytes_per_tu / 1000; + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_INIT_WAIT, init_wait); +} + +/** + * zynqmp_dp_encoder_mode_set_stream - Configure the main stream + * @dp: DisplayPort IP core structure + * @mode: requested display mode + * + * Configure the main stream based on the requested mode @mode. Calculation is + * based on IP core specification. + */ +void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, + struct drm_display_mode *mode) +{ + void __iomem *iomem = dp->iomem; + u8 lane_cnt = dp->mode.lane_cnt; + u32 reg, wpl; + unsigned int rate; + + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_HTOTAL, mode->htotal); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_VTOTAL, mode->vtotal); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_POLARITY, + (!!(mode->flags & DRM_MODE_FLAG_PVSYNC) << + ZYNQMP_DP_TX_MAIN_STREAM_POLARITY_VSYNC_SHIFT) | + (!!(mode->flags & DRM_MODE_FLAG_PHSYNC) << + ZYNQMP_DP_TX_MAIN_STREAM_POLARITY_HSYNC_SHIFT)); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_HSWIDTH, + mode->hsync_end - mode->hsync_start); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_VSWIDTH, + mode->vsync_end - mode->vsync_start); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_HRES, mode->hdisplay); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_VRES, mode->vdisplay); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_HSTART, + mode->htotal - mode->hsync_start); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_MAIN_STREAM_VSTART, + mode->vtotal - mode->vsync_start); + + /* In synchronous mode, set the diviers */ + if (dp->config.misc0 & ZYNQMP_DP_TX_MAIN_STREAM_MISC0_SYNC) { + reg = drm_dp_bw_code_to_link_rate(dp->mode.bw_code); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_N_VID, reg); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_M_VID, mode->clock); + rate = zynqmp_disp_get_aud_clk_rate(dp->dpsub->disp); + if (rate) { + dev_dbg(dp->dev, "Audio rate: %d\n", rate / 512); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUDIO_N_AUD, reg); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUDIO_M_AUD, + rate / 1000); + } + } + + /* Only 2 channel audio is supported now */ + if (zynqmp_disp_aud_enabled(dp->dpsub->disp)) + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUDIO_CHANNELS, 1); + + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_USER_PIXEL_WIDTH, 1); + + /* Translate to the native 16 bit datapath based on IP core spec */ + wpl = (mode->hdisplay * dp->config.bpp + 15) / 16; + reg = wpl + wpl % lane_cnt - lane_cnt; + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_USER_DATA_CNT_PER_LANE, reg); +} + +/* + * DRM connector functions + */ + +static enum drm_connector_status +zynqmp_dp_connector_detect(struct drm_connector *connector, bool force) +{ + struct zynqmp_dp *dp = connector_to_dp(connector); + struct zynqmp_dp_link_config *link_config = &dp->link_config; + u32 state, i; + int ret; + + /* + * This is from heuristic. It takes some delay (ex, 100 ~ 500 msec) to + * get the HPD signal with some monitors. + */ + for (i = 0; i < 10; i++) { + state = zynqmp_dp_read(dp->iomem, + ZYNQMP_DP_TX_INTR_SIGNAL_STATE); + if (state & ZYNQMP_DP_TX_INTR_SIGNAL_STATE_HPD) + break; + msleep(100); + } + + if (state & ZYNQMP_DP_TX_INTR_SIGNAL_STATE_HPD) { + ret = drm_dp_dpcd_read(&dp->aux, 0x0, dp->dpcd, + sizeof(dp->dpcd)); + if (ret < 0) { + dev_dbg(dp->dev, "DPCD read failes"); + goto disconnected; + } + + link_config->max_rate = min_t(int, + drm_dp_max_link_rate(dp->dpcd), + DP_HIGH_BIT_RATE2); + link_config->max_lanes = min_t(u8, + drm_dp_max_lane_count(dp->dpcd), + dp->num_lanes); + + dp->status = connector_status_connected; + return connector_status_connected; + } + +disconnected: + dp->status = connector_status_disconnected; + return connector_status_disconnected; +} + +static int zynqmp_dp_connector_get_modes(struct drm_connector *connector) +{ + struct zynqmp_dp *dp = connector_to_dp(connector); + struct edid *edid; + int ret; + + edid = drm_get_edid(connector, &dp->aux.ddc); + if (!edid) + return 0; + + drm_mode_connector_update_edid_property(connector, edid); + ret = drm_add_edid_modes(connector, edid); + kfree(edid); + + return ret; +} + +static struct drm_encoder * +zynqmp_dp_connector_best_encoder(struct drm_connector *connector) +{ + struct zynqmp_dp *dp = connector_to_dp(connector); + + return &dp->encoder; +} + +static int zynqmp_dp_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) +{ + struct zynqmp_dp *dp = connector_to_dp(connector); + u8 max_lanes = dp->link_config.max_lanes; + u8 bpp = dp->config.bpp; + int max_rate = dp->link_config.max_rate; + int rate; + + if (mode->clock > ZYNQMP_MAX_FREQ) { + dev_dbg(dp->dev, "filtered the mode, %s,for high pixel rate\n", + mode->name); + drm_mode_debug_printmodeline(mode); + return MODE_CLOCK_HIGH; + } + + /* Check with link rate and lane count */ + rate = zynqmp_dp_max_rate(max_rate, max_lanes, bpp); + if (mode->clock > rate) { + dev_dbg(dp->dev, "filtered the mode, %s,for high pixel rate\n", + mode->name); + drm_mode_debug_printmodeline(mode); + return MODE_CLOCK_HIGH; + } + + return MODE_OK; +} + +static void zynqmp_dp_connector_destroy(struct drm_connector *connector) +{ + drm_connector_unregister(connector); + drm_connector_cleanup(connector); +} + +static const struct drm_connector_funcs zynqmp_dp_connector_funcs = { + .detect = zynqmp_dp_connector_detect, + .fill_modes = drm_helper_probe_single_connector_modes, + .destroy = zynqmp_dp_connector_destroy, + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, + .reset = drm_atomic_helper_connector_reset, +}; + +static const struct drm_connector_helper_funcs +zynqmp_dp_connector_helper_funcs = { + .get_modes = zynqmp_dp_connector_get_modes, + .best_encoder = zynqmp_dp_connector_best_encoder, + .mode_valid = zynqmp_dp_connector_mode_valid, +}; + +/* + * DRM encoder functions + */ + +static void zynqmp_dp_encoder_enable(struct drm_encoder *encoder) +{ + struct zynqmp_dp *dp = encoder_to_dp(encoder); + void __iomem *iomem = dp->iomem; + unsigned int i; + int ret = 0; + + pm_runtime_get_sync(dp->dev); + dp->enabled = true; + zynqmp_dp_init_aux(dp); + zynqmp_dp_update_misc(dp); + if (zynqmp_disp_aud_enabled(dp->dpsub->disp)) + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUDIO_CONTROL, 1); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_PHY_POWER_DOWN, 0); + if (dp->status == connector_status_connected) { + for (i = 0; i < 3; i++) { + ret = drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, + DP_SET_POWER_D0); + if (ret == 1) + break; + usleep_range(300, 500); + } + /* Some monitors take time to wake up properly */ + msleep(zynqmp_dp_power_on_delay_ms); + } + if (ret != 1) + dev_dbg(dp->dev, "DP aux failed\n"); + else + zynqmp_dp_train_loop(dp); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_SW_RESET, + ZYNQMP_DP_TX_SW_RESET_ALL); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_ENABLE_MAIN_STREAM, 1); +} + +static void zynqmp_dp_encoder_disable(struct drm_encoder *encoder) +{ + struct zynqmp_dp *dp = encoder_to_dp(encoder); + void __iomem *iomem = dp->iomem; + + dp->enabled = false; + cancel_delayed_work(&dp->hpd_work); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_ENABLE_MAIN_STREAM, 0); + drm_dp_dpcd_writeb(&dp->aux, DP_SET_POWER, DP_SET_POWER_D3); + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_PHY_POWER_DOWN, + ZYNQMP_DP_TX_PHY_POWER_DOWN_ALL); + if (zynqmp_disp_aud_enabled(dp->dpsub->disp)) + zynqmp_dp_write(iomem, ZYNQMP_DP_TX_AUDIO_CONTROL, 0); + pm_runtime_put_sync(dp->dev); +} + +static void +zynqmp_dp_encoder_atomic_mode_set(struct drm_encoder *encoder, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *connector_state) +{ + struct zynqmp_dp *dp = encoder_to_dp(encoder); + struct drm_display_mode *mode = &crtc_state->mode; + struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; + u8 max_lanes = dp->link_config.max_lanes; + u8 bpp = dp->config.bpp; + int rate, max_rate = dp->link_config.max_rate; + int ret; + + /* Check again as bpp or format might have been chagned */ + rate = zynqmp_dp_max_rate(max_rate, max_lanes, bpp); + if (mode->clock > rate) { + dev_err(dp->dev, "the mode, %s,has too high pixel rate\n", + mode->name); + drm_mode_debug_printmodeline(mode); + } + + ret = zynqmp_dp_mode_configure(dp, adjusted_mode->clock, 0); + if (ret < 0) + return; + + zynqmp_dp_encoder_mode_set_transfer_unit(dp, adjusted_mode); +} + +#define ZYNQMP_DP_MIN_H_BACKPORCH 20 + +static int +zynqmp_dp_encoder_atomic_check(struct drm_encoder *encoder, + struct drm_crtc_state *crtc_state, + struct drm_connector_state *conn_state) +{ + struct drm_display_mode *mode = &crtc_state->mode; + struct drm_display_mode *adjusted_mode = &crtc_state->adjusted_mode; + int diff = mode->htotal - mode->hsync_end; + + /* + * ZynqMP DP requires horizontal backporch to be greater than 12. + * This limitation may not be compatible with the sink device. + */ + if (diff < ZYNQMP_DP_MIN_H_BACKPORCH) { + int vrefresh = (adjusted_mode->clock * 1000) / + (adjusted_mode->vtotal * adjusted_mode->htotal); + + dev_dbg(encoder->dev->dev, "hbackporch adjusted: %d to %d", + diff, ZYNQMP_DP_MIN_H_BACKPORCH - diff); + diff = ZYNQMP_DP_MIN_H_BACKPORCH - diff; + adjusted_mode->htotal += diff; + adjusted_mode->clock = adjusted_mode->vtotal * + adjusted_mode->htotal * vrefresh / 1000; + } + + return 0; +} + +static const struct drm_encoder_funcs zynqmp_dp_encoder_funcs = { + .destroy = drm_encoder_cleanup, +}; + +static const struct drm_encoder_helper_funcs zynqmp_dp_encoder_helper_funcs = { + .enable = zynqmp_dp_encoder_enable, + .disable = zynqmp_dp_encoder_disable, + .atomic_mode_set = zynqmp_dp_encoder_atomic_mode_set, + .atomic_check = zynqmp_dp_encoder_atomic_check, +}; + +/* + * Component functions + */ + +static void zynqmp_dp_hpd_work_func(struct work_struct *work) +{ + struct zynqmp_dp *dp; + + dp = container_of(work, struct zynqmp_dp, hpd_work.work); + + if (dp->drm) + drm_helper_hpd_irq_event(dp->drm); +} + +int zynqmp_dp_bind(struct device *dev, struct device *master, void *data) +{ + struct zynqmp_dpsub *dpsub = dev_get_drvdata(dev); + struct zynqmp_dp *dp = dpsub->dp; + struct drm_encoder *encoder = &dp->encoder; + struct drm_connector *connector = &dp->connector; + struct drm_device *drm = data; + struct device_node *port; + int ret; + + if (!dp->num_lanes) + return 0; + + encoder->possible_crtcs |= zynqmp_disp_get_crtc_mask(dpsub->disp); + for_each_child_of_node(dev->of_node, port) { + if (!port->name || of_node_cmp(port->name, "port")) + continue; + encoder->possible_crtcs |= drm_of_find_possible_crtcs(drm, + port); + } + drm_encoder_init(drm, encoder, &zynqmp_dp_encoder_funcs, + DRM_MODE_ENCODER_TMDS, NULL); + drm_encoder_helper_add(encoder, &zynqmp_dp_encoder_helper_funcs); + + connector->polled = DRM_CONNECTOR_POLL_HPD; + ret = drm_connector_init(encoder->dev, connector, + &zynqmp_dp_connector_funcs, + DRM_MODE_CONNECTOR_DisplayPort); + if (ret) { + dev_err(dp->dev, "failed to initialize the drm connector"); + goto error_encoder; + } + + drm_connector_helper_add(connector, &zynqmp_dp_connector_helper_funcs); + drm_connector_register(connector); + drm_mode_connector_attach_encoder(connector, encoder); + connector->dpms = DRM_MODE_DPMS_OFF; + + dp->drm = drm; + dp->config.misc0 &= ~ZYNQMP_DP_TX_MAIN_STREAM_MISC0_SYNC; + ret = zynqmp_dp_set_bpc(dp, 8); + zynqmp_dp_update_bpp(dp); + + /* This enables interrupts, so should be called after DRM init */ + ret = zynqmp_dp_init_aux(dp); + if (ret) { + dev_err(dp->dev, "failed to initialize DP aux"); + goto error_connector; + } + INIT_DELAYED_WORK(&dp->hpd_work, zynqmp_dp_hpd_work_func); + + return 0; + +error_connector: + zynqmp_dp_connector_destroy(&dp->connector); +error_encoder: + drm_encoder_cleanup(&dp->encoder); + return ret; +} + +void zynqmp_dp_unbind(struct device *dev, struct device *master, void *data) +{ + struct zynqmp_dpsub *dpsub = dev_get_drvdata(dev); + struct zynqmp_dp *dp = dpsub->dp; + + disable_irq(dp->irq); + if (!dp->num_lanes) + return; + + cancel_delayed_work_sync(&dp->hpd_work); + zynqmp_dp_exit_aux(dp); + zynqmp_dp_connector_destroy(&dp->connector); + drm_encoder_cleanup(&dp->encoder); +} + +/* + * Platform functions + */ + +static irqreturn_t zynqmp_dp_irq_handler(int irq, void *data) +{ + struct zynqmp_dp *dp = (struct zynqmp_dp *)data; + u32 status, mask; + + status = zynqmp_dp_read(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_STATUS); + mask = zynqmp_dp_read(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_MASK); + if (!(status & ~mask)) + return IRQ_NONE; + + /* dbg for diagnostic, but not much that the driver can do */ + if (status & ZYNQMP_DP_TX_INTR_CHBUF_UNDERFLW_MASK) + dev_dbg_ratelimited(dp->dev, "underflow interrupt\n"); + if (status & ZYNQMP_DP_TX_INTR_CHBUF_OVERFLW_MASK) + dev_dbg_ratelimited(dp->dev, "overflow interrupt\n"); + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_SUB_TX_INTR_STATUS, status); + + /* The DP vblank will not be enabled with remote crtc device */ + if (status & ZYNQMP_DP_TX_INTR_VBLANK_START) + zynqmp_disp_handle_vblank(dp->dpsub->disp); + + if (status & ZYNQMP_DP_TX_INTR_HPD_EVENT) + schedule_delayed_work(&dp->hpd_work, 0); + + if (status & ZYNQMP_DP_TX_INTR_HPD_IRQ) { + int ret; + u8 status[DP_LINK_STATUS_SIZE + 2]; + + ret = drm_dp_dpcd_read(&dp->aux, DP_SINK_COUNT, status, + DP_LINK_STATUS_SIZE + 2); + if (ret < 0) + goto handled; + + if (status[4] & DP_LINK_STATUS_UPDATED || + !drm_dp_clock_recovery_ok(&status[2], dp->mode.lane_cnt) || + !drm_dp_channel_eq_ok(&status[2], dp->mode.lane_cnt)) { + zynqmp_dp_train_loop(dp); + } + } + +handled: + return IRQ_HANDLED; +} + +int zynqmp_dp_probe(struct platform_device *pdev) +{ + struct zynqmp_dpsub *dpsub; + struct zynqmp_dp *dp; + struct resource *res; + unsigned int i; + int irq, ret; + + dp = devm_kzalloc(&pdev->dev, sizeof(*dp), GFP_KERNEL); + if (!dp) + return -ENOMEM; + + dp->dpms = DRM_MODE_DPMS_OFF; + dp->status = connector_status_disconnected; + dp->dev = &pdev->dev; + + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dp"); + dp->iomem = devm_ioremap_resource(dp->dev, res); + if (IS_ERR(dp->iomem)) + return PTR_ERR(dp->iomem); + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_PHY_POWER_DOWN, + ZYNQMP_DP_TX_PHY_POWER_DOWN_ALL); + zynqmp_dp_set(dp->iomem, ZYNQMP_DP_TX_PHY_CONFIG, + ZYNQMP_DP_TX_PHY_CONFIG_ALL_RESET); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_FORCE_SCRAMBLER_RESET, 1); + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_ENABLE, 0); + + dp->num_lanes = 2; + for (i = 0; i < ZYNQMP_DP_MAX_LANES; i++) { + char phy_name[16]; + + snprintf(phy_name, sizeof(phy_name), "dp-phy%d", i); + dp->phy[i] = devm_phy_get(dp->dev, phy_name); + if (IS_ERR(dp->phy[i])) { + ret = PTR_ERR(dp->phy[i]); + dp->phy[i] = NULL; + + /* 2nd lane is optional */ + if (i == 1 && ret == -ENODEV) { + dp->num_lanes = 1; + break; + } + + /* + * If no phy lane is assigned, the DP Tx gets disabled. + * The display part of the DP subsystem can still be + * used to drive the output to FPGA, thus let the DP + * subsystem driver to proceed without this DP Tx. + */ + if (i == 0 && ret == -ENODEV) { + dp->num_lanes = 0; + goto out; + } + + if (ret != -EPROBE_DEFER) + dev_err(dp->dev, "failed to get phy lane\n"); + + return ret; + } + } + + ret = zynqmp_dp_init_phy(dp); + if (ret) + goto error_phy; + + dp->aux.name = "ZynqMP DP AUX"; + dp->aux.dev = dp->dev; + dp->aux.transfer = zynqmp_dp_aux_transfer; + ret = drm_dp_aux_register(&dp->aux); + if (ret < 0) { + dev_err(dp->dev, "failed to initialize DP aux\n"); + goto error; + } + +out: + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + ret = irq; + goto error; + } + + ret = devm_request_threaded_irq(dp->dev, irq, NULL, + zynqmp_dp_irq_handler, IRQF_ONESHOT, + dev_name(dp->dev), dp); + if (ret < 0) + goto error; + dp->irq = irq; + + dpsub = platform_get_drvdata(pdev); + dpsub->dp = dp; + dp->dpsub = dpsub; + + dev_dbg(dp->dev, + "ZynqMP DisplayPort Tx driver probed with %u phy lanes\n", + dp->num_lanes); + + return 0; + +error: + drm_dp_aux_unregister(&dp->aux); +error_phy: + zynqmp_dp_exit_phy(dp); + return ret; +} + +int zynqmp_dp_remove(struct platform_device *pdev) +{ + struct zynqmp_dpsub *dpsub = platform_get_drvdata(pdev); + struct zynqmp_dp *dp = dpsub->dp; + + zynqmp_dp_write(dp->iomem, ZYNQMP_DP_TX_ENABLE, 0); + drm_dp_aux_unregister(&dp->aux); + zynqmp_dp_exit_phy(dp); + dpsub->dp = NULL; + + return 0; +} diff --git a/drivers/gpu/drm/xlnx/zynqmp_dp.h b/drivers/gpu/drm/xlnx/zynqmp_dp.h new file mode 100644 index 0000000..a9360f1 --- /dev/null +++ b/drivers/gpu/drm/xlnx/zynqmp_dp.h @@ -0,0 +1,30 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ZynqMP DisplayPort Driver + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#ifndef _ZYNQMP_DP_H_ +#define _ZYNQMP_DP_H_ + +struct device; +struct drm_display_mode; +struct platform_device; +struct zynqmp_dp; + +const int zynqmp_dp_set_color(struct zynqmp_dp *dp, const char *color); +void zynqmp_dp_enable_vblank(struct zynqmp_dp *dp); +void zynqmp_dp_disable_vblank(struct zynqmp_dp *dp); +void zynqmp_dp_encoder_mode_set_stream(struct zynqmp_dp *dp, + struct drm_display_mode *mode); + +int zynqmp_dp_bind(struct device *dev, struct device *master, void *data); +void zynqmp_dp_unbind(struct device *dev, struct device *master, void *data); + +int zynqmp_dp_probe(struct platform_device *pdev); +int zynqmp_dp_remove(struct platform_device *pdev); + +#endif /* _ZYNQMP_DP_H_ */ -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH v8 5/5] drm: xlnx: ZynqMP DP subsystem DRM KMS driver 2018-07-08 2:05 [PATCH v8 0/5] Xilinx ZynqMP DisplayPort KMS driver Hyun Kwon ` (3 preceding siblings ...) 2018-07-08 2:05 ` [PATCH v8 4/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DisplayPort Hyun Kwon @ 2018-07-08 2:05 ` Hyun Kwon 2019-02-17 23:34 ` Laurent Pinchart 4 siblings, 1 reply; 10+ messages in thread From: Hyun Kwon @ 2018-07-08 2:05 UTC (permalink / raw) To: dri-devel, devicetree, Laurent Pinchart Cc: Daniel Vetter, Rob Herring, Michal Simek, Hyun Kwon This is a wrapper around the ZynqMP Display and DisplayPort drivers. Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> --- v8 - Support reserved memory through memory-region dt binding v6 - Accomodate the migration of logical master from platform device to device - Remove the duplicate license paragraphs - Do complete forward declaration in the header v5 - Add an error handling of pipeline initialization v4 - Use the newly added xlnx pipeline calls to initialize drm device v2 - Change the SPDX identifier format --- --- drivers/gpu/drm/xlnx/Kconfig | 11 +++ drivers/gpu/drm/xlnx/Makefile | 3 + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 158 ++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 23 ++++++ 4 files changed, 195 insertions(+) create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.c create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.h diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig index 19fd7cd..7c5529c 100644 --- a/drivers/gpu/drm/xlnx/Kconfig +++ b/drivers/gpu/drm/xlnx/Kconfig @@ -10,3 +10,14 @@ config DRM_XLNX display pipeline using Xilinx IPs in FPGA. This module provides the kernel mode setting functionalities for Xilinx display drivers. + +config DRM_ZYNQMP_DPSUB + tristate "ZynqMP DP Subsystem Driver" + depends on ARCH_ZYNQMP && OF && DRM_XLNX && COMMON_CLK + select DMA_ENGINE + select GENERIC_PHY + help + DRM KMS driver for ZynqMP DP Subsystem controller. Choose + this option if you have a Xilinx ZynqMP SoC with DisplayPort + subsystem. The driver provides the kernel mode setting + functionlaities for ZynqMP DP subsystem. diff --git a/drivers/gpu/drm/xlnx/Makefile b/drivers/gpu/drm/xlnx/Makefile index c60a281..064a05a 100644 --- a/drivers/gpu/drm/xlnx/Makefile +++ b/drivers/gpu/drm/xlnx/Makefile @@ -1,2 +1,5 @@ xlnx_drm-objs += xlnx_crtc.o xlnx_drv.o xlnx_fb.o xlnx_gem.o obj-$(CONFIG_DRM_XLNX) += xlnx_drm.o + +zynqmp-dpsub-objs += zynqmp_disp.o zynqmp_dpsub.o zynqmp_dp.o +obj-$(CONFIG_DRM_ZYNQMP_DPSUB) += zynqmp-dpsub.o diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c new file mode 100644 index 0000000..34e81d0 --- /dev/null +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c @@ -0,0 +1,158 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ZynqMP DP Subsystem Driver + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#include <linux/component.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/of_reserved_mem.h> +#include <linux/platform_device.h> +#include <linux/pm_runtime.h> + +#include "xlnx_drv.h" + +#include "zynqmp_disp.h" +#include "zynqmp_dp.h" +#include "zynqmp_dpsub.h" + +static int +zynqmp_dpsub_bind(struct device *dev, struct device *master, void *data) +{ + int ret; + + ret = zynqmp_disp_bind(dev, master, data); + if (ret) + return ret; + + /* zynqmp_disp should bind first, so zynqmp_dp encoder can find crtc */ + ret = zynqmp_dp_bind(dev, master, data); + if (ret) + return ret; + + return 0; +} + +static void +zynqmp_dpsub_unbind(struct device *dev, struct device *master, void *data) +{ + zynqmp_dp_unbind(dev, master, data); + zynqmp_disp_unbind(dev, master, data); +} + +static const struct component_ops zynqmp_dpsub_component_ops = { + .bind = zynqmp_dpsub_bind, + .unbind = zynqmp_dpsub_unbind, +}; + +static int zynqmp_dpsub_probe(struct platform_device *pdev) +{ + struct zynqmp_dpsub *dpsub; + int ret; + + dpsub = devm_kzalloc(&pdev->dev, sizeof(*dpsub), GFP_KERNEL); + if (!dpsub) + return -ENOMEM; + + /* Sub-driver will access dpsub from drvdata */ + platform_set_drvdata(pdev, dpsub); + pm_runtime_enable(&pdev->dev); + + /* + * DP should be probed first so that the zynqmp_disp can set the output + * format accordingly. + */ + ret = zynqmp_dp_probe(pdev); + if (ret) + goto err_pm; + + ret = zynqmp_disp_probe(pdev); + if (ret) + goto err_dp; + + ret = component_add(&pdev->dev, &zynqmp_dpsub_component_ops); + if (ret) + goto err_disp; + + /* Try the reserved memory. Proceed if there's none */ + of_reserved_mem_device_init(&pdev->dev); + + /* Populate the sound child nodes */ + ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); + if (ret) { + dev_err(&pdev->dev, "failed to populate child nodes\n"); + goto err_rmem; + } + + dpsub->master = xlnx_drm_pipeline_init(&pdev->dev); + if (IS_ERR(dpsub->master)) { + dev_err(&pdev->dev, "failed to initialize the drm pipeline\n"); + goto err_populate; + } + + dev_info(&pdev->dev, "ZynqMP DisplayPort Subsystem driver probed"); + + return 0; + +err_populate: + of_platform_depopulate(&pdev->dev); +err_rmem: + of_reserved_mem_device_release(&pdev->dev); + component_del(&pdev->dev, &zynqmp_dpsub_component_ops); +err_disp: + zynqmp_disp_remove(pdev); +err_dp: + zynqmp_dp_remove(pdev); +err_pm: + pm_runtime_disable(&pdev->dev); + return ret; +} + +static int zynqmp_dpsub_remove(struct platform_device *pdev) +{ + struct zynqmp_dpsub *dpsub = platform_get_drvdata(pdev); + int err, ret = 0; + + xlnx_drm_pipeline_exit(dpsub->master); + of_platform_depopulate(&pdev->dev); + of_reserved_mem_device_release(&pdev->dev); + component_del(&pdev->dev, &zynqmp_dpsub_component_ops); + + err = zynqmp_disp_remove(pdev); + if (err) + ret = -EIO; + + err = zynqmp_dp_remove(pdev); + if (err) + ret = -EIO; + + pm_runtime_disable(&pdev->dev); + + return err; +} + +static const struct of_device_id zynqmp_dpsub_of_match[] = { + { .compatible = "xlnx,zynqmp-dpsub-1.7", }, + { /* end of table */ }, +}; +MODULE_DEVICE_TABLE(of, zynqmp_dpsub_of_match); + +static struct platform_driver zynqmp_dpsub_driver = { + .probe = zynqmp_dpsub_probe, + .remove = zynqmp_dpsub_remove, + .driver = { + .owner = THIS_MODULE, + .name = "zynqmp-display", + .of_match_table = zynqmp_dpsub_of_match, + }, +}; + +module_platform_driver(zynqmp_dpsub_driver); + +MODULE_AUTHOR("Xilinx, Inc."); +MODULE_DESCRIPTION("ZynqMP DP Subsystem Driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.h b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h new file mode 100644 index 0000000..95239bb --- /dev/null +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h @@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * ZynqMP DPSUB Subsystem Driver + * + * Copyright (C) 2017 - 2018 Xilinx, Inc. + * + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> + */ + +#ifndef _ZYNQMP_DPSUB_H_ +#define _ZYNQMP_DPSUB_H_ + +struct device; +struct zynqmp_dp; +struct zynqmp_disp; + +struct zynqmp_dpsub { + struct zynqmp_dp *dp; + struct zynqmp_disp *disp; + struct device *master; +}; + +#endif /* _ZYNQMP_DPSUB_H_ */ -- 2.7.4 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH v8 5/5] drm: xlnx: ZynqMP DP subsystem DRM KMS driver 2018-07-08 2:05 ` [PATCH v8 5/5] drm: xlnx: ZynqMP DP subsystem DRM KMS driver Hyun Kwon @ 2019-02-17 23:34 ` Laurent Pinchart 0 siblings, 0 replies; 10+ messages in thread From: Laurent Pinchart @ 2019-02-17 23:34 UTC (permalink / raw) To: Hyun Kwon; +Cc: devicetree, Rob Herring, Michal Simek, dri-devel, Daniel Vetter Hi Hyun, Thank you for the patch. On Sat, Jul 07, 2018 at 07:05:38PM -0700, Hyun Kwon wrote: > This is a wrapper around the ZynqMP Display and DisplayPort drivers. This isn't quite accurate. There's a single driver, named zynqmp-dpsub, split in a few source files. You've split the code in several patches to ease review (thank you for that !), but this patch isn't a wrapper, it's the top-level entry point for the driver. > Signed-off-by: Hyun Kwon <hyun.kwon@xilinx.com> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > v8 > - Support reserved memory through memory-region dt binding > v6 > - Accomodate the migration of logical master from platform device to device > - Remove the duplicate license paragraphs > - Do complete forward declaration in the header > v5 > - Add an error handling of pipeline initialization > v4 > - Use the newly added xlnx pipeline calls to initialize drm device > v2 > - Change the SPDX identifier format > --- > --- > drivers/gpu/drm/xlnx/Kconfig | 11 +++ > drivers/gpu/drm/xlnx/Makefile | 3 + > drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 158 ++++++++++++++++++++++++++++++++++++ > drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 23 ++++++ > 4 files changed, 195 insertions(+) > create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.c > create mode 100644 drivers/gpu/drm/xlnx/zynqmp_dpsub.h > > diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig > index 19fd7cd..7c5529c 100644 > --- a/drivers/gpu/drm/xlnx/Kconfig > +++ b/drivers/gpu/drm/xlnx/Kconfig > @@ -10,3 +10,14 @@ config DRM_XLNX > display pipeline using Xilinx IPs in FPGA. This module > provides the kernel mode setting functionalities > for Xilinx display drivers. > + > +config DRM_ZYNQMP_DPSUB > + tristate "ZynqMP DP Subsystem Driver" Should we spell DisplayPort in full here to make it easier to understand, or is "ZynqMP DP" used through the Xiinx documentation in a way that makes the configuration option title impossible to mistake for users ? > + depends on ARCH_ZYNQMP && OF && DRM_XLNX && COMMON_CLK > + select DMA_ENGINE > + select GENERIC_PHY > + help > + DRM KMS driver for ZynqMP DP Subsystem controller. Choose > + this option if you have a Xilinx ZynqMP SoC with DisplayPort > + subsystem. The driver provides the kernel mode setting > + functionlaities for ZynqMP DP subsystem. s/functionlaities/functionality/ Or maybe just "The driver provides kernel mode setting for the ZynqMP DP subsystem". Or drop that sentence as it says pretty much the same thing as the first one :-) > diff --git a/drivers/gpu/drm/xlnx/Makefile b/drivers/gpu/drm/xlnx/Makefile > index c60a281..064a05a 100644 > --- a/drivers/gpu/drm/xlnx/Makefile > +++ b/drivers/gpu/drm/xlnx/Makefile > @@ -1,2 +1,5 @@ > xlnx_drm-objs += xlnx_crtc.o xlnx_drv.o xlnx_fb.o xlnx_gem.o > obj-$(CONFIG_DRM_XLNX) += xlnx_drm.o > + > +zynqmp-dpsub-objs += zynqmp_disp.o zynqmp_dpsub.o zynqmp_dp.o > +obj-$(CONFIG_DRM_ZYNQMP_DPSUB) += zynqmp-dpsub.o > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > new file mode 100644 > index 0000000..34e81d0 > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > @@ -0,0 +1,158 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * ZynqMP DP Subsystem Driver > + * > + * Copyright (C) 2017 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#include <linux/component.h> > +#include <linux/module.h> > +#include <linux/of_platform.h> > +#include <linux/of_reserved_mem.h> > +#include <linux/platform_device.h> > +#include <linux/pm_runtime.h> > + > +#include "xlnx_drv.h" > + > +#include "zynqmp_disp.h" > +#include "zynqmp_dp.h" > +#include "zynqmp_dpsub.h" > + > +static int > +zynqmp_dpsub_bind(struct device *dev, struct device *master, void *data) > +{ > + int ret; > + > + ret = zynqmp_disp_bind(dev, master, data); This isn't a component helper. You can pass it pointers to zynqmp_dpsub and drm_device instead of retrieving them internally through platform device data. The pointer to master is not needed. Same for zynqmp_dp_bind() below and the corresponding unbind functions. > + if (ret) > + return ret; > + > + /* zynqmp_disp should bind first, so zynqmp_dp encoder can find crtc */ > + ret = zynqmp_dp_bind(dev, master, data); > + if (ret) Shouldn't you call zynqmp_disp_unbind() here ? > + return ret; > + > + return 0; > +} > + > +static void > +zynqmp_dpsub_unbind(struct device *dev, struct device *master, void *data) > +{ > + zynqmp_dp_unbind(dev, master, data); > + zynqmp_disp_unbind(dev, master, data); > +} > + > +static const struct component_ops zynqmp_dpsub_component_ops = { > + .bind = zynqmp_dpsub_bind, > + .unbind = zynqmp_dpsub_unbind, > +}; > + > +static int zynqmp_dpsub_probe(struct platform_device *pdev) > +{ > + struct zynqmp_dpsub *dpsub; > + int ret; > + > + dpsub = devm_kzalloc(&pdev->dev, sizeof(*dpsub), GFP_KERNEL); > + if (!dpsub) > + return -ENOMEM; > + > + /* Sub-driver will access dpsub from drvdata */ > + platform_set_drvdata(pdev, dpsub); > + pm_runtime_enable(&pdev->dev); > + > + /* > + * DP should be probed first so that the zynqmp_disp can set the output > + * format accordingly. > + */ > + ret = zynqmp_dp_probe(pdev); > + if (ret) > + goto err_pm; > + > + ret = zynqmp_disp_probe(pdev); > + if (ret) > + goto err_dp; > + > + ret = component_add(&pdev->dev, &zynqmp_dpsub_component_ops); > + if (ret) > + goto err_disp; > + > + /* Try the reserved memory. Proceed if there's none */ > + of_reserved_mem_device_init(&pdev->dev); > + > + /* Populate the sound child nodes */ > + ret = of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); > + if (ret) { > + dev_err(&pdev->dev, "failed to populate child nodes\n"); > + goto err_rmem; > + } > + > + dpsub->master = xlnx_drm_pipeline_init(&pdev->dev); > + if (IS_ERR(dpsub->master)) { > + dev_err(&pdev->dev, "failed to initialize the drm pipeline\n"); > + goto err_populate; > + } > + > + dev_info(&pdev->dev, "ZynqMP DisplayPort Subsystem driver probed"); > + > + return 0; > + > +err_populate: > + of_platform_depopulate(&pdev->dev); > +err_rmem: > + of_reserved_mem_device_release(&pdev->dev); > + component_del(&pdev->dev, &zynqmp_dpsub_component_ops); > +err_disp: > + zynqmp_disp_remove(pdev); > +err_dp: > + zynqmp_dp_remove(pdev); > +err_pm: > + pm_runtime_disable(&pdev->dev); > + return ret; > +} > + > +static int zynqmp_dpsub_remove(struct platform_device *pdev) > +{ > + struct zynqmp_dpsub *dpsub = platform_get_drvdata(pdev); > + int err, ret = 0; > + > + xlnx_drm_pipeline_exit(dpsub->master); > + of_platform_depopulate(&pdev->dev); > + of_reserved_mem_device_release(&pdev->dev); > + component_del(&pdev->dev, &zynqmp_dpsub_component_ops); > + > + err = zynqmp_disp_remove(pdev); > + if (err) > + ret = -EIO; > + > + err = zynqmp_dp_remove(pdev); > + if (err) > + ret = -EIO; These two functions always return 0, let's make them void, and drop error handling here. > + > + pm_runtime_disable(&pdev->dev); > + > + return err; > +} > + > +static const struct of_device_id zynqmp_dpsub_of_match[] = { > + { .compatible = "xlnx,zynqmp-dpsub-1.7", }, > + { /* end of table */ }, > +}; > +MODULE_DEVICE_TABLE(of, zynqmp_dpsub_of_match); > + > +static struct platform_driver zynqmp_dpsub_driver = { > + .probe = zynqmp_dpsub_probe, > + .remove = zynqmp_dpsub_remove, > + .driver = { > + .owner = THIS_MODULE, > + .name = "zynqmp-display", > + .of_match_table = zynqmp_dpsub_of_match, > + }, > +}; > + > +module_platform_driver(zynqmp_dpsub_driver); > + > +MODULE_AUTHOR("Xilinx, Inc."); > +MODULE_DESCRIPTION("ZynqMP DP Subsystem Driver"); > +MODULE_LICENSE("GPL v2"); > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.h b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h > new file mode 100644 > index 0000000..95239bb > --- /dev/null > +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.h > @@ -0,0 +1,23 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * ZynqMP DPSUB Subsystem Driver > + * > + * Copyright (C) 2017 - 2018 Xilinx, Inc. > + * > + * Author: Hyun Woo Kwon <hyun.kwon@xilinx.com> > + */ > + > +#ifndef _ZYNQMP_DPSUB_H_ > +#define _ZYNQMP_DPSUB_H_ > + > +struct device; > +struct zynqmp_dp; > +struct zynqmp_disp; zynqmp_disp first in alphabetical order. > + > +struct zynqmp_dpsub { > + struct zynqmp_dp *dp; > + struct zynqmp_disp *disp; > + struct device *master; > +}; > + > +#endif /* _ZYNQMP_DPSUB_H_ */ -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2019-02-17 23:34 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2018-07-08 2:05 [PATCH v8 0/5] Xilinx ZynqMP DisplayPort KMS driver Hyun Kwon 2018-07-08 2:05 ` [PATCH v8 1/5] drm: xlnx: Xilinx DRM KMS module Hyun Kwon 2019-02-17 23:33 ` Laurent Pinchart 2018-07-08 2:05 ` [PATCH v8 2/5] dt-bindings: display: xlnx: Add ZynqMP DP subsystem bindings Hyun Kwon 2019-02-17 23:33 ` Laurent Pinchart 2018-07-08 2:05 ` [PATCH v8 3/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DP subsystem display Hyun Kwon 2019-02-17 23:34 ` Laurent Pinchart 2018-07-08 2:05 ` [PATCH v8 4/5] drm: xlnx: DRM KMS driver for Xilinx ZynqMP DisplayPort Hyun Kwon 2018-07-08 2:05 ` [PATCH v8 5/5] drm: xlnx: ZynqMP DP subsystem DRM KMS driver Hyun Kwon 2019-02-17 23:34 ` Laurent Pinchart
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).