This series adds support for ARM's HDLCD display controller found in Juno and ARM TC2 Coretile. The HDLCD outputs an RGB stream that feeds into a single digital encoder (DVI or HDMI).
The dependencies for this patch series are now queued for the next release or are already in the mainline.
Only the Juno functionality has been tested as the TC2 Coretile require a working SiI9022 driver for VExpress that is not subject of this patchset.
Changelog: v5: Queue the pending vblank events sent by userspace using a list instead of keeping the last event seen. Suggested by Daniel Stone daniel@fooishbar.org. v4: Remove some debugging code that could return an error on a critical path and updated the check for valid format in hdlcd_set_pxl_fmt() to only WARN() if an invalid format found (unlikely case). Added the ACKs received. [1] v3: Changed the driver to use the memory-region phandle for bespoke framebuffers. [2] v2: Added support for atomic modeset [3] v1: Original DRM submission [4]
[1] http://lists.freedesktop.org/archives/dri-devel/2015-December/095990.html [2] http://lists.freedesktop.org/archives/dri-devel/2015-December/095877.html [3] http://lists.freedesktop.org/archives/dri-devel/2015-November/094177.html [4] http://lists.freedesktop.org/archives/dri-devel/2015-August/087685.html
Best regards, Liviu
Liviu Dudau (4): drm: arm: Add DT bindings documentation for HDLCD driver. drm: Add support for ARM's HDLCD controller. arm64: Juno: Add HDLCD support to the Juno boards. MAINTAINERS: Add Liviu Dudau as maintainer for ARM HDLCD driver.
.../devicetree/bindings/display/arm,hdlcd.txt | 79 +++ MAINTAINERS | 6 + arch/arm64/boot/dts/arm/juno-base.dtsi | 46 +- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/arm/Kconfig | 29 ++ drivers/gpu/drm/arm/Makefile | 2 + drivers/gpu/drm/arm/hdlcd_crtc.c | 329 ++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.c | 580 +++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.h | 42 ++ drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++++ 11 files changed, 1199 insertions(+), 4 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt create mode 100644 drivers/gpu/drm/arm/Kconfig create mode 100644 drivers/gpu/drm/arm/Makefile create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
Cc: Pawel Moll pawel.moll@arm.com Cc: Mark Rutland mark.rutland@arm.com Cc: Ian Campbell ijc+devicetree@hellion.org.uk Cc: Kumar Gala galak@codeaurora.org
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com Acked-by: Rob Herring robh@kernel.org --- .../devicetree/bindings/display/arm,hdlcd.txt | 79 ++++++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/arm,hdlcd.txt
diff --git a/Documentation/devicetree/bindings/display/arm,hdlcd.txt b/Documentation/devicetree/bindings/display/arm,hdlcd.txt new file mode 100644 index 0000000..78bc242 --- /dev/null +++ b/Documentation/devicetree/bindings/display/arm,hdlcd.txt @@ -0,0 +1,79 @@ +ARM HDLCD + +This is a display controller found on several development platforms produced +by ARM Ltd and in more modern of its' Fast Models. The HDLCD is an RGB +streamer that reads the data from a framebuffer and sends it to a single +digital encoder (DVI or HDMI). + +Required properties: + - compatible: "arm,hdlcd" + - reg: Physical base address and length of the controller's registers. + - interrupts: One interrupt used by the display controller to notify the + interrupt controller when any of the interrupt sources programmed in + the interrupt mask register have activated. + - clocks: A list of phandle + clock-specifier pairs, one for each + entry in 'clock-names'. + - clock-names: A list of clock names. For HDLCD it should contain: + - "pxlclk" for the clock feeding the output PLL of the controller. + +Required sub-nodes: + - port: The HDLCD connection to an encoder chip. The connection is modeled + using the OF graph bindings specified in + Documentation/devicetree/bindings/graph.txt. + +Optional properties: + - memory-region: phandle to a node describing memory (see + Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt) to be + used for the framebuffer; if not present, the framebuffer may be located + anywhere in memory. + + +Example: + +/ { + ... + + hdlcd@2b000000 { + compatible = "arm,hdlcd"; + reg = <0 0x2b000000 0 0x1000>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&oscclk5>; + clock-names = "pxlclk"; + port { + hdlcd_output: endpoint@0 { + remote-endpoint = <&hdmi_enc_input>; + }; + }; + }; + + /* HDMI encoder on I2C bus */ + i2c@7ffa0000 { + .... + hdmi-transmitter@70 { + compatible = "....."; + reg = <0x70>; + port@0 { + hdmi_enc_input: endpoint { + remote-endpoint = <&hdlcd_output>; + }; + + hdmi_enc_output: endpoint { + remote-endpoint = <&hdmi_1_port>; + }; + }; + }; + + }; + + hdmi1: connector@1 { + compatible = "hdmi-connector"; + type = "a"; + port { + hdmi_1_port: endpoint { + remote-endpoint = <&hdmi_enc_output>; + }; + }; + }; + + ... +};
The HDLCD controller is a display controller that supports resolutions up to 4096x4096 pixels. It is present on various development boards produced by ARM Ltd and emulated by the latest Fast Models from the company.
Cc: David Airlie airlied@linux.ie Cc: Robin Murphy robin.murphy@arm.com
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com Acked-by: Daniel Vetter daniel.vetter@ffwll.ch --- drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/arm/Kconfig | 29 ++ drivers/gpu/drm/arm/Makefile | 2 + drivers/gpu/drm/arm/hdlcd_crtc.c | 329 ++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.c | 580 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.h | 42 +++ drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++++++ 8 files changed, 1072 insertions(+) create mode 100644 drivers/gpu/drm/arm/Kconfig create mode 100644 drivers/gpu/drm/arm/Makefile create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index c4bf9a1..3fd9124 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -106,6 +106,8 @@ config DRM_TDFX Choose this option if you have a 3dfx Banshee or Voodoo3 (or later), graphics card. If M is selected, the module will be called tdfx.
+source "drivers/gpu/drm/arm/Kconfig" + config DRM_R128 tristate "ATI Rage 128" depends on DRM && PCI diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 1e9ff4c..6b42d75 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -35,6 +35,7 @@ CFLAGS_drm_trace_points.o := -I$(src)
obj-$(CONFIG_DRM) += drm.o obj-$(CONFIG_DRM_MIPI_DSI) += drm_mipi_dsi.o +obj-$(CONFIG_DRM_ARM) += arm/ obj-$(CONFIG_DRM_TTM) += ttm/ obj-$(CONFIG_DRM_TDFX) += tdfx/ obj-$(CONFIG_DRM_R128) += r128/ diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig new file mode 100644 index 0000000..5e8c8a8 --- /dev/null +++ b/drivers/gpu/drm/arm/Kconfig @@ -0,0 +1,29 @@ +config DRM_ARM + bool "ARM Ltd. drivers" + depends on DRM && OF && (ARM || ARM64) + select DRM_KMS_HELPER + help + Choose this option to select drivers for ARM's devices + +config DRM_HDLCD + tristate "ARM HDLCD" + depends on DRM_ARM + depends on COMMON_CLK + select COMMON_CLK_SCPI + select DMA_CMA + select DRM_KMS_CMA_HELPER + select DRM_GEM_CMA_HELPER + help + Choose this option if you have an ARM High Definition Colour LCD + controller. + + If M is selected the module will be called hdlcd. + +config DRM_HDLCD_SHOW_UNDERRUN + bool "Show underrun conditions" + depends on DRM_HDLCD + default n + help + Enable this option to show in red colour the pixels that the + HDLCD device did not fetch from framebuffer due to underrun + conditions. diff --git a/drivers/gpu/drm/arm/Makefile b/drivers/gpu/drm/arm/Makefile new file mode 100644 index 0000000..89dcb7b --- /dev/null +++ b/drivers/gpu/drm/arm/Makefile @@ -0,0 +1,2 @@ +hdlcd-y := hdlcd_drv.o hdlcd_crtc.o +obj-$(CONFIG_DRM_HDLCD) += hdlcd.o diff --git a/drivers/gpu/drm/arm/hdlcd_crtc.c b/drivers/gpu/drm/arm/hdlcd_crtc.c new file mode 100644 index 0000000..97105b7 --- /dev/null +++ b/drivers/gpu/drm/arm/hdlcd_crtc.c @@ -0,0 +1,329 @@ +/* + * Copyright (C) 2013-2015 ARM Limited + * Author: Liviu Dudau Liviu.Dudau@arm.com + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive + * for more details. + * + * Implementation of a CRTC class for the HDLCD driver. + */ + +#include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> +#include <drm/drm_plane_helper.h> +#include <linux/clk.h> +#include <linux/of_graph.h> +#include <linux/platform_data/simplefb.h> +#include <video/videomode.h> + +#include "hdlcd_drv.h" +#include "hdlcd_regs.h" + +/* + * The HDLCD controller is a dumb RGB streamer that gets connected to + * a single HDMI transmitter or in the case of the ARM Models it gets + * emulated by the software that does the actual rendering. + * + */ + +static const struct drm_crtc_funcs hdlcd_crtc_funcs = { + .destroy = drm_crtc_cleanup, + .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, +}; + +static struct simplefb_format supported_formats[] = SIMPLEFB_FORMATS; + +/* + * Setup the HDLCD registers for decoding the pixels out of the framebuffer + */ +static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) +{ + unsigned int btpp, default_color = 0x00000000; + struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); + uint32_t pixel_format; + struct simplefb_format *format = NULL; + int i; + +#ifdef CONFIG_DRM_HDLCD_SHOW_UNDERRUN + default_color = 0x00ff0000; /* show underruns in red */ +#endif + + pixel_format = crtc->primary->state->fb->pixel_format; + + for (i = 0; i < ARRAY_SIZE(supported_formats); i++) { + if (supported_formats[i].fourcc == pixel_format) + format = &supported_formats[i]; + } + + if (WARN_ON(!format)) { + return 0; + } + + /* HDLCD uses 'bytes per pixel', zero means 1 byte */ + btpp = (format->bits_per_pixel + 7) / 8; + hdlcd_write(hdlcd, HDLCD_REG_PIXEL_FORMAT, (btpp - 1) << 3); + + /* + * The format of the HDLCD_REG_<color>_SELECT register is: + * - bits[23:16] - default value for that color component + * - bits[11:8] - number of bits to extract for each color component + * - bits[4:0] - index of the lowest bit to extract + * + * The default color value is used when bits[11:8] are zero, when the + * pixel is outside the visible frame area or when there is a + * buffer underrun. + */ + hdlcd_write(hdlcd, HDLCD_REG_RED_SELECT, default_color | + format->red.offset | (format->red.length & 0xf) << 8); + hdlcd_write(hdlcd, HDLCD_REG_GREEN_SELECT, default_color | + format->green.offset | (format->green.length & 0xf) << 8); + hdlcd_write(hdlcd, HDLCD_REG_BLUE_SELECT, default_color | + format->blue.offset | (format->blue.length & 0xf) << 8); + + return 0; +} + +static void hdlcd_crtc_mode_set_nofb(struct drm_crtc *crtc) +{ + struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); + struct drm_display_mode *m = &crtc->state->adjusted_mode; + struct videomode vm; + unsigned int polarities, line_length, err; + + vm.vfront_porch = m->crtc_vsync_start - m->crtc_vdisplay; + vm.vback_porch = m->crtc_vtotal - m->crtc_vsync_end; + vm.vsync_len = m->crtc_vsync_end - m->crtc_vsync_start; + vm.hfront_porch = m->crtc_hsync_start - m->crtc_hdisplay; + vm.hback_porch = m->crtc_htotal - m->crtc_hsync_end; + vm.hsync_len = m->crtc_hsync_end - m->crtc_hsync_start; + + polarities = HDLCD_POLARITY_DATAEN | HDLCD_POLARITY_DATA; + + if (m->flags & DRM_MODE_FLAG_PHSYNC) + polarities |= HDLCD_POLARITY_HSYNC; + if (m->flags & DRM_MODE_FLAG_PVSYNC) + polarities |= HDLCD_POLARITY_VSYNC; + + line_length = crtc->primary->state->fb->pitches[0]; + + /* Allow max number of outstanding requests and largest burst size */ + hdlcd_write(hdlcd, HDLCD_REG_BUS_OPTIONS, + HDLCD_BUS_MAX_OUTSTAND | HDLCD_BUS_BURST_16); + + hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_LENGTH, line_length); + hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_PITCH, line_length); + hdlcd_write(hdlcd, HDLCD_REG_FB_LINE_COUNT, m->crtc_vdisplay - 1); + hdlcd_write(hdlcd, HDLCD_REG_V_DATA, m->crtc_vdisplay - 1); + hdlcd_write(hdlcd, HDLCD_REG_V_BACK_PORCH, vm.vback_porch - 1); + hdlcd_write(hdlcd, HDLCD_REG_V_FRONT_PORCH, vm.vfront_porch - 1); + hdlcd_write(hdlcd, HDLCD_REG_V_SYNC, vm.vsync_len - 1); + hdlcd_write(hdlcd, HDLCD_REG_H_BACK_PORCH, vm.hback_porch - 1); + hdlcd_write(hdlcd, HDLCD_REG_H_FRONT_PORCH, vm.hfront_porch - 1); + hdlcd_write(hdlcd, HDLCD_REG_H_SYNC, vm.hsync_len - 1); + hdlcd_write(hdlcd, HDLCD_REG_H_DATA, m->crtc_hdisplay - 1); + hdlcd_write(hdlcd, HDLCD_REG_POLARITIES, polarities); + + err = hdlcd_set_pxl_fmt(crtc); + if (err) + return; + + clk_set_rate(hdlcd->clk, m->crtc_clock * 1000); +} + +static void hdlcd_crtc_enable(struct drm_crtc *crtc) +{ + struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); + + clk_prepare_enable(hdlcd->clk); + hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 1); + drm_crtc_vblank_on(crtc); +} + +static void hdlcd_crtc_disable(struct drm_crtc *crtc) +{ + struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); + + if (!crtc->primary->fb) + return; + + clk_disable_unprepare(hdlcd->clk); + hdlcd_write(hdlcd, HDLCD_REG_COMMAND, 0); + drm_crtc_vblank_off(crtc); +} + +static int hdlcd_crtc_atomic_check(struct drm_crtc *crtc, + struct drm_crtc_state *state) +{ + struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); + struct drm_display_mode *mode = &state->adjusted_mode; + long rate, clk_rate = mode->clock * 1000; + + rate = clk_round_rate(hdlcd->clk, clk_rate); + if (rate != clk_rate) { + /* clock required by mode not supported by hardware */ + return -EINVAL; + } + + return 0; +} + +static void hdlcd_crtc_atomic_begin(struct drm_crtc *crtc, + struct drm_crtc_state *state) +{ + struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc); + unsigned long flags; + + if (crtc->state->event) { + struct drm_pending_vblank_event *event = crtc->state->event; + + crtc->state->event = NULL; + event->pipe = drm_crtc_index(crtc); + + WARN_ON(drm_crtc_vblank_get(crtc) != 0); + + spin_lock_irqsave(&crtc->dev->event_lock, flags); + list_add_tail(&event->base.link, &hdlcd->event_list); + spin_unlock_irqrestore(&crtc->dev->event_lock, flags); + } +} + +static void hdlcd_crtc_atomic_flush(struct drm_crtc *crtc, + struct drm_crtc_state *state) +{ +} + +static bool hdlcd_crtc_mode_fixup(struct drm_crtc *crtc, + const struct drm_display_mode *mode, + struct drm_display_mode *adjusted_mode) +{ + return true; +} + +static const struct drm_crtc_helper_funcs hdlcd_crtc_helper_funcs = { + .mode_fixup = hdlcd_crtc_mode_fixup, + .mode_set = drm_helper_crtc_mode_set, + .mode_set_base = drm_helper_crtc_mode_set_base, + .mode_set_nofb = hdlcd_crtc_mode_set_nofb, + .enable = hdlcd_crtc_enable, + .disable = hdlcd_crtc_disable, + .prepare = hdlcd_crtc_disable, + .commit = hdlcd_crtc_enable, + .atomic_check = hdlcd_crtc_atomic_check, + .atomic_begin = hdlcd_crtc_atomic_begin, + .atomic_flush = hdlcd_crtc_atomic_flush, +}; + +static int hdlcd_plane_atomic_check(struct drm_plane *plane, + struct drm_plane_state *state) +{ + return 0; +} + +static void hdlcd_plane_atomic_update(struct drm_plane *plane, + struct drm_plane_state *state) +{ + struct hdlcd_drm_private *hdlcd; + struct drm_gem_cma_object *gem; + dma_addr_t scanout_start; + + if (!plane->state->crtc || !plane->state->fb) + return; + + hdlcd = crtc_to_hdlcd_priv(plane->state->crtc); + gem = drm_fb_cma_get_gem_obj(plane->state->fb, 0); + scanout_start = gem->paddr; + hdlcd_write(hdlcd, HDLCD_REG_FB_BASE, scanout_start); +} + +static const struct drm_plane_helper_funcs hdlcd_plane_helper_funcs = { + .prepare_fb = NULL, + .cleanup_fb = NULL, + .atomic_check = hdlcd_plane_atomic_check, + .atomic_update = hdlcd_plane_atomic_update, +}; + +static void hdlcd_plane_destroy(struct drm_plane *plane) +{ + drm_plane_helper_disable(plane); + drm_plane_cleanup(plane); +} + +static const struct drm_plane_funcs hdlcd_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = hdlcd_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 struct drm_plane *hdlcd_plane_init(struct drm_device *drm) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct drm_plane *plane = NULL; + u32 formats[ARRAY_SIZE(supported_formats)], i; + int ret; + + plane = devm_kzalloc(drm->dev, sizeof(*plane), GFP_KERNEL); + if (!plane) + return ERR_PTR(-ENOMEM); + + for (i = 0; i < ARRAY_SIZE(supported_formats); i++) + formats[i] = supported_formats[i].fourcc; + + ret = drm_universal_plane_init(drm, plane, 0xff, &hdlcd_plane_funcs, + formats, ARRAY_SIZE(formats), + DRM_PLANE_TYPE_PRIMARY); + if (ret) { + devm_kfree(drm->dev, plane); + return ERR_PTR(ret); + } + + drm_plane_helper_add(plane, &hdlcd_plane_helper_funcs); + hdlcd->plane = plane; + + return plane; +} + +void hdlcd_crtc_suspend(struct drm_crtc *crtc) +{ + hdlcd_crtc_disable(crtc); +} + +void hdlcd_crtc_resume(struct drm_crtc *crtc) +{ + hdlcd_crtc_enable(crtc); +} + +int hdlcd_setup_crtc(struct drm_device *drm) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct drm_plane *primary; + int ret; + + primary = hdlcd_plane_init(drm); + if (IS_ERR(primary)) + return PTR_ERR(primary); + + ret = drm_crtc_init_with_planes(drm, &hdlcd->crtc, primary, NULL, + &hdlcd_crtc_funcs); + if (ret) { + hdlcd_plane_destroy(primary); + devm_kfree(drm->dev, primary); + return ret; + } + + drm_crtc_helper_add(&hdlcd->crtc, &hdlcd_crtc_helper_funcs); + return 0; +} diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c new file mode 100644 index 0000000..544b7f7 --- /dev/null +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -0,0 +1,580 @@ +/* + * Copyright (C) 2013-2015 ARM Limited + * Author: Liviu Dudau Liviu.Dudau@arm.com + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive + * for more details. + * + * ARM HDLCD Driver + */ + +#include <linux/module.h> +#include <linux/spinlock.h> +#include <linux/clk.h> +#include <linux/component.h> +#include <linux/list.h> +#include <linux/of_graph.h> +#include <linux/of_reserved_mem.h> +#include <linux/pm_runtime.h> + +#include <drm/drmP.h> +#include <drm/drm_atomic_helper.h> +#include <drm/drm_crtc.h> +#include <drm/drm_crtc_helper.h> +#include <drm/drm_fb_helper.h> +#include <drm/drm_fb_cma_helper.h> +#include <drm/drm_gem_cma_helper.h> +#include <drm/drm_of.h> + +#include "hdlcd_drv.h" +#include "hdlcd_regs.h" + +static int compare_dev(struct device *dev, void *data) +{ + return dev->of_node == data; +} + +static int hdlcd_load(struct drm_device *drm, unsigned long flags) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + struct platform_device *pdev = to_platform_device(drm->dev); + struct resource *res; + u32 version; + int ret; + + hdlcd->clk = devm_clk_get(drm->dev, "pxlclk"); + if (IS_ERR(hdlcd->clk)) + return PTR_ERR(hdlcd->clk); + +#ifdef CONFIG_DEBUG_FS + atomic_set(&hdlcd->buffer_underrun_count, 0); + atomic_set(&hdlcd->bus_error_count, 0); + atomic_set(&hdlcd->vsync_count, 0); + atomic_set(&hdlcd->dma_end_count, 0); +#endif + + INIT_LIST_HEAD(&hdlcd->event_list); + + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + hdlcd->mmio = devm_ioremap_resource(drm->dev, res); + if (IS_ERR(hdlcd->mmio)) { + DRM_ERROR("failed to map control registers area\n"); + ret = PTR_ERR(hdlcd->mmio); + hdlcd->mmio = NULL; + goto fail; + } + + version = hdlcd_read(hdlcd, HDLCD_REG_VERSION); + if ((version & HDLCD_PRODUCT_MASK) != HDLCD_PRODUCT_ID) { + DRM_ERROR("unknown product id: 0x%x\n", version); + ret = -EINVAL; + goto fail; + } + DRM_INFO("found ARM HDLCD version r%dp%d\n", + (version & HDLCD_VERSION_MAJOR_MASK) >> 8, + version & HDLCD_VERSION_MINOR_MASK); + + /* Get the optional framebuffer memory resource */ + ret = of_reserved_mem_device_init(drm->dev); + if (ret && ret != -ENODEV) + goto fail; + + ret = dma_set_mask_and_coherent(drm->dev, DMA_BIT_MASK(32)); + if (ret) + goto setup_fail; + + ret = hdlcd_setup_crtc(drm); + if (ret < 0) { + DRM_ERROR("failed to create crtc\n"); + goto setup_fail; + } + + pm_runtime_enable(drm->dev); + + pm_runtime_get_sync(drm->dev); + ret = drm_irq_install(drm, platform_get_irq(pdev, 0)); + pm_runtime_put_sync(drm->dev); + if (ret < 0) { + DRM_ERROR("failed to install IRQ handler\n"); + goto irq_fail; + } + + return 0; + +irq_fail: + drm_crtc_cleanup(&hdlcd->crtc); +setup_fail: + of_reserved_mem_device_release(drm->dev); +fail: + devm_clk_put(drm->dev, hdlcd->clk); + + return ret; +} + +static void hdlcd_fb_output_poll_changed(struct drm_device *drm) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + + if (hdlcd->fbdev) { + drm_fbdev_cma_hotplug_event(hdlcd->fbdev); + } +} + +static int hdlcd_atomic_commit(struct drm_device *dev, + struct drm_atomic_state *state, bool async) +{ + return drm_atomic_helper_commit(dev, state, false); +} + +static const struct drm_mode_config_funcs hdlcd_mode_config_funcs = { + .fb_create = drm_fb_cma_create, + .output_poll_changed = hdlcd_fb_output_poll_changed, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = hdlcd_atomic_commit, +}; + +static void hdlcd_setup_mode_config(struct drm_device *drm) +{ + drm_mode_config_init(drm); + drm->mode_config.min_width = 0; + drm->mode_config.min_height = 0; + drm->mode_config.max_width = HDLCD_MAX_XRES; + drm->mode_config.max_height = HDLCD_MAX_YRES; + drm->mode_config.funcs = &hdlcd_mode_config_funcs; +} + +static void hdlcd_preclose(struct drm_device *drm, struct drm_file *file) +{ + unsigned long flags; + struct drm_pending_vblank_event *e, *t; + struct hdlcd_drm_private *hdlcd = drm->dev_private; + + spin_lock_irqsave(&drm->event_lock, flags); + list_for_each_entry_safe(e, t, &hdlcd->event_list, base.link) { + if (e->base.file_priv != file) + continue; + list_del(&e->base.link); + e->base.destroy(&e->base); + } + spin_unlock_irqrestore(&drm->event_lock, flags); +} + +static void hdlcd_lastclose(struct drm_device *drm) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + + drm_fbdev_cma_restore_mode(hdlcd->fbdev); +} + +static irqreturn_t hdlcd_irq(int irq, void *arg) +{ + struct drm_device *drm = arg; + struct hdlcd_drm_private *hdlcd = drm->dev_private; + unsigned long irq_status; + + irq_status = hdlcd_read(hdlcd, HDLCD_REG_INT_STATUS); + +#ifdef CONFIG_DEBUG_FS + if (irq_status & HDLCD_INTERRUPT_UNDERRUN) { + atomic_inc(&hdlcd->buffer_underrun_count); + } + if (irq_status & HDLCD_INTERRUPT_DMA_END) { + atomic_inc(&hdlcd->dma_end_count); + } + if (irq_status & HDLCD_INTERRUPT_BUS_ERROR) { + atomic_inc(&hdlcd->bus_error_count); + } + if (irq_status & HDLCD_INTERRUPT_VSYNC) { + atomic_inc(&hdlcd->vsync_count); + } +#endif + if (irq_status & HDLCD_INTERRUPT_VSYNC) { + bool events_sent = false; + unsigned long flags; + struct drm_pending_vblank_event *e, *t; + + drm_crtc_handle_vblank(&hdlcd->crtc); + + spin_lock_irqsave(&drm->event_lock, flags); + list_for_each_entry_safe(e, t, &hdlcd->event_list, base.link) { + list_del(&e->base.link); + drm_crtc_send_vblank_event(&hdlcd->crtc, e); + events_sent = true; + } + if (events_sent) + drm_crtc_vblank_put(&hdlcd->crtc); + spin_unlock_irqrestore(&drm->event_lock, flags); + } + + /* acknowledge interrupt(s) */ + hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, irq_status); + + return IRQ_HANDLED; +} + +static void hdlcd_irq_preinstall(struct drm_device *drm) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + /* Ensure interrupts are disabled */ + hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, 0); + hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, ~0); +} + +static int hdlcd_irq_postinstall(struct drm_device *drm) +{ +#ifdef CONFIG_DEBUG_FS + struct hdlcd_drm_private *hdlcd = drm->dev_private; + unsigned long irq_mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK); + + /* enable debug interrupts */ + irq_mask |= HDLCD_DEBUG_INT_MASK; + + hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, irq_mask); +#endif + return 0; +} + +static void hdlcd_irq_uninstall(struct drm_device *drm) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + /* disable all the interrupts that we might have enabled */ + unsigned long irq_mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK); + +#ifdef CONFIG_DEBUG_FS + /* disable debug interrupts */ + irq_mask &= ~HDLCD_DEBUG_INT_MASK; +#endif + + /* disable vsync interrupts */ + irq_mask &= ~HDLCD_INTERRUPT_VSYNC; + + hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, irq_mask); +} + +static int hdlcd_enable_vblank(struct drm_device *drm, unsigned int crtc) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + unsigned int mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK); + + hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, mask | HDLCD_INTERRUPT_VSYNC); + + return 0; +} + +static void hdlcd_disable_vblank(struct drm_device *drm, unsigned int crtc) +{ + struct hdlcd_drm_private *hdlcd = drm->dev_private; + unsigned int mask = hdlcd_read(hdlcd, HDLCD_REG_INT_MASK); + + hdlcd_write(hdlcd, HDLCD_REG_INT_MASK, mask & ~HDLCD_INTERRUPT_VSYNC); +} + +#ifdef CONFIG_DEBUG_FS +static int hdlcd_show_underrun_count(struct seq_file *m, void *arg) +{ + struct drm_info_node *node = (struct drm_info_node *)m->private; + struct drm_device *drm = node->minor->dev; + struct hdlcd_drm_private *hdlcd = drm->dev_private; + + seq_printf(m, "underrun : %d\n", atomic_read(&hdlcd->buffer_underrun_count)); + seq_printf(m, "dma_end : %d\n", atomic_read(&hdlcd->dma_end_count)); + seq_printf(m, "bus_error: %d\n", atomic_read(&hdlcd->bus_error_count)); + seq_printf(m, "vsync : %d\n", atomic_read(&hdlcd->vsync_count)); + return 0; +} + +static int hdlcd_show_pxlclock(struct seq_file *m, void *arg) +{ + struct drm_info_node *node = (struct drm_info_node *)m->private; + struct drm_device *drm = node->minor->dev; + struct hdlcd_drm_private *hdlcd = drm->dev_private; + unsigned long clkrate = clk_get_rate(hdlcd->clk); + unsigned long mode_clock = hdlcd->crtc.mode.crtc_clock * 1000; + + seq_printf(m, "hw : %lu\n", clkrate); + seq_printf(m, "mode: %lu\n", mode_clock); + return 0; +} + +static struct drm_info_list hdlcd_debugfs_list[] = { + { "interrupt_count", hdlcd_show_underrun_count, 0 }, + { "clocks", hdlcd_show_pxlclock, 0 }, +}; + +static int hdlcd_debugfs_init(struct drm_minor *minor) +{ + return drm_debugfs_create_files(hdlcd_debugfs_list, + ARRAY_SIZE(hdlcd_debugfs_list), minor->debugfs_root, minor); +} + +static void hdlcd_debugfs_cleanup(struct drm_minor *minor) +{ + drm_debugfs_remove_files(hdlcd_debugfs_list, + ARRAY_SIZE(hdlcd_debugfs_list), minor); +} +#endif + +static const struct file_operations fops = { + .owner = THIS_MODULE, + .open = drm_open, + .release = drm_release, + .unlocked_ioctl = drm_ioctl, +#ifdef CONFIG_COMPAT + .compat_ioctl = drm_compat_ioctl, +#endif + .poll = drm_poll, + .read = drm_read, + .llseek = noop_llseek, + .mmap = drm_gem_cma_mmap, +}; + +static struct drm_driver hdlcd_driver = { + .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | + DRIVER_MODESET | DRIVER_PRIME | + DRIVER_ATOMIC, + .preclose = hdlcd_preclose, + .lastclose = hdlcd_lastclose, + .irq_handler = hdlcd_irq, + .irq_preinstall = hdlcd_irq_preinstall, + .irq_postinstall = hdlcd_irq_postinstall, + .irq_uninstall = hdlcd_irq_uninstall, + .get_vblank_counter = drm_vblank_no_hw_counter, + .enable_vblank = hdlcd_enable_vblank, + .disable_vblank = hdlcd_disable_vblank, + .gem_free_object = drm_gem_cma_free_object, + .gem_vm_ops = &drm_gem_cma_vm_ops, + .dumb_create = drm_gem_cma_dumb_create, + .dumb_map_offset = drm_gem_cma_dumb_map_offset, + .dumb_destroy = drm_gem_dumb_destroy, + .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, +#ifdef CONFIG_DEBUG_FS + .debugfs_init = hdlcd_debugfs_init, + .debugfs_cleanup = hdlcd_debugfs_cleanup, +#endif + .fops = &fops, + .name = "hdlcd", + .desc = "ARM HDLCD Controller DRM", + .date = "20151021", + .major = 1, + .minor = 0, +}; + +static int hdlcd_add_components(struct device *dev, struct master *master) +{ + struct device_node *port, *ep = NULL; + int ret = -ENXIO; + + if (!dev->of_node) + return -ENODEV; + + do { + ep = of_graph_get_next_endpoint(dev->of_node, ep); + if (!ep) + break; + + if (!of_device_is_available(ep)) { + of_node_put(ep); + continue; + } + + port = of_graph_get_remote_port_parent(ep); + of_node_put(ep); + if (!port || !of_device_is_available(port)) { + of_node_put(port); + continue; + } + + ret = component_master_add_child(master, compare_dev, port); + of_node_put(port); + } while (1); + + return ret; +} + +static int hdlcd_drm_bind(struct device *dev) +{ + struct drm_device *drm; + struct hdlcd_drm_private *hdlcd; + int ret; + + hdlcd = devm_kzalloc(dev, sizeof(*hdlcd), GFP_KERNEL); + if (!hdlcd) + return -ENOMEM; + + drm = drm_dev_alloc(&hdlcd_driver, dev); + if (!drm) + return -ENOMEM; + + drm->dev_private = hdlcd; + + ret = drm_dev_set_unique(drm, "%s", dev_name(dev)); + if (ret) + goto err_free; + + hdlcd_setup_mode_config(drm); + + ret = hdlcd_load(drm, 0); + if (ret) + goto err_free; + + ret = drm_dev_register(drm, 0); + if (ret) + goto err_unload; + + dev_set_drvdata(dev, drm); + + ret = component_bind_all(dev, drm); + if (ret) { + DRM_ERROR("Failed to bind all components\n"); + goto err_unregister; + } + + ret = drm_vblank_init(drm, drm->mode_config.num_crtc); + if (ret < 0) { + DRM_ERROR("failed to initialise vblank\n"); + goto err_vblank; + } + drm->vblank_disable_allowed = true; + + drm_mode_config_reset(drm); + drm_kms_helper_poll_init(drm); + + hdlcd->fbdev = drm_fbdev_cma_init(drm, 32, drm->mode_config.num_crtc, + drm->mode_config.num_connector); + + if (IS_ERR(hdlcd->fbdev)) { + ret = PTR_ERR(hdlcd->fbdev); + hdlcd->fbdev = NULL; + goto err_fbdev; + } + + return 0; + +err_fbdev: + drm_kms_helper_poll_fini(drm); + drm_mode_config_cleanup(drm); + drm_vblank_cleanup(drm); +err_vblank: + component_unbind_all(dev, drm); +err_unregister: + drm_dev_unregister(drm); +err_unload: + pm_runtime_get_sync(drm->dev); + drm_irq_uninstall(drm); + pm_runtime_put_sync(drm->dev); + pm_runtime_disable(drm->dev); + of_reserved_mem_device_release(drm->dev); + devm_clk_put(dev, hdlcd->clk); +err_free: + drm_dev_unref(drm); + + return ret; +} + +static void hdlcd_drm_unbind(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + struct hdlcd_drm_private *hdlcd = drm->dev_private; + + if (hdlcd->fbdev) { + drm_fbdev_cma_fini(hdlcd->fbdev); + hdlcd->fbdev = NULL; + } + drm_kms_helper_poll_fini(drm); + component_unbind_all(dev, drm); + drm_vblank_cleanup(drm); + pm_runtime_get_sync(drm->dev); + drm_irq_uninstall(drm); + pm_runtime_put_sync(drm->dev); + pm_runtime_disable(drm->dev); + of_reserved_mem_device_release(drm->dev); + if (!IS_ERR(hdlcd->clk)) { + devm_clk_put(drm->dev, hdlcd->clk); + hdlcd->clk = NULL; + } + drm_mode_config_cleanup(drm); + drm_dev_unregister(drm); + drm_dev_unref(drm); + drm->dev_private = NULL; + dev_set_drvdata(dev, NULL); +} + +static const struct component_master_ops hdlcd_master_ops = { + .add_components = hdlcd_add_components, + .bind = hdlcd_drm_bind, + .unbind = hdlcd_drm_unbind, +}; + +static int hdlcd_probe(struct platform_device *pdev) +{ + return component_master_add(&pdev->dev, &hdlcd_master_ops); +} + +static int hdlcd_remove(struct platform_device *pdev) +{ + component_master_del(&pdev->dev, &hdlcd_master_ops); + return 0; +} + +static const struct of_device_id hdlcd_of_match[] = { + { .compatible = "arm,hdlcd" }, + {}, +}; +MODULE_DEVICE_TABLE(of, hdlcd_of_match); + +static int hdlcd_pm_suspend(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + struct drm_crtc *crtc; + + if (pm_runtime_suspended(dev)) + return 0; + + drm_modeset_lock_all(drm); + list_for_each_entry(crtc, &drm->mode_config.crtc_list, head) + hdlcd_crtc_suspend(crtc); + drm_modeset_unlock_all(drm); + return 0; +} + +static int hdlcd_pm_resume(struct device *dev) +{ + struct drm_device *drm = dev_get_drvdata(dev); + struct drm_crtc *crtc; + + if (!pm_runtime_suspended(dev)) + return 0; + + drm_modeset_lock_all(drm); + list_for_each_entry(crtc, &drm->mode_config.crtc_list, head) + hdlcd_crtc_resume(crtc); + drm_modeset_unlock_all(drm); + return 0; +} + +static SIMPLE_DEV_PM_OPS(hdlcd_pm_ops, hdlcd_pm_suspend, hdlcd_pm_resume); + +static struct platform_driver hdlcd_platform_driver = { + .probe = hdlcd_probe, + .remove = hdlcd_remove, + .driver = { + .name = "hdlcd", + .pm = &hdlcd_pm_ops, + .of_match_table = hdlcd_of_match, + }, +}; + +module_platform_driver(hdlcd_platform_driver); + +MODULE_AUTHOR("Liviu Dudau"); +MODULE_DESCRIPTION("ARM HDLCD DRM driver"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/gpu/drm/arm/hdlcd_drv.h b/drivers/gpu/drm/arm/hdlcd_drv.h new file mode 100644 index 0000000..aa23478 --- /dev/null +++ b/drivers/gpu/drm/arm/hdlcd_drv.h @@ -0,0 +1,42 @@ +/* + * ARM HDLCD Controller register definition + */ + +#ifndef __HDLCD_DRV_H__ +#define __HDLCD_DRV_H__ + +struct hdlcd_drm_private { + void __iomem *mmio; + struct clk *clk; + struct drm_fbdev_cma *fbdev; + struct drm_framebuffer *fb; + struct list_head event_list; + struct drm_crtc crtc; + struct drm_plane *plane; +#ifdef CONFIG_DEBUG_FS + atomic_t buffer_underrun_count; + atomic_t bus_error_count; + atomic_t vsync_count; + atomic_t dma_end_count; +#endif +}; + +#define crtc_to_hdlcd_priv(x) container_of(x, struct hdlcd_drm_private, crtc) + +static inline void hdlcd_write(struct hdlcd_drm_private *hdlcd, + unsigned int reg, u32 value) +{ + writel(value, hdlcd->mmio + reg); +} + +static inline u32 hdlcd_read(struct hdlcd_drm_private *hdlcd, unsigned int reg) +{ + return readl(hdlcd->mmio + reg); +} + +int hdlcd_setup_crtc(struct drm_device *dev); +void hdlcd_set_scanout(struct hdlcd_drm_private *hdlcd); +void hdlcd_crtc_suspend(struct drm_crtc *crtc); +void hdlcd_crtc_resume(struct drm_crtc *crtc); + +#endif /* __HDLCD_DRV_H__ */ diff --git a/drivers/gpu/drm/arm/hdlcd_regs.h b/drivers/gpu/drm/arm/hdlcd_regs.h new file mode 100644 index 0000000..66799eb --- /dev/null +++ b/drivers/gpu/drm/arm/hdlcd_regs.h @@ -0,0 +1,87 @@ +/* + * Copyright (C) 2013,2014 ARM Limited + * + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file COPYING in the main directory of this archive + * for more details. + * + * ARM HDLCD Controller register definition + */ + +#ifndef __HDLCD_REGS_H__ +#define __HDLCD_REGS_H__ + +/* register offsets */ +#define HDLCD_REG_VERSION 0x0000 /* ro */ +#define HDLCD_REG_INT_RAWSTAT 0x0010 /* rw */ +#define HDLCD_REG_INT_CLEAR 0x0014 /* wo */ +#define HDLCD_REG_INT_MASK 0x0018 /* rw */ +#define HDLCD_REG_INT_STATUS 0x001c /* ro */ +#define HDLCD_REG_FB_BASE 0x0100 /* rw */ +#define HDLCD_REG_FB_LINE_LENGTH 0x0104 /* rw */ +#define HDLCD_REG_FB_LINE_COUNT 0x0108 /* rw */ +#define HDLCD_REG_FB_LINE_PITCH 0x010c /* rw */ +#define HDLCD_REG_BUS_OPTIONS 0x0110 /* rw */ +#define HDLCD_REG_V_SYNC 0x0200 /* rw */ +#define HDLCD_REG_V_BACK_PORCH 0x0204 /* rw */ +#define HDLCD_REG_V_DATA 0x0208 /* rw */ +#define HDLCD_REG_V_FRONT_PORCH 0x020c /* rw */ +#define HDLCD_REG_H_SYNC 0x0210 /* rw */ +#define HDLCD_REG_H_BACK_PORCH 0x0214 /* rw */ +#define HDLCD_REG_H_DATA 0x0218 /* rw */ +#define HDLCD_REG_H_FRONT_PORCH 0x021c /* rw */ +#define HDLCD_REG_POLARITIES 0x0220 /* rw */ +#define HDLCD_REG_COMMAND 0x0230 /* rw */ +#define HDLCD_REG_PIXEL_FORMAT 0x0240 /* rw */ +#define HDLCD_REG_RED_SELECT 0x0244 /* rw */ +#define HDLCD_REG_GREEN_SELECT 0x0248 /* rw */ +#define HDLCD_REG_BLUE_SELECT 0x024c /* rw */ + +/* version */ +#define HDLCD_PRODUCT_ID 0x1CDC0000 +#define HDLCD_PRODUCT_MASK 0xFFFF0000 +#define HDLCD_VERSION_MAJOR_MASK 0x0000FF00 +#define HDLCD_VERSION_MINOR_MASK 0x000000FF + +/* interrupts */ +#define HDLCD_INTERRUPT_DMA_END (1 << 0) +#define HDLCD_INTERRUPT_BUS_ERROR (1 << 1) +#define HDLCD_INTERRUPT_VSYNC (1 << 2) +#define HDLCD_INTERRUPT_UNDERRUN (1 << 3) +#define HDLCD_DEBUG_INT_MASK (HDLCD_INTERRUPT_DMA_END | \ + HDLCD_INTERRUPT_BUS_ERROR | \ + HDLCD_INTERRUPT_UNDERRUN) + +/* polarities */ +#define HDLCD_POLARITY_VSYNC (1 << 0) +#define HDLCD_POLARITY_HSYNC (1 << 1) +#define HDLCD_POLARITY_DATAEN (1 << 2) +#define HDLCD_POLARITY_DATA (1 << 3) +#define HDLCD_POLARITY_PIXELCLK (1 << 4) + +/* commands */ +#define HDLCD_COMMAND_DISABLE (0 << 0) +#define HDLCD_COMMAND_ENABLE (1 << 0) + +/* pixel format */ +#define HDLCD_PIXEL_FMT_LITTLE_ENDIAN (0 << 31) +#define HDLCD_PIXEL_FMT_BIG_ENDIAN (1 << 31) +#define HDLCD_BYTES_PER_PIXEL_MASK (3 << 3) + +/* bus options */ +#define HDLCD_BUS_BURST_MASK 0x01f +#define HDLCD_BUS_MAX_OUTSTAND 0xf00 +#define HDLCD_BUS_BURST_NONE (0 << 0) +#define HDLCD_BUS_BURST_1 (1 << 0) +#define HDLCD_BUS_BURST_2 (1 << 1) +#define HDLCD_BUS_BURST_4 (1 << 2) +#define HDLCD_BUS_BURST_8 (1 << 3) +#define HDLCD_BUS_BURST_16 (1 << 4) + +/* Max resolution supported is 4096x4096, 32bpp */ +#define HDLCD_MAX_XRES 4096 +#define HDLCD_MAX_YRES 4096 + +#define NR_PALETTE 256 + +#endif /* __HDLCD_REGS_H__ */
Hi Liviu,
On 07/12/15 12:11, Liviu Dudau wrote:
The HDLCD controller is a display controller that supports resolutions up to 4096x4096 pixels. It is present on various development boards produced by ARM Ltd and emulated by the latest Fast Models from the company.
Cc: David Airlie airlied@linux.ie Cc: Robin Murphy robin.murphy@arm.com
I've given this a spin on my Juno, and the first thing of note is this:
hdlcd 7ff60000.hdlcd: master bind failed: -517 hdlcd 7ff50000.hdlcd: master bind failed: -517 scpi_protocol scpi: SCP Protocol 1.0 Firmware 1.9.0 version [drm] found ARM HDLCD version r0p0 tda998x 0-0070: Falling back to first CRTC usb 1-1: new high-speed USB device number 2 using ehci-platform tda998x 0-0070: found TDA19988 hdlcd 7ff60000.hdlcd: bound 0-0070 (ops tda998x_ops) [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). [drm] No driver support for vblank timestamp query. ------------[ cut here ]------------ WARNING: at drivers/gpu/drm/drm_atomic_helper.c:682 Modules linked in:
CPU: 2 PID: 98 Comm: kworker/u12:3 Tainted: G W 4.4.0-rc2+ #846 Hardware name: ARM Juno development board (r1) (DT) Workqueue: deferwq deferred_probe_work_func task: fffffe007ecb3700 ti: fffffe09409c8000 task.ti: fffffe09409c8000 PC is at drm_atomic_helper_update_legacy_modeset_state+0x1e8/0x1f0 LR is at drm_atomic_helper_commit_modeset_disables+0x1a8/0x388 pc : [<fffffe00004a4468>] lr : [<fffffe00004a59b8>] pstate: 20000045 sp : fffffe09409cb560 x29: fffffe09409cb560 x28: fffffe0940bf2800 x27: fffffe0940070000 x26: 0000000000000001 x25: fffffe0000be4b50 x24: fffffe00007ae820 x23: fffffe0000be4b50 x22: fffffe0940bd1000 x21: fffffe0940bd1000 x20: 0000000000000000 x19: fffffe0940968000 x18: fffffe0940c8091c x17: 0000000000000007 x16: 0000000000000001 x15: fffffe0940c8016f x14: 0000003c00000000 x13: 0000000000000000 x12: 000004c9000004b4 x11: 000004b1000004c9 x10: 000004b0000004b0 x9 : 00000000000006f4 x8 : 000006a400000654 x7 : 000006f400000640 x6 : fffffe0940966480 x5 : fffffe0940968200 x4 : 0000000000000001 x3 : fffffe0940966a80 x2 : 0000000000000000 x1 : fffffe0940bd0900 x0 : fffffe0940bd0960
---[ end trace bdb6af69b29bf7ea ]--- Call trace: [<fffffe00004a4468>] drm_atomic_helper_update_legacy_modeset_state+0x1e8/0x1f0 [<fffffe00004a59b8>] drm_atomic_helper_commit_modeset_disables+0x1a8/0x388 [<fffffe00004a5c70>] drm_atomic_helper_commit+0xd8/0x140 [<fffffe00004ccce0>] hdlcd_atomic_commit+0x10/0x18 [<fffffe00004c9ef8>] drm_atomic_commit+0x40/0x70 [<fffffe00004a69b0>] restore_fbdev_mode+0x270/0x2b0 [<fffffe00004a8d64>] drm_fb_helper_restore_fbdev_mode_unlocked+0x34/0x90 [<fffffe00004a8dec>] drm_fb_helper_set_par+0x2c/0x60 [<fffffe000042f010>] fbcon_init+0x4d0/0x520 [<fffffe000046ec9c>] visual_init+0xac/0x108 [<fffffe000047060c>] do_bind_con_driver+0x1d4/0x3e8 [<fffffe0000470c14>] do_take_over_console+0x174/0x1e8 [<fffffe000042c38c>] do_fbcon_takeover+0x74/0x100 [<fffffe00004313b4>] fbcon_event_notify+0x77c/0x7d8 [<fffffe00000dc700>] notifier_call_chain+0x50/0x90 [<fffffe00000dcadc>] __blocking_notifier_call_chain+0x4c/0x90 [<fffffe00000dcb34>] blocking_notifier_call_chain+0x14/0x20 [<fffffe0000435204>] fb_notifier_call_chain+0x1c/0x28 [<fffffe0000437010>] register_framebuffer+0x1c0/0x2b8 [<fffffe00004a90a4>] drm_fb_helper_initial_config+0x284/0x3e8 [<fffffe00004a991c>] drm_fbdev_cma_init+0x94/0x148 [<fffffe00004ccfc4>] hdlcd_drm_bind+0x1d4/0x418 [<fffffe00004d15f0>] try_to_bring_up_master.part.2+0xc8/0x110 [<fffffe00004d1820>] component_add+0x90/0x108 [<fffffe00004ce6a8>] tda998x_probe+0x18/0x20 [<fffffe00005a6d24>] i2c_device_probe+0x164/0x228 [<fffffe00004d698c>] driver_probe_device+0x1ec/0x2f0 [<fffffe00004d6bc0>] __device_attach_driver+0x90/0xd8 [<fffffe00004d4b88>] bus_for_each_drv+0x58/0x98 [<fffffe00004d66e4>] __device_attach+0xc4/0x148 [<fffffe00004d6c58>] device_initial_probe+0x10/0x18 [<fffffe00004d5b9c>] bus_probe_device+0x94/0xa0 [<fffffe00004d6020>] deferred_probe_work_func+0x70/0xa8 [<fffffe00000d5b70>] process_one_work+0x138/0x378 [<fffffe00000d5ed4>] worker_thread+0x124/0x498 [<fffffe00000dbb54>] kthread+0xdc/0xf0 [<fffffe0000093980>] ret_from_fork+0x10/0x50 Console: switching to colour frame buffer device 150x100
which for reference, is the first one in that function:
... /* clear out existing links and update dpms */ for_each_connector_in_state(old_state, connector, old_conn_state, i) { if (connector->encoder) { WARN_ON(!connector->encoder->crtc); ...
That's on 4.4-rc2 with this series plus the 3 tda998x patches from Russell's patch system applied. Is there something else I'm missing or does this need looking at (could it be related to that initial probe deferral)?
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com Acked-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/arm/Kconfig | 29 ++ drivers/gpu/drm/arm/Makefile | 2 + drivers/gpu/drm/arm/hdlcd_crtc.c | 329 ++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.c | 580 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.h | 42 +++ drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++++++ 8 files changed, 1072 insertions(+) create mode 100644 drivers/gpu/drm/arm/Kconfig create mode 100644 drivers/gpu/drm/arm/Makefile create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
[...]
+static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) +{
- unsigned int btpp, default_color = 0x00000000;
- struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
- uint32_t pixel_format;
- struct simplefb_format *format = NULL;
- int i;
+#ifdef CONFIG_DRM_HDLCD_SHOW_UNDERRUN
- default_color = 0x00ff0000; /* show underruns in red */
+#endif
- pixel_format = crtc->primary->state->fb->pixel_format;
- for (i = 0; i < ARRAY_SIZE(supported_formats); i++) {
if (supported_formats[i].fourcc == pixel_format)format = &supported_formats[i];- }
- if (WARN_ON(!format)) {
return 0;- }
nit: unnecessary braces.
- /* HDLCD uses 'bytes per pixel', zero means 1 byte */
- btpp = (format->bits_per_pixel + 7) / 8;
- hdlcd_write(hdlcd, HDLCD_REG_PIXEL_FORMAT, (btpp - 1) << 3);
- /*
* The format of the HDLCD_REG_<color>_SELECT register is:* - bits[23:16] - default value for that color component* - bits[11:8] - number of bits to extract for each color component* - bits[4:0] - index of the lowest bit to extract** The default color value is used when bits[11:8] are zero, when the* pixel is outside the visible frame area or when there is a* buffer underrun.*/- hdlcd_write(hdlcd, HDLCD_REG_RED_SELECT, default_color |
format->red.offset | (format->red.length & 0xf) << 8);- hdlcd_write(hdlcd, HDLCD_REG_GREEN_SELECT, default_color |
format->green.offset | (format->green.length & 0xf) << 8);- hdlcd_write(hdlcd, HDLCD_REG_BLUE_SELECT, default_color |
format->blue.offset | (format->blue.length & 0xf) << 8);
These would seem to be putting bits 23:16 from default_color into the default field of every register, and indeed underruns show up as a very white-looking shade of red for me ;)
- return 0;
+}
[...]
+static void hdlcd_fb_output_poll_changed(struct drm_device *drm) +{
- struct hdlcd_drm_private *hdlcd = drm->dev_private;
- if (hdlcd->fbdev) {
drm_fbdev_cma_hotplug_event(hdlcd->fbdev);- }
nit: braces.
+}
[...]
+static irqreturn_t hdlcd_irq(int irq, void *arg) +{
- struct drm_device *drm = arg;
- struct hdlcd_drm_private *hdlcd = drm->dev_private;
- unsigned long irq_status;
- irq_status = hdlcd_read(hdlcd, HDLCD_REG_INT_STATUS);
+#ifdef CONFIG_DEBUG_FS
- if (irq_status & HDLCD_INTERRUPT_UNDERRUN) {
atomic_inc(&hdlcd->buffer_underrun_count);- }
- if (irq_status & HDLCD_INTERRUPT_DMA_END) {
atomic_inc(&hdlcd->dma_end_count);- }
- if (irq_status & HDLCD_INTERRUPT_BUS_ERROR) {
atomic_inc(&hdlcd->bus_error_count);- }
- if (irq_status & HDLCD_INTERRUPT_VSYNC) {
atomic_inc(&hdlcd->vsync_count);- }
nit: braces again (it's only because I'm too lazy to remove the newbie checkpatch commit hook, and a manual merge of this into my SMMU dev tree made that throw a fit)
+#endif
- if (irq_status & HDLCD_INTERRUPT_VSYNC) {
bool events_sent = false;unsigned long flags;struct drm_pending_vblank_event *e, *t;drm_crtc_handle_vblank(&hdlcd->crtc);spin_lock_irqsave(&drm->event_lock, flags);list_for_each_entry_safe(e, t, &hdlcd->event_list, base.link) {list_del(&e->base.link);drm_crtc_send_vblank_event(&hdlcd->crtc, e);events_sent = true;}if (events_sent)drm_crtc_vblank_put(&hdlcd->crtc);spin_unlock_irqrestore(&drm->event_lock, flags);- }
- /* acknowledge interrupt(s) */
- hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, irq_status);
- return IRQ_HANDLED;
+}
Other than that though, it seems to do the job. I get a usable framebuffer console and can boot to an X desktop with at least the ancient 1600x1200 DVI monitor I have handy - the 1920x1080 HDMI one seems to get recognised OK but the monitor itself doesn't like the signal and just locks up until I unplug it, although I know that's more of a clock driver/firmware issue.
Robin.
On Tue, Dec 08, 2015 at 04:25:27PM +0000, Robin Murphy wrote:
Hi Liviu,
On 07/12/15 12:11, Liviu Dudau wrote:
The HDLCD controller is a display controller that supports resolutions up to 4096x4096 pixels. It is present on various development boards produced by ARM Ltd and emulated by the latest Fast Models from the company.
Cc: David Airlie airlied@linux.ie Cc: Robin Murphy robin.murphy@arm.com
I've given this a spin on my Juno, and the first thing of note is this:
hdlcd 7ff60000.hdlcd: master bind failed: -517 hdlcd 7ff50000.hdlcd: master bind failed: -517 scpi_protocol scpi: SCP Protocol 1.0 Firmware 1.9.0 version [drm] found ARM HDLCD version r0p0 tda998x 0-0070: Falling back to first CRTC usb 1-1: new high-speed USB device number 2 using ehci-platform tda998x 0-0070: found TDA19988 hdlcd 7ff60000.hdlcd: bound 0-0070 (ops tda998x_ops) [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). [drm] No driver support for vblank timestamp query. ------------[ cut here ]------------ WARNING: at drivers/gpu/drm/drm_atomic_helper.c:682 Modules linked in:
CPU: 2 PID: 98 Comm: kworker/u12:3 Tainted: G W 4.4.0-rc2+ #846 Hardware name: ARM Juno development board (r1) (DT) Workqueue: deferwq deferred_probe_work_func task: fffffe007ecb3700 ti: fffffe09409c8000 task.ti: fffffe09409c8000 PC is at drm_atomic_helper_update_legacy_modeset_state+0x1e8/0x1f0 LR is at drm_atomic_helper_commit_modeset_disables+0x1a8/0x388 pc : [<fffffe00004a4468>] lr : [<fffffe00004a59b8>] pstate: 20000045 sp : fffffe09409cb560 x29: fffffe09409cb560 x28: fffffe0940bf2800 x27: fffffe0940070000 x26: 0000000000000001 x25: fffffe0000be4b50 x24: fffffe00007ae820 x23: fffffe0000be4b50 x22: fffffe0940bd1000 x21: fffffe0940bd1000 x20: 0000000000000000 x19: fffffe0940968000 x18: fffffe0940c8091c x17: 0000000000000007 x16: 0000000000000001 x15: fffffe0940c8016f x14: 0000003c00000000 x13: 0000000000000000 x12: 000004c9000004b4 x11: 000004b1000004c9 x10: 000004b0000004b0 x9 : 00000000000006f4 x8 : 000006a400000654 x7 : 000006f400000640 x6 : fffffe0940966480 x5 : fffffe0940968200 x4 : 0000000000000001 x3 : fffffe0940966a80 x2 : 0000000000000000 x1 : fffffe0940bd0900 x0 : fffffe0940bd0960
---[ end trace bdb6af69b29bf7ea ]--- Call trace: [<fffffe00004a4468>] drm_atomic_helper_update_legacy_modeset_state+0x1e8/0x1f0 [<fffffe00004a59b8>] drm_atomic_helper_commit_modeset_disables+0x1a8/0x388 [<fffffe00004a5c70>] drm_atomic_helper_commit+0xd8/0x140 [<fffffe00004ccce0>] hdlcd_atomic_commit+0x10/0x18 [<fffffe00004c9ef8>] drm_atomic_commit+0x40/0x70 [<fffffe00004a69b0>] restore_fbdev_mode+0x270/0x2b0 [<fffffe00004a8d64>] drm_fb_helper_restore_fbdev_mode_unlocked+0x34/0x90 [<fffffe00004a8dec>] drm_fb_helper_set_par+0x2c/0x60 [<fffffe000042f010>] fbcon_init+0x4d0/0x520 [<fffffe000046ec9c>] visual_init+0xac/0x108 [<fffffe000047060c>] do_bind_con_driver+0x1d4/0x3e8 [<fffffe0000470c14>] do_take_over_console+0x174/0x1e8 [<fffffe000042c38c>] do_fbcon_takeover+0x74/0x100 [<fffffe00004313b4>] fbcon_event_notify+0x77c/0x7d8 [<fffffe00000dc700>] notifier_call_chain+0x50/0x90 [<fffffe00000dcadc>] __blocking_notifier_call_chain+0x4c/0x90 [<fffffe00000dcb34>] blocking_notifier_call_chain+0x14/0x20 [<fffffe0000435204>] fb_notifier_call_chain+0x1c/0x28 [<fffffe0000437010>] register_framebuffer+0x1c0/0x2b8 [<fffffe00004a90a4>] drm_fb_helper_initial_config+0x284/0x3e8 [<fffffe00004a991c>] drm_fbdev_cma_init+0x94/0x148 [<fffffe00004ccfc4>] hdlcd_drm_bind+0x1d4/0x418 [<fffffe00004d15f0>] try_to_bring_up_master.part.2+0xc8/0x110 [<fffffe00004d1820>] component_add+0x90/0x108 [<fffffe00004ce6a8>] tda998x_probe+0x18/0x20 [<fffffe00005a6d24>] i2c_device_probe+0x164/0x228 [<fffffe00004d698c>] driver_probe_device+0x1ec/0x2f0 [<fffffe00004d6bc0>] __device_attach_driver+0x90/0xd8 [<fffffe00004d4b88>] bus_for_each_drv+0x58/0x98 [<fffffe00004d66e4>] __device_attach+0xc4/0x148 [<fffffe00004d6c58>] device_initial_probe+0x10/0x18 [<fffffe00004d5b9c>] bus_probe_device+0x94/0xa0 [<fffffe00004d6020>] deferred_probe_work_func+0x70/0xa8 [<fffffe00000d5b70>] process_one_work+0x138/0x378 [<fffffe00000d5ed4>] worker_thread+0x124/0x498 [<fffffe00000dbb54>] kthread+0xdc/0xf0 [<fffffe0000093980>] ret_from_fork+0x10/0x50 Console: switching to colour frame buffer device 150x100
which for reference, is the first one in that function:
... /* clear out existing links and update dpms */ for_each_connector_in_state(old_state, connector, old_conn_state, i) { if (connector->encoder) { WARN_ON(!connector->encoder->crtc); ...
That's on 4.4-rc2 with this series plus the 3 tda998x patches from Russell's patch system applied. Is there something else I'm missing or does this need looking at (could it be related to that initial probe deferral)?
Yeah, you also need Thierry Reding's patch to not set the connector->encoder in drivers.
http://lists.freedesktop.org/archives/dri-devel/2015-November/094576.html
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com Acked-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/arm/Kconfig | 29 ++ drivers/gpu/drm/arm/Makefile | 2 + drivers/gpu/drm/arm/hdlcd_crtc.c | 329 ++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.c | 580 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.h | 42 +++ drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++++++ 8 files changed, 1072 insertions(+) create mode 100644 drivers/gpu/drm/arm/Kconfig create mode 100644 drivers/gpu/drm/arm/Makefile create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
[...]
+static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) +{
- unsigned int btpp, default_color = 0x00000000;
- struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
- uint32_t pixel_format;
- struct simplefb_format *format = NULL;
- int i;
+#ifdef CONFIG_DRM_HDLCD_SHOW_UNDERRUN
- default_color = 0x00ff0000; /* show underruns in red */
+#endif
- pixel_format = crtc->primary->state->fb->pixel_format;
- for (i = 0; i < ARRAY_SIZE(supported_formats); i++) {
if (supported_formats[i].fourcc == pixel_format)format = &supported_formats[i];- }
- if (WARN_ON(!format)) {
return 0;- }
nit: unnecessary braces.
- /* HDLCD uses 'bytes per pixel', zero means 1 byte */
- btpp = (format->bits_per_pixel + 7) / 8;
- hdlcd_write(hdlcd, HDLCD_REG_PIXEL_FORMAT, (btpp - 1) << 3);
- /*
* The format of the HDLCD_REG_<color>_SELECT register is:* - bits[23:16] - default value for that color component* - bits[11:8] - number of bits to extract for each color component* - bits[4:0] - index of the lowest bit to extract** The default color value is used when bits[11:8] are zero, when the* pixel is outside the visible frame area or when there is a* buffer underrun.*/- hdlcd_write(hdlcd, HDLCD_REG_RED_SELECT, default_color |
format->red.offset | (format->red.length & 0xf) << 8);- hdlcd_write(hdlcd, HDLCD_REG_GREEN_SELECT, default_color |
format->green.offset | (format->green.length & 0xf) << 8);- hdlcd_write(hdlcd, HDLCD_REG_BLUE_SELECT, default_color |
format->blue.offset | (format->blue.length & 0xf) << 8);These would seem to be putting bits 23:16 from default_color into the default field of every register, and indeed underruns show up as a very white-looking shade of red for me ;)
Ooops, I better change that. Could you tell me how you trigger underruns in your setup?
- return 0;
+}
[...]
+static void hdlcd_fb_output_poll_changed(struct drm_device *drm) +{
- struct hdlcd_drm_private *hdlcd = drm->dev_private;
- if (hdlcd->fbdev) {
drm_fbdev_cma_hotplug_event(hdlcd->fbdev);- }
nit: braces.
+}
[...]
+static irqreturn_t hdlcd_irq(int irq, void *arg) +{
- struct drm_device *drm = arg;
- struct hdlcd_drm_private *hdlcd = drm->dev_private;
- unsigned long irq_status;
- irq_status = hdlcd_read(hdlcd, HDLCD_REG_INT_STATUS);
+#ifdef CONFIG_DEBUG_FS
- if (irq_status & HDLCD_INTERRUPT_UNDERRUN) {
atomic_inc(&hdlcd->buffer_underrun_count);- }
- if (irq_status & HDLCD_INTERRUPT_DMA_END) {
atomic_inc(&hdlcd->dma_end_count);- }
- if (irq_status & HDLCD_INTERRUPT_BUS_ERROR) {
atomic_inc(&hdlcd->bus_error_count);- }
- if (irq_status & HDLCD_INTERRUPT_VSYNC) {
atomic_inc(&hdlcd->vsync_count);- }
nit: braces again (it's only because I'm too lazy to remove the newbie checkpatch commit hook, and a manual merge of this into my SMMU dev tree made that throw a fit)
+#endif
- if (irq_status & HDLCD_INTERRUPT_VSYNC) {
bool events_sent = false;unsigned long flags;struct drm_pending_vblank_event *e, *t;drm_crtc_handle_vblank(&hdlcd->crtc);spin_lock_irqsave(&drm->event_lock, flags);list_for_each_entry_safe(e, t, &hdlcd->event_list, base.link) {list_del(&e->base.link);drm_crtc_send_vblank_event(&hdlcd->crtc, e);events_sent = true;}if (events_sent)drm_crtc_vblank_put(&hdlcd->crtc);spin_unlock_irqrestore(&drm->event_lock, flags);- }
- /* acknowledge interrupt(s) */
- hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, irq_status);
- return IRQ_HANDLED;
+}
Other than that though, it seems to do the job. I get a usable framebuffer console and can boot to an X desktop with at least the ancient 1600x1200 DVI monitor I have handy - the 1920x1080 HDMI one seems to get recognised OK but the monitor itself doesn't like the signal and just locks up until I unplug it, although I know that's more of a clock driver/firmware issue.
I have a TV that does the same. Yes, the SCPI clock that was picked for this resolution is a standard one, but I bet that these monitors are slightly out of spec. At least my TV lists two options for 1080p: one with 145MHz pixel clock and another with 145.382MHz. But Linux decides to go interlaced anyway, so I can't test without a hack in tda998x_drv.c.
Thanks for testing this.
Best regards, Liviu
Robin.
On 08/12/15 16:52, Liviu Dudau wrote:
On Tue, Dec 08, 2015 at 04:25:27PM +0000, Robin Murphy wrote:
Hi Liviu,
On 07/12/15 12:11, Liviu Dudau wrote:
The HDLCD controller is a display controller that supports resolutions up to 4096x4096 pixels. It is present on various development boards produced by ARM Ltd and emulated by the latest Fast Models from the company.
Cc: David Airlie airlied@linux.ie Cc: Robin Murphy robin.murphy@arm.com
I've given this a spin on my Juno, and the first thing of note is this:
hdlcd 7ff60000.hdlcd: master bind failed: -517 hdlcd 7ff50000.hdlcd: master bind failed: -517 scpi_protocol scpi: SCP Protocol 1.0 Firmware 1.9.0 version [drm] found ARM HDLCD version r0p0 tda998x 0-0070: Falling back to first CRTC usb 1-1: new high-speed USB device number 2 using ehci-platform tda998x 0-0070: found TDA19988 hdlcd 7ff60000.hdlcd: bound 0-0070 (ops tda998x_ops) [drm] Supports vblank timestamp caching Rev 2 (21.10.2013). [drm] No driver support for vblank timestamp query. ------------[ cut here ]------------ WARNING: at drivers/gpu/drm/drm_atomic_helper.c:682 Modules linked in:
CPU: 2 PID: 98 Comm: kworker/u12:3 Tainted: G W 4.4.0-rc2+ #846 Hardware name: ARM Juno development board (r1) (DT) Workqueue: deferwq deferred_probe_work_func task: fffffe007ecb3700 ti: fffffe09409c8000 task.ti: fffffe09409c8000 PC is at drm_atomic_helper_update_legacy_modeset_state+0x1e8/0x1f0 LR is at drm_atomic_helper_commit_modeset_disables+0x1a8/0x388 pc : [<fffffe00004a4468>] lr : [<fffffe00004a59b8>] pstate: 20000045 sp : fffffe09409cb560 x29: fffffe09409cb560 x28: fffffe0940bf2800 x27: fffffe0940070000 x26: 0000000000000001 x25: fffffe0000be4b50 x24: fffffe00007ae820 x23: fffffe0000be4b50 x22: fffffe0940bd1000 x21: fffffe0940bd1000 x20: 0000000000000000 x19: fffffe0940968000 x18: fffffe0940c8091c x17: 0000000000000007 x16: 0000000000000001 x15: fffffe0940c8016f x14: 0000003c00000000 x13: 0000000000000000 x12: 000004c9000004b4 x11: 000004b1000004c9 x10: 000004b0000004b0 x9 : 00000000000006f4 x8 : 000006a400000654 x7 : 000006f400000640 x6 : fffffe0940966480 x5 : fffffe0940968200 x4 : 0000000000000001 x3 : fffffe0940966a80 x2 : 0000000000000000 x1 : fffffe0940bd0900 x0 : fffffe0940bd0960
---[ end trace bdb6af69b29bf7ea ]--- Call trace: [<fffffe00004a4468>] drm_atomic_helper_update_legacy_modeset_state+0x1e8/0x1f0 [<fffffe00004a59b8>] drm_atomic_helper_commit_modeset_disables+0x1a8/0x388 [<fffffe00004a5c70>] drm_atomic_helper_commit+0xd8/0x140 [<fffffe00004ccce0>] hdlcd_atomic_commit+0x10/0x18 [<fffffe00004c9ef8>] drm_atomic_commit+0x40/0x70 [<fffffe00004a69b0>] restore_fbdev_mode+0x270/0x2b0 [<fffffe00004a8d64>] drm_fb_helper_restore_fbdev_mode_unlocked+0x34/0x90 [<fffffe00004a8dec>] drm_fb_helper_set_par+0x2c/0x60 [<fffffe000042f010>] fbcon_init+0x4d0/0x520 [<fffffe000046ec9c>] visual_init+0xac/0x108 [<fffffe000047060c>] do_bind_con_driver+0x1d4/0x3e8 [<fffffe0000470c14>] do_take_over_console+0x174/0x1e8 [<fffffe000042c38c>] do_fbcon_takeover+0x74/0x100 [<fffffe00004313b4>] fbcon_event_notify+0x77c/0x7d8 [<fffffe00000dc700>] notifier_call_chain+0x50/0x90 [<fffffe00000dcadc>] __blocking_notifier_call_chain+0x4c/0x90 [<fffffe00000dcb34>] blocking_notifier_call_chain+0x14/0x20 [<fffffe0000435204>] fb_notifier_call_chain+0x1c/0x28 [<fffffe0000437010>] register_framebuffer+0x1c0/0x2b8 [<fffffe00004a90a4>] drm_fb_helper_initial_config+0x284/0x3e8 [<fffffe00004a991c>] drm_fbdev_cma_init+0x94/0x148 [<fffffe00004ccfc4>] hdlcd_drm_bind+0x1d4/0x418 [<fffffe00004d15f0>] try_to_bring_up_master.part.2+0xc8/0x110 [<fffffe00004d1820>] component_add+0x90/0x108 [<fffffe00004ce6a8>] tda998x_probe+0x18/0x20 [<fffffe00005a6d24>] i2c_device_probe+0x164/0x228 [<fffffe00004d698c>] driver_probe_device+0x1ec/0x2f0 [<fffffe00004d6bc0>] __device_attach_driver+0x90/0xd8 [<fffffe00004d4b88>] bus_for_each_drv+0x58/0x98 [<fffffe00004d66e4>] __device_attach+0xc4/0x148 [<fffffe00004d6c58>] device_initial_probe+0x10/0x18 [<fffffe00004d5b9c>] bus_probe_device+0x94/0xa0 [<fffffe00004d6020>] deferred_probe_work_func+0x70/0xa8 [<fffffe00000d5b70>] process_one_work+0x138/0x378 [<fffffe00000d5ed4>] worker_thread+0x124/0x498 [<fffffe00000dbb54>] kthread+0xdc/0xf0 [<fffffe0000093980>] ret_from_fork+0x10/0x50 Console: switching to colour frame buffer device 150x100
which for reference, is the first one in that function:
... /* clear out existing links and update dpms */ for_each_connector_in_state(old_state, connector, old_conn_state, i) { if (connector->encoder) { WARN_ON(!connector->encoder->crtc); ...
That's on 4.4-rc2 with this series plus the 3 tda998x patches from Russell's patch system applied. Is there something else I'm missing or does this need looking at (could it be related to that initial probe deferral)?
Yeah, you also need Thierry Reding's patch to not set the connector->encoder in drivers.
http://lists.freedesktop.org/archives/dri-devel/2015-November/094576.html
Ah, right, I don't think that one was specifically called out anywhere, but it does indeed make the splat go away, thanks!
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com Acked-by: Daniel Vetter daniel.vetter@ffwll.ch
drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/arm/Kconfig | 29 ++ drivers/gpu/drm/arm/Makefile | 2 + drivers/gpu/drm/arm/hdlcd_crtc.c | 329 ++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.c | 580 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/arm/hdlcd_drv.h | 42 +++ drivers/gpu/drm/arm/hdlcd_regs.h | 87 ++++++ 8 files changed, 1072 insertions(+) create mode 100644 drivers/gpu/drm/arm/Kconfig create mode 100644 drivers/gpu/drm/arm/Makefile create mode 100644 drivers/gpu/drm/arm/hdlcd_crtc.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.c create mode 100644 drivers/gpu/drm/arm/hdlcd_drv.h create mode 100644 drivers/gpu/drm/arm/hdlcd_regs.h
[...]
+static int hdlcd_set_pxl_fmt(struct drm_crtc *crtc) +{
- unsigned int btpp, default_color = 0x00000000;
- struct hdlcd_drm_private *hdlcd = crtc_to_hdlcd_priv(crtc);
- uint32_t pixel_format;
- struct simplefb_format *format = NULL;
- int i;
+#ifdef CONFIG_DRM_HDLCD_SHOW_UNDERRUN
- default_color = 0x00ff0000; /* show underruns in red */
+#endif
- pixel_format = crtc->primary->state->fb->pixel_format;
- for (i = 0; i < ARRAY_SIZE(supported_formats); i++) {
if (supported_formats[i].fourcc == pixel_format)format = &supported_formats[i];- }
- if (WARN_ON(!format)) {
return 0;- }
nit: unnecessary braces.
- /* HDLCD uses 'bytes per pixel', zero means 1 byte */
- btpp = (format->bits_per_pixel + 7) / 8;
- hdlcd_write(hdlcd, HDLCD_REG_PIXEL_FORMAT, (btpp - 1) << 3);
- /*
* The format of the HDLCD_REG_<color>_SELECT register is:* - bits[23:16] - default value for that color component* - bits[11:8] - number of bits to extract for each color component* - bits[4:0] - index of the lowest bit to extract** The default color value is used when bits[11:8] are zero, when the* pixel is outside the visible frame area or when there is a* buffer underrun.*/- hdlcd_write(hdlcd, HDLCD_REG_RED_SELECT, default_color |
format->red.offset | (format->red.length & 0xf) << 8);- hdlcd_write(hdlcd, HDLCD_REG_GREEN_SELECT, default_color |
format->green.offset | (format->green.length & 0xf) << 8);- hdlcd_write(hdlcd, HDLCD_REG_BLUE_SELECT, default_color |
format->blue.offset | (format->blue.length & 0xf) << 8);These would seem to be putting bits 23:16 from default_color into the default field of every register, and indeed underruns show up as a very white-looking shade of red for me ;)
Ooops, I better change that. Could you tell me how you trigger underruns in your setup?
I cheat and put the SMMU into a state where it won't allow anything through at all, so it's the ultimate 'underrun'.
- return 0;
+}
[...]
+static void hdlcd_fb_output_poll_changed(struct drm_device *drm) +{
- struct hdlcd_drm_private *hdlcd = drm->dev_private;
- if (hdlcd->fbdev) {
drm_fbdev_cma_hotplug_event(hdlcd->fbdev);- }
nit: braces.
+}
[...]
+static irqreturn_t hdlcd_irq(int irq, void *arg) +{
- struct drm_device *drm = arg;
- struct hdlcd_drm_private *hdlcd = drm->dev_private;
- unsigned long irq_status;
- irq_status = hdlcd_read(hdlcd, HDLCD_REG_INT_STATUS);
+#ifdef CONFIG_DEBUG_FS
- if (irq_status & HDLCD_INTERRUPT_UNDERRUN) {
atomic_inc(&hdlcd->buffer_underrun_count);- }
- if (irq_status & HDLCD_INTERRUPT_DMA_END) {
atomic_inc(&hdlcd->dma_end_count);- }
- if (irq_status & HDLCD_INTERRUPT_BUS_ERROR) {
atomic_inc(&hdlcd->bus_error_count);- }
- if (irq_status & HDLCD_INTERRUPT_VSYNC) {
atomic_inc(&hdlcd->vsync_count);- }
nit: braces again (it's only because I'm too lazy to remove the newbie checkpatch commit hook, and a manual merge of this into my SMMU dev tree made that throw a fit)
+#endif
- if (irq_status & HDLCD_INTERRUPT_VSYNC) {
bool events_sent = false;unsigned long flags;struct drm_pending_vblank_event *e, *t;drm_crtc_handle_vblank(&hdlcd->crtc);spin_lock_irqsave(&drm->event_lock, flags);list_for_each_entry_safe(e, t, &hdlcd->event_list, base.link) {list_del(&e->base.link);drm_crtc_send_vblank_event(&hdlcd->crtc, e);events_sent = true;}if (events_sent)drm_crtc_vblank_put(&hdlcd->crtc);spin_unlock_irqrestore(&drm->event_lock, flags);- }
- /* acknowledge interrupt(s) */
- hdlcd_write(hdlcd, HDLCD_REG_INT_CLEAR, irq_status);
- return IRQ_HANDLED;
+}
Other than that though, it seems to do the job. I get a usable framebuffer console and can boot to an X desktop with at least the ancient 1600x1200 DVI monitor I have handy - the 1920x1080 HDMI one seems to get recognised OK but the monitor itself doesn't like the signal and just locks up until I unplug it, although I know that's more of a clock driver/firmware issue.
I have a TV that does the same. Yes, the SCPI clock that was picked for this resolution is a standard one, but I bet that these monitors are slightly out of spec. At least my TV lists two options for 1080p: one with 145MHz pixel clock and another with 145.382MHz. But Linux decides to go interlaced anyway, so I can't test without a hack in tda998x_drv.c.
Yeah, the fact that it goes unresponsive by continually trying to sync with the signal rather than just giving up and displaying the 'out of range' message suggests that's the case. Oddly, that one did used to work fine with the old hard-coded SCP clock. Oh well.
Robin.
Thanks for testing this.
Best regards, Liviu
Robin.
ARM's Juno board has two HDLCD controllers, each linked to an NXP TDA19988 HDMI transmitter that provides output encoding. Add them to the device tree.
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com --- arch/arm64/boot/dts/arm/juno-base.dtsi | 46 +++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/arch/arm64/boot/dts/arm/juno-base.dtsi b/arch/arm64/boot/dts/arm/juno-base.dtsi index dd5158e..8ee094a 100644 --- a/arch/arm64/boot/dts/arm/juno-base.dtsi +++ b/arch/arm64/boot/dts/arm/juno-base.dtsi @@ -92,8 +92,8 @@ scpi_clk: scpi_clocks@3 { compatible = "arm,scpi-variable-clocks"; #clock-cells = <1>; - clock-indices = <3>, <4>; - clock-output-names = "pxlclk0", "pxlclk1"; + clock-indices = <3>; + clock-output-names = "pxlclk"; }; };
@@ -123,6 +123,34 @@ clock-names = "apb_pclk"; };
+ hdlcd@7ff50000 { + compatible = "arm,hdlcd"; + reg = <0 0x7ff50000 0 0x1000>; + interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scpi_clk 3>; + clock-names = "pxlclk"; + + port { + hdlcd1_output: endpoint@0 { + remote-endpoint = <&tda998x_1_input>; + }; + }; + }; + + hdlcd@7ff60000 { + compatible = "arm,hdlcd"; + reg = <0 0x7ff60000 0 0x1000>; + interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&scpi_clk 3>; + clock-names = "pxlclk"; + + port { + hdlcd0_output: endpoint@0 { + remote-endpoint = <&tda998x_0_input>; + }; + }; + }; + soc_uart0: uart@7ff80000 { compatible = "arm,pl011", "arm,primecell"; reg = <0x0 0x7ff80000 0x0 0x1000>; @@ -141,14 +169,24 @@ i2c-sda-hold-time-ns = <500>; clocks = <&soc_smc50mhz>;
- dvi0: dvi-transmitter@70 { + hdmi-transmitter@70 { compatible = "nxp,tda998x"; reg = <0x70>; + port { + tda998x_0_input: endpoint@0 { + remote-endpoint = <&hdlcd0_output>; + }; + }; };
- dvi1: dvi-transmitter@71 { + hdmi-transmitter@71 { compatible = "nxp,tda998x"; reg = <0x71>; + port { + tda998x_1_input: endpoint@0 { + remote-endpoint = <&hdlcd1_output>; + }; + }; }; };
Update MAINTAINERS file for HDLCD driver.
Cc: Andrew Morton akpm@linux-foundation.org Cc: Arnd Bergmann arnd@arndb.de Cc: Mauro Carvalho Chehab mchehab@osg.samsung.com Cc: Greg KH gregkh@linuxfoundation.org Cc: Joe Perches joe@perches.com Cc: Jiri Slaby jslaby@suse.com
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com --- MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index cba790b..8a637e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -820,6 +820,12 @@ S: Maintained F: drivers/net/arcnet/ F: include/uapi/linux/if_arcnet.h
+ARM HDLCD DRM DRIVER +M: Liviu Dudau liviu.dudau@arm.com +S: Maintained +F: drivers/gpu/drm/arm/ +F: Documentation/devicetree/bindings/display/arm,hdlcd.txt + ARM MFM AND FLOPPY DRIVERS M: Ian Molton spyro@f2s.com S: Maintained
On 12/07/2015, 01:11 PM, Liviu Dudau wrote:
Update MAINTAINERS file for HDLCD driver.
Cc: Andrew Morton akpm@linux-foundation.org Cc: Arnd Bergmann arnd@arndb.de Cc: Mauro Carvalho Chehab mchehab@osg.samsung.com Cc: Greg KH gregkh@linuxfoundation.org Cc: Joe Perches joe@perches.com Cc: Jiri Slaby jslaby@suse.com
Please drop all of us who edited MAINTAINERS in the last decade from your CC list in next submissions. Naturally, we do not care about your changes in MAINTAINERS at all.
get_maintainers perhaps should not return 'git log' people for the MAINTAINERS file?
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com
MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index cba790b..8a637e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -820,6 +820,12 @@ S: Maintained F: drivers/net/arcnet/ F: include/uapi/linux/if_arcnet.h
+ARM HDLCD DRM DRIVER +M: Liviu Dudau liviu.dudau@arm.com +S: Maintained +F: drivers/gpu/drm/arm/ +F: Documentation/devicetree/bindings/display/arm,hdlcd.txt
ARM MFM AND FLOPPY DRIVERS M: Ian Molton spyro@f2s.com S: Maintained
thanks,
On Mon, Dec 07, 2015 at 01:19:35PM +0100, Jiri Slaby wrote:
On 12/07/2015, 01:11 PM, Liviu Dudau wrote:
Update MAINTAINERS file for HDLCD driver.
Cc: Andrew Morton akpm@linux-foundation.org Cc: Arnd Bergmann arnd@arndb.de Cc: Mauro Carvalho Chehab mchehab@osg.samsung.com Cc: Greg KH gregkh@linuxfoundation.org Cc: Joe Perches joe@perches.com Cc: Jiri Slaby jslaby@suse.com
Hi Jiri,
Please drop all of us who edited MAINTAINERS in the last decade from your CC list in next submissions. Naturally, we do not care about your changes in MAINTAINERS at all.
Sorry for the noise, but as you have guess, I've used the list generated by get_maintainers.pl. Hopefully this is the last iteration of the series, but if there will be further ones I will make sure that I remove you from the Cc: list and keep only the commit_signers.
Best regards, Liviu
get_maintainers perhaps should not return 'git log' people for the MAINTAINERS file?
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com
MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index cba790b..8a637e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -820,6 +820,12 @@ S: Maintained F: drivers/net/arcnet/ F: include/uapi/linux/if_arcnet.h
+ARM HDLCD DRM DRIVER +M: Liviu Dudau liviu.dudau@arm.com +S: Maintained +F: drivers/gpu/drm/arm/ +F: Documentation/devicetree/bindings/display/arm,hdlcd.txt
ARM MFM AND FLOPPY DRIVERS M: Ian Molton spyro@f2s.com S: Maintained
thanks,
js suse labs
On 7 December 2015 at 12:11, Liviu Dudau Liviu.Dudau@arm.com wrote:
Update MAINTAINERS file for HDLCD driver.
Cc: Andrew Morton akpm@linux-foundation.org Cc: Arnd Bergmann arnd@arndb.de Cc: Mauro Carvalho Chehab mchehab@osg.samsung.com Cc: Greg KH gregkh@linuxfoundation.org Cc: Joe Perches joe@perches.com Cc: Jiri Slaby jslaby@suse.com
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com
MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index cba790b..8a637e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -820,6 +820,12 @@ S: Maintained F: drivers/net/arcnet/ F: include/uapi/linux/if_arcnet.h
+ARM HDLCD DRM DRIVER +M: Liviu Dudau liviu.dudau@arm.com +S: Maintained
You surely meant Supported, didn't you ?
Regards, Emil
On Mon, Dec 07, 2015 at 01:25:10PM +0000, Emil Velikov wrote:
On 7 December 2015 at 12:11, Liviu Dudau Liviu.Dudau@arm.com wrote:
Update MAINTAINERS file for HDLCD driver.
Cc: Andrew Morton akpm@linux-foundation.org Cc: Arnd Bergmann arnd@arndb.de Cc: Mauro Carvalho Chehab mchehab@osg.samsung.com Cc: Greg KH gregkh@linuxfoundation.org Cc: Joe Perches joe@perches.com Cc: Jiri Slaby jslaby@suse.com
Signed-off-by: Liviu Dudau Liviu.Dudau@arm.com
MAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS index cba790b..8a637e3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -820,6 +820,12 @@ S: Maintained F: drivers/net/arcnet/ F: include/uapi/linux/if_arcnet.h
+ARM HDLCD DRM DRIVER +M: Liviu Dudau liviu.dudau@arm.com +S: Maintained
You surely meant Supported, didn't you ?
Well .... it is a very fine line in corporate world, when a new product comes the next year, to justify spending time (or money) on last year's (or 5) product.
I am payed to do work now in the display drivers, so yes, is Supported. As for the HDLCD, it could soon turn into a "legacy" device as the new products come online having the Mali DP engine.
I'm not sure it makes a difference, but I can go with Supported for now. Thanks for spotting it!
Best regards, Liviu
Regards, Emil
dri-devel@lists.freedesktop.org
-
Emil Velikov -
Jiri Slaby -
Liviu Dudau -
Robin Murphy