drm/meson: add support for MIPI DSI Display
Subsystems (5)
v2 cover drm/meson: add support for MIPI DSI Display
The Amlogic G12A, G12B & SM1 SoCs embeds a Synopsys DW-MIPI-DSI transceiver (ver 1.21a), with a custom glue managing the IP resets, clock and data input similar to the DW-HDMI glue on the same Amlogic SoCs.
This adds support for the glue managing the transceiver, mimicing the init flow provided by Amlogic to setup the ENCL encoder, the glue, the transceiver, the digital D-PHY and the Analog PHY in the proper way.
The DW-MIPI-DSI transceiver + D-PHY are clocked by the GP0 PLL, and the ENCL encoder + VIU pixel reader by the VCLK2 clock using the HDMI PLL.
The DW-MIPI-DSI transceiver gets this pixel stream as input clocked with the VCLK2 clock.
An optional "MEAS" clock can be enabled to measure the delay between each vsync feeding the DW-MIPI-DSI transceiver.
This patchset is based on an earlier attempt at [1] for the AXG SoCs, but:
- the AXG has a single clock source for both transceiver + pixel, which makes it an exception instead of a rule, it's simpler to add support for G12A then add AXG on it
- previous glue code was a single monolitic code mixing encoders & bridges, this version is aligned on the previous cleanup done on HDMI & CVBS bridges architecture at [2]
- since the only output of AXG is DSI, AXG VPU support is post-poned until we implement single-clock DSI support specific case on top of this.
Changes from v1 at [3]:
- fixed DSI host bindings
- add reviewed-by tags for bindings
- moved magic values to defines thanks to Martin's searches
- added proper prefixes to defines
- moved phy_configure to phy_init() dw-mipi-dsi callback
- moved phy_on to a new phy_power_on() dw-mipi-dsi callback
- correctly return phy_init/configure errors to callback returns
[1] https://lore.kernel.org/r/[email protected]
[2] https://lore.kernel.org/r/[email protected]
Neil Armstrong (6):
dt-bindings: display: add Amlogic MIPI DSI Host Controller bindings
dt-bindings: display: meson-vpu: add third DPI output port drm/meson: venc: add ENCL encoder setup for MIPI-DSI output drm/meson: vclk: add DSI clock config
drm/meson: add DSI encoder
drm/meson: add support for MIPI-DSI transceiver
.../display/amlogic,meson-dw-mipi-dsi.yaml | 116 ++++++ .../bindings/display/amlogic,meson-vpu.yaml | 5 + drivers/gpu/drm/meson/Kconfig | 7 + drivers/gpu/drm/meson/Makefile | 3 +- drivers/gpu/drm/meson/meson_drv.c | 7 + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 357 ++++++++++++++++++ drivers/gpu/drm/meson/meson_dw_mipi_dsi.h | 160 ++++++++ drivers/gpu/drm/meson/meson_encoder_dsi.c | 160 ++++++++ drivers/gpu/drm/meson/meson_encoder_dsi.h | 12 + drivers/gpu/drm/meson/meson_registers.h | 15 + drivers/gpu/drm/meson/meson_vclk.c | 47 +++ drivers/gpu/drm/meson/meson_vclk.h | 1 + drivers/gpu/drm/meson/meson_venc.c | 211 ++++++++++- drivers/gpu/drm/meson/meson_venc.h | 6 + drivers/gpu/drm/meson/meson_vpp.h | 2 + 15 files changed, 1106 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-mipi-dsi.yaml create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.h create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.h
Signature · 1 line
2.25.1
PATCH v2 1/6 dt-bindings: display: add Amlogic MIPI DSI Host Controller bindings
The Amlogic G12A, G12B & SM1 SoCs embeds a Synopsys DW-MIPI-DSI transceiver (ver 1.21a), with a custom glue managing the IP resets, clock and data input similar to the DW-HDMI Glue on the same Amlogic SoCs.
--- .../display/amlogic,meson-dw-mipi-dsi.yaml | 116 ++++++++++++++++++ 1 file changed, 116 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/amlogic,meson-dw-mipi-dsi.yaml
Documentation/devicetree/bindings/display/amlogic,meson-dw-mipi-dsi.yaml new file +116 -0
@@ -0,0 +1,116 @@ +# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) +# Copyright 2020 BayLibre, SAS +%YAML 1.2 +--- +$id: "http://devicetree.org/schemas/display/amlogic,meson-dw-mipi-dsi.yaml#" +$schema: "http://devicetree.org/meta-schemas/core.yaml#" + +title: Amlogic specific extensions to the Synopsys Designware MIPI DSI Host Controller + +maintainers: + - Neil Armstrong <[email protected]> + +description: | + The Amlogic Meson Synopsys Designware Integration is composed of + - A Synopsys DesignWare MIPI DSI Host Controller IP + - A TOP control block controlling the Clocks & Resets of the IP + +allOf: + - $ref: dsi-controller.yaml# + +properties: + compatible: + enum: + - amlogic,meson-g12a-dw-mipi-dsi + + reg: + maxItems: 1 + + clocks: + minItems: 2 + + clock-names: + minItems: 2 + items: + - const: pclk + - const: px_clk + - const: meas_clk + + resets: + minItems: 1 + + reset-names: + items: + - const: top + + phys: + minItems: 1 + + phy-names: + items: + - const: dphy + + ports: + $ref: /schemas/graph.yaml#/properties/ports + + properties: + port@0: + $ref: /schemas/graph.yaml#/properties/port + description: Input node to receive pixel data. + + port@1: + $ref: /schemas/graph.yaml#/properties/port + description: DSI output node to panel. + + required: + - port@0 + - port@1 + +required: + - compatible + - reg + - clocks + - clock-names + - resets + - reset-names + - phys + - phy-names + - ports + +unevaluatedProperties: false + +examples: + - | + dsi@7000 { + compatible = "amlogic,meson-g12a-dw-mipi-dsi"; + reg = <0x6000 0x400>; + resets = <&reset_top>; + reset-names = "top"; + clocks = <&clk_pclk>, <&clk_px>; + clock-names = "pclk", "px_clk"; + phys = <&mipi_dphy>; + phy-names = "dphy"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + /* VPU VENC Input */ + mipi_dsi_venc_port: port@0 { + reg = <0>; + + mipi_dsi_in: endpoint { + remote-endpoint = <&dpi_out>; + }; + }; + + /* DSI Output */ + mipi_dsi_panel_port: port@1 { + reg = <1>; + + mipi_out_panel: endpoint { + remote-endpoint = <&mipi_in_panel>; + }; + }; + }; + };
Signature · 1 line
2.25.1
PATCH v2 2/6 dt-bindings: display: meson-vpu: add third DPI output port
In reply to Neil ArmstrongAdd third port corresponding to the ENCL DPI encoder used to connect to DSI or LVDS transceivers.
--- .../devicetree/bindings/display/amlogic,meson-vpu.yaml | 5 +++++ 1 file changed, 5 insertions(+)
Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml +5 -0
@@ -92,6 +92,11 @@ properties: description: A port node pointing to the HDMI-TX port node. + port@2: + $ref: /schemas/graph.yaml#/properties/port + description: + A port node pointing to the DPI port node (e.g. DSI or LVDS transceiver). + "#address-cells": const: 1
Signature · 1 line
2.25.1
PATCH v2 3/6 drm/meson: venc: add ENCL encoder setup for MIPI-DSI output
In reply to Neil ArmstrongThis adds supports for the ENCL encoder connected to a MIPI-DSI transceiver on the Amlogic AXG, G12A, G12B & SM1 SoCs.
--- drivers/gpu/drm/meson/meson_registers.h | 15 ++ drivers/gpu/drm/meson/meson_venc.c | 211 +++++++++++++++++++++++- drivers/gpu/drm/meson/meson_venc.h | 6 + drivers/gpu/drm/meson/meson_vpp.h | 2 + 4 files changed, 232 insertions(+), 2 deletions(-)
drivers/gpu/drm/meson/meson_registers.h +15 -0
@@ -1300,13 +1300,28 @@#define RDMA_STATUS2 0x1116#define RDMA_STATUS3 0x1117#define L_GAMMA_CNTL_PORT 0x1400 +#define L_GAMMA_CNTL_PORT_VCOM_POL BIT(7)/* RW */ +#define L_GAMMA_CNTL_PORT_RVS_OUT BIT(6)/* RW */ +#define L_GAMMA_CNTL_PORT_ADR_RDY BIT(5)/* Read Only */ +#define L_GAMMA_CNTL_PORT_WR_RDY BIT(4)/* Read Only */ +#define L_GAMMA_CNTL_PORT_RD_RDY BIT(3)/* Read Only */ +#define L_GAMMA_CNTL_PORT_TR BIT(2)/* RW */ +#define L_GAMMA_CNTL_PORT_SET BIT(1)/* RW */ +#define L_GAMMA_CNTL_PORT_EN BIT(0)/* RW */ #define L_GAMMA_DATA_PORT 0x1401#define L_GAMMA_ADDR_PORT 0x1402 +#define L_GAMMA_ADDR_PORT_RD BIT(12) +#define L_GAMMA_ADDR_PORT_AUTO_INC BIT(11) +#define L_GAMMA_ADDR_PORT_SEL_R BIT(10) +#define L_GAMMA_ADDR_PORT_SEL_G BIT(9) +#define L_GAMMA_ADDR_PORT_SEL_B BIT(8) +#define L_GAMMA_ADDR_PORT_ADDR GENMASK(7, 0)#define L_GAMMA_VCOM_HSWITCH_ADDR 0x1403#define L_RGB_BASE_ADDR 0x1405#define L_RGB_COEFF_ADDR 0x1406#define L_POL_CNTL_ADDR 0x1407#define L_DITH_CNTL_ADDR 0x1408 +#define L_DITH_CNTL_DITH10_EN BIT(10)#define L_GAMMA_PROBE_CTRL 0x1409#define L_GAMMA_PROBE_COLOR_L 0x140a#define L_GAMMA_PROBE_COLOR_H 0x140b
drivers/gpu/drm/meson/meson_venc.c +209 -2
229 lines not on this page · raw message
drivers/gpu/drm/meson/meson_venc.h +6 -0
@@ -21,6 +21,7 @@ enum {MESON_VENC_MODE_CVBS_PAL ,MESON_VENC_MODE_CVBS_NTSC ,MESON_VENC_MODE_HDMI , + MESON_VENC_MODE_MIPI_DSI, }; struct meson_cvbs_enci_mode {
@@ -47,6 +48,9 @@ struct meson_cvbs_enci_mode {unsigned int analog_sync_adj; }; +/* LCD Encoder gamma setup */ +void meson_encl_load_gamma (struct meson_drm *priv); +/* HDMI Clock parameters */ enum drm_mode_status meson_venc_hdmi_supported_mode (const struct drm_display_mode *mode);
@@ -63,6 +67,8 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,unsigned int ycrcb_map, bool yuv420_mode, const struct drm_display_mode *mode); +void meson_venc_mipi_dsi_mode_set (struct meson_drm *priv, +const struct drm_display_mode *mode);unsigned int meson_venci_get_field (struct meson_drm *priv);void meson_venc_enable_vsync (struct meson_drm *priv);
drivers/gpu/drm/meson/meson_vpp.h +2 -0
@@ -12,6 +12,8 @@struct drm_rect ;struct meson_drm ; +/* Mux VIU/VPP to ENCL */ +#define MESON_VIU_VPP_MUX_ENCL 0x0/* Mux VIU/VPP to ENCI */ #define MESON_VIU_VPP_MUX_ENCI 0x5/* Mux VIU/VPP to ENCP */
Signature · 1 line
2.25.1
kernel test robot
build botRe: [PATCH v2 3/6] drm/meson: venc: add ENCL encoder setup for MIPI-DSI output
I love your patch! Yet something to improve:
Hi Neil,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[also build test ERROR on drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next v5.16 next-20220120] [cannot apply to drm/drm-next drm-intel/for-linux-next airlied/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: arm-randconfig-r002-20220120 (https://download.01.org/0day-ci/archive/20220120/202201202322.HA2Ce0Rs-lkp(a)intel.com/config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project f7b7138a62648f4019c55e4671682af1f851f295)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/0day-ci/linux/commit/582fe216b10e102620e7148d6df969d4eed430af
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 git checkout 582fe216b10e102620e7148d6df969d4eed430af
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/gpu/drm/meson/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/meson/meson_venc.c:1595:10: error: implicit declaration of function 'FIELD_PREP' [-Werror,-Wimplicit-function-declaration]
FIELD_PREP(L_GAMMA_ADDR_PORT_ADDR, 0),
^
>> drivers/gpu/drm/meson/meson_venc.c:1661:17: error: use of undeclared identifier 'ENCL_PX_LN_CNT_SHADOW_EN'
writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
^
>> drivers/gpu/drm/meson/meson_venc.c:1662:17: error: use of undeclared identifier 'ENCL_VIDEO_MODE_ADV_VFIFO_EN'
writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
^
>> drivers/gpu/drm/meson/meson_venc.c:1663:10: error: use of undeclared identifier 'ENCL_VIDEO_MODE_ADV_GAIN_HDTV'
ENCL_VIDEO_MODE_ADV_GAIN_HDTV |
^
>> drivers/gpu/drm/meson/meson_venc.c:1664:10: error: use of undeclared identifier 'ENCL_SEL_GAMMA_RGB_IN'
ENCL_SEL_GAMMA_RGB_IN, priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
^
>> drivers/gpu/drm/meson/meson_venc.c:1666:17: error: use of undeclared identifier 'ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER'
writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
^
>> drivers/gpu/drm/meson/meson_venc.c:1681:17: error: use of undeclared identifier 'ENCL_VIDEO_RGBIN_RGB'
writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
^
>> drivers/gpu/drm/meson/meson_venc.c:1681:40: error: use of undeclared identifier 'ENCL_VIDEO_RGBIN_ZBLK'
writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
^
drivers/gpu/drm/meson/meson_venc.c:1690:22: error: use of undeclared identifier 'ENCL_VIDEO_MODE_ADV_VFIFO_EN'
writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, 0,
^
drivers/gpu/drm/meson/meson_venc.c:1690:22: error: use of undeclared identifier 'ENCL_VIDEO_MODE_ADV_VFIFO_EN'
>> drivers/gpu/drm/meson/meson_venc.c:1753:17: error: use of undeclared identifier 'L_TCON_MISC_SEL_STV1'
writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
^
>> drivers/gpu/drm/meson/meson_venc.c:1753:40: error: use of undeclared identifier 'L_TCON_MISC_SEL_STV2'
writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
^
>> drivers/gpu/drm/meson/meson_venc.c:1952:18: error: use of undeclared identifier 'VENC_INTCTRL_ENCP_LNRST_INT_EN'
writel_relaxed(VENC_INTCTRL_ENCP_LNRST_INT_EN,
^13 errors generated.
vim +/FIELD_PREP +1595 drivers/gpu/drm/meson/meson_venc.c
1579
1580 static void meson_encl_set_gamma_table(struct meson_drm *priv, u16 *data,
1581 u32 rgb_mask)
1582 {
1583 int i, ret;
1584 u32 reg;
1585
1586 writel_bits_relaxed(L_GAMMA_CNTL_PORT_EN, 0,
1587 priv->io_base + _REG(L_GAMMA_CNTL_PORT));
1588
1589 ret = readl_relaxed_poll_timeout(priv->io_base + _REG(L_GAMMA_CNTL_PORT),
1590 reg, reg & L_GAMMA_CNTL_PORT_ADR_RDY, 10, 10000);
1591 if (ret)
1592 pr_warn("%s: GAMMA ADR_RDY timeout\n", __func__);
1593
1594 writel_relaxed(L_GAMMA_ADDR_PORT_AUTO_INC | rgb_mask |
> 1595 FIELD_PREP(L_GAMMA_ADDR_PORT_ADDR, 0),
1596 priv->io_base + _REG(L_GAMMA_ADDR_PORT));
1597
1598 for (i = 0; i < 256; i++) {
1599 ret = readl_relaxed_poll_timeout(priv->io_base + _REG(L_GAMMA_CNTL_PORT),
1600 reg, reg & L_GAMMA_CNTL_PORT_WR_RDY,
1601 10, 10000);
1602 if (ret)
1603 pr_warn_once("%s: GAMMA WR_RDY timeout\n", __func__);
1604
1605 writel_relaxed(data[i], priv->io_base + _REG(L_GAMMA_DATA_PORT));
1606 }
1607
1608 ret = readl_relaxed_poll_timeout(priv->io_base + _REG(L_GAMMA_CNTL_PORT),
1609 reg, reg & L_GAMMA_CNTL_PORT_ADR_RDY, 10, 10000);
1610 if (ret)
1611 pr_warn("%s: GAMMA ADR_RDY timeout\n", __func__);
1612
1613 writel_relaxed(L_GAMMA_ADDR_PORT_AUTO_INC | rgb_mask |
1614 FIELD_PREP(L_GAMMA_ADDR_PORT_ADDR, 0x23),
1615 priv->io_base + _REG(L_GAMMA_ADDR_PORT));
1616 }
1617
1618 void meson_encl_load_gamma(struct meson_drm *priv)
1619 {
1620 meson_encl_set_gamma_table(priv, meson_encl_gamma_table, L_GAMMA_ADDR_PORT_SEL_R);
1621 meson_encl_set_gamma_table(priv, meson_encl_gamma_table, L_GAMMA_ADDR_PORT_SEL_G);
1622 meson_encl_set_gamma_table(priv, meson_encl_gamma_table, L_GAMMA_ADDR_PORT_SEL_B);
1623
1624 writel_bits_relaxed(L_GAMMA_CNTL_PORT_EN, L_GAMMA_CNTL_PORT_EN,
1625 priv->io_base + _REG(L_GAMMA_CNTL_PORT));
1626 }
1627
1628 void meson_venc_mipi_dsi_mode_set(struct meson_drm *priv,
1629 const struct drm_display_mode *mode)
1630 {
1631 unsigned int max_pxcnt;
1632 unsigned int max_lncnt;
1633 unsigned int havon_begin;
1634 unsigned int havon_end;
1635 unsigned int vavon_bline;
1636 unsigned int vavon_eline;
1637 unsigned int hso_begin;
1638 unsigned int hso_end;
1639 unsigned int vso_begin;
1640 unsigned int vso_end;
1641 unsigned int vso_bline;
1642 unsigned int vso_eline;
1643
1644 max_pxcnt = mode->htotal - 1;
1645 max_lncnt = mode->vtotal - 1;
1646 havon_begin = mode->htotal - mode->hsync_start;
1647 havon_end = havon_begin + mode->hdisplay - 1;
1648 vavon_bline = mode->vtotal - mode->vsync_start;
1649 vavon_eline = vavon_bline + mode->vdisplay - 1;
1650 hso_begin = 0;
1651 hso_end = mode->hsync_end - mode->hsync_start;
1652 vso_begin = 0;
1653 vso_end = 0;
1654 vso_bline = 0;
1655 vso_eline = mode->vsync_end - mode->vsync_start;
1656
1657 meson_vpp_setup_mux(priv, MESON_VIU_VPP_MUX_ENCL);
1658
1659 writel_relaxed(0, priv->io_base + _REG(ENCL_VIDEO_EN));
1660
> 1661 writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
> 1662 writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
> 1663 ENCL_VIDEO_MODE_ADV_GAIN_HDTV |
> 1664 ENCL_SEL_GAMMA_RGB_IN, priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
1665
> 1666 writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
1667 priv->io_base + _REG(ENCL_VIDEO_FILT_CTRL));
1668 writel_relaxed(max_pxcnt, priv->io_base + _REG(ENCL_VIDEO_MAX_PXCNT));
1669 writel_relaxed(max_lncnt, priv->io_base + _REG(ENCL_VIDEO_MAX_LNCNT));
1670 writel_relaxed(havon_begin, priv->io_base + _REG(ENCL_VIDEO_HAVON_BEGIN));
1671 writel_relaxed(havon_end, priv->io_base + _REG(ENCL_VIDEO_HAVON_END));
1672 writel_relaxed(vavon_bline, priv->io_base + _REG(ENCL_VIDEO_VAVON_BLINE));
1673 writel_relaxed(vavon_eline, priv->io_base + _REG(ENCL_VIDEO_VAVON_ELINE));
1674
1675 writel_relaxed(hso_begin, priv->io_base + _REG(ENCL_VIDEO_HSO_BEGIN));
1676 writel_relaxed(hso_end, priv->io_base + _REG(ENCL_VIDEO_HSO_END));
1677 writel_relaxed(vso_begin, priv->io_base + _REG(ENCL_VIDEO_VSO_BEGIN));
1678 writel_relaxed(vso_end, priv->io_base + _REG(ENCL_VIDEO_VSO_END));
1679 writel_relaxed(vso_bline, priv->io_base + _REG(ENCL_VIDEO_VSO_BLINE));
1680 writel_relaxed(vso_eline, priv->io_base + _REG(ENCL_VIDEO_VSO_ELINE));
> 1681 writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
1682 priv->io_base + _REG(ENCL_VIDEO_RGBIN_CTRL));
1683
1684 /* default black pattern */
1685 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_MDSEL));
1686 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_Y));
1687 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_CB));
1688 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_CR));
1689 writel_relaxed(1, priv->io_base + _REG(ENCL_TST_EN));
1690 writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, 0,
1691 priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
1692
1693 writel_relaxed(1, priv->io_base + _REG(ENCL_VIDEO_EN));
1694
1695 writel_relaxed(0, priv->io_base + _REG(L_RGB_BASE_ADDR));
1696 writel_relaxed(0x400, priv->io_base + _REG(L_RGB_COEFF_ADDR)); /* Magic value */
1697
1698 writel_relaxed(L_DITH_CNTL_DITH10_EN, priv->io_base + _REG(L_DITH_CNTL_ADDR));
1699
1700 /* DE signal for TTL */
1701 writel_relaxed(havon_begin, priv->io_base + _REG(L_OEH_HS_ADDR));
1702 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_OEH_HE_ADDR));
1703 writel_relaxed(vavon_bline, priv->io_base + _REG(L_OEH_VS_ADDR));
1704 writel_relaxed(vavon_eline, priv->io_base + _REG(L_OEH_VE_ADDR));
1705
1706 /* DE signal for TTL */
1707 writel_relaxed(havon_begin, priv->io_base + _REG(L_OEV1_HS_ADDR));
1708 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_OEV1_HE_ADDR));
1709 writel_relaxed(vavon_bline, priv->io_base + _REG(L_OEV1_VS_ADDR));
1710 writel_relaxed(vavon_eline, priv->io_base + _REG(L_OEV1_VE_ADDR));
1711
1712 /* Hsync signal for TTL */
1713 if (mode->flags & DRM_MODE_FLAG_PHSYNC) {
1714 writel_relaxed(hso_end, priv->io_base + _REG(L_STH1_HS_ADDR));
1715 writel_relaxed(hso_begin, priv->io_base + _REG(L_STH1_HE_ADDR));
1716 } else {
1717 writel_relaxed(hso_begin, priv->io_base + _REG(L_STH1_HS_ADDR));
1718 writel_relaxed(hso_end, priv->io_base + _REG(L_STH1_HE_ADDR));
1719 }
1720 writel_relaxed(0, priv->io_base + _REG(L_STH1_VS_ADDR));
1721 writel_relaxed(max_lncnt, priv->io_base + _REG(L_STH1_VE_ADDR));
1722
1723 /* Vsync signal for TTL */
1724 writel_relaxed(vso_begin, priv->io_base + _REG(L_STV1_HS_ADDR));
1725 writel_relaxed(vso_end, priv->io_base + _REG(L_STV1_HE_ADDR));
1726 if (mode->flags & DRM_MODE_FLAG_PVSYNC) {
1727 writel_relaxed(vso_eline, priv->io_base + _REG(L_STV1_VS_ADDR));
1728 writel_relaxed(vso_bline, priv->io_base + _REG(L_STV1_VE_ADDR));
1729 } else {
1730 writel_relaxed(vso_bline, priv->io_base + _REG(L_STV1_VS_ADDR));
1731 writel_relaxed(vso_eline, priv->io_base + _REG(L_STV1_VE_ADDR));
1732 }
1733
1734 /* DE signal */
1735 writel_relaxed(havon_begin, priv->io_base + _REG(L_DE_HS_ADDR));
1736 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_DE_HE_ADDR));
1737 writel_relaxed(vavon_bline, priv->io_base + _REG(L_DE_VS_ADDR));
1738 writel_relaxed(vavon_eline, priv->io_base + _REG(L_DE_VE_ADDR));
1739
1740 /* Hsync signal */
1741 writel_relaxed(hso_begin, priv->io_base + _REG(L_HSYNC_HS_ADDR));
1742 writel_relaxed(hso_end, priv->io_base + _REG(L_HSYNC_HE_ADDR));
1743 writel_relaxed(0, priv->io_base + _REG(L_HSYNC_VS_ADDR));
1744 writel_relaxed(max_lncnt, priv->io_base + _REG(L_HSYNC_VE_ADDR));
1745
1746 /* Vsync signal */
1747 writel_relaxed(vso_begin, priv->io_base + _REG(L_VSYNC_HS_ADDR));
1748 writel_relaxed(vso_end, priv->io_base + _REG(L_VSYNC_HE_ADDR));
1749 writel_relaxed(vso_bline, priv->io_base + _REG(L_VSYNC_VS_ADDR));
1750 writel_relaxed(vso_eline, priv->io_base + _REG(L_VSYNC_VE_ADDR));
1751
1752 writel_relaxed(0, priv->io_base + _REG(L_INV_CNT_ADDR));
> 1753 writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2, 1754 priv->io_base + _REG(L_TCON_MISC_SEL_ADDR));
1755
1756 priv->venc.current_mode = MESON_VENC_MODE_MIPI_DSI;
1757 }
1758 EXPORT_SYMBOL_GPL(meson_venc_mipi_dsi_mode_set);
1759
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH v2 3/6] drm/meson: venc: add ENCL encoder setup for MIPI-DSI output
In reply to Neil ArmstrongI love your patch! Yet something to improve:
Hi Neil,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[also build test ERROR on drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next v5.16 next-20220120] [cannot apply to drm/drm-next drm-intel/for-linux-next airlied/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: arm64-buildonly-randconfig-r005-20220120 (https://download.01.org/0day-ci/archive/20220120/202201202318.BaTOOAWE-lkp(a)intel.com/config) compiler: aarch64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/582fe216b10e102620e7148d6df969d4eed430af
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 git checkout 582fe216b10e102620e7148d6df969d4eed430af
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/gpu/drm/meson/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from include/linux/swab.h:5,
from include/uapi/linux/byteorder/big_endian.h:14,
from include/linux/byteorder/big_endian.h:5,
from arch/arm64/include/uapi/asm/byteorder.h:21,
from include/asm-generic/bitops/le.h:7,
from arch/arm64/include/asm/bitops.h:29,
from include/linux/bitops.h:33,
from include/linux/kernel.h:13,
from include/linux/iopoll.h:9,
from drivers/gpu/drm/meson/meson_venc.c:9:
drivers/gpu/drm/meson/meson_venc.c: In function 'meson_venc_mipi_dsi_mode_set':
>> drivers/gpu/drm/meson/meson_venc.c:1661:24: error: 'ENCL_PX_LN_CNT_SHADOW_EN' undeclared (first use in this function)
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1661:9: note: in expansion of macro 'writel_relaxed'
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1661:24: note: each undeclared identifier is reported only once for each function it appears in
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1661:9: note: in expansion of macro 'writel_relaxed'
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1662:24: error: 'ENCL_VIDEO_MODE_ADV_VFIFO_EN' undeclared (first use in this function); did you mean 'ENCI_VIDEO_MODE_ADV_YBW_LOW'?
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1662:9: note: in expansion of macro 'writel_relaxed'
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1663:24: error: 'ENCL_VIDEO_MODE_ADV_GAIN_HDTV' undeclared (first use in this function); did you mean 'ENCI_VIDEO_MODE_ADV_YBW_HIGH'?
1663 | ENCL_VIDEO_MODE_ADV_GAIN_HDTV |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1662:9: note: in expansion of macro 'writel_relaxed'
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1664:24: error: 'ENCL_SEL_GAMMA_RGB_IN' undeclared (first use in this function)
1664 | ENCL_SEL_GAMMA_RGB_IN, priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
| ^~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1662:9: note: in expansion of macro 'writel_relaxed'
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1666:24: error: 'ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER' undeclared (first use in this function)
1666 | writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1666:9: note: in expansion of macro 'writel_relaxed'
1666 | writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1681:24: error: 'ENCL_VIDEO_RGBIN_RGB' undeclared (first use in this function); did you mean 'ENCL_VIDEO_RGBIN_CTRL'?
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1681:9: note: in expansion of macro 'writel_relaxed'
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1681:47: error: 'ENCL_VIDEO_RGBIN_ZBLK' undeclared (first use in this function); did you mean 'ENCL_VIDEO_RGBIN_CTRL'?
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1681:9: note: in expansion of macro 'writel_relaxed'
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1753:24: error: 'L_TCON_MISC_SEL_STV1' undeclared (first use in this function); did you mean 'L_TCON_MISC_SEL_ADDR'?
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1753:9: note: in expansion of macro 'writel_relaxed'
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1753:47: error: 'L_TCON_MISC_SEL_STV2' undeclared (first use in this function); did you mean 'L_TCON_MISC_SEL_ADDR'?
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1753:9: note: in expansion of macro 'writel_relaxed'
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c: In function 'meson_venc_enable_vsync':
>> drivers/gpu/drm/meson/meson_venc.c:1952:32: error: 'VENC_INTCTRL_ENCP_LNRST_INT_EN' undeclared (first use in this function); did you mean 'VENC_INTCTRL_ENCI_LNRST_INT_EN'?
1952 | writel_relaxed(VENC_INTCTRL_ENCP_LNRST_INT_EN,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1952:17: note: in expansion of macro 'writel_relaxed'
1952 | writel_relaxed(VENC_INTCTRL_ENCP_LNRST_INT_EN,
| ^~~~~~~~~~~~~~vim +/ENCL_PX_LN_CNT_SHADOW_EN +1661 drivers/gpu/drm/meson/meson_venc.c
1627
1628 void meson_venc_mipi_dsi_mode_set(struct meson_drm *priv,
1629 const struct drm_display_mode *mode)
1630 {
1631 unsigned int max_pxcnt;
1632 unsigned int max_lncnt;
1633 unsigned int havon_begin;
1634 unsigned int havon_end;
1635 unsigned int vavon_bline;
1636 unsigned int vavon_eline;
1637 unsigned int hso_begin;
1638 unsigned int hso_end;
1639 unsigned int vso_begin;
1640 unsigned int vso_end;
1641 unsigned int vso_bline;
1642 unsigned int vso_eline;
1643
1644 max_pxcnt = mode->htotal - 1;
1645 max_lncnt = mode->vtotal - 1;
1646 havon_begin = mode->htotal - mode->hsync_start;
1647 havon_end = havon_begin + mode->hdisplay - 1;
1648 vavon_bline = mode->vtotal - mode->vsync_start;
1649 vavon_eline = vavon_bline + mode->vdisplay - 1;
1650 hso_begin = 0;
1651 hso_end = mode->hsync_end - mode->hsync_start;
1652 vso_begin = 0;
1653 vso_end = 0;
1654 vso_bline = 0;
1655 vso_eline = mode->vsync_end - mode->vsync_start;
1656
1657 meson_vpp_setup_mux(priv, MESON_VIU_VPP_MUX_ENCL);
1658
1659 writel_relaxed(0, priv->io_base + _REG(ENCL_VIDEO_EN));
1660
> 1661 writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
> 1662 writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
> 1663 ENCL_VIDEO_MODE_ADV_GAIN_HDTV |
> 1664 ENCL_SEL_GAMMA_RGB_IN, priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
1665
> 1666 writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
1667 priv->io_base + _REG(ENCL_VIDEO_FILT_CTRL));
1668 writel_relaxed(max_pxcnt, priv->io_base + _REG(ENCL_VIDEO_MAX_PXCNT));
1669 writel_relaxed(max_lncnt, priv->io_base + _REG(ENCL_VIDEO_MAX_LNCNT));
1670 writel_relaxed(havon_begin, priv->io_base + _REG(ENCL_VIDEO_HAVON_BEGIN));
1671 writel_relaxed(havon_end, priv->io_base + _REG(ENCL_VIDEO_HAVON_END));
1672 writel_relaxed(vavon_bline, priv->io_base + _REG(ENCL_VIDEO_VAVON_BLINE));
1673 writel_relaxed(vavon_eline, priv->io_base + _REG(ENCL_VIDEO_VAVON_ELINE));
1674
1675 writel_relaxed(hso_begin, priv->io_base + _REG(ENCL_VIDEO_HSO_BEGIN));
1676 writel_relaxed(hso_end, priv->io_base + _REG(ENCL_VIDEO_HSO_END));
1677 writel_relaxed(vso_begin, priv->io_base + _REG(ENCL_VIDEO_VSO_BEGIN));
1678 writel_relaxed(vso_end, priv->io_base + _REG(ENCL_VIDEO_VSO_END));
1679 writel_relaxed(vso_bline, priv->io_base + _REG(ENCL_VIDEO_VSO_BLINE));
1680 writel_relaxed(vso_eline, priv->io_base + _REG(ENCL_VIDEO_VSO_ELINE));
> 1681 writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
1682 priv->io_base + _REG(ENCL_VIDEO_RGBIN_CTRL));
1683
1684 /* default black pattern */
1685 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_MDSEL));
1686 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_Y));
1687 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_CB));
1688 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_CR));
1689 writel_relaxed(1, priv->io_base + _REG(ENCL_TST_EN));
1690 writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, 0,
1691 priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
1692
1693 writel_relaxed(1, priv->io_base + _REG(ENCL_VIDEO_EN));
1694
1695 writel_relaxed(0, priv->io_base + _REG(L_RGB_BASE_ADDR));
1696 writel_relaxed(0x400, priv->io_base + _REG(L_RGB_COEFF_ADDR)); /* Magic value */
1697
1698 writel_relaxed(L_DITH_CNTL_DITH10_EN, priv->io_base + _REG(L_DITH_CNTL_ADDR));
1699
1700 /* DE signal for TTL */
1701 writel_relaxed(havon_begin, priv->io_base + _REG(L_OEH_HS_ADDR));
1702 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_OEH_HE_ADDR));
1703 writel_relaxed(vavon_bline, priv->io_base + _REG(L_OEH_VS_ADDR));
1704 writel_relaxed(vavon_eline, priv->io_base + _REG(L_OEH_VE_ADDR));
1705
1706 /* DE signal for TTL */
1707 writel_relaxed(havon_begin, priv->io_base + _REG(L_OEV1_HS_ADDR));
1708 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_OEV1_HE_ADDR));
1709 writel_relaxed(vavon_bline, priv->io_base + _REG(L_OEV1_VS_ADDR));
1710 writel_relaxed(vavon_eline, priv->io_base + _REG(L_OEV1_VE_ADDR));
1711
1712 /* Hsync signal for TTL */
1713 if (mode->flags & DRM_MODE_FLAG_PHSYNC) {
1714 writel_relaxed(hso_end, priv->io_base + _REG(L_STH1_HS_ADDR));
1715 writel_relaxed(hso_begin, priv->io_base + _REG(L_STH1_HE_ADDR));
1716 } else {
1717 writel_relaxed(hso_begin, priv->io_base + _REG(L_STH1_HS_ADDR));
1718 writel_relaxed(hso_end, priv->io_base + _REG(L_STH1_HE_ADDR));
1719 }
1720 writel_relaxed(0, priv->io_base + _REG(L_STH1_VS_ADDR));
1721 writel_relaxed(max_lncnt, priv->io_base + _REG(L_STH1_VE_ADDR));
1722
1723 /* Vsync signal for TTL */
1724 writel_relaxed(vso_begin, priv->io_base + _REG(L_STV1_HS_ADDR));
1725 writel_relaxed(vso_end, priv->io_base + _REG(L_STV1_HE_ADDR));
1726 if (mode->flags & DRM_MODE_FLAG_PVSYNC) {
1727 writel_relaxed(vso_eline, priv->io_base + _REG(L_STV1_VS_ADDR));
1728 writel_relaxed(vso_bline, priv->io_base + _REG(L_STV1_VE_ADDR));
1729 } else {
1730 writel_relaxed(vso_bline, priv->io_base + _REG(L_STV1_VS_ADDR));
1731 writel_relaxed(vso_eline, priv->io_base + _REG(L_STV1_VE_ADDR));
1732 }
1733
1734 /* DE signal */
1735 writel_relaxed(havon_begin, priv->io_base + _REG(L_DE_HS_ADDR));
1736 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_DE_HE_ADDR));
1737 writel_relaxed(vavon_bline, priv->io_base + _REG(L_DE_VS_ADDR));
1738 writel_relaxed(vavon_eline, priv->io_base + _REG(L_DE_VE_ADDR));
1739
1740 /* Hsync signal */
1741 writel_relaxed(hso_begin, priv->io_base + _REG(L_HSYNC_HS_ADDR));
1742 writel_relaxed(hso_end, priv->io_base + _REG(L_HSYNC_HE_ADDR));
1743 writel_relaxed(0, priv->io_base + _REG(L_HSYNC_VS_ADDR));
1744 writel_relaxed(max_lncnt, priv->io_base + _REG(L_HSYNC_VE_ADDR));
1745
1746 /* Vsync signal */
1747 writel_relaxed(vso_begin, priv->io_base + _REG(L_VSYNC_HS_ADDR));
1748 writel_relaxed(vso_end, priv->io_base + _REG(L_VSYNC_HE_ADDR));
1749 writel_relaxed(vso_bline, priv->io_base + _REG(L_VSYNC_VS_ADDR));
1750 writel_relaxed(vso_eline, priv->io_base + _REG(L_VSYNC_VE_ADDR));
1751
1752 writel_relaxed(0, priv->io_base + _REG(L_INV_CNT_ADDR));
> 1753 writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2, 1754 priv->io_base + _REG(L_TCON_MISC_SEL_ADDR));
1755
1756 priv->venc.current_mode = MESON_VENC_MODE_MIPI_DSI;
1757 }
1758 EXPORT_SYMBOL_GPL(meson_venc_mipi_dsi_mode_set);
1759
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH v2 3/6] drm/meson: venc: add ENCL encoder setup for MIPI-DSI output
In reply to Neil ArmstrongI love your patch! Yet something to improve:
Hi Neil,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[also build test ERROR on drm-exynos/exynos-drm-next tegra-drm/drm/tegra/for-next v5.16 next-20220120] [cannot apply to drm/drm-next drm-intel/for-linux-next airlied/drm-next]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: arm-randconfig-r023-20220120 (https://download.01.org/0day-ci/archive/20220121/202201210039.murVNA9k-lkp(a)intel.com/config) compiler: arm-linux-gnueabi-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/582fe216b10e102620e7148d6df969d4eed430af
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 git checkout 582fe216b10e102620e7148d6df969d4eed430af
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm SHELL=/bin/bash drivers/gpu/drm/meson/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from include/linux/byteorder/little_endian.h:5,
from arch/arm/include/uapi/asm/byteorder.h:22,
from include/asm-generic/bitops/le.h:7,
from arch/arm/include/asm/bitops.h:268,
from include/linux/bitops.h:33,
from include/linux/kernel.h:13,
from include/linux/iopoll.h:9,
from drivers/gpu/drm/meson/meson_venc.c:9:
drivers/gpu/drm/meson/meson_venc.c: In function 'meson_encl_set_gamma_table':
>> drivers/gpu/drm/meson/meson_venc.c:1595:24: error: implicit declaration of function 'FIELD_PREP' [-Werror=implicit-function-declaration]
1595 | FIELD_PREP(L_GAMMA_ADDR_PORT_ADDR, 0),
| ^~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1594:9: note: in expansion of macro 'writel_relaxed'
1594 | writel_relaxed(L_GAMMA_ADDR_PORT_AUTO_INC | rgb_mask |
| ^~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c: In function 'meson_venc_mipi_dsi_mode_set':
>> drivers/gpu/drm/meson/meson_venc.c:1661:24: error: 'ENCL_PX_LN_CNT_SHADOW_EN' undeclared (first use in this function)
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1661:9: note: in expansion of macro 'writel_relaxed'
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c:1661:24: note: each undeclared identifier is reported only once for each function it appears in
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1661:9: note: in expansion of macro 'writel_relaxed'
1661 | writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1662:24: error: 'ENCL_VIDEO_MODE_ADV_VFIFO_EN' undeclared (first use in this function); did you mean 'ENCI_VIDEO_MODE_ADV_YBW_LOW'?
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1662:9: note: in expansion of macro 'writel_relaxed'
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1663:24: error: 'ENCL_VIDEO_MODE_ADV_GAIN_HDTV' undeclared (first use in this function); did you mean 'ENCI_VIDEO_MODE_ADV_YBW_HIGH'?
1663 | ENCL_VIDEO_MODE_ADV_GAIN_HDTV |
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1662:9: note: in expansion of macro 'writel_relaxed'
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1664:24: error: 'ENCL_SEL_GAMMA_RGB_IN' undeclared (first use in this function)
1664 | ENCL_SEL_GAMMA_RGB_IN, priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
| ^~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1662:9: note: in expansion of macro 'writel_relaxed'
1662 | writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1666:24: error: 'ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER' undeclared (first use in this function)
1666 | writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1666:9: note: in expansion of macro 'writel_relaxed'
1666 | writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1681:24: error: 'ENCL_VIDEO_RGBIN_RGB' undeclared (first use in this function); did you mean 'ENCL_VIDEO_RGBIN_CTRL'?
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1681:9: note: in expansion of macro 'writel_relaxed'
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1681:47: error: 'ENCL_VIDEO_RGBIN_ZBLK' undeclared (first use in this function); did you mean 'ENCL_VIDEO_RGBIN_CTRL'?
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1681:9: note: in expansion of macro 'writel_relaxed'
1681 | writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1753:24: error: 'L_TCON_MISC_SEL_STV1' undeclared (first use in this function); did you mean 'L_TCON_MISC_SEL_ADDR'?
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1753:9: note: in expansion of macro 'writel_relaxed'
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~
>> drivers/gpu/drm/meson/meson_venc.c:1753:47: error: 'L_TCON_MISC_SEL_STV2' undeclared (first use in this function); did you mean 'L_TCON_MISC_SEL_ADDR'?
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1753:9: note: in expansion of macro 'writel_relaxed'
1753 | writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2,
| ^~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_venc.c: In function 'meson_venc_enable_vsync':
>> drivers/gpu/drm/meson/meson_venc.c:1952:32: error: 'VENC_INTCTRL_ENCP_LNRST_INT_EN' undeclared (first use in this function); did you mean 'VENC_INTCTRL_ENCI_LNRST_INT_EN'?
1952 | writel_relaxed(VENC_INTCTRL_ENCP_LNRST_INT_EN,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/byteorder/little_endian.h:34:51: note: in definition of macro '__cpu_to_le32'
34 | #define __cpu_to_le32(x) ((__force __le32)(__u32)(x))
| ^
drivers/gpu/drm/meson/meson_venc.c:1952:17: note: in expansion of macro 'writel_relaxed'
1952 | writel_relaxed(VENC_INTCTRL_ENCP_LNRST_INT_EN,
| ^~~~~~~~~~~~~~cc1: some warnings being treated as errors
vim +/FIELD_PREP +1595 drivers/gpu/drm/meson/meson_venc.c
1579
1580 static void meson_encl_set_gamma_table(struct meson_drm *priv, u16 *data,
1581 u32 rgb_mask)
1582 {
1583 int i, ret;
1584 u32 reg;
1585
1586 writel_bits_relaxed(L_GAMMA_CNTL_PORT_EN, 0,
1587 priv->io_base + _REG(L_GAMMA_CNTL_PORT));
1588
1589 ret = readl_relaxed_poll_timeout(priv->io_base + _REG(L_GAMMA_CNTL_PORT),
1590 reg, reg & L_GAMMA_CNTL_PORT_ADR_RDY, 10, 10000);
1591 if (ret)
1592 pr_warn("%s: GAMMA ADR_RDY timeout\n", __func__);
1593
1594 writel_relaxed(L_GAMMA_ADDR_PORT_AUTO_INC | rgb_mask |
> 1595 FIELD_PREP(L_GAMMA_ADDR_PORT_ADDR, 0),
1596 priv->io_base + _REG(L_GAMMA_ADDR_PORT));
1597
1598 for (i = 0; i < 256; i++) {
1599 ret = readl_relaxed_poll_timeout(priv->io_base + _REG(L_GAMMA_CNTL_PORT),
1600 reg, reg & L_GAMMA_CNTL_PORT_WR_RDY,
1601 10, 10000);
1602 if (ret)
1603 pr_warn_once("%s: GAMMA WR_RDY timeout\n", __func__);
1604
1605 writel_relaxed(data[i], priv->io_base + _REG(L_GAMMA_DATA_PORT));
1606 }
1607
1608 ret = readl_relaxed_poll_timeout(priv->io_base + _REG(L_GAMMA_CNTL_PORT),
1609 reg, reg & L_GAMMA_CNTL_PORT_ADR_RDY, 10, 10000);
1610 if (ret)
1611 pr_warn("%s: GAMMA ADR_RDY timeout\n", __func__);
1612
1613 writel_relaxed(L_GAMMA_ADDR_PORT_AUTO_INC | rgb_mask |
1614 FIELD_PREP(L_GAMMA_ADDR_PORT_ADDR, 0x23),
1615 priv->io_base + _REG(L_GAMMA_ADDR_PORT));
1616 }
1617
1618 void meson_encl_load_gamma(struct meson_drm *priv)
1619 {
1620 meson_encl_set_gamma_table(priv, meson_encl_gamma_table, L_GAMMA_ADDR_PORT_SEL_R);
1621 meson_encl_set_gamma_table(priv, meson_encl_gamma_table, L_GAMMA_ADDR_PORT_SEL_G);
1622 meson_encl_set_gamma_table(priv, meson_encl_gamma_table, L_GAMMA_ADDR_PORT_SEL_B);
1623
1624 writel_bits_relaxed(L_GAMMA_CNTL_PORT_EN, L_GAMMA_CNTL_PORT_EN,
1625 priv->io_base + _REG(L_GAMMA_CNTL_PORT));
1626 }
1627
1628 void meson_venc_mipi_dsi_mode_set(struct meson_drm *priv,
1629 const struct drm_display_mode *mode)
1630 {
1631 unsigned int max_pxcnt;
1632 unsigned int max_lncnt;
1633 unsigned int havon_begin;
1634 unsigned int havon_end;
1635 unsigned int vavon_bline;
1636 unsigned int vavon_eline;
1637 unsigned int hso_begin;
1638 unsigned int hso_end;
1639 unsigned int vso_begin;
1640 unsigned int vso_end;
1641 unsigned int vso_bline;
1642 unsigned int vso_eline;
1643
1644 max_pxcnt = mode->htotal - 1;
1645 max_lncnt = mode->vtotal - 1;
1646 havon_begin = mode->htotal - mode->hsync_start;
1647 havon_end = havon_begin + mode->hdisplay - 1;
1648 vavon_bline = mode->vtotal - mode->vsync_start;
1649 vavon_eline = vavon_bline + mode->vdisplay - 1;
1650 hso_begin = 0;
1651 hso_end = mode->hsync_end - mode->hsync_start;
1652 vso_begin = 0;
1653 vso_end = 0;
1654 vso_bline = 0;
1655 vso_eline = mode->vsync_end - mode->vsync_start;
1656
1657 meson_vpp_setup_mux(priv, MESON_VIU_VPP_MUX_ENCL);
1658
1659 writel_relaxed(0, priv->io_base + _REG(ENCL_VIDEO_EN));
1660
> 1661 writel_relaxed(ENCL_PX_LN_CNT_SHADOW_EN, priv->io_base + _REG(ENCL_VIDEO_MODE));
> 1662 writel_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN |
> 1663 ENCL_VIDEO_MODE_ADV_GAIN_HDTV |
> 1664 ENCL_SEL_GAMMA_RGB_IN, priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
1665
> 1666 writel_relaxed(ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER,
1667 priv->io_base + _REG(ENCL_VIDEO_FILT_CTRL));
1668 writel_relaxed(max_pxcnt, priv->io_base + _REG(ENCL_VIDEO_MAX_PXCNT));
1669 writel_relaxed(max_lncnt, priv->io_base + _REG(ENCL_VIDEO_MAX_LNCNT));
1670 writel_relaxed(havon_begin, priv->io_base + _REG(ENCL_VIDEO_HAVON_BEGIN));
1671 writel_relaxed(havon_end, priv->io_base + _REG(ENCL_VIDEO_HAVON_END));
1672 writel_relaxed(vavon_bline, priv->io_base + _REG(ENCL_VIDEO_VAVON_BLINE));
1673 writel_relaxed(vavon_eline, priv->io_base + _REG(ENCL_VIDEO_VAVON_ELINE));
1674
1675 writel_relaxed(hso_begin, priv->io_base + _REG(ENCL_VIDEO_HSO_BEGIN));
1676 writel_relaxed(hso_end, priv->io_base + _REG(ENCL_VIDEO_HSO_END));
1677 writel_relaxed(vso_begin, priv->io_base + _REG(ENCL_VIDEO_VSO_BEGIN));
1678 writel_relaxed(vso_end, priv->io_base + _REG(ENCL_VIDEO_VSO_END));
1679 writel_relaxed(vso_bline, priv->io_base + _REG(ENCL_VIDEO_VSO_BLINE));
1680 writel_relaxed(vso_eline, priv->io_base + _REG(ENCL_VIDEO_VSO_ELINE));
> 1681 writel_relaxed(ENCL_VIDEO_RGBIN_RGB | ENCL_VIDEO_RGBIN_ZBLK,
1682 priv->io_base + _REG(ENCL_VIDEO_RGBIN_CTRL));
1683
1684 /* default black pattern */
1685 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_MDSEL));
1686 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_Y));
1687 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_CB));
1688 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_CR));
1689 writel_relaxed(1, priv->io_base + _REG(ENCL_TST_EN));
1690 writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, 0,
1691 priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
1692
1693 writel_relaxed(1, priv->io_base + _REG(ENCL_VIDEO_EN));
1694
1695 writel_relaxed(0, priv->io_base + _REG(L_RGB_BASE_ADDR));
1696 writel_relaxed(0x400, priv->io_base + _REG(L_RGB_COEFF_ADDR)); /* Magic value */
1697
1698 writel_relaxed(L_DITH_CNTL_DITH10_EN, priv->io_base + _REG(L_DITH_CNTL_ADDR));
1699
1700 /* DE signal for TTL */
1701 writel_relaxed(havon_begin, priv->io_base + _REG(L_OEH_HS_ADDR));
1702 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_OEH_HE_ADDR));
1703 writel_relaxed(vavon_bline, priv->io_base + _REG(L_OEH_VS_ADDR));
1704 writel_relaxed(vavon_eline, priv->io_base + _REG(L_OEH_VE_ADDR));
1705
1706 /* DE signal for TTL */
1707 writel_relaxed(havon_begin, priv->io_base + _REG(L_OEV1_HS_ADDR));
1708 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_OEV1_HE_ADDR));
1709 writel_relaxed(vavon_bline, priv->io_base + _REG(L_OEV1_VS_ADDR));
1710 writel_relaxed(vavon_eline, priv->io_base + _REG(L_OEV1_VE_ADDR));
1711
1712 /* Hsync signal for TTL */
1713 if (mode->flags & DRM_MODE_FLAG_PHSYNC) {
1714 writel_relaxed(hso_end, priv->io_base + _REG(L_STH1_HS_ADDR));
1715 writel_relaxed(hso_begin, priv->io_base + _REG(L_STH1_HE_ADDR));
1716 } else {
1717 writel_relaxed(hso_begin, priv->io_base + _REG(L_STH1_HS_ADDR));
1718 writel_relaxed(hso_end, priv->io_base + _REG(L_STH1_HE_ADDR));
1719 }
1720 writel_relaxed(0, priv->io_base + _REG(L_STH1_VS_ADDR));
1721 writel_relaxed(max_lncnt, priv->io_base + _REG(L_STH1_VE_ADDR));
1722
1723 /* Vsync signal for TTL */
1724 writel_relaxed(vso_begin, priv->io_base + _REG(L_STV1_HS_ADDR));
1725 writel_relaxed(vso_end, priv->io_base + _REG(L_STV1_HE_ADDR));
1726 if (mode->flags & DRM_MODE_FLAG_PVSYNC) {
1727 writel_relaxed(vso_eline, priv->io_base + _REG(L_STV1_VS_ADDR));
1728 writel_relaxed(vso_bline, priv->io_base + _REG(L_STV1_VE_ADDR));
1729 } else {
1730 writel_relaxed(vso_bline, priv->io_base + _REG(L_STV1_VS_ADDR));
1731 writel_relaxed(vso_eline, priv->io_base + _REG(L_STV1_VE_ADDR));
1732 }
1733
1734 /* DE signal */
1735 writel_relaxed(havon_begin, priv->io_base + _REG(L_DE_HS_ADDR));
1736 writel_relaxed(havon_end + 1, priv->io_base + _REG(L_DE_HE_ADDR));
1737 writel_relaxed(vavon_bline, priv->io_base + _REG(L_DE_VS_ADDR));
1738 writel_relaxed(vavon_eline, priv->io_base + _REG(L_DE_VE_ADDR));
1739
1740 /* Hsync signal */
1741 writel_relaxed(hso_begin, priv->io_base + _REG(L_HSYNC_HS_ADDR));
1742 writel_relaxed(hso_end, priv->io_base + _REG(L_HSYNC_HE_ADDR));
1743 writel_relaxed(0, priv->io_base + _REG(L_HSYNC_VS_ADDR));
1744 writel_relaxed(max_lncnt, priv->io_base + _REG(L_HSYNC_VE_ADDR));
1745
1746 /* Vsync signal */
1747 writel_relaxed(vso_begin, priv->io_base + _REG(L_VSYNC_HS_ADDR));
1748 writel_relaxed(vso_end, priv->io_base + _REG(L_VSYNC_HE_ADDR));
1749 writel_relaxed(vso_bline, priv->io_base + _REG(L_VSYNC_VS_ADDR));
1750 writel_relaxed(vso_eline, priv->io_base + _REG(L_VSYNC_VE_ADDR));
1751
1752 writel_relaxed(0, priv->io_base + _REG(L_INV_CNT_ADDR));
> 1753 writel_relaxed(L_TCON_MISC_SEL_STV1 | L_TCON_MISC_SEL_STV2, 1754 priv->io_base + _REG(L_TCON_MISC_SEL_ADDR));
1755
1756 priv->venc.current_mode = MESON_VENC_MODE_MIPI_DSI;
1757 }
1758 EXPORT_SYMBOL_GPL(meson_venc_mipi_dsi_mode_set);
1759
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
Re: [PATCH v2 3/6] drm/meson: venc: add ENCL encoder setup for MIPI-DSI output
In reply to Neil ArmstrongQuoted 34 lines · Neil Armstrong
This adds supports for the ENCL encoder connected to a MIPI-DSI transceiver on the Amlogic AXG, G12A, G12B & SM1 SoCs.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/gpu/drm/meson/meson_registers.h | 15 ++ drivers/gpu/drm/meson/meson_venc.c | 211 +++++++++++++++++++++++- drivers/gpu/drm/meson/meson_venc.h | 6 + drivers/gpu/drm/meson/meson_vpp.h | 2 + 4 files changed, 232 insertions(+), 2 deletions(-)drivers/gpu/drm/meson/meson_registers.h +13
-0@@ -1300,13 +1300,28 @@#define RDMA_STATUS2 0x1116#define RDMA_STATUS3 0x1117#define L_GAMMA_CNTL_PORT 0x1400 +#define L_GAMMA_CNTL_PORT_VCOM_POL BIT(7)/* RW */ +#define L_GAMMA_CNTL_PORT_RVS_OUT BIT(6)/* RW */ +#define L_GAMMA_CNTL_PORT_ADR_RDY BIT(5)/* Read Only */ +#define L_GAMMA_CNTL_PORT_WR_RDY BIT(4)/* Read Only */ +#define L_GAMMA_CNTL_PORT_RD_RDY BIT(3)/* Read Only */ +#define L_GAMMA_CNTL_PORT_TR BIT(2)/* RW */ +#define L_GAMMA_CNTL_PORT_SET BIT(1)/* RW */ +#define L_GAMMA_CNTL_PORT_EN BIT(0)/* RW */ #define L_GAMMA_DATA_PORT 0x1401#define L_GAMMA_ADDR_PORT 0x1402 +#define L_GAMMA_ADDR_PORT_RD BIT(12) +#define L_GAMMA_ADDR_PORT_AUTO_INC BIT(11) +#define L_GAMMA_ADDR_PORT_SEL_R BIT(10) +#define L_GAMMA_ADDR_PORT_SEL_G BIT(9) +#define L_GAMMA_ADDR_PORT_SEL_B BIT(8)
drivers/gpu/drm/meson/meson_registers.h line 1327
Quoted 10 lines
drivers/gpu/drm/meson/meson_registers.h +2
-0+#define L_GAMMA_ADDR_PORT_ADDR GENMASK(7, 0)#define L_GAMMA_VCOM_HSWITCH_ADDR 0x1403#define L_RGB_BASE_ADDR 0x1405#define L_RGB_COEFF_ADDR 0x1406#define L_POL_CNTL_ADDR 0x1407#define L_DITH_CNTL_ADDR 0x1408 +#define L_DITH_CNTL_DITH10_EN BIT(10)#define L_GAMMA_PROBE_CTRL 0x1409#define L_GAMMA_PROBE_COLOR_L 0x140a#define L_GAMMA_PROBE_COLOR_H 0x140b
OK Somehow the following disappeared from the patchset...
#define VENC_INTCTRL 0x1b6e
#define VENC_INTCTRL_ENCI_LNRST_INT_EN BIT(1)
-#define VENC_INTCTRL_ENCP_LNRST_INT_EN BIT(9)
#define VENC_INTFLAG 0x1b6f
#define ENCL_VIDEO_MODE 0x1ca7
-#define ENCL_PX_LN_CNT_SHADOW_EN BIT(15)
#define ENCL_VIDEO_MODE_ADV 0x1ca8
-#define ENCL_VIDEO_MODE_ADV_VFIFO_EN BIT(3)
-#define ENCL_VIDEO_MODE_ADV_GAIN_HDTV BIT(4)
-#define ENCL_SEL_GAMMA_RGB_IN BIT(10)
#define ENCL_DBG_PX_RST 0x1ca9
#define ENCL_VIDEO_FILT_CTRL 0x1cc2
-#define ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER BIT(12)
#define ENCL_VIDEO_OFLD_VPEQ_OFST 0x1cc3
#define ENCL_VIDEO_RGBIN_CTRL 0x1cc7
-#define ENCL_VIDEO_RGBIN_RGB BIT(0)
-#define ENCL_VIDEO_RGBIN_ZBLK BIT(1)
#define ENCL_MAX_LINE_SWITCH_POINT 0x1cc8
#define L_TCON_MISC_SEL_ADDR 0x1441
-#define L_TCON_MISC_SEL_STV1 BIT(4)
-#define L_TCON_MISC_SEL_STV2 BIT(5)
#define L_DUAL_PORT_CNTL_ADDR 0x1442
I'll resend with those
Quoted 281 lines
drivers/gpu/drm/meson/meson_venc.c +209
-2@@ -6,6 +6,7 @@*/ #include <linux/export.h> +#include <linux/iopoll.h> #include <drm/drm_modes.h> @@ -1557,6 +1558,205 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic, }EXPORT_SYMBOL_GPL (meson_venc_hdmi_mode_set); +static unsigned short meson_encl_gamma_table[256 ] = { +0 ,4 ,8 ,12 ,16 ,20 ,24 ,28 ,32 ,36 ,40 ,44 ,48 ,52 ,56 ,60 , +64 ,68 ,72 ,76 ,80 ,84 ,88 ,92 ,96 ,100 ,104 ,108 ,112 ,116 ,120 ,124 , +128 ,132 ,136 ,140 ,144 ,148 ,152 ,156 ,160 ,164 ,168 ,172 ,176 ,180 ,184 ,188 , +192 ,196 ,200 ,204 ,208 ,212 ,216 ,220 ,224 ,228 ,232 ,236 ,240 ,244 ,248 ,252 , +256 ,260 ,264 ,268 ,272 ,276 ,280 ,284 ,288 ,292 ,296 ,300 ,304 ,308 ,312 ,316 , +320 ,324 ,328 ,332 ,336 ,340 ,344 ,348 ,352 ,356 ,360 ,364 ,368 ,372 ,376 ,380 , +384 ,388 ,392 ,396 ,400 ,404 ,408 ,412 ,416 ,420 ,424 ,428 ,432 ,436 ,440 ,444 , +448 ,452 ,456 ,460 ,464 ,468 ,472 ,476 ,480 ,484 ,488 ,492 ,496 ,500 ,504 ,508 , +512 ,516 ,520 ,524 ,528 ,532 ,536 ,540 ,544 ,548 ,552 ,556 ,560 ,564 ,568 ,572 , +576 ,580 ,584 ,588 ,592 ,596 ,600 ,604 ,608 ,612 ,616 ,620 ,624 ,628 ,632 ,636 , +640 ,644 ,648 ,652 ,656 ,660 ,664 ,668 ,672 ,676 ,680 ,684 ,688 ,692 ,696 ,700 , +704 ,708 ,712 ,716 ,720 ,724 ,728 ,732 ,736 ,740 ,744 ,748 ,752 ,756 ,760 ,764 , +768 ,772 ,776 ,780 ,784 ,788 ,792 ,796 ,800 ,804 ,808 ,812 ,816 ,820 ,824 ,828 , +832 ,836 ,840 ,844 ,848 ,852 ,856 ,860 ,864 ,868 ,872 ,876 ,880 ,884 ,888 ,892 , +896 ,900 ,904 ,908 ,912 ,916 ,920 ,924 ,928 ,932 ,936 ,940 ,944 ,948 ,952 ,956 , +960 ,964 ,968 ,972 ,976 ,980 ,984 ,988 ,992 ,996 ,1000 ,1004 ,1008 ,1012 ,1016 ,1020 , +}; + +static void meson_encl_set_gamma_table (struct meson_drm *priv,u16 *data, +u32 rgb_mask) +{ +int i, ret; +u32 reg; + +writel_bits_relaxed (L_GAMMA_CNTL_PORT_EN ,0 , + priv->io_base +_REG (L_GAMMA_CNTL_PORT )); + + ret =readl_relaxed_poll_timeout (priv->io_base +_REG (L_GAMMA_CNTL_PORT ), + reg, reg &L_GAMMA_CNTL_PORT_ADR_RDY ,10 ,10000 ); +if (ret) +pr_warn ("%s: GAMMA ADR_RDY timeout\n" , __func__); + +writel_relaxed (L_GAMMA_ADDR_PORT_AUTO_INC | rgb_mask | +FIELD_PREP (L_GAMMA_ADDR_PORT_ADDR ,0 ), + priv->io_base +_REG (L_GAMMA_ADDR_PORT )); + +for (i =0 ; i <256 ; i++) { + ret =readl_relaxed_poll_timeout (priv->io_base +_REG (L_GAMMA_CNTL_PORT ), + reg, reg &L_GAMMA_CNTL_PORT_WR_RDY , +10 ,10000 ); +if (ret) +pr_warn_once ("%s: GAMMA WR_RDY timeout\n" , __func__); + +writel_relaxed (data[i], priv->io_base +_REG (L_GAMMA_DATA_PORT )); + } + + ret =readl_relaxed_poll_timeout (priv->io_base +_REG (L_GAMMA_CNTL_PORT ), + reg, reg &L_GAMMA_CNTL_PORT_ADR_RDY ,10 ,10000 ); +if (ret) +pr_warn ("%s: GAMMA ADR_RDY timeout\n" , __func__); + +writel_relaxed (L_GAMMA_ADDR_PORT_AUTO_INC | rgb_mask | +FIELD_PREP (L_GAMMA_ADDR_PORT_ADDR ,0x23 ), + priv->io_base +_REG (L_GAMMA_ADDR_PORT )); +} + +void meson_encl_load_gamma (struct meson_drm *priv) +{ +meson_encl_set_gamma_table (priv, meson_encl_gamma_table,L_GAMMA_ADDR_PORT_SEL_R ); +meson_encl_set_gamma_table (priv, meson_encl_gamma_table,L_GAMMA_ADDR_PORT_SEL_G ); +meson_encl_set_gamma_table (priv, meson_encl_gamma_table,L_GAMMA_ADDR_PORT_SEL_B ); + +writel_bits_relaxed (L_GAMMA_CNTL_PORT_EN ,L_GAMMA_CNTL_PORT_EN , + priv->io_base +_REG (L_GAMMA_CNTL_PORT )); +} + +void meson_venc_mipi_dsi_mode_set (struct meson_drm *priv, +const struct drm_display_mode *mode) +{ +unsigned int max_pxcnt; +unsigned int max_lncnt; +unsigned int havon_begin; +unsigned int havon_end; +unsigned int vavon_bline; +unsigned int vavon_eline; +unsigned int hso_begin; +unsigned int hso_end; +unsigned int vso_begin; +unsigned int vso_end; +unsigned int vso_bline; +unsigned int vso_eline; + + max_pxcnt = mode->htotal -1 ; + max_lncnt = mode->vtotal -1 ; + havon_begin = mode->htotal - mode->hsync_start; + havon_end = havon_begin + mode->hdisplay -1 ; + vavon_bline = mode->vtotal - mode->vsync_start; + vavon_eline = vavon_bline + mode->vdisplay -1 ; + hso_begin =0 ; + hso_end = mode->hsync_end - mode->hsync_start; + vso_begin =0 ; + vso_end =0 ; + vso_bline =0 ; + vso_eline = mode->vsync_end - mode->vsync_start; + +meson_vpp_setup_mux (priv,MESON_VIU_VPP_MUX_ENCL ); + +writel_relaxed (0 , priv->io_base +_REG (ENCL_VIDEO_EN )); + +writel_relaxed (ENCL_PX_LN_CNT_SHADOW_EN , priv->io_base +_REG (ENCL_VIDEO_MODE )); +writel_relaxed (ENCL_VIDEO_MODE_ADV_VFIFO_EN | +ENCL_VIDEO_MODE_ADV_GAIN_HDTV | +ENCL_SEL_GAMMA_RGB_IN , priv->io_base +_REG (ENCL_VIDEO_MODE_ADV )); + +writel_relaxed (ENCL_VIDEO_FILT_CTRL_BYPASS_FILTER , + priv->io_base +_REG (ENCL_VIDEO_FILT_CTRL )); +writel_relaxed (max_pxcnt, priv->io_base +_REG (ENCL_VIDEO_MAX_PXCNT )); +writel_relaxed (max_lncnt, priv->io_base +_REG (ENCL_VIDEO_MAX_LNCNT )); +writel_relaxed (havon_begin, priv->io_base +_REG (ENCL_VIDEO_HAVON_BEGIN )); +writel_relaxed (havon_end, priv->io_base +_REG (ENCL_VIDEO_HAVON_END )); +writel_relaxed (vavon_bline, priv->io_base +_REG (ENCL_VIDEO_VAVON_BLINE )); +writel_relaxed (vavon_eline, priv->io_base +_REG (ENCL_VIDEO_VAVON_ELINE )); + +writel_relaxed (hso_begin, priv->io_base +_REG (ENCL_VIDEO_HSO_BEGIN )); +writel_relaxed (hso_end, priv->io_base +_REG (ENCL_VIDEO_HSO_END )); +writel_relaxed (vso_begin, priv->io_base +_REG (ENCL_VIDEO_VSO_BEGIN )); +writel_relaxed (vso_end, priv->io_base +_REG (ENCL_VIDEO_VSO_END )); +writel_relaxed (vso_bline, priv->io_base +_REG (ENCL_VIDEO_VSO_BLINE )); +writel_relaxed (vso_eline, priv->io_base +_REG (ENCL_VIDEO_VSO_ELINE )); +writel_relaxed (ENCL_VIDEO_RGBIN_RGB |ENCL_VIDEO_RGBIN_ZBLK , + priv->io_base +_REG (ENCL_VIDEO_RGBIN_CTRL )); + +/* default black pattern */ +writel_relaxed (0 , priv->io_base +_REG (ENCL_TST_MDSEL )); +writel_relaxed (0 , priv->io_base +_REG (ENCL_TST_Y )); +writel_relaxed (0 , priv->io_base +_REG (ENCL_TST_CB )); +writel_relaxed (0 , priv->io_base +_REG (ENCL_TST_CR )); +writel_relaxed (1 , priv->io_base +_REG (ENCL_TST_EN )); +writel_bits_relaxed (ENCL_VIDEO_MODE_ADV_VFIFO_EN ,0 , + priv->io_base +_REG (ENCL_VIDEO_MODE_ADV )); + +writel_relaxed (1 , priv->io_base +_REG (ENCL_VIDEO_EN )); + +writel_relaxed (0 , priv->io_base +_REG (L_RGB_BASE_ADDR )); +writel_relaxed (0x400 , priv->io_base +_REG (L_RGB_COEFF_ADDR ));/* Magic value */ + +writel_relaxed (L_DITH_CNTL_DITH10_EN , priv->io_base +_REG (L_DITH_CNTL_ADDR )); + +/* DE signal for TTL */ +writel_relaxed (havon_begin, priv->io_base +_REG (L_OEH_HS_ADDR )); +writel_relaxed (havon_end +1 , priv->io_base +_REG (L_OEH_HE_ADDR )); +writel_relaxed (vavon_bline, priv->io_base +_REG (L_OEH_VS_ADDR )); +writel_relaxed (vavon_eline, priv->io_base +_REG (L_OEH_VE_ADDR )); + +/* DE signal for TTL */ +writel_relaxed (havon_begin, priv->io_base +_REG (L_OEV1_HS_ADDR )); +writel_relaxed (havon_end +1 , priv->io_base +_REG (L_OEV1_HE_ADDR )); +writel_relaxed (vavon_bline, priv->io_base +_REG (L_OEV1_VS_ADDR )); +writel_relaxed (vavon_eline, priv->io_base +_REG (L_OEV1_VE_ADDR )); + +/* Hsync signal for TTL */ +if (mode->flags &DRM_MODE_FLAG_PHSYNC ) { +writel_relaxed (hso_end, priv->io_base +_REG (L_STH1_HS_ADDR )); +writel_relaxed (hso_begin, priv->io_base +_REG (L_STH1_HE_ADDR )); + }else { +writel_relaxed (hso_begin, priv->io_base +_REG (L_STH1_HS_ADDR )); +writel_relaxed (hso_end, priv->io_base +_REG (L_STH1_HE_ADDR )); + } +writel_relaxed (0 , priv->io_base +_REG (L_STH1_VS_ADDR )); +writel_relaxed (max_lncnt, priv->io_base +_REG (L_STH1_VE_ADDR )); + +/* Vsync signal for TTL */ +writel_relaxed (vso_begin, priv->io_base +_REG (L_STV1_HS_ADDR )); +writel_relaxed (vso_end, priv->io_base +_REG (L_STV1_HE_ADDR )); +if (mode->flags &DRM_MODE_FLAG_PVSYNC ) { +writel_relaxed (vso_eline, priv->io_base +_REG (L_STV1_VS_ADDR )); +writel_relaxed (vso_bline, priv->io_base +_REG (L_STV1_VE_ADDR )); + }else { +writel_relaxed (vso_bline, priv->io_base +_REG (L_STV1_VS_ADDR )); +writel_relaxed (vso_eline, priv->io_base +_REG (L_STV1_VE_ADDR )); + } + +/* DE signal */ +writel_relaxed (havon_begin, priv->io_base +_REG (L_DE_HS_ADDR )); +writel_relaxed (havon_end +1 , priv->io_base +_REG (L_DE_HE_ADDR )); +writel_relaxed (vavon_bline, priv->io_base +_REG (L_DE_VS_ADDR )); +writel_relaxed (vavon_eline, priv->io_base +_REG (L_DE_VE_ADDR )); + +/* Hsync signal */ +writel_relaxed (hso_begin, priv->io_base +_REG (L_HSYNC_HS_ADDR )); +writel_relaxed (hso_end, priv->io_base +_REG (L_HSYNC_HE_ADDR )); +writel_relaxed (0 , priv->io_base +_REG (L_HSYNC_VS_ADDR )); +writel_relaxed (max_lncnt, priv->io_base +_REG (L_HSYNC_VE_ADDR )); + +/* Vsync signal */ +writel_relaxed (vso_begin, priv->io_base +_REG (L_VSYNC_HS_ADDR )); +writel_relaxed (vso_end, priv->io_base +_REG (L_VSYNC_HE_ADDR )); +writel_relaxed (vso_bline, priv->io_base +_REG (L_VSYNC_VS_ADDR )); +writel_relaxed (vso_eline, priv->io_base +_REG (L_VSYNC_VE_ADDR )); + +writel_relaxed (0 , priv->io_base +_REG (L_INV_CNT_ADDR )); +writel_relaxed (L_TCON_MISC_SEL_STV1 |L_TCON_MISC_SEL_STV2 , + priv->io_base +_REG (L_TCON_MISC_SEL_ADDR )); + + priv->venc.current_mode =MESON_VENC_MODE_MIPI_DSI ; +} +EXPORT_SYMBOL_GPL (meson_venc_mipi_dsi_mode_set); +void meson_venci_cvbs_mode_set (struct meson_drm *priv,struct meson_cvbs_enci_mode *mode) {@@ -1747,8 +1947,15 @@ unsigned int meson_venci_get_field(struct meson_drm *priv)void meson_venc_enable_vsync (struct meson_drm *priv) { -writel_relaxed (VENC_INTCTRL_ENCI_LNRST_INT_EN , - priv->io_base +_REG (VENC_INTCTRL )); +switch (priv->venc.current_mode) { +case MESON_VENC_MODE_MIPI_DSI : +writel_relaxed (VENC_INTCTRL_ENCP_LNRST_INT_EN , + priv->io_base +_REG (VENC_INTCTRL )); +break ; +default : +writel_relaxed (VENC_INTCTRL_ENCI_LNRST_INT_EN , + priv->io_base +_REG (VENC_INTCTRL )); + }regmap_update_bits (priv->hhi,HHI_GCLK_MPEG2 ,BIT (25 ),BIT (25 )); }drivers/gpu/drm/meson/meson_venc.h +6
-0@@ -21,6 +21,7 @@ enum {MESON_VENC_MODE_CVBS_PAL ,MESON_VENC_MODE_CVBS_NTSC ,MESON_VENC_MODE_HDMI , + MESON_VENC_MODE_MIPI_DSI, }; struct meson_cvbs_enci_mode {@@ -47,6 +48,9 @@ struct meson_cvbs_enci_mode {unsigned int analog_sync_adj; }; +/* LCD Encoder gamma setup */ +void meson_encl_load_gamma (struct meson_drm *priv); +/* HDMI Clock parameters */ enum drm_mode_status meson_venc_hdmi_supported_mode (const struct drm_display_mode *mode);@@ -63,6 +67,8 @@ void meson_venc_hdmi_mode_set(struct meson_drm *priv, int vic,unsigned int ycrcb_map, bool yuv420_mode, const struct drm_display_mode *mode); +void meson_venc_mipi_dsi_mode_set (struct meson_drm *priv, +const struct drm_display_mode *mode);unsigned int meson_venci_get_field (struct meson_drm *priv);void meson_venc_enable_vsync (struct meson_drm *priv);drivers/gpu/drm/meson/meson_vpp.h +2
-0@@ -12,6 +12,8 @@struct drm_rect ;struct meson_drm ; +/* Mux VIU/VPP to ENCL */ +#define MESON_VIU_VPP_MUX_ENCL 0x0/* Mux VIU/VPP to ENCI */ #define MESON_VIU_VPP_MUX_ENCI 0x5/* Mux VIU/VPP to ENCP */
PATCH v2 4/6 drm/meson: vclk: add DSI clock config
In reply to Neil ArmstrongThe DSI path used the ENCL pixel encoder, thus this adds a clock config using the HDMI PLL in order to feed the ENCL encoder via the VCLK2 path and the CTS_ENCL clock output.
--- drivers/gpu/drm/meson/meson_vclk.c | 47 ++++++++++++++++++++++++++++++ drivers/gpu/drm/meson/meson_vclk.h | 1 + 2 files changed, 48 insertions(+)
drivers/gpu/drm/meson/meson_vclk.c +47 -0
@@ -55,6 +55,8 @@#define VCLK2_DIV_MASK 0xff#define VCLK2_DIV_EN BIT(16)#define VCLK2_DIV_RESET BIT(17) +#define CTS_ENCL_SEL_MASK (0xf << 12) +#define CTS_ENCL_SEL_SHIFT 12#define CTS_VDAC_SEL_MASK (0xf << 28)#define CTS_VDAC_SEL_SHIFT 28#define HHI_VIID_CLK_CNTL 0x12c/* 0x4b offset in data sheet */
@@ -83,6 +85,7 @@#define VCLK_DIV12_EN BIT(4)#define HHI_VID_CLK_CNTL2 0x194/* 0x65 offset in data sheet */ #define CTS_ENCI_EN BIT(0) +#define CTS_ENCL_EN BIT(3)#define CTS_ENCP_EN BIT(2)#define CTS_VDAC_EN BIT(4)#define HDMI_TX_PIXEL_EN BIT(5)
@@ -1024,6 +1027,47 @@ static void meson_vclk_set(struct meson_drm *priv, unsigned int pll_base_freq,regmap_update_bits (priv->hhi,HHI_VID_CLK_CNTL ,VCLK_EN ,VCLK_EN ); } +static void meson_dsi_clock_config (struct meson_drm *priv,unsigned int freq) +{ +meson_hdmi_pll_generic_set (priv, freq *10 ); + +/* Setup vid_pll divider value /5 */ +meson_vid_pll_set (priv,VID_PLL_DIV_5 ); + +/* Disable VCLK2 */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_CNTL ,VCLK2_EN ,0 ); + +/* Setup the VCLK2 divider value /2 */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_DIV ,VCLK2_DIV_MASK ,2 -1 ); + +/* select vid_pll for vclk2 */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_CNTL , +VCLK2_SEL_MASK , (0 <<VCLK2_SEL_SHIFT )); + +/* enable vclk2 gate */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_CNTL ,VCLK2_EN ,VCLK2_EN ); + +/* select vclk2_div1 for encl */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_DIV , +CTS_ENCL_SEL_MASK , (8 <<CTS_ENCL_SEL_SHIFT )); + +/* release vclk2_div_reset and enable vclk2_div */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_DIV ,VCLK2_DIV_EN |VCLK2_DIV_RESET , +VCLK2_DIV_EN ); + +/* enable vclk2_div1 gate */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_CNTL ,VCLK2_DIV1_EN ,VCLK2_DIV1_EN ); + +/* reset vclk2 */ +regmap_update_bits (priv->hhi,HHI_VIID_CLK_CNTL ,VCLK2_SOFT_RESET ,VCLK2_SOFT_RESET ); +regmap_update_bits (priv->hhi,HHI_VIID_CLK_CNTL ,VCLK2_SOFT_RESET ,0 ); + +/* enable encl_clk */ +regmap_update_bits (priv->hhi,HHI_VID_CLK_CNTL2 ,CTS_ENCL_EN ,CTS_ENCL_EN ); + +usleep_range (10000 ,11000 ); +} + void meson_vclk_setup(struct meson_drm *priv, unsigned int target, unsigned int phy_freq, unsigned int vclk_freq, unsigned int venc_freq, unsigned int dac_freq,
@@ -1050,6 +1094,9 @@ void meson_vclk_setup(struct meson_drm *priv, unsigned int target,meson_vclk_set (priv, phy_freq,0 ,0 ,0 ,VID_PLL_DIV_5 ,2 ,1 ,1 , false, false);return ; + }else if (target ==MESON_VCLK_TARGET_DSI ) { +meson_dsi_clock_config (priv, phy_freq); +return ; } hdmi_tx_div = vclk_freq / dac_freq;
drivers/gpu/drm/meson/meson_vclk.h +1 -0
@@ -17,6 +17,7 @@ enum {MESON_VCLK_TARGET_CVBS =0 ,MESON_VCLK_TARGET_HDMI =1 ,MESON_VCLK_TARGET_DMT =2 , + MESON_VCLK_TARGET_DSI = 3, };/* 27MHz is the CVBS Pixel Clock */
Signature · 1 line
2.25.1
PATCH v2 5/6 drm/meson: add DSI encoder
In reply to Neil ArmstrongThis adds an encoder bridge designed to drive a MIPI-DSI display by using the ENCL encoder through the internal MIPI DSI transceiver connected to the output of the ENCL pixel encoder.
--- drivers/gpu/drm/meson/Makefile | 2 +- drivers/gpu/drm/meson/meson_drv.c | 7 + drivers/gpu/drm/meson/meson_encoder_dsi.c | 160 ++++++++++++++++++++++ drivers/gpu/drm/meson/meson_encoder_dsi.h | 12 ++ 4 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.h
drivers/gpu/drm/meson/Makefile +1 -1
@@ -2,7 +2,7 @@ meson-drm-y := meson_drv.o meson_plane.o meson_crtc.o meson_encoder_cvbs.o meson-drm-y += meson_viu.o meson_vpp.o meson_venc.o meson_vclk.o meson_overlay.o meson-drm-y += meson_rdma.o meson_osd_afbcd.o -meson-drm-y += meson_encoder_hdmi.o +meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o
drivers/gpu/drm/meson/meson_drv.c +7 -0
@@ -33,6 +33,7 @@#include "meson_registers.h" #include "meson_encoder_cvbs.h" #include "meson_encoder_hdmi.h" +#include "meson_encoder_dsi.h" #include "meson_viu.h" #include "meson_vpp.h" #include "meson_rdma.h"
@@ -323,6 +324,12 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)if (ret) goto exit_afbcd; +if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A )) { + ret =meson_encoder_dsi_init (priv); +if (ret) + goto free_drm; + } + ret =meson_plane_create (priv);if (ret) goto exit_afbcd;
drivers/gpu/drm/meson/meson_encoder_dsi.c new file +160 -0
160 lines not on this page · raw message
drivers/gpu/drm/meson/meson_encoder_dsi.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (C) 2021 BayLibre, SAS +* Author: Neil Armstrong <[email protected]> +*/ + +#ifndef __MESON_ENCODER_DSI_H +#define __MESON_ENCODER_DSI_H + +int meson_encoder_dsi_init (struct meson_drm *priv); + +#endif /* __MESON_ENCODER_DSI_H */
Signature · 1 line
2.25.1
Re: [PATCH v2 5/6] drm/meson: add DSI encoder
Quoted 204 lines · Neil Armstrong
This adds an encoder bridge designed to drive a MIPI-DSI display by using the ENCL encoder through the internal MIPI DSI transceiver connected to the output of the ENCL pixel encoder.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/gpu/drm/meson/Makefile | 2 +- drivers/gpu/drm/meson/meson_drv.c | 7 + drivers/gpu/drm/meson/meson_encoder_dsi.c | 160 ++++++++++++++++++++++ drivers/gpu/drm/meson/meson_encoder_dsi.h | 12 ++ 4 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_encoder_dsi.hdrivers/gpu/drm/meson/Makefile +1
-1@@ -2,7 +2,7 @@ meson-drm-y := meson_drv.o meson_plane.o meson_crtc.o meson_encoder_cvbs.o meson-drm-y += meson_viu.o meson_vpp.o meson_venc.o meson_vclk.o meson_overlay.o meson-drm-y += meson_rdma.o meson_osd_afbcd.o -meson-drm-y += meson_encoder_hdmi.o +meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.odrivers/gpu/drm/meson/meson_drv.c +7
-0@@ -33,6 +33,7 @@#include "meson_registers.h" #include "meson_encoder_cvbs.h" #include "meson_encoder_hdmi.h" +#include "meson_encoder_dsi.h" #include "meson_viu.h" #include "meson_vpp.h" #include "meson_rdma.h" @@ -323,6 +324,12 @@ static int meson_drv_bind_master(struct device *dev, bool has_components)if (ret) goto exit_afbcd; +if (meson_vpu_is_compatible (priv,VPU_COMPATIBLE_G12A )) { + ret =meson_encoder_dsi_init (priv); +if (ret) + goto free_drm; + } + ret =meson_plane_create (priv);if (ret) goto exit_afbcd;drivers/gpu/drm/meson/meson_encoder_dsi.c new file +145
-0@@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Copyright (C) 2016 BayLibre, SAS +* Author: Neil Armstrong <[email protected]> +* Copyright (C) 2015 Amlogic, Inc. All rights reserved. +*/ + +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/of_graph.h> + +#include <drm/drm_atomic_helper.h> +#include <drm/drm_simple_kms_helper.h> +#include <drm/drm_bridge.h> +#include <drm/drm_bridge_connector.h> +#include <drm/drm_device.h> +#include <drm/drm_probe_helper.h> + +#include "meson_drv.h" +#include "meson_encoder_dsi.h" +#include "meson_registers.h" +#include "meson_venc.h" +#include "meson_vclk.h" + +struct meson_encoder_dsi { +struct drm_encoder encoder; +struct drm_bridge bridge; +struct drm_bridge *next_bridge; +struct meson_drm *priv; +}; + +#define bridge_to_meson_encoder_dsi (x) \ + container_of(x, struct meson_encoder_dsi, bridge) + +static int meson_encoder_dsi_attach (struct drm_bridge *bridge, +enum drm_bridge_attach_flags flags) +{ +struct meson_encoder_dsi *encoder_dsi =bridge_to_meson_encoder_dsi (bridge); + +return drm_bridge_attach (bridge->encoder, encoder_dsi->next_bridge, + &encoder_dsi->bridge, flags); +} + +static void meson_encoder_dsi_mode_set (struct drm_bridge *bridge, +const struct drm_display_mode *mode, +const struct drm_display_mode *adjusted_mode) +{ +struct meson_encoder_dsi *encoder_dsi =bridge_to_meson_encoder_dsi (bridge); +struct meson_drm *priv = encoder_dsi->priv; + +meson_vclk_setup (priv,MESON_VCLK_TARGET_DSI , mode->clock,0 ,0 ,0 , false); + +meson_venc_mipi_dsi_mode_set (priv, mode); +meson_encl_load_gamma (priv); + +writel_relaxed (0 , priv->io_base +_REG (ENCL_VIDEO_EN )); + +writel_bits_relaxed (ENCL_VIDEO_MODE_ADV_VFIFO_EN ,ENCL_VIDEO_MODE_ADV_VFIFO_EN , + priv->io_base +_REG (ENCL_VIDEO_MODE_ADV )); +writel_relaxed (0 , priv->io_base +_REG (ENCL_TST_EN )); +} + +static void meson_encoder_dsi_atomic_enable (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state) +{ +struct meson_encoder_dsi *encoder_dsi =bridge_to_meson_encoder_dsi (bridge); +struct meson_drm *priv = encoder_dsi->priv; + +writel_bits_relaxed (BIT (0 ),0 , priv->io_base +_REG (VPP_WRAP_OSD1_MATRIX_EN_CTRL )); + +writel_relaxed (1 , priv->io_base +_REG (ENCL_VIDEO_EN )); +} + +static void meson_encoder_dsi_atomic_disable (struct drm_bridge *bridge, +struct drm_bridge_state *bridge_state) +{ +struct meson_encoder_dsi *meson_encoder_dsi = +bridge_to_meson_encoder_dsi (bridge); +struct meson_drm *priv = meson_encoder_dsi->priv; + +writel_relaxed (0 , priv->io_base +_REG (ENCL_VIDEO_EN )); + +writel_bits_relaxed (BIT (0 ),BIT (0 ), priv->io_base +_REG (VPP_WRAP_OSD1_MATRIX_EN_CTRL )); +} + +static const struct drm_bridge_funcs meson_encoder_dsi_bridge_funcs = { + .attach = meson_encoder_dsi_attach, +/* +* TOFIX: remove when dw-mipi-dsi moves out of mode_set +* We should get rid of mode_set, but until dw-mipi-dsi uses it +* we need to setup the pixel clock before the following +* bridge tries to setup the HW. +*/ + .mode_set = meson_encoder_dsi_mode_set, + .atomic_enable = meson_encoder_dsi_atomic_enable, + .atomic_disable = meson_encoder_dsi_atomic_disable, + .atomic_duplicate_state = drm_atomic_helper_bridge_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_bridge_destroy_state, + .atomic_reset = drm_atomic_helper_bridge_reset, +}; + +int meson_encoder_dsi_init (struct meson_drm *priv) +{ +struct meson_encoder_dsi *meson_encoder_dsi; +struct device_node *remote; +int ret; + + meson_encoder_dsi =devm_kzalloc (priv->dev,sizeof (*meson_encoder_dsi),GFP_KERNEL ); +if (!meson_encoder_dsi) +return -ENOMEM ; + +/* DSI Transceiver Bridge */ + remote =of_graph_get_remote_node (priv->dev->of_node,2 ,0 ); +if (!remote) { +dev_err (priv->dev,"DSI transceiver device is disabled" ); +return 0 ; + } + + meson_encoder_dsi->next_bridge =of_drm_find_bridge (remote); +if (!meson_encoder_dsi->next_bridge) { +dev_dbg (priv->dev,"Failed to find DSI transceiver bridge: %d\n" , ret); +return -EPROBE_DEFER ; + } + +/* DSI Encoder Bridge */ + meson_encoder_dsi->bridge.funcs = &meson_encoder_dsi_bridge_funcs; + meson_encoder_dsi->bridge.of_node = priv->dev->of_node; + meson_encoder_dsi->bridge.type =DRM_MODE_CONNECTOR_DSI ; + +drm_bridge_add (&meson_encoder_dsi->bridge); + + meson_encoder_dsi->priv = priv; + +/* Encoder */ + ret =drm_simple_encoder_init (priv->drm, &meson_encoder_dsi->encoder, +DRM_MODE_ENCODER_DSI ); +if (ret) { +dev_err (priv->dev,"Failed to init DSI encoder: %d\n" , ret); +return ret; + } + + meson_encoder_dsi->encoder.possible_crtcs =BIT (0 ); + +/* Attach DSI Encoder Bridge to Encoder */
drivers/gpu/drm/meson/meson_encoder_dsi.c line 155
Quoted 10 lines
drivers/gpu/drm/meson/meson_encoder_dsi.c new file +10
-0+ ret =drm_bridge_attach (&meson_encoder_dsi->encoder, &meson_encoder_dsi->bridge,NULL ,0 ); +if (ret) { +dev_err (priv->dev,"Failed to attach bridge: %d\n" , ret); +return ret; + } + +/* +* We should have now in place: +* encoder->[dsi encoder bridge]->[dw-mipi-dsi bridge]->[panel bridge]->[panel] +*/
kernel test robot
build botRe: [PATCH v2 5/6] drm/meson: add DSI encoder
In reply to Neil ArmstrongI love your patch! Yet something to improve:
Hi Neil,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[also build test ERROR on drm-exynos/exynos-drm-next next-20220120]
[cannot apply to drm/drm-next drm-intel/for-linux-next tegra-drm/drm/tegra/for-next airlied/drm-next v5.16] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: arm-randconfig-r002-20220120 (https://download.01.org/0day-ci/archive/20220121/202201210035.iKVahxg2-lkp(a)intel.com/config) compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project f7b7138a62648f4019c55e4671682af1f851f295)
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# install arm cross compiling tool for clang build
# apt-get install binutils-arm-linux-gnueabi
# https://github.com/0day-ci/linux/commit/2684fdff4655533195eb3db9760865fea5a13dc7
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 git checkout 2684fdff4655533195eb3db9760865fea5a13dc7
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/gpu/drm/meson/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/meson/meson_encoder_dsi.c:59:22: error: use of undeclared identifier 'ENCL_VIDEO_MODE_ADV_VFIFO_EN'
writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
^
drivers/gpu/drm/meson/meson_encoder_dsi.c:59:52: error: use of undeclared identifier 'ENCL_VIDEO_MODE_ADV_VFIFO_EN'
writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
^
>> drivers/gpu/drm/meson/meson_encoder_dsi.c:59:22: error: use of undeclared identifier 'ENCL_VIDEO_MODE_ADV_VFIFO_EN'
writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
^3 errors generated.
vim +/ENCL_VIDEO_MODE_ADV_VFIFO_EN +59 drivers/gpu/drm/meson/meson_encoder_dsi.c
44
45 static void meson_encoder_dsi_mode_set(struct drm_bridge *bridge,
46 const struct drm_display_mode *mode,
47 const struct drm_display_mode *adjusted_mode)
48 {
49 struct meson_encoder_dsi *encoder_dsi = bridge_to_meson_encoder_dsi(bridge);
50 struct meson_drm *priv = encoder_dsi->priv;
51
52 meson_vclk_setup(priv, MESON_VCLK_TARGET_DSI, mode->clock, 0, 0, 0, false);
53
54 meson_venc_mipi_dsi_mode_set(priv, mode);
55 meson_encl_load_gamma(priv);
56
57 writel_relaxed(0, priv->io_base + _REG(ENCL_VIDEO_EN));
58
> 59 writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
60 priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
61 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_EN));
62 }
63 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build botRe: [PATCH v2 5/6] drm/meson: add DSI encoder
In reply to Neil ArmstrongI love your patch! Yet something to improve:
Hi Neil,
I love your patch! Yet something to improve:
[auto build test ERROR on drm-tip/drm-tip]
[also build test ERROR on drm-exynos/exynos-drm-next next-20220120]
[cannot apply to drm/drm-next drm-intel/for-linux-next tegra-drm/drm/tegra/for-next airlied/drm-next v5.16] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 base: git://anongit.freedesktop.org/drm/drm-tip drm-tip config: arm64-buildonly-randconfig-r005-20220120 (https://download.01.org/0day-ci/archive/20220121/202201210137.9hzPb4nG-lkp(a)intel.com/config) compiler: aarch64-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/2684fdff4655533195eb3db9760865fea5a13dc7
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Neil-Armstrong/drm-meson-add-support-for-MIPI-DSI-Display/20220120-163607 git checkout 2684fdff4655533195eb3db9760865fea5a13dc7
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=arm64 SHELL=/bin/bash drivers/gpu/drm/meson/
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>):
In file included from include/linux/swab.h:5,
from include/uapi/linux/byteorder/big_endian.h:14,
from include/linux/byteorder/big_endian.h:5,
from arch/arm64/include/uapi/asm/byteorder.h:21,
from include/asm-generic/bitops/le.h:7,
from arch/arm64/include/asm/bitops.h:29,
from include/linux/bitops.h:33,
from include/linux/kernel.h:13,
from drivers/gpu/drm/meson/meson_encoder_dsi.c:8:
drivers/gpu/drm/meson/meson_encoder_dsi.c: In function 'meson_encoder_dsi_mode_set':
>> drivers/gpu/drm/meson/meson_encoder_dsi.c:59:29: error: 'ENCL_VIDEO_MODE_ADV_VFIFO_EN' undeclared (first use in this function); did you mean 'ENCI_VIDEO_MODE_ADV_YBW_LOW'?
59 | writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_registers.h:15:9: note: in expansion of macro 'writel_relaxed'
15 | writel_relaxed((readl_relaxed(addr) & ~(mask)) | ((val) & (mask)), addr)
| ^~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_encoder_dsi.c:59:9: note: in expansion of macro 'writel_bits_relaxed'
59 | writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
| ^~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_encoder_dsi.c:59:29: note: each undeclared identifier is reported only once for each function it appears in
59 | writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
include/uapi/linux/swab.h:118:39: note: in definition of macro '__swab32'
118 | (__builtin_constant_p((__u32)(x)) ? \
| ^
include/linux/byteorder/generic.h:88:21: note: in expansion of macro '__cpu_to_le32'
88 | #define cpu_to_le32 __cpu_to_le32
| ^~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_registers.h:15:9: note: in expansion of macro 'writel_relaxed'
15 | writel_relaxed((readl_relaxed(addr) & ~(mask)) | ((val) & (mask)), addr)
| ^~~~~~~~~~~~~~
drivers/gpu/drm/meson/meson_encoder_dsi.c:59:9: note: in expansion of macro 'writel_bits_relaxed'
59 | writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
| ^~~~~~~~~~~~~~~~~~~vim +59 drivers/gpu/drm/meson/meson_encoder_dsi.c
> 8 #include <linux/kernel.h>
9 #include <linux/module.h>
10 #include <linux/of_device.h>
11 #include <linux/of_graph.h>
12
13 #include <drm/drm_atomic_helper.h>
14 #include <drm/drm_simple_kms_helper.h>
15 #include <drm/drm_bridge.h>
16 #include <drm/drm_bridge_connector.h>
17 #include <drm/drm_device.h>
18 #include <drm/drm_probe_helper.h>
19
20 #include "meson_drv.h"
21 #include "meson_encoder_dsi.h"
22 #include "meson_registers.h"
23 #include "meson_venc.h"
24 #include "meson_vclk.h"
25
26 struct meson_encoder_dsi {
27 struct drm_encoder encoder;
28 struct drm_bridge bridge;
29 struct drm_bridge *next_bridge;
30 struct meson_drm *priv;
31 };
32
33 #define bridge_to_meson_encoder_dsi(x) \
34 container_of(x, struct meson_encoder_dsi, bridge)
35
36 static int meson_encoder_dsi_attach(struct drm_bridge *bridge,
37 enum drm_bridge_attach_flags flags)
38 {
39 struct meson_encoder_dsi *encoder_dsi = bridge_to_meson_encoder_dsi(bridge);
40
41 return drm_bridge_attach(bridge->encoder, encoder_dsi->next_bridge,
42 &encoder_dsi->bridge, flags);
43 }
44
45 static void meson_encoder_dsi_mode_set(struct drm_bridge *bridge,
46 const struct drm_display_mode *mode,
47 const struct drm_display_mode *adjusted_mode)
48 {
49 struct meson_encoder_dsi *encoder_dsi = bridge_to_meson_encoder_dsi(bridge);
50 struct meson_drm *priv = encoder_dsi->priv;
51
52 meson_vclk_setup(priv, MESON_VCLK_TARGET_DSI, mode->clock, 0, 0, 0, false);
53
54 meson_venc_mipi_dsi_mode_set(priv, mode);
55 meson_encl_load_gamma(priv);
56
57 writel_relaxed(0, priv->io_base + _REG(ENCL_VIDEO_EN));
58
> 59 writel_bits_relaxed(ENCL_VIDEO_MODE_ADV_VFIFO_EN, ENCL_VIDEO_MODE_ADV_VFIFO_EN,
60 priv->io_base + _REG(ENCL_VIDEO_MODE_ADV));
61 writel_relaxed(0, priv->io_base + _REG(ENCL_TST_EN));
62 }
63 ---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
PATCH v2 6/6 drm/meson: add support for MIPI-DSI transceiver
In reply to Neil ArmstrongThe Amlogic G12A/G12B/SM1 SoCs embeds a Synopsys DW-MIPI-DSI transceiver (ver 1.21a), with a custom glue managing the IP resets, clock and data input similar to the DW-HDMI Glue on other Amlogic SoCs.
This adds support for the Glue managing the transceiver, mimicing the init flow provided by Amlogic to setup the ENCL encoder, the glue, the transceiver, the digital D-PHY and the Analog PHY in the proper way.
An optional "MEAS" clock can be enabled to measure the delay between each vsync feeding the DW-MIPI-DSI transceiver.
--- drivers/gpu/drm/meson/Kconfig | 7 + drivers/gpu/drm/meson/Makefile | 1 + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 357 ++++++++++++++++++++++ drivers/gpu/drm/meson/meson_dw_mipi_dsi.h | 160 ++++++++++ 4 files changed, 525 insertions(+) create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.h
drivers/gpu/drm/meson/Kconfig +7 -0
@@ -17,3 +17,10 @@ config DRM_MESON_DW_HDMI default y if DRM_MESON select DRM_DW_HDMI imply DRM_DW_HDMI_I2S_AUDIO + +config DRM_MESON_DW_MIPI_DSI + tristate "MIPI DSI Synopsys Controller support for Amlogic Meson Display" + depends on DRM_MESON + default y if DRM_MESON + select DRM_DW_MIPI_DSI + select GENERIC_PHY_MIPI_DPHY
drivers/gpu/drm/meson/Makefile +1 -0
@@ -6,3 +6,4 @@ meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o +obj-$(CONFIG_DRM_MESON_DW_MIPI_DSI) += meson_dw_mipi_dsi.o
drivers/gpu/drm/meson/meson_dw_mipi_dsi.c new file +357 -0
357 lines not on this page · raw message
drivers/gpu/drm/meson/meson_dw_mipi_dsi.h new file +160 -0
160 lines not on this page · raw message
Signature · 1 line
2.25.1
Re: [PATCH v2 6/6] drm/meson: add support for MIPI-DSI transceiver
Quoted 42 lines · Neil Armstrong
The Amlogic G12A/G12B/SM1 SoCs embeds a Synopsys DW-MIPI-DSI transceiver (ver 1.21a), with a custom glue managing the IP resets, clock and data input similar to the DW-HDMI Glue on other Amlogic SoCs.
This adds support for the Glue managing the transceiver, mimicing the init flow provided by Amlogic to setup the ENCL encoder, the glue, the transceiver, the digital D-PHY and the Analog PHY in the proper way.
An optional "MEAS" clock can be enabled to measure the delay between each vsync feeding the DW-MIPI-DSI transceiver.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/gpu/drm/meson/Kconfig | 7 + drivers/gpu/drm/meson/Makefile | 1 + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 357 ++++++++++++++++++++++ drivers/gpu/drm/meson/meson_dw_mipi_dsi.h | 160 ++++++++++ 4 files changed, 525 insertions(+) create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.hdrivers/gpu/drm/meson/Kconfig +7
-0@@ -17,3 +17,10 @@ config DRM_MESON_DW_HDMI default y if DRM_MESON select DRM_DW_HDMI imply DRM_DW_HDMI_I2S_AUDIO + +config DRM_MESON_DW_MIPI_DSI + tristate "MIPI DSI Synopsys Controller support for Amlogic Meson Display" + depends on DRM_MESON + default y if DRM_MESON + select DRM_DW_MIPI_DSI + select GENERIC_PHY_MIPI_DPHYdrivers/gpu/drm/meson/Makefile +0
-0
drivers/gpu/drm/meson/Makefile meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o · line 9
Quoted 4 lines
drivers/gpu/drm/meson/Makefile +1
-0@@ -6,3 +6,4 @@ meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o +obj-$(CONFIG_DRM_MESON_DW_MIPI_DSI) += meson_dw_mipi_dsi.o
Can the naming convention prefix with dw-mipi-dsi like other glue drivers follow?
Jagan.
Re: [PATCH v2 6/6] drm/meson: add support for MIPI-DSI transceiver
Hi,
Quoted 44 lines · Jagan Teki
Quoted 43 lines · Neil Armstrong
The Amlogic G12A/G12B/SM1 SoCs embeds a Synopsys DW-MIPI-DSI transceiver (ver 1.21a), with a custom glue managing the IP resets, clock and data input similar to the DW-HDMI Glue on other Amlogic SoCs.
This adds support for the Glue managing the transceiver, mimicing the init flow provided by Amlogic to setup the ENCL encoder, the glue, the transceiver, the digital D-PHY and the Analog PHY in the proper way.
An optional "MEAS" clock can be enabled to measure the delay between each vsync feeding the DW-MIPI-DSI transceiver.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/gpu/drm/meson/Kconfig | 7 + drivers/gpu/drm/meson/Makefile | 1 + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 357 ++++++++++++++++++++++ drivers/gpu/drm/meson/meson_dw_mipi_dsi.h | 160 ++++++++++ 4 files changed, 525 insertions(+) create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.hdrivers/gpu/drm/meson/Kconfig +7
-0@@ -17,3 +17,10 @@ config DRM_MESON_DW_HDMI default y if DRM_MESON select DRM_DW_HDMI imply DRM_DW_HDMI_I2S_AUDIO + +config DRM_MESON_DW_MIPI_DSI + tristate "MIPI DSI Synopsys Controller support for Amlogic Meson Display" + depends on DRM_MESON + default y if DRM_MESON + select DRM_DW_MIPI_DSI + select GENERIC_PHY_MIPI_DPHYdrivers/gpu/drm/meson/Makefile +0
-0@@ -6,3 +6,4 @@ meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o
Quoted 6 lines
drivers/gpu/drm/meson/Makefile meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o · line 9
Quoted 3 lines
drivers/gpu/drm/meson/Makefile +1
-0obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o +obj-$(CONFIG_DRM_MESON_DW_MIPI_DSI) += meson_dw_mipi_dsi.oCan the naming convention prefix with dw-mipi-dsi like other glue drivers follow?
Seems only rockchip names their glue like that:
$ find drivers/gpu/drm/ -name "*dw*mipi*dsi*.c" drivers/gpu/drm/meson/meson_dw_mipi_dsi.c drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c drivers/gpu/drm/stm/dw_mipi_dsi-stm.c
If you look at dw-hdmi it's even worse:
$ find drivers/gpu/drm/ -name "*dw*hdmi*.c" | grep -v mod drivers/gpu/drm/meson/meson_dw_hdmi.c drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c drivers/gpu/drm/bridge/synopsys/dw-hdmi.c drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c drivers/gpu/drm/imx/dw_hdmi-imx.c drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
Neil
Quoted 3 lines
Jagan.
Re: [PATCH v2 6/6] drm/meson: add support for MIPI-DSI transceiver
Quoted 65 lines · Neil Armstrong
Hi,
Quoted 44 lines · Jagan Teki
Quoted 43 lines · Neil Armstrong
The Amlogic G12A/G12B/SM1 SoCs embeds a Synopsys DW-MIPI-DSI transceiver (ver 1.21a), with a custom glue managing the IP resets, clock and data input similar to the DW-HDMI Glue on other Amlogic SoCs.
This adds support for the Glue managing the transceiver, mimicing the init flow provided by Amlogic to setup the ENCL encoder, the glue, the transceiver, the digital D-PHY and the Analog PHY in the proper way.
An optional "MEAS" clock can be enabled to measure the delay between each vsync feeding the DW-MIPI-DSI transceiver.
Signed-off-by Neil Armstrong <[email protected]>--- drivers/gpu/drm/meson/Kconfig | 7 + drivers/gpu/drm/meson/Makefile | 1 + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 357 ++++++++++++++++++++++ drivers/gpu/drm/meson/meson_dw_mipi_dsi.h | 160 ++++++++++ 4 files changed, 525 insertions(+) create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.c create mode 100644 drivers/gpu/drm/meson/meson_dw_mipi_dsi.hdrivers/gpu/drm/meson/Kconfig +7
-0@@ -17,3 +17,10 @@ config DRM_MESON_DW_HDMI default y if DRM_MESON select DRM_DW_HDMI imply DRM_DW_HDMI_I2S_AUDIO + +config DRM_MESON_DW_MIPI_DSI + tristate "MIPI DSI Synopsys Controller support for Amlogic Meson Display" + depends on DRM_MESON + default y if DRM_MESON + select DRM_DW_MIPI_DSI + select GENERIC_PHY_MIPI_DPHYdrivers/gpu/drm/meson/Makefile +0
-0@@ -6,3 +6,4 @@ meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.oQuoted 6 lines
drivers/gpu/drm/meson/Makefile meson-drm-y += meson_encoder_hdmi.o meson_encoder_dsi.o · line 9
Quoted 3 lines
drivers/gpu/drm/meson/Makefile +1
-0obj-$(CONFIG_DRM_MESON) += meson-drm.o obj-$(CONFIG_DRM_MESON_DW_HDMI) += meson_dw_hdmi.o +obj-$(CONFIG_DRM_MESON_DW_MIPI_DSI) += meson_dw_mipi_dsi.oCan the naming convention prefix with dw-mipi-dsi like other glue drivers follow?
Seems only rockchip names their glue like that:
$ find drivers/gpu/drm/ -name "*dw*mipi*dsi*.c" drivers/gpu/drm/meson/meson_dw_mipi_dsi.c drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c drivers/gpu/drm/stm/dw_mipi_dsi-stm.cIf you look at dw-hdmi it's even worse:
Quoted 10 lines
$ find drivers/gpu/drm/ -name "*dw*hdmi*.c" | grep -v mod drivers/gpu/drm/meson/meson_dw_hdmi.c drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c drivers/gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c drivers/gpu/drm/bridge/synopsys/dw-hdmi.c drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c drivers/gpu/drm/imx/dw_hdmi-imx.c drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c
Look like there is no standard naming, thanks.
Jagan.
Re: [PATCH v2 6/6] drm/meson: add support for MIPI-DSI transceiver
In reply to Neil ArmstrongQuoted 9 lines · Neil Armstrong
The Amlogic G12A/G12B/SM1 SoCs embeds a Synopsys DW-MIPI-DSI transceiver (ver 1.21a), with a custom glue managing the IP resets, clock and data input similar to the DW-HDMI Glue on other Amlogic SoCs.
This adds support for the Glue managing the transceiver, mimicing the init flow provided by Amlogic to setup the ENCL encoder, the glue, the transceiver, the digital D-PHY and the Analog PHY in the proper way.
Quoted 5 lines
An optional "MEAS" clock can be enabled to measure the delay between each vsync feeding the DW-MIPI-DSI transceiver.
Signed-off-by Neil Armstrong <[email protected]>---