subject:"\[linux\-sunxi\] Re\: \[PATCH 05\/15\] drm\/sun4i\: Add TCON TOP driver"

Re: [linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

2018-05-24 Thread Jernej Škrabec

Hi,

Dne četrtek, 24. maj 2018 ob 10:43:51 CEST je Maxime Ripard napisal(a):
> Hi,
> 
> On Mon, May 21, 2018 at 05:15:15PM +0200, Jernej Škrabec wrote:
> > > > +   /*
> > > > +* Default register values might have some reserved bits set, 
which
> > > > +* prevents TCON TOP from working properly. Set them to 0 here.
> > > > +*/
> > > > +   writel(0, tcon_top->regs + TCON_TOP_PORT_SEL_REG);
> > > > +   writel(0, tcon_top->regs + TCON_TOP_GATE_SRC_REG);
> > > > +
> > > > +   for (i = 0; i < CLK_NUM; i++) {
> > > > +   const char *parent_name = "bus-tcon-top";
> > > 
> > > I guess retrieving the parent's clock name at runtime would be more
> > > flexible.
> > 
> > It is, but will it ever be anything else?
> 
> Probably not, but when the complexity is exactly the same (using
> __clk_get_name), we'd better use the more appropriate solution. If we
> ever need to change that clock name, or to use the driver with an SoC
> that wouldn't have the same clock name for whatever reason, it will
> just work.
> 
> > > > +   struct clk_init_data init;
> > > > +   struct clk_gate *gate;
> > > > +
> > > > +   gate = devm_kzalloc(dev, sizeof(*gate), GFP_KERNEL);
> > > > +   if (!gate) {
> > > > +   ret = -ENOMEM;
> > > > +   goto err_disable_clock;
> > > > +   }
> > > > +
> > > > +   init.name = gates[i].name;
> > > > +   init.ops = _gate_ops;
> > > > +   init.flags = CLK_IS_BASIC;
> > > > +   init.parent_names = _name;
> > > > +   init.num_parents = 1;
> > > > +
> > > > +   gate->reg = tcon_top->regs + TCON_TOP_GATE_SRC_REG;
> > > > +   gate->bit_idx = gates[i].bit;
> > > > +   gate->lock = _top->reg_lock;
> > > > +   gate->hw.init = 
> > > > +
> > > > +   ret = devm_clk_hw_register(dev, >hw);
> > > > +   if (ret)
> > > > +   goto err_disable_clock;
> > > 
> > > Isn't it what clk_hw_register_gate is doing?
> > 
> > Almost, but not exactly. My goal was to use devm_* functions, so there is
> > no need to do any special cleanup.
> 
> Is it the only difference? If so, you can just create a
> devm_clk_hw_register gate.

I checked around and it seems that in clk core there are only non devm_* 
helpers like clk_hw_register_gate() for some reason. I guess I'll just use 
that and manually unregister all the clocks in cleanup function.

Best regards,
Jernej


-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

2018-05-24 Thread Maxime Ripard

Hi,

On Mon, May 21, 2018 at 05:15:15PM +0200, Jernej Škrabec wrote:
> > > + /*
> > > +  * Default register values might have some reserved bits set, which
> > > +  * prevents TCON TOP from working properly. Set them to 0 here.
> > > +  */
> > > + writel(0, tcon_top->regs + TCON_TOP_PORT_SEL_REG);
> > > + writel(0, tcon_top->regs + TCON_TOP_GATE_SRC_REG);
> > > +
> > > + for (i = 0; i < CLK_NUM; i++) {
> > > + const char *parent_name = "bus-tcon-top";
> > 
> > I guess retrieving the parent's clock name at runtime would be more
> > flexible.
> 
> It is, but will it ever be anything else?

Probably not, but when the complexity is exactly the same (using
__clk_get_name), we'd better use the more appropriate solution. If we
ever need to change that clock name, or to use the driver with an SoC
that wouldn't have the same clock name for whatever reason, it will
just work.

> > > + struct clk_init_data init;
> > > + struct clk_gate *gate;
> > > +
> > > + gate = devm_kzalloc(dev, sizeof(*gate), GFP_KERNEL);
> > > + if (!gate) {
> > > + ret = -ENOMEM;
> > > + goto err_disable_clock;
> > > + }
> > > +
> > > + init.name = gates[i].name;
> > > + init.ops = _gate_ops;
> > > + init.flags = CLK_IS_BASIC;
> > > + init.parent_names = _name;
> > > + init.num_parents = 1;
> > > +
> > > + gate->reg = tcon_top->regs + TCON_TOP_GATE_SRC_REG;
> > > + gate->bit_idx = gates[i].bit;
> > > + gate->lock = _top->reg_lock;
> > > + gate->hw.init = 
> > > +
> > > + ret = devm_clk_hw_register(dev, >hw);
> > > + if (ret)
> > > + goto err_disable_clock;
> > 
> > Isn't it what clk_hw_register_gate is doing?
> 
> Almost, but not exactly. My goal was to use devm_* functions, so there is no 
> need to do any special cleanup.

Is it the only difference? If so, you can just create a
devm_clk_hw_register gate.

Maxime

-- 
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


signature.asc
Description: PGP signature

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

2018-05-23 Thread Rob Herring

On Sat, May 19, 2018 at 08:31:17PM +0200, Jernej Skrabec wrote:
> As already described in DT binding, TCON TOP is responsible for
> configuring display pipeline. In this initial driver focus is on HDMI
> pipeline, so TVE and LCD configuration is not implemented.
> 
> Implemented features:
> - HDMI source selection
> - clock driver (TCON and DSI gating)
> - connecting mixers and TCONS
> 
> Something similar also existed in previous SoCs, except that it was part
> of first TCON.
> 
> Signed-off-by: Jernej Skrabec 
> ---
>  drivers/gpu/drm/sun4i/Makefile |   3 +-
>  drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 256 +
>  drivers/gpu/drm/sun4i/sun8i_tcon_top.h |  20 ++
>  include/dt-bindings/clock/sun8i-tcon-top.h |  11 +

This belongs with the binding doc patch.

>  4 files changed, 289 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.c
>  create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.h
>  create mode 100644 include/dt-bindings/clock/sun8i-tcon-top.h

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

2018-05-21 Thread kbuild test robot

Hi Jernej,

Thank you for the patch! Yet something to improve:

[auto build test ERROR on drm/drm-next]
[also build test ERROR on v4.17-rc6 next-20180517]
[if your patch is applied to the wrong git tree, please drop us a note to help 
improve the system]

url:
https://github.com/0day-ci/linux/commits/Jernej-Skrabec/Add-support-for-R40-HDMI-pipeline/20180521-131839
base:   git://people.freedesktop.org/~airlied/linux.git drm-next
config: arm-multi_v7_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget 
https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O 
~/bin/make.cross
chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=arm 

All errors (new ones prefixed by >>):

   drivers/gpu/drm/sun4i/sun8i_tcon_top.o: In function `init_module':
>> sun8i_tcon_top.c:(.init.text+0x0): multiple definition of `init_module'
   drivers/gpu/drm/sun4i/sun8i_mixer.o:sun8i_mixer.c:(.init.text+0x0): first 
defined here
   drivers/gpu/drm/sun4i/sun8i_tcon_top.o: In function `cleanup_module':
>> sun8i_tcon_top.c:(.exit.text+0x0): multiple definition of `cleanup_module'
   drivers/gpu/drm/sun4i/sun8i_mixer.o:sun8i_mixer.c:(.exit.text+0x0): first 
defined here

---
0-DAY kernel test infrastructureOpen Source Technology Center
https://lists.01.org/pipermail/kbuild-all   Intel Corporation

-- 
You received this message because you are subscribed to the Google Groups 
"linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to linux-sunxi+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.


.config.gz
Description: application/gzip

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

2018-05-21 Thread Jernej Škrabec

Hi,

Dne ponedeljek, 21. maj 2018 ob 10:05:17 CEST je Maxime Ripard napisal(a):
> On Sat, May 19, 2018 at 08:31:17PM +0200, Jernej Skrabec wrote:
> > As already described in DT binding, TCON TOP is responsible for
> > configuring display pipeline. In this initial driver focus is on HDMI
> > pipeline, so TVE and LCD configuration is not implemented.
> > 
> > Implemented features:
> > - HDMI source selection
> > - clock driver (TCON and DSI gating)
> > - connecting mixers and TCONS
> > 
> > Something similar also existed in previous SoCs, except that it was part
> > of first TCON.
> > 
> > Signed-off-by: Jernej Skrabec 
> > ---
> > 
> >  drivers/gpu/drm/sun4i/Makefile |   3 +-
> >  drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 256 +
> >  drivers/gpu/drm/sun4i/sun8i_tcon_top.h |  20 ++
> >  include/dt-bindings/clock/sun8i-tcon-top.h |  11 +
> >  4 files changed, 289 insertions(+), 1 deletion(-)
> >  create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.c
> >  create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.h
> >  create mode 100644 include/dt-bindings/clock/sun8i-tcon-top.h
> > 
> > diff --git a/drivers/gpu/drm/sun4i/Makefile
> > b/drivers/gpu/drm/sun4i/Makefile index 2589f4acd5ae..09fbfd6304ba 100644
> > --- a/drivers/gpu/drm/sun4i/Makefile
> > +++ b/drivers/gpu/drm/sun4i/Makefile
> > @@ -16,7 +16,8 @@ sun8i-drm-hdmi-y  += sun8i_hdmi_phy_clk.o
> > 
> >  sun8i-mixer-y  += sun8i_mixer.o sun8i_ui_layer.o \
> >  
> >sun8i_vi_layer.o sun8i_ui_scaler.o \
> > 
> > -  sun8i_vi_scaler.o sun8i_csc.o
> > +  sun8i_vi_scaler.o sun8i_csc.o \
> > +  sun8i_tcon_top.o
> > 
> >  sun4i-tcon-y   += sun4i_crtc.o
> >  sun4i-tcon-y   += sun4i_dotclock.o
> > 
> > diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
> > b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c new file mode 100644
> > index ..075a356a6dfa
> > --- /dev/null
> > +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
> > @@ -0,0 +1,256 @@
> > +// SPDX-License-Identifier: GPL-2.0+
> > +/* Copyright (c) 2018 Jernej Skrabec  */
> > +
> > +#include 
> > +
> > +#include 
> > +
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +#include 
> > +
> > +#include "sun8i_tcon_top.h"
> > +
> > +#define TCON_TOP_PORT_SEL_REG  0x1C
> > +#define TCON_TOP_PORT_DE0_MSK  GENMASK(1, 0)
> > +#define TCON_TOP_PORT_DE1_MSK  GENMASK(5, 4)
> > +#define TCON_TOP_PORT_TCON_LCD00
> > +#define TCON_TOP_PORT_TCON_LCD11
> > +#define TCON_TOP_PORT_TCON_TV0 2
> > +#define TCON_TOP_PORT_TCON_TV1 3
> > +
> > +#define TCON_TOP_GATE_SRC_REG  0x20
> > +#define TCON_TOP_HDMI_SRC_MSK  GENMASK(29, 28)
> > +#define TCON_TOP_HDMI_SRC_NONE 0
> > +#define TCON_TOP_HDMI_SRC_TCON_TV0 1
> > +#define TCON_TOP_HDMI_SRC_TCON_TV1 2
> > +#define TCON_TOP_TCON_TV1_GATE 24
> > +#define TCON_TOP_TCON_TV0_GATE 20
> > +#define TCON_TOP_TCON_DSI_GATE 16
> > +
> > +#define CLK_NUM3
> > +
> > +struct sun8i_tcon_top {
> > +   struct clk  *bus;
> > +   void __iomem*regs;
> > +   struct reset_control*rst;
> > +
> > +   /*
> > +* spinlock is used for locking access to registers from different
> > +* places - tcon driver and clk subsystem.
> > +*/
> > +   spinlock_t  reg_lock;
> > +};
> > +
> > +struct sun8i_tcon_top_gate {
> > +   const char  *name;
> > +   u8  bit;
> > +   int index;
> > +};
> > +
> > +static const struct sun8i_tcon_top_gate gates[] = {
> > +   {"bus-tcon-top-dsi", TCON_TOP_TCON_DSI_GATE, CLK_BUS_TCON_TOP_DSI},
> > +   {"bus-tcon-top-tv0", TCON_TOP_TCON_TV0_GATE, CLK_BUS_TCON_TOP_TV0},
> > +   {"bus-tcon-top-tv1", TCON_TOP_TCON_TV1_GATE, CLK_BUS_TCON_TOP_TV1},
> > +};
> > +
> > +void sun8i_tcon_top_set_hdmi_src(struct sun8i_tcon_top *tcon_top, int
> > tcon) +{
> > +   unsigned long flags;
> > +   u32 val;
> > +
> > +   if (tcon > 1) {
> > +   DRM_ERROR("TCON index is too high!\n");
> > +   return;
> > +   }
> > +
> > +   spin_lock_irqsave(_top->reg_lock, flags);
> > +
> > +   val = readl(tcon_top->regs + TCON_TOP_GATE_SRC_REG);
> > +   val &= ~TCON_TOP_HDMI_SRC_MSK;
> > +   val |= FIELD_PREP(TCON_TOP_HDMI_SRC_MSK,
> > + TCON_TOP_HDMI_SRC_TCON_TV0 + tcon);
> > +   writel(val, tcon_top->regs + TCON_TOP_GATE_SRC_REG);
> > +
> > +   spin_unlock_irqrestore(_top->reg_lock, flags);
> > +}
> > +
> > +void sun8i_tcon_top_de_config(struct sun8i_tcon_top *tcon_top,
> > + int

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

2018-05-21 Thread Maxime Ripard

On Sat, May 19, 2018 at 08:31:17PM +0200, Jernej Skrabec wrote:
> As already described in DT binding, TCON TOP is responsible for
> configuring display pipeline. In this initial driver focus is on HDMI
> pipeline, so TVE and LCD configuration is not implemented.
> 
> Implemented features:
> - HDMI source selection
> - clock driver (TCON and DSI gating)
> - connecting mixers and TCONS
> 
> Something similar also existed in previous SoCs, except that it was part
> of first TCON.
> 
> Signed-off-by: Jernej Skrabec 
> ---
>  drivers/gpu/drm/sun4i/Makefile |   3 +-
>  drivers/gpu/drm/sun4i/sun8i_tcon_top.c | 256 +
>  drivers/gpu/drm/sun4i/sun8i_tcon_top.h |  20 ++
>  include/dt-bindings/clock/sun8i-tcon-top.h |  11 +
>  4 files changed, 289 insertions(+), 1 deletion(-)
>  create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.c
>  create mode 100644 drivers/gpu/drm/sun4i/sun8i_tcon_top.h
>  create mode 100644 include/dt-bindings/clock/sun8i-tcon-top.h
> 
> diff --git a/drivers/gpu/drm/sun4i/Makefile b/drivers/gpu/drm/sun4i/Makefile
> index 2589f4acd5ae..09fbfd6304ba 100644
> --- a/drivers/gpu/drm/sun4i/Makefile
> +++ b/drivers/gpu/drm/sun4i/Makefile
> @@ -16,7 +16,8 @@ sun8i-drm-hdmi-y+= sun8i_hdmi_phy_clk.o
>  
>  sun8i-mixer-y+= sun8i_mixer.o sun8i_ui_layer.o \
>  sun8i_vi_layer.o sun8i_ui_scaler.o \
> -sun8i_vi_scaler.o sun8i_csc.o
> +sun8i_vi_scaler.o sun8i_csc.o \
> +sun8i_tcon_top.o
>  
>  sun4i-tcon-y += sun4i_crtc.o
>  sun4i-tcon-y += sun4i_dotclock.o
> diff --git a/drivers/gpu/drm/sun4i/sun8i_tcon_top.c 
> b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
> new file mode 100644
> index ..075a356a6dfa
> --- /dev/null
> +++ b/drivers/gpu/drm/sun4i/sun8i_tcon_top.c
> @@ -0,0 +1,256 @@
> +// SPDX-License-Identifier: GPL-2.0+
> +/* Copyright (c) 2018 Jernej Skrabec  */
> +
> +#include 
> +
> +#include 
> +
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +#include 
> +
> +#include "sun8i_tcon_top.h"
> +
> +#define TCON_TOP_PORT_SEL_REG0x1C
> +#define TCON_TOP_PORT_DE0_MSKGENMASK(1, 0)
> +#define TCON_TOP_PORT_DE1_MSKGENMASK(5, 4)
> +#define TCON_TOP_PORT_TCON_LCD0  0
> +#define TCON_TOP_PORT_TCON_LCD1  1
> +#define TCON_TOP_PORT_TCON_TV0   2
> +#define TCON_TOP_PORT_TCON_TV1   3
> +
> +#define TCON_TOP_GATE_SRC_REG0x20
> +#define TCON_TOP_HDMI_SRC_MSKGENMASK(29, 28)
> +#define TCON_TOP_HDMI_SRC_NONE   0
> +#define TCON_TOP_HDMI_SRC_TCON_TV0   1
> +#define TCON_TOP_HDMI_SRC_TCON_TV1   2
> +#define TCON_TOP_TCON_TV1_GATE   24
> +#define TCON_TOP_TCON_TV0_GATE   20
> +#define TCON_TOP_TCON_DSI_GATE   16
> +
> +#define CLK_NUM  3
> +
> +struct sun8i_tcon_top {
> + struct clk  *bus;
> + void __iomem*regs;
> + struct reset_control*rst;
> +
> + /*
> +  * spinlock is used for locking access to registers from different
> +  * places - tcon driver and clk subsystem.
> +  */
> + spinlock_t  reg_lock;
> +};
> +
> +struct sun8i_tcon_top_gate {
> + const char  *name;
> + u8  bit;
> + int index;
> +};
> +
> +static const struct sun8i_tcon_top_gate gates[] = {
> + {"bus-tcon-top-dsi", TCON_TOP_TCON_DSI_GATE, CLK_BUS_TCON_TOP_DSI},
> + {"bus-tcon-top-tv0", TCON_TOP_TCON_TV0_GATE, CLK_BUS_TCON_TOP_TV0},
> + {"bus-tcon-top-tv1", TCON_TOP_TCON_TV1_GATE, CLK_BUS_TCON_TOP_TV1},
> +};
> +
> +void sun8i_tcon_top_set_hdmi_src(struct sun8i_tcon_top *tcon_top, int tcon)
> +{
> + unsigned long flags;
> + u32 val;
> +
> + if (tcon > 1) {
> + DRM_ERROR("TCON index is too high!\n");
> + return;
> + }
> +
> + spin_lock_irqsave(_top->reg_lock, flags);
> +
> + val = readl(tcon_top->regs + TCON_TOP_GATE_SRC_REG);
> + val &= ~TCON_TOP_HDMI_SRC_MSK;
> + val |= FIELD_PREP(TCON_TOP_HDMI_SRC_MSK,
> +   TCON_TOP_HDMI_SRC_TCON_TV0 + tcon);
> + writel(val, tcon_top->regs + TCON_TOP_GATE_SRC_REG);
> +
> + spin_unlock_irqrestore(_top->reg_lock, flags);
> +}
> +
> +void sun8i_tcon_top_de_config(struct sun8i_tcon_top *tcon_top,
> +   int mixer, enum tcon_type tcon_type, int tcon)
> +{
> + unsigned long flags;
> + u32 val, reg;
> +
> + if (mixer > 1) {
> + DRM_ERROR("Mixer index is too high!\n");
> + return;
> + }
> +
> + if (tcon > 1) {
> +

Re: [linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

[linux-sunxi] Re: [PATCH 05/15] drm/sun4i: Add TCON TOP driver

6 matches

Site Navigation

Mail list logo

Footer information