mbox series

[v12,0/3] drm/rockchip: RK356x VOP2 support last fixups

Message ID 20220509083738.1246866-1-s.hauer@pengutronix.de (mailing list archive)
Headers show
Series drm/rockchip: RK356x VOP2 support last fixups | expand

Message

Sascha Hauer May 9, 2022, 8:37 a.m. UTC
This is not the full series, if you want that, look for v11.

This series merely has a last-minute change: The VOP2 driver used
platform_get_resource_byname() to get its registers, but the reg-names
property hasn't been documented in the binding. This series adds the
missing documentation and along the way renames the generic "regs"
name to "vop" and "gamma_lut" to "gamma-lut".

Sascha


Andy Yan (1):
  drm: rockchip: Add VOP2 driver

Sascha Hauer (2):
  arm64: dts: rockchip: rk356x: Add VOP2 nodes
  dt-bindings: display: rockchip: Add binding for VOP2

 .../display/rockchip/rockchip-vop2.yaml       |  146 +
 arch/arm64/boot/dts/rockchip/rk3566.dtsi      |    4 +
 arch/arm64/boot/dts/rockchip/rk3568.dtsi      |    4 +
 arch/arm64/boot/dts/rockchip/rk356x.dtsi      |   51 +
 drivers/gpu/drm/rockchip/Kconfig              |    6 +
 drivers/gpu/drm/rockchip/Makefile             |    1 +
 drivers/gpu/drm/rockchip/rockchip_drm_drv.c   |    1 +
 drivers/gpu/drm/rockchip/rockchip_drm_drv.h   |    6 +-
 drivers/gpu/drm/rockchip/rockchip_drm_fb.c    |    2 +
 drivers/gpu/drm/rockchip/rockchip_drm_vop.h   |   15 +
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c  | 2706 +++++++++++++++++
 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h  |  477 +++
 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c  |  281 ++
 include/dt-bindings/soc/rockchip,vop2.h       |   14 +
 14 files changed, 3713 insertions(+), 1 deletion(-)
 create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
 create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
 create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
 create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
 create mode 100644 include/dt-bindings/soc/rockchip,vop2.h

Comments

Heiko Stuebner May 9, 2022, 8:44 a.m. UTC | #1
Hi Sascha,

Am Montag, 9. Mai 2022, 10:37:35 CEST schrieb Sascha Hauer:
> This is not the full series, if you want that, look for v11.
> 
> This series merely has a last-minute change: The VOP2 driver used
> platform_get_resource_byname() to get its registers, but the reg-names
> property hasn't been documented in the binding. This series adds the
> missing documentation and along the way renames the generic "regs"
> name to "vop" and "gamma_lut" to "gamma-lut".

we need a fixup-series though. Both the original binding + vop2 driver
already made it into drm-misc [0]. As this is a shared tree, this can't be
changed anymore ;-) .

(Just ignore that the vop2-header moved to the driver-patch, I'll
fix that up when applying to not cause conflicts)


Heiko

[0] https://cgit.freedesktop.org/drm/drm-misc/commit/?id=604be85547ce4d61b89292d2f9a78c721b778c16
    https://cgit.freedesktop.org/drm/drm-misc/commit/?id=74015e2650bad641a02100cdf0ac23a96c1a2553


> Andy Yan (1):
>   drm: rockchip: Add VOP2 driver
> 
> Sascha Hauer (2):
>   arm64: dts: rockchip: rk356x: Add VOP2 nodes
>   dt-bindings: display: rockchip: Add binding for VOP2
> 
>  .../display/rockchip/rockchip-vop2.yaml       |  146 +
>  arch/arm64/boot/dts/rockchip/rk3566.dtsi      |    4 +
>  arch/arm64/boot/dts/rockchip/rk3568.dtsi      |    4 +
>  arch/arm64/boot/dts/rockchip/rk356x.dtsi      |   51 +
>  drivers/gpu/drm/rockchip/Kconfig              |    6 +
>  drivers/gpu/drm/rockchip/Makefile             |    1 +
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.c   |    1 +
>  drivers/gpu/drm/rockchip/rockchip_drm_drv.h   |    6 +-
>  drivers/gpu/drm/rockchip/rockchip_drm_fb.c    |    2 +
>  drivers/gpu/drm/rockchip/rockchip_drm_vop.h   |   15 +
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c  | 2706 +++++++++++++++++
>  drivers/gpu/drm/rockchip/rockchip_drm_vop2.h  |  477 +++
>  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c  |  281 ++
>  include/dt-bindings/soc/rockchip,vop2.h       |   14 +
>  14 files changed, 3713 insertions(+), 1 deletion(-)
>  create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
>  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
>  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
>  create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
>  create mode 100644 include/dt-bindings/soc/rockchip,vop2.h
> 
>
Sascha Hauer May 9, 2022, 9:55 a.m. UTC | #2
On Mon, May 09, 2022 at 10:44:17AM +0200, Heiko Stübner wrote:
> Hi Sascha,
> 
> Am Montag, 9. Mai 2022, 10:37:35 CEST schrieb Sascha Hauer:
> > This is not the full series, if you want that, look for v11.
> > 
> > This series merely has a last-minute change: The VOP2 driver used
> > platform_get_resource_byname() to get its registers, but the reg-names
> > property hasn't been documented in the binding. This series adds the
> > missing documentation and along the way renames the generic "regs"
> > name to "vop" and "gamma_lut" to "gamma-lut".
> 
> we need a fixup-series though. Both the original binding + vop2 driver
> already made it into drm-misc [0]. As this is a shared tree, this can't be
> changed anymore ;-) .
> 
> (Just ignore that the vop2-header moved to the driver-patch, I'll
> fix that up when applying to not cause conflicts)

Ok, I just sent the series as a fixup series. After I've hit the send
button I am not quite sure if that's what you want, you probably want
the patches with proper patch description rather than just --fixup
patches :(

Sascha

> 
> 
> Heiko
> 
> [0] https://cgit.freedesktop.org/drm/drm-misc/commit/?id=604be85547ce4d61b89292d2f9a78c721b778c16
>     https://cgit.freedesktop.org/drm/drm-misc/commit/?id=74015e2650bad641a02100cdf0ac23a96c1a2553
> 
> 
> > Andy Yan (1):
> >   drm: rockchip: Add VOP2 driver
> > 
> > Sascha Hauer (2):
> >   arm64: dts: rockchip: rk356x: Add VOP2 nodes
> >   dt-bindings: display: rockchip: Add binding for VOP2
> > 
> >  .../display/rockchip/rockchip-vop2.yaml       |  146 +
> >  arch/arm64/boot/dts/rockchip/rk3566.dtsi      |    4 +
> >  arch/arm64/boot/dts/rockchip/rk3568.dtsi      |    4 +
> >  arch/arm64/boot/dts/rockchip/rk356x.dtsi      |   51 +
> >  drivers/gpu/drm/rockchip/Kconfig              |    6 +
> >  drivers/gpu/drm/rockchip/Makefile             |    1 +
> >  drivers/gpu/drm/rockchip/rockchip_drm_drv.c   |    1 +
> >  drivers/gpu/drm/rockchip/rockchip_drm_drv.h   |    6 +-
> >  drivers/gpu/drm/rockchip/rockchip_drm_fb.c    |    2 +
> >  drivers/gpu/drm/rockchip/rockchip_drm_vop.h   |   15 +
> >  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c  | 2706 +++++++++++++++++
> >  drivers/gpu/drm/rockchip/rockchip_drm_vop2.h  |  477 +++
> >  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c  |  281 ++
> >  include/dt-bindings/soc/rockchip,vop2.h       |   14 +
> >  14 files changed, 3713 insertions(+), 1 deletion(-)
> >  create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
> >  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> >  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
> >  create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> >  create mode 100644 include/dt-bindings/soc/rockchip,vop2.h
> > 
> > 
> 
> 
> 
> 
>
Heiko Stuebner May 9, 2022, 10:05 a.m. UTC | #3
Am Montag, 9. Mai 2022, 11:55:59 CEST schrieb Sascha Hauer:
> On Mon, May 09, 2022 at 10:44:17AM +0200, Heiko Stübner wrote:
> > Hi Sascha,
> > 
> > Am Montag, 9. Mai 2022, 10:37:35 CEST schrieb Sascha Hauer:
> > > This is not the full series, if you want that, look for v11.
> > > 
> > > This series merely has a last-minute change: The VOP2 driver used
> > > platform_get_resource_byname() to get its registers, but the reg-names
> > > property hasn't been documented in the binding. This series adds the
> > > missing documentation and along the way renames the generic "regs"
> > > name to "vop" and "gamma_lut" to "gamma-lut".
> > 
> > we need a fixup-series though. Both the original binding + vop2 driver
> > already made it into drm-misc [0]. As this is a shared tree, this can't be
> > changed anymore ;-) .
> > 
> > (Just ignore that the vop2-header moved to the driver-patch, I'll
> > fix that up when applying to not cause conflicts)
> 
> Ok, I just sent the series as a fixup series. After I've hit the send
> button I am not quite sure if that's what you want, you probably want
> the patches with proper patch description rather than just --fixup
> patches :(

from the sound of it that was probably the wrong approach :-)
I.e. drm-misc is a shared tree (with a plethora of people),
so there is always only a way forward, so fixing things is always
adding new things on top - like Dan's error handling as well as
the spelling and coci patches I applied yesterday.

So yes, we need proper patches on top of the drm-misc-next
branch for the VOP2 + binding changes.


Heiko


> > 
> > 
> > Heiko
> > 
> > [0] https://cgit.freedesktop.org/drm/drm-misc/commit/?id=604be85547ce4d61b89292d2f9a78c721b778c16
> >     https://cgit.freedesktop.org/drm/drm-misc/commit/?id=74015e2650bad641a02100cdf0ac23a96c1a2553
> > 
> > 
> > > Andy Yan (1):
> > >   drm: rockchip: Add VOP2 driver
> > > 
> > > Sascha Hauer (2):
> > >   arm64: dts: rockchip: rk356x: Add VOP2 nodes
> > >   dt-bindings: display: rockchip: Add binding for VOP2
> > > 
> > >  .../display/rockchip/rockchip-vop2.yaml       |  146 +
> > >  arch/arm64/boot/dts/rockchip/rk3566.dtsi      |    4 +
> > >  arch/arm64/boot/dts/rockchip/rk3568.dtsi      |    4 +
> > >  arch/arm64/boot/dts/rockchip/rk356x.dtsi      |   51 +
> > >  drivers/gpu/drm/rockchip/Kconfig              |    6 +
> > >  drivers/gpu/drm/rockchip/Makefile             |    1 +
> > >  drivers/gpu/drm/rockchip/rockchip_drm_drv.c   |    1 +
> > >  drivers/gpu/drm/rockchip/rockchip_drm_drv.h   |    6 +-
> > >  drivers/gpu/drm/rockchip/rockchip_drm_fb.c    |    2 +
> > >  drivers/gpu/drm/rockchip/rockchip_drm_vop.h   |   15 +
> > >  drivers/gpu/drm/rockchip/rockchip_drm_vop2.c  | 2706 +++++++++++++++++
> > >  drivers/gpu/drm/rockchip/rockchip_drm_vop2.h  |  477 +++
> > >  drivers/gpu/drm/rockchip/rockchip_vop2_reg.c  |  281 ++
> > >  include/dt-bindings/soc/rockchip,vop2.h       |   14 +
> > >  14 files changed, 3713 insertions(+), 1 deletion(-)
> > >  create mode 100644 Documentation/devicetree/bindings/display/rockchip/rockchip-vop2.yaml
> > >  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
> > >  create mode 100644 drivers/gpu/drm/rockchip/rockchip_drm_vop2.h
> > >  create mode 100644 drivers/gpu/drm/rockchip/rockchip_vop2_reg.c
> > >  create mode 100644 include/dt-bindings/soc/rockchip,vop2.h
> > > 
> > > 
> > 
> > 
> > 
> > 
> > 
> 
>