mbox series

[GIT,PULL] drm: renesas: shmobile: Atomic conversion + DT support (was: Re: [PATCH v4 00/41] drm: renesas: shmobile: Atomic conversion + DT support)

Message ID CAMuHMdWfBTKdXvZutg4LvWqBjuz-X=ZjzX0LKPqD=JxYuLoPRw@mail.gmail.com
State New
Headers show
Series drm: renesas: shmobile: Atomic conversion + DT support | expand

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git tags/shmob-drm-atomic-dt-tag1

Message

Geert Uytterhoeven Sept. 19, 2023, 2:28 p.m. UTC 
Hi David, Daniel,

The following changes since commit 0663e1da5ba8e6459e3555ac12c62741668c0d30:

  drm/dp_mst: Tune down error message during payload addition
(2023-09-18 16:38:21 +0300)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
tags/shmob-drm-atomic-dt-tag1

for you to fetch changes up to bfea0fa9052aa8d235b24957eb84d9ff20cb87b7:

  drm: renesas: shmobile: Add DT support (2023-09-19 15:58:04 +0200)

----------------------------------------------------------------
drm: renesas: shmobile: Atomic conversion + DT support

Currently, there are two drivers for the LCD controller on Renesas
SuperH-based and ARM-based SH-Mobile and R-Mobile SoCs:
  1. sh_mobile_lcdcfb, using the fbdev framework,
  2. shmob_drm, using the DRM framework.
However, only the former driver is used, as all platform support
integrates the former.  None of these drivers support DT-based systems.

Convert the SH-Mobile DRM driver to atomic modesetting, and add DT
support, complemented by the customary set of fixes and improvements.

Link: https://lore.kernel.org/r/cover.1694767208.git.geert+renesas@glider.be/

This PR is based on today's drm-misc/for-linux-next, to avoid a
conflict with commit 775b0669e19f2e4a ("drm/shmobile: Convert to
platform remove callback returning void") in drm-misc/for-linux-next
.
Thanks for pulling!
----------------------------------------------------------------
Geert Uytterhoeven (36):
      MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers
      dt-bindings: display: Add Renesas SH-Mobile LCDC bindings
      media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9_BE format
      drm: renesas: shmobile: Fix overlay plane disable
      drm: renesas: shmobile: Fix ARGB32 overlay format typo
      drm: renesas: shmobile: Correct encoder/connector types
      drm: renesas: shmobile: Add support for Runtime PM
      drm: renesas: shmobile: Restore indentation of shmob_drm_setup_clocks()
      drm: renesas: shmobile: Use %p4cc to print fourcc code
      drm: renesas: shmobile: Add missing YCbCr formats
      drm: renesas: shmobile: Improve shmob_drm_format_info table
      drm: renesas: shmobile: Improve error handling
      drm: renesas: shmobile: Convert to use devm_request_irq()
      drm: renesas: shmobile: Remove custom plane destroy callback
      drm: renesas: shmobile: Use drmm_universal_plane_alloc()
      drm: renesas: shmobile: Embed drm_device in shmob_drm_device
      drm: renesas: shmobile: Convert container helpers to static
inline functions
      drm: renesas: shmobile: Replace .dev_private with container_of()
      drm: renesas: shmobile: Use media bus formats in platform data
      drm: renesas: shmobile: Move interface handling to connector setup
      drm: renesas: shmobile: Unify plane allocation
      drm: renesas: shmobile: Rename shmob_drm_crtc.crtc
      drm: renesas: shmobile: Rename shmob_drm_connector.connector
      drm: renesas: shmobile: Rename shmob_drm_plane.plane
      drm: renesas: shmobile: Use drm_crtc_handle_vblank()
      drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip()
      drm: renesas: shmobile: Wait for page flip when turning CRTC off
      drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC
      drm: renesas: shmobile: Shutdown the display on remove
      drm: renesas: shmobile: Cleanup encoder
      drm: renesas: shmobile: Atomic conversion part 1
      drm: renesas: shmobile: Atomic conversion part 2
      drm: renesas: shmobile: Use suspend/resume helpers
      drm: renesas: shmobile: Remove internal CRTC state tracking
      drm: renesas: shmobile: Atomic conversion part 3
      drm: renesas: shmobile: Add DT support

Laurent Pinchart (5):
      drm: renesas: shmobile: Remove backlight support
      drm: renesas: shmobile: Don't set display info width and height twice
      drm: renesas: shmobile: Rename input clocks
      drm: renesas: shmobile: Remove support for SYS panels
      drm: renesas: shmobile: Use struct videomode in platform data

 .../bindings/display/renesas,shmobile-lcdc.yaml    | 130 +++++
 .../userspace-api/media/v4l/subdev-formats.rst     |  72 +++
 MAINTAINERS                                        |  13 +-
 drivers/gpu/drm/renesas/shmobile/Kconfig           |   3 +-
 drivers/gpu/drm/renesas/shmobile/Makefile          |   3 +-
 .../gpu/drm/renesas/shmobile/shmob_drm_backlight.c |  82 ---
 .../gpu/drm/renesas/shmobile/shmob_drm_backlight.h |  19 -
 drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c  | 650 +++++++++------------
 drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h  |  27 +-
 drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c   | 179 +++---
 drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h   |  18 +-
 drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c   |  77 ++-
 drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h   |   9 +-
 drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 326 ++++++-----
 drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h |   5 +-
 include/linux/platform_data/shmob_drm.h            |  57 +-
 include/uapi/linux/media-bus-format.h              |   3 +-
 17 files changed, 860 insertions(+), 813 deletions(-)
 create mode 100644
Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
 delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.c
 delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.h

Gr{oetje,eeting}s,

                        Geert

Comments

Laurent Pinchart Sept. 19, 2023, 3:24 p.m. UTC | #1 
On Tue, Sep 19, 2023 at 04:28:40PM +0200, Geert Uytterhoeven wrote:
> Hi David, Daniel,
> 
> The following changes since commit 0663e1da5ba8e6459e3555ac12c62741668c0d30:
> 
>   drm/dp_mst: Tune down error message during payload addition
> (2023-09-18 16:38:21 +0300)
> 
> are available in the Git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> tags/shmob-drm-atomic-dt-tag1
> 
> for you to fetch changes up to bfea0fa9052aa8d235b24957eb84d9ff20cb87b7:
> 
>   drm: renesas: shmobile: Add DT support (2023-09-19 15:58:04 +0200)
> 
> ----------------------------------------------------------------
> drm: renesas: shmobile: Atomic conversion + DT support
> 
> Currently, there are two drivers for the LCD controller on Renesas
> SuperH-based and ARM-based SH-Mobile and R-Mobile SoCs:
>   1. sh_mobile_lcdcfb, using the fbdev framework,
>   2. shmob_drm, using the DRM framework.
> However, only the former driver is used, as all platform support
> integrates the former.  None of these drivers support DT-based systems.
> 
> Convert the SH-Mobile DRM driver to atomic modesetting, and add DT
> support, complemented by the customary set of fixes and improvements.
> 
> Link: https://lore.kernel.org/r/cover.1694767208.git.geert+renesas@glider.be/
> 
> This PR is based on today's drm-misc/for-linux-next, to avoid a
> conflict with commit 775b0669e19f2e4a ("drm/shmobile: Convert to
> platform remove callback returning void") in drm-misc/for-linux-next
> .
> Thanks for pulling!
> ----------------------------------------------------------------
> Geert Uytterhoeven (36):
>       MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers

I'm technically listed as the maintainer for this driver until Geert
takes over, so for this pull request,

Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

And after that, shmobile won't need my ack to merge further changes :-)

This is very nice work Geert. I'm looking forward to dropping the
sh_mobile_lcdcfb driver.

>       dt-bindings: display: Add Renesas SH-Mobile LCDC bindings
>       media: uapi: Add MEDIA_BUS_FMT_RGB666_2X9_BE format
>       drm: renesas: shmobile: Fix overlay plane disable
>       drm: renesas: shmobile: Fix ARGB32 overlay format typo
>       drm: renesas: shmobile: Correct encoder/connector types
>       drm: renesas: shmobile: Add support for Runtime PM
>       drm: renesas: shmobile: Restore indentation of shmob_drm_setup_clocks()
>       drm: renesas: shmobile: Use %p4cc to print fourcc code
>       drm: renesas: shmobile: Add missing YCbCr formats
>       drm: renesas: shmobile: Improve shmob_drm_format_info table
>       drm: renesas: shmobile: Improve error handling
>       drm: renesas: shmobile: Convert to use devm_request_irq()
>       drm: renesas: shmobile: Remove custom plane destroy callback
>       drm: renesas: shmobile: Use drmm_universal_plane_alloc()
>       drm: renesas: shmobile: Embed drm_device in shmob_drm_device
>       drm: renesas: shmobile: Convert container helpers to static inline functions
>       drm: renesas: shmobile: Replace .dev_private with container_of()
>       drm: renesas: shmobile: Use media bus formats in platform data
>       drm: renesas: shmobile: Move interface handling to connector setup
>       drm: renesas: shmobile: Unify plane allocation
>       drm: renesas: shmobile: Rename shmob_drm_crtc.crtc
>       drm: renesas: shmobile: Rename shmob_drm_connector.connector
>       drm: renesas: shmobile: Rename shmob_drm_plane.plane
>       drm: renesas: shmobile: Use drm_crtc_handle_vblank()
>       drm: renesas: shmobile: Move shmob_drm_crtc_finish_page_flip()
>       drm: renesas: shmobile: Wait for page flip when turning CRTC off
>       drm: renesas: shmobile: Turn vblank on/off when enabling/disabling CRTC
>       drm: renesas: shmobile: Shutdown the display on remove
>       drm: renesas: shmobile: Cleanup encoder
>       drm: renesas: shmobile: Atomic conversion part 1
>       drm: renesas: shmobile: Atomic conversion part 2
>       drm: renesas: shmobile: Use suspend/resume helpers
>       drm: renesas: shmobile: Remove internal CRTC state tracking
>       drm: renesas: shmobile: Atomic conversion part 3
>       drm: renesas: shmobile: Add DT support
> 
> Laurent Pinchart (5):
>       drm: renesas: shmobile: Remove backlight support
>       drm: renesas: shmobile: Don't set display info width and height twice
>       drm: renesas: shmobile: Rename input clocks
>       drm: renesas: shmobile: Remove support for SYS panels
>       drm: renesas: shmobile: Use struct videomode in platform data
> 
>  .../bindings/display/renesas,shmobile-lcdc.yaml    | 130 +++++
>  .../userspace-api/media/v4l/subdev-formats.rst     |  72 +++
>  MAINTAINERS                                        |  13 +-
>  drivers/gpu/drm/renesas/shmobile/Kconfig           |   3 +-
>  drivers/gpu/drm/renesas/shmobile/Makefile          |   3 +-
>  .../gpu/drm/renesas/shmobile/shmob_drm_backlight.c |  82 ---
>  .../gpu/drm/renesas/shmobile/shmob_drm_backlight.h |  19 -
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c  | 650 +++++++++------------
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h  |  27 +-
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c   | 179 +++---
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h   |  18 +-
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c   |  77 ++-
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h   |   9 +-
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 326 ++++++-----
>  drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h |   5 +-
>  include/linux/platform_data/shmob_drm.h            |  57 +-
>  include/uapi/linux/media-bus-format.h              |   3 +-
>  17 files changed, 860 insertions(+), 813 deletions(-)
>  create mode 100644
> Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml
>  delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.c
>  delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.h
Geert Uytterhoeven Sept. 26, 2023, 2:51 p.m. UTC | #2 
Hi Laurent, David, Daniel,

On Tue, Sep 19, 2023 at 5:24 PM Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Tue, Sep 19, 2023 at 04:28:40PM +0200, Geert Uytterhoeven wrote:
> > The following changes since commit 0663e1da5ba8e6459e3555ac12c62741668c0d30:
> >
> >   drm/dp_mst: Tune down error message during payload addition
> > (2023-09-18 16:38:21 +0300)
> >
> > are available in the Git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> > tags/shmob-drm-atomic-dt-tag1
> >
> > for you to fetch changes up to bfea0fa9052aa8d235b24957eb84d9ff20cb87b7:
> >
> >   drm: renesas: shmobile: Add DT support (2023-09-19 15:58:04 +0200)
> >
> > ----------------------------------------------------------------
> > drm: renesas: shmobile: Atomic conversion + DT support
> >
> > Currently, there are two drivers for the LCD controller on Renesas
> > SuperH-based and ARM-based SH-Mobile and R-Mobile SoCs:
> >   1. sh_mobile_lcdcfb, using the fbdev framework,
> >   2. shmob_drm, using the DRM framework.
> > However, only the former driver is used, as all platform support
> > integrates the former.  None of these drivers support DT-based systems.
> >
> > Convert the SH-Mobile DRM driver to atomic modesetting, and add DT
> > support, complemented by the customary set of fixes and improvements.
> >
> > Link: https://lore.kernel.org/r/cover.1694767208.git.geert+renesas@glider.be/
> >
> > This PR is based on today's drm-misc/for-linux-next, to avoid a
> > conflict with commit 775b0669e19f2e4a ("drm/shmobile: Convert to
> > platform remove callback returning void") in drm-misc/for-linux-next

Now drm-misc/for-linux-next (which is still at v6.5-rc2) has been
merged into drm/drm-next (which is at v6.6-rc2), do you want me to
rebase my branch to current drm/drm-next, or any other commit?

Thanks!

> > Thanks for pulling!
> > ----------------------------------------------------------------
> > Geert Uytterhoeven (36):
> >       MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers
>
> I'm technically listed as the maintainer for this driver until Geert
> takes over, so for this pull request,
>
> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
>
> And after that, shmobile won't need my ack to merge further changes :-)
>
> This is very nice work Geert. I'm looking forward to dropping the
> sh_mobile_lcdcfb driver.

Thank you!

Gr{oetje,eeting}s,

                        Geert
Geert Uytterhoeven Oct. 6, 2023, 6:57 a.m. UTC | #3 
Hi all,

On Tue, Sep 26, 2023 at 4:51 PM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Tue, Sep 19, 2023 at 5:24 PM Laurent Pinchart
> <laurent.pinchart@ideasonboard.com> wrote:
> > On Tue, Sep 19, 2023 at 04:28:40PM +0200, Geert Uytterhoeven wrote:
> > > The following changes since commit 0663e1da5ba8e6459e3555ac12c62741668c0d30:
> > >
> > >   drm/dp_mst: Tune down error message during payload addition
> > > (2023-09-18 16:38:21 +0300)
> > >
> > > are available in the Git repository at:
> > >
> > >   git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git
> > > tags/shmob-drm-atomic-dt-tag1
> > >
> > > for you to fetch changes up to bfea0fa9052aa8d235b24957eb84d9ff20cb87b7:
> > >
> > >   drm: renesas: shmobile: Add DT support (2023-09-19 15:58:04 +0200)
> > >
> > > ----------------------------------------------------------------
> > > drm: renesas: shmobile: Atomic conversion + DT support
> > >
> > > Currently, there are two drivers for the LCD controller on Renesas
> > > SuperH-based and ARM-based SH-Mobile and R-Mobile SoCs:
> > >   1. sh_mobile_lcdcfb, using the fbdev framework,
> > >   2. shmob_drm, using the DRM framework.
> > > However, only the former driver is used, as all platform support
> > > integrates the former.  None of these drivers support DT-based systems.
> > >
> > > Convert the SH-Mobile DRM driver to atomic modesetting, and add DT
> > > support, complemented by the customary set of fixes and improvements.
> > >
> > > Link: https://lore.kernel.org/r/cover.1694767208.git.geert+renesas@glider.be/
> > >
> > > This PR is based on today's drm-misc/for-linux-next, to avoid a
> > > conflict with commit 775b0669e19f2e4a ("drm/shmobile: Convert to
> > > platform remove callback returning void") in drm-misc/for-linux-next
>
> Now drm-misc/for-linux-next (which is still at v6.5-rc2) has been
> merged into drm/drm-next (which is at v6.6-rc2), do you want me to
> rebase my branch to current drm/drm-next, or any other commit?

Please advise me what needs to be done to move this forward.
Thanks!

> > > Thanks for pulling!
> > > ----------------------------------------------------------------
> > > Geert Uytterhoeven (36):
> > >       MAINTAINER: Create entry for Renesas SH-Mobile DRM drivers
> >
> > I'm technically listed as the maintainer for this driver until Geert
> > takes over, so for this pull request,
> >
> > Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> >
> > And after that, shmobile won't need my ack to merge further changes :-)
> >
> > This is very nice work Geert. I'm looking forward to dropping the
> > sh_mobile_lcdcfb driver.

Gr{oetje,eeting}s,

                        Geert