Renesas DRM changes

GIT PULL Laurent Pinchart 2 participants 3 messages Sep 15, 2014 – Sep 18, 2014 SuperH

lore

Share & tools

lore

Laurent Pinchart

author

2014-09-15 09:09 UTC #0 lore raw

Hi Dave,

Could you please pull the following changes for v3.18 ?

Commit "drm/rcar-du: Use struct videomode in platform data" touches board code in arch/arm/mach-shmobile. There is, to the best of my knowledge, no risk of conflict for v3.18. Simon, are you fine with getting those changes merged through Dave's tree (and could you confirm that no conflict should occur) ?

The following changes since commit 98faa78ce7f1f986e11e7805d31b409782a6d2d4:

Merge tag 'topic/drm-header-rework-2014-09-12' of
git://anongit.freedesktop.org/drm-intel into drm-next (2014-09-13 07:01:49 +1000)

are available in the git repository at:

git://linuxtv.org/pinchartl/fbdev.git drm/next/du

for you to fetch changes up to 96c026911890ceacee238da00a0b140ad634cc43:

drm/rcar-du: Add OF support (2014-09-15 11:55:47 +0300)

----------------------------------------------------------------
Laurent Pinchart (10):
drm/rcar-du: Update copyright notice
drm/shmob: Update copyright notice
devicetree: Add vendor prefix "mitsubishi" to vendor-prefixes.txt
devicetree: Add vendor prefix "thine" to vendor-prefixes.txt
video: Add DT binding documentation for VGA connector
video: Add ADV7123 DT bindings documentation
video: Add THC63LVDM83D DT bindings documentation
video: Add DT bindings for the R-Car Display Unit drm/rcar-du: Use struct videomode in platform data drm/rcar-du: Add OF support

 Documentation/devicetree/bindings/vendor-prefixes.txt   |   2 +
 Documentation/devicetree/bindings/video/adi,adv7123.txt |  50 +++++
 Documentation/devicetree/bindings/video/renesas,du.txt  |  84 +++++++++
 .../devicetree/bindings/video/thine,thc63lvdm83d        |  50 +++++
 .../devicetree/bindings/video/vga-connector.txt         |  36 ++++
 arch/arm/mach-shmobile/board-koelsch-reference.c        |  19 +-
 arch/arm/mach-shmobile/board-koelsch.c                  |  19 +-
 arch/arm/mach-shmobile/board-lager-reference.c          |  19 +-
 arch/arm/mach-shmobile/board-lager.c                    |  19 +-
 arch/arm/mach-shmobile/board-marzen.c                   |  19 +-
 drivers/gpu/drm/rcar-du/Kconfig                         |   1 +
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c                  |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h                  |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_drv.c                   | 172 ++++++++-------
 drivers/gpu/drm/rcar-du/rcar_du_drv.h                   |   4 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c               |  13 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h               |   5 +-
 drivers/gpu/drm/rcar-du/rcar_du_group.c                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_group.h                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c                   | 233 +++++++++++++--
 drivers/gpu/drm/rcar-du/rcar_du_kms.h                   |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c               |  45 +++--
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h               |   5 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c               |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h               |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.h                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c                |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_backlight.c          |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_backlight.h          |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c               |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.h               |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_kms.c                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_kms.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.c              |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.h              |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_regs.h               |   2 +-
 include/linux/platform_data/rcar-du.h                   |   4 +-
 41 files changed, 645 insertions(+), 198 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/video/adi,adv7123.txt
 create mode 100644 Documentation/devicetree/bindings/video/renesas,du.txt
 create mode 100644 Documentation/devicetree/bindings/video/thine,thc63lvdm83d
 create mode 100644 Documentation/devicetree/bindings/video/vga-connector.txt

Signature · 3 lines

Regards,

Laurent Pinchart

Simon Horman

Acked-by

2014-09-18 09:11 UTC #1 lore raw

Quoted 15 lines · Laurent Pinchart

Hi Dave,
Could you please pull the following changes for v3.18 ?
Commit "drm/rcar-du: Use struct videomode in platform data" touches board code in arch/arm/mach-shmobile. There is, to the best of my knowledge, no risk of conflict for v3.18. Simon, are you fine with getting those changes merged through Dave's tree (and could you confirm that no conflict should occur) ?
The following changes since commit 98faa78ce7f1f986e11e7805d31b409782a6d2d4:
Merge tag 'topic/drm-header-rework-2014-09-12' of
git://anongit.freedesktop.org/drm-intel into drm-next (2014-09-13 07:01:49 +1000)

Quoted 7 lines

are available in the git repository at:
git://linuxtv.org/pinchartl/fbdev.git drm/next/du
for you to fetch changes up to 96c026911890ceacee238da00a0b140ad634cc43:
drm/rcar-du: Add OF support (2014-09-15 11:55:47 +0300)

Hi Laurent, Hi Dave,

I'm comfortable with these shmobile changes going via Dave's tree as they do not seem to conflict with anything queued up between for v3.18. I would however like these changes included in v3.18-rc1 so that I can manage any conflicts that may emerge in patches I queue up for v3.19.

I'm not asking you to update the patches, but for the record, shmobile portion:

Acked-by Simon Horman <[email protected]>

Quoted 70 lines

 Documentation/devicetree/bindings/vendor-prefixes.txt   |   2 +
 Documentation/devicetree/bindings/video/adi,adv7123.txt |  50 +++++
 Documentation/devicetree/bindings/video/renesas,du.txt  |  84 +++++++++
 .../devicetree/bindings/video/thine,thc63lvdm83d        |  50 +++++
 .../devicetree/bindings/video/vga-connector.txt         |  36 ++++
 arch/arm/mach-shmobile/board-koelsch-reference.c        |  19 +-
 arch/arm/mach-shmobile/board-koelsch.c                  |  19 +-
 arch/arm/mach-shmobile/board-lager-reference.c          |  19 +-
 arch/arm/mach-shmobile/board-lager.c                    |  19 +-
 arch/arm/mach-shmobile/board-marzen.c                   |  19 +-
 drivers/gpu/drm/rcar-du/Kconfig                         |   1 +
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c                  |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h                  |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_drv.c                   | 172 ++++++++-------
 drivers/gpu/drm/rcar-du/rcar_du_drv.h                   |   4 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c               |  13 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h               |   5 +-
 drivers/gpu/drm/rcar-du/rcar_du_group.c                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_group.h                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c                   | 233 +++++++++++++--
 drivers/gpu/drm/rcar-du/rcar_du_kms.h                   |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c               |  45 +++--
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h               |   5 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c               |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h               |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.h                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c                |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_backlight.c          |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_backlight.h          |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c               |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.h               |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_kms.c                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_kms.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.c              |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.h              |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_regs.h               |   2 +-
 include/linux/platform_data/rcar-du.h                   |   4 +-
 41 files changed, 645 insertions(+), 198 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/video/adi,adv7123.txt
 create mode 100644 Documentation/devicetree/bindings/video/renesas,du.txt
 create mode 100644 Documentation/devicetree/bindings/video/thine,thc63lvdm83d
 create mode 100644 Documentation/devicetree/bindings/video/vga-connector.txt

Signature · 8 lines

Regards,

Laurent Pinchart

--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Laurent Pinchart

author

2014-09-18 09:14 UTC #2 lore raw

Hi Simon,

Quoted 32 lines · On Thursday 18 September 2014 18:11:31 Simon Horman wrote:

Quoted 14 lines · Laurent Pinchart
Hi Dave,
Could you please pull the following changes for v3.18 ?
Commit "drm/rcar-du: Use struct videomode in platform data" touches board code in arch/arm/mach-shmobile. There is, to the best of my knowledge, no risk of conflict for v3.18. Simon, are you fine with getting those changes merged through Dave's tree (and could you confirm that no conflict should occur) ?
The following changes since commit 98faa78ce7f1f986e11e7805d31b409782a6d2d4:
Merge tag 'topic/drm-header-rework-2014-09-12' of
Quoted 8 lines
git://anongit.freedesktop.org/drm-intel into drm-next (2014-09-13 07:01:49 +1000)
are available in the git repository at:
git://linuxtv.org/pinchartl/fbdev.git drm/next/du
for you to fetch changes up to 96c026911890ceacee238da00a0b140ad634cc43:
drm/rcar-du: Add OF support (2014-09-15 11:55:47 +0300)
Hi Laurent, Hi Dave,
I'm comfortable with these shmobile changes going via Dave's tree as they do not seem to conflict with anything queued up between for v3.18. I would however like these changes included in v3.18-rc1 so that I can manage any conflicts that may emerge in patches I queue up for v3.19.

Quoted 4 lines

I'm not asking you to update the patches, but for the record, shmobile portion:
Acked-by Simon Horman <[email protected]>

Thank you.

Dave, if you haven't pulled the patches yet, could you apply Simon's ack when you do ?

Quoted 62 lines

----------------------------------------------------------------

Laurent Pinchart (10):
drm/rcar-du: Update copyright notice
drm/shmob: Update copyright notice
devicetree: Add vendor prefix "mitsubishi" to vendor-prefixes.txt
devicetree: Add vendor prefix "thine" to vendor-prefixes.txt
video: Add DT binding documentation for VGA connector
video: Add ADV7123 DT bindings documentation
video: Add THC63LVDM83D DT bindings documentation
video: Add DT bindings for the R-Car Display Unit drm/rcar-du: Use struct videomode in platform data drm/rcar-du: Add OF support

 Documentation/devicetree/bindings/vendor-prefixes.txt   |   2 +
 Documentation/devicetree/bindings/video/adi,adv7123.txt |  50 +++++
 Documentation/devicetree/bindings/video/renesas,du.txt  |  84 +++++++++
 .../devicetree/bindings/video/thine,thc63lvdm83d        |  50 +++++
 .../devicetree/bindings/video/vga-connector.txt         |  36 ++++
 arch/arm/mach-shmobile/board-koelsch-reference.c        |  19 +-
 arch/arm/mach-shmobile/board-koelsch.c                  |  19 +-
 arch/arm/mach-shmobile/board-lager-reference.c          |  19 +-
 arch/arm/mach-shmobile/board-lager.c                    |  19 +-
 arch/arm/mach-shmobile/board-marzen.c                   |  19 +-
 drivers/gpu/drm/rcar-du/Kconfig                         |   1 +
 drivers/gpu/drm/rcar-du/rcar_du_crtc.c                  |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h                  |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_drv.c                   | 172 ++++++-----
 drivers/gpu/drm/rcar-du/rcar_du_drv.h                   |   4 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c               |  13 +-
 drivers/gpu/drm/rcar-du/rcar_du_encoder.h               |   5 +-
 drivers/gpu/drm/rcar-du/rcar_du_group.c                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_group.h                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c                   | 233 +++++++++--
 drivers/gpu/drm/rcar-du/rcar_du_kms.h                   |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c               |  45 +++--
 drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h               |   5 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c               |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h               |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.c                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_plane.h                 |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.c                |   2 +-
 drivers/gpu/drm/rcar-du/rcar_du_vgacon.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_backlight.c          |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_backlight.h          |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.c               |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_crtc.h               |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.c                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_drv.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_kms.c                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_kms.h                |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.c              |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_plane.h              |   2 +-
 drivers/gpu/drm/shmobile/shmob_drm_regs.h               |   2 +-
 include/linux/platform_data/rcar-du.h                   |   4 +-
 41 files changed, 645 insertions(+), 198 deletions(-)
 create mode 100644
 Documentation/devicetree/bindings/video/adi,adv7123.txt
 create mode 100644 Documentation/devicetree/bindings/video/renesas,du.txt
 create mode 100644

Documentation/devicetree/bindings/video/thine,thc63lvdm83d create mode 100644 Documentation/devicetree/bindings/video/vga-connector.txt

Signature · 3 lines

Regards,

Laurent Pinchart