| Message ID | cover.1579202260.git.jsarha@ti.com |
|---|---|
| Headers | show |
| Series | drm/tidss: New driver for TI Keystone platform Display SubSystem | expand |
Jyri Sarha <jsarha@ti.com> wrote on Thu [2020-Jan-16 23:06:00 +0200]: > Add entry for tidss DRM driver. > > Version history: > > v2: no change > > v3: - Move tidss entry after omapdrm > - Add "T: git git://anongit.freedesktop.org/drm/drm-misc" > > v4: no change > > v5: no change > > v6: no change > > v7: no change > > Signed-off-by: Jyri Sarha <jsarha@ti.com Reviewed-by: Benoit Parrot <bparrot@ti.com> > --- > MAINTAINERS | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index aa9add598b7d..d8f65dc1dde8 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -5630,6 +5630,17 @@ S: Maintained > F: drivers/gpu/drm/omapdrm/ > F: Documentation/devicetree/bindings/display/ti/ > > +DRM DRIVERS FOR TI KEYSTONE > +M: Jyri Sarha <jsarha@ti.com> > +M: Tomi Valkeinen <tomi.valkeinen@ti.com> > +L: dri-devel@lists.freedesktop.org > +S: Maintained > +F: drivers/gpu/drm/tidss/ > +F: Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml > +F: Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml > +F: Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml > +T: git git://anongit.freedesktop.org/drm/drm-misc > + > DRM DRIVERS FOR V3D > M: Eric Anholt <eric@anholt.net> > S: Supported > -- > Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki >
Jyri Sarha <jsarha@ti.com> wrote on Fri [2020-Jan-17 00:09:29 +0200]: > This patch adds a new DRM driver for Texas Instruments DSS IPs used on > Texas Instruments Keystone K2G, AM65x, and J721e SoCs. The new DSS IP is > a major change to the older DSS IP versions, which are supported by > the omapdrm driver. While on higher level the Keystone DSS resembles > the older DSS versions, the registers are completely different and the > internal pipelines differ a lot. > > DSS IP found on K2G is an "ultra-light" version, and has only a single > plane and a single output. The K3 DSS IPs are found on AM65x and J721E > SoCs. AM65x DSS has two video ports, one full video plane, and another > "lite" plane without scaling support. J721E has 4 video ports, 2 video > planes and 2 lite planes. AM65x DSS has also an integrated OLDI (LVDS) > output. > > Version history: > > v2: - rebased on top of drm-next-2019-11-27 > - sort all include lines in all files > - remove all include <drm/drmP.h> > - remove select "select VIDEOMODE_HELPERS" > - call dispc_vp_setup() later in tidss_crtc_atomic_flush() (there is no > to call it in new modeset case as it is also called in vp_enable()) > - change probe sequence and drm_device allocation (follow example in > drm_drv.c) > - use __maybe_unused instead of #ifdef for pm functions > - remove "struct drm_fbdev_cma *fbdev;" from driver data > - check panel connector type before connecting it > > v3: no change > > v4: no change > > v5: - remove fifo underflow irq handling, it is not an error and > it should be used for debug purposes only > - memory tuning, prefetch plane fifo up to high-threshold value to > minimize possibility of underflows. > > v6: - Check CTM and gamma support from dispc_features when creating crtc > - Implement CTM support for k2g and fix k3 CTM implementation > - Remove gamma property persistence and always write color properties > in a new modeset > > v7: - Fix checkpatch.pl --strict issues > - Rebase on top of drm-misc-next-2020-01-10 > > Co-developed-by: Tomi Valkeinen <tomi.valkeinen@ti.com> > Signed-off-by: Jyri Sarha <jsarha@ti.com> > Acked-by: Sam Ravnborg <sam@ravnborg.org> > --- <snip> > + > +int dispc_init(struct tidss_device *tidss) > +{ > + struct device *dev = tidss->dev; > + struct platform_device *pdev = to_platform_device(dev); > + struct dispc_device *dispc; > + const struct dispc_features *feat; > + unsigned int i, num_fourccs; > + int r = 0; > + > + dev_dbg(dev, "%s\n", __func__); > + > + feat = tidss->feat; > + > + if (feat->subrev != DISPC_K2G) { > + r = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48)); > + if (r) > + dev_warn(dev, "cannot set DMA masks to 48-bit\n"); > + } > + > + dispc = devm_kzalloc(dev, sizeof(*dispc), GFP_KERNEL); > + if (!dispc) > + return -ENOMEM; > + > + dispc->fourccs = devm_kcalloc(dev, ARRAY_SIZE(dispc_color_formats), > + sizeof(*dispc->fourccs), GFP_KERNEL); > + if (!dispc->fourccs) > + return -ENOMEM; > + > + num_fourccs = 0; > + for (i = 0; i < ARRAY_SIZE(dispc_color_formats); ++i) { > + if (feat->errata.i2000 && > + dispc_fourcc_is_yuv(dispc_color_formats[i].fourcc)) > + continue; > + dispc->fourccs[num_fourccs++] = dispc_color_formats[i].fourcc; > + } > + dispc->num_fourccs = num_fourccs; > + dispc->tidss = tidss; > + dispc->dev = dev; > + dispc->feat = feat; > + > + dispc_common_regmap = dispc->feat->common_regs; > + > + r = dispc_iomap_resource(pdev, dispc->feat->common, > + &dispc->base_common); > + if (r) > + return r; > + > + for (i = 0; i < dispc->feat->num_planes; i++) { > + r = dispc_iomap_resource(pdev, dispc->feat->vid_name[i], > + &dispc->base_vid[i]); > + dev_dbg(dev, "%s: %u %s %d\n", __func__, > + i, dispc->feat->vid_name[i], r); dispc_iomap_resource() already print an error trace when something is wrong. Not sure this dev_dbg add any info. > + if (r) > + return r; > + } > + > + for (i = 0; i < dispc->feat->num_vps; i++) { > + u32 gamma_size = dispc->feat->vp_feat.color.gamma_size; > + u32 *gamma_table; > + struct clk *clk; > + > + r = dispc_iomap_resource(pdev, dispc->feat->ovr_name[i], > + &dispc->base_ovr[i]); > + dev_dbg(dev, "%s: %u %s %d\n", __func__, > + i, dispc->feat->ovr_name[i], r); Same here. > + if (r) > + return r; > + > + r = dispc_iomap_resource(pdev, dispc->feat->vp_name[i], > + &dispc->base_vp[i]); > + dev_dbg(dev, "%s: %u %s %d\n", __func__, > + i, dispc->feat->vp_name[i], r); And here. But with or without this change Reviewed-by: Benoit Parrot <bparrot@ti.com> > + if (r) > + return r; > + > + clk = devm_clk_get(dev, dispc->feat->vpclk_name[i]); > + if (IS_ERR(clk)) { > + dev_err(dev, "%s: Failed to get clk %s:%ld\n", __func__, > + dispc->feat->vpclk_name[i], PTR_ERR(clk)); > + return PTR_ERR(clk); > + } > + dispc->vp_clk[i] = clk; > + > + gamma_table = devm_kmalloc_array(dev, gamma_size, > + sizeof(*gamma_table), > + GFP_KERNEL); > + if (!gamma_table) > + return -ENOMEM; > + dispc->vp_data[i].gamma_table = gamma_table; > + } > + > + if (feat->subrev == DISPC_AM65X) { > + r = dispc_init_am65x_oldi_io_ctrl(dev, dispc); > + if (r) > + return r; > + } > + > + dispc->fclk = devm_clk_get(dev, "fck"); > + if (IS_ERR(dispc->fclk)) { > + dev_err(dev, "%s: Failed to get fclk: %ld\n", > + __func__, PTR_ERR(dispc->fclk)); > + return PTR_ERR(dispc->fclk); > + } > + dev_dbg(dev, "DSS fclk %lu Hz\n", clk_get_rate(dispc->fclk)); > + > + of_property_read_u32(dispc->dev->of_node, "max-memory-bandwidth", > + &dispc->memory_bandwidth_limit); > + > + tidss->dispc = dispc; > + > + return 0; > +}
Changes since v6: - Rebase on top of drm-misc-next-2020-01-10 - Fix all checkpatch.pl -q --emacs --strict --show-types issues - all issues but these have been fixed: - over 80 char lines in scale coefficients found in tidss_scale_coefs.c - Co-developed-by and Signed-off-by: name/email do not match - added, moved or deleted file(s), does MAINTAINERS need updating - Add Acked-by: Sam Ravnborg <sam@ravnborg.org> to "drm/tidss: New driver ..." Changes since v5: - Add Add Reviewed-by: from Rob Herring <robh@kernel.org> and Benoit Parrot <bparrot@ti.com> to binding patches - Color property changes and fixes to the driver implementation patch - Check CTM and gamma support from dispc_features when creating crtc - Implement CTM support for k2g and fix k3 CTM implementation - Remove gamma property persistence and always write color properties in a new modeset Changes since v4: - itemize named resource property descriptions in dt binding - fix wp to wb in the ti,j721e-dss reg property description - remove fifo underflow irq handling, it is not an error and it should be used for debug purposes only - memory tuning, prefetch plane fifo up to high-threshold value to minimize possibility of underflows. Changes since v3: - Add descriptions some yaml binding properites - Remove redundant minItems directives from yaml bindings - Remove ports node from ti,k2g-dss yaml binding - no change to MAINTAINERS or to the driver code Changes since v2: - Add version history to commit messages - Fix yaml bindings now that got dt_binding_check dtbs_check working propery - Move tidss entry in MAINTAINERS after omapdrm and add "T: git git://anongit.freedesktop.org/drm/drm-misc" - no change to driver code Changes since the first version of the patch series [2]: - "drm/tidss: New driver for TI Keystone platform Display SubSystem" - rebased on top of drm-next-2019-11-27 - sort all include lines in all files - remove all include <drm/drmP.h> - remove select "select VIDEOMODE_HELPERS" - call dispc_vp_setup() later in tidss_crtc_atomic_flush() (there is no to call it in new modeset case as it is also called in vp_enable()) - change probe sequence and drm_device allocation (follow example in drm_drv.c) - use __maybe_unused instead of #ifdef for pm functions - remove "struct drm_fbdev_cma *fbdev;" from driver data - check panel connector type before connecting it - No change to binding or MAINTAINERS patches There was couple of attempts upstream an earlier version of this driver about a year ago [1]. Back then I needed to stop my efforts to implement support for next Keystone DSS version, so now the driver supports three different Keystone DSS version on three different SoCs. I am starting the patch series versioning from the beginning because it has been over a year since the previous patch set and the structure of the driver has evolved quite a bit. However, all the earlier comments should be addressed in this series. [1] https://patchwork.freedesktop.org/series/44947/ [2] https://lists.freedesktop.org/archives/dri-devel/2019-November/246542.html Jyri Sarha (5): dt-bindings: display: ti,k2g-dss: Add dt-schema yaml binding dt-bindings: display: ti,am65x-dss: Add dt-schema yaml binding dt-bindings: display: ti,j721e-dss: Add dt-schema yaml binding drm/tidss: New driver for TI Keystone platform Display SubSystem MAINTAINERS: add entry for tidss .../bindings/display/ti/ti,am65x-dss.yaml | 152 + .../bindings/display/ti/ti,j721e-dss.yaml | 208 ++ .../bindings/display/ti/ti,k2g-dss.yaml | 109 + MAINTAINERS | 11 + drivers/gpu/drm/Kconfig | 2 + drivers/gpu/drm/Makefile | 1 + drivers/gpu/drm/tidss/Kconfig | 14 + drivers/gpu/drm/tidss/Makefile | 12 + drivers/gpu/drm/tidss/tidss_crtc.c | 377 +++ drivers/gpu/drm/tidss/tidss_crtc.h | 46 + drivers/gpu/drm/tidss/tidss_dispc.c | 2774 +++++++++++++++++ drivers/gpu/drm/tidss/tidss_dispc.h | 132 + drivers/gpu/drm/tidss/tidss_dispc_regs.h | 243 ++ drivers/gpu/drm/tidss/tidss_drv.c | 285 ++ drivers/gpu/drm/tidss/tidss_drv.h | 39 + drivers/gpu/drm/tidss/tidss_encoder.c | 88 + drivers/gpu/drm/tidss/tidss_encoder.h | 17 + drivers/gpu/drm/tidss/tidss_irq.c | 146 + drivers/gpu/drm/tidss/tidss_irq.h | 77 + drivers/gpu/drm/tidss/tidss_kms.c | 249 ++ drivers/gpu/drm/tidss/tidss_kms.h | 15 + drivers/gpu/drm/tidss/tidss_plane.c | 217 ++ drivers/gpu/drm/tidss/tidss_plane.h | 25 + drivers/gpu/drm/tidss/tidss_scale_coefs.c | 202 ++ drivers/gpu/drm/tidss/tidss_scale_coefs.h | 22 + 25 files changed, 5463 insertions(+) create mode 100644 Documentation/devicetree/bindings/display/ti/ti,am65x-dss.yaml create mode 100644 Documentation/devicetree/bindings/display/ti/ti,j721e-dss.yaml create mode 100644 Documentation/devicetree/bindings/display/ti/ti,k2g-dss.yaml create mode 100644 drivers/gpu/drm/tidss/Kconfig create mode 100644 drivers/gpu/drm/tidss/Makefile create mode 100644 drivers/gpu/drm/tidss/tidss_crtc.c create mode 100644 drivers/gpu/drm/tidss/tidss_crtc.h create mode 100644 drivers/gpu/drm/tidss/tidss_dispc.c create mode 100644 drivers/gpu/drm/tidss/tidss_dispc.h create mode 100644 drivers/gpu/drm/tidss/tidss_dispc_regs.h create mode 100644 drivers/gpu/drm/tidss/tidss_drv.c create mode 100644 drivers/gpu/drm/tidss/tidss_drv.h create mode 100644 drivers/gpu/drm/tidss/tidss_encoder.c create mode 100644 drivers/gpu/drm/tidss/tidss_encoder.h create mode 100644 drivers/gpu/drm/tidss/tidss_irq.c create mode 100644 drivers/gpu/drm/tidss/tidss_irq.h create mode 100644 drivers/gpu/drm/tidss/tidss_kms.c create mode 100644 drivers/gpu/drm/tidss/tidss_kms.h create mode 100644 drivers/gpu/drm/tidss/tidss_plane.c create mode 100644 drivers/gpu/drm/tidss/tidss_plane.h create mode 100644 drivers/gpu/drm/tidss/tidss_scale_coefs.c create mode 100644 drivers/gpu/drm/tidss/tidss_scale_coefs.h