All of lore.kernel.org
 help / color / mirror / Atom feed
* [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support
@ 2017-06-15 18:54 Laurent Pinchart
  2017-06-16  8:03 ` Geert Uytterhoeven
  0 siblings, 1 reply; 4+ messages in thread
From: Laurent Pinchart @ 2017-06-15 18:54 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: linux-renesas-soc

Hi Geert,

The following changes implement display support for the R-Car H3 ES2.0. They 
have been split in three distinct branches:

- tags/drm-h3-es2-dt-20170615 contains the DT changes and is based on top of 
topic/r8a7795es2-integration

The following changes since commit 2009b241fbbc368f290e18e829f723eeb25a9bdd:

  Merge branches 'clk-renesas-for-v4.13', 'sh-pfc-for-v4.13' and 
'topic/r8a7795es2-dt-v4' into topic/r8a7795es2-integration (2017-05-15 
13:54:40 +0200)

are available in the git repository at:

  git://linuxtv.org/pinchartl/media.git tags/drm-h3-es2-dt-20170615

for you to fetch changes up to 0e174a552a84f638b00549eda58ba97c5bf1832c:

  arm64: dts: r8a7795: salvator-x: Unify DU node between ES1.x and ES2.0 
(2017-06-15 21:20:11 +0300)

----------------------------------------------------------------
Laurent Pinchart (2):
      arm64: dts: r8a7795: Add support for the DU
      arm64: dts: r8a7795: salvator-x: Unify DU node between ES1.x and ES2.0

 arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts | 14 --------------
 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts     | 14 --------------
 arch/arm64/boot/dts/renesas/r8a7795.dtsi               |  2 ++
 arch/arm64/boot/dts/renesas/salvator-x.dtsi            | 12 ++++++++++++
 4 files changed, 14 insertions(+), 28 deletions(-)

- tags/drm-h3-es2-pinctrl-20170615 contains the pinctrl changes for the DU and 
is based on top of sh-pfc-for-v4.13-tag1

The following changes since commit c8bac70f079bb3ecaf9a716f141f3d85cef27231:

  pinctrl: sh-pfc: r8a7794: Add R8A7745 support (2017-05-16 13:53:15 +0200)

are available in the git repository at:

  git://linuxtv.org/pinchartl/media.git tags/drm-h3-es2-pinctrl-20170615

for you to fetch changes up to d83572a23b5b636cef20074fad4b7d2ca073a6f5:

  pinctrl: sh-pfc: r8a7795: Add DU parallel RGB output support (2017-06-15 
10:42:34 +0300)

----------------------------------------------------------------
Geert Uytterhoeven (1):
      pinctrl: sh-pfc: r8a7795: Add EtherAVB pins, groups and function

Laurent Pinchart (1):
      pinctrl: sh-pfc: r8a7795: Add DU parallel RGB output support

 drivers/pinctrl/sh-pfc/pfc-r8a7795.c | 212 ++++++++++++++++++++++++++++++++++
 1 file changed, 212 insertions(+)

- tags/drm-h3-es2-vsp-20170615 contains the VSP changes and is based on top of 
v4.12-rc1

The following changes since commit 2ea659a9ef488125eb46da6eb571de5eae5c43f6:

  Linux 4.12-rc1 (2017-05-13 13:19:49 -0700)

are available in the git repository at:

  git://linuxtv.org/pinchartl/media.git tags/drm-h3-es2-vsp-20170615

for you to fetch changes up to 378c824b087ca9b02a9b690007aec707aed8d457:

  v4l: vsp1: Add support for header display lists in continuous mode 
(2017-06-15 21:39:16 +0300)

----------------------------------------------------------------
Laurent Pinchart (6):
      v4l: vsp1: Remove WPF vertical flip support on VSP2-B[CD] and VSP2-D
      v4l: vsp1: Add support for the BRS entity
      v4l: vsp1: Add support for new VSP2-BS, VSP2-DL and VSP2-D instances
      v4l: vsp1: Add pipe index argument to the VSP-DU API
      v4l: vsp1: Fill display list headers without holding dlm spinlock
      v4l: vsp1: Add support for header display lists in continuous mode

 drivers/gpu/drm/rcar-du/rcar_du_vsp.c     |   9 +-
 drivers/media/platform/vsp1/vsp1.h        |   2 +
 drivers/media/platform/vsp1/vsp1_bru.c    |  45 ++++++---
 drivers/media/platform/vsp1/vsp1_bru.h    |   4 +-
 drivers/media/platform/vsp1/vsp1_dl.c     | 202 +++++++++++++++++++----------
 drivers/media/platform/vsp1/vsp1_drm.c    |  28 ++++--
 drivers/media/platform/vsp1/vsp1_drv.c    |  49 ++++++++-
 drivers/media/platform/vsp1/vsp1_entity.c |  13 ++-
 drivers/media/platform/vsp1/vsp1_entity.h |   1 +
 drivers/media/platform/vsp1/vsp1_pipe.c   |   7 +-
 drivers/media/platform/vsp1/vsp1_regs.h   |  41 ++++++--
 drivers/media/platform/vsp1/vsp1_video.c  |  63 +++++++-----
 drivers/media/platform/vsp1/vsp1_wpf.c    |   4 +-
 include/media/vsp1.h                      |   8 +-
 14 files changed, 334 insertions(+), 142 deletions(-)

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support
  2017-06-15 18:54 [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support Laurent Pinchart
@ 2017-06-16  8:03 ` Geert Uytterhoeven
  2017-06-19  8:15   ` Laurent Pinchart
  0 siblings, 1 reply; 4+ messages in thread
From: Geert Uytterhoeven @ 2017-06-16  8:03 UTC (permalink / raw)
  To: Laurent Pinchart; +Cc: Linux-Renesas

Hi Laurent,

On Thu, Jun 15, 2017 at 8:54 PM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> The following changes implement display support for the R-Car H3 ES2.0. They
> have been split in three distinct branches:

Thanks for your branches!

> - tags/drm-h3-es2-dt-20170615 contains the DT changes and is based on top of
> topic/r8a7795es2-integration

When merging this into next-20170616, there are lots of conflicts.
Most are due to your tag being based on a one-month old version of
renesas-devel.

As the relevant DT changes in topic/r8a7795es2-integration have been applied
to renesas-devel, you could rebase on top of the latter.

> - tags/drm-h3-es2-pinctrl-20170615 contains the pinctrl changes for the DU and
> is based on top of sh-pfc-for-v4.13-tag1

Merges cleanly into next-20170616.

> - tags/drm-h3-es2-vsp-20170615 contains the VSP changes and is based on top of
> v4.12-rc1

When merging this into next-20170616, there are two conflicts, in
drivers/media/platform/vsp1/vsp1_dl.c and include/media/vsp1.h.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support
  2017-06-16  8:03 ` Geert Uytterhoeven
@ 2017-06-19  8:15   ` Laurent Pinchart
  2017-06-19  8:27     ` Geert Uytterhoeven
  0 siblings, 1 reply; 4+ messages in thread
From: Laurent Pinchart @ 2017-06-19  8:15 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: Linux-Renesas

Hi Geert,

On Friday 16 Jun 2017 10:03:57 Geert Uytterhoeven wrote:
> On Thu, Jun 15, 2017 at 8:54 PM, Laurent Pinchart wrote:
> > The following changes implement display support for the R-Car H3 ES2.0.
> > They have been split in three distinct branches:
>
> Thanks for your branches!
> 
> > - tags/drm-h3-es2-dt-20170615 contains the DT changes and is based on top
> > of topic/r8a7795es2-integration
> 
> When merging this into next-20170616, there are lots of conflicts.
> Most are due to your tag being based on a one-month old version of
> renesas-devel.
> 
> As the relevant DT changes in topic/r8a7795es2-integration have been applied
> to renesas-devel, you could rebase on top of the latter.

Do you mean renesas-devel-20170616-v4.12-rc5 ? I don't want to pull the whole 
renesas-drivers tree as a base for my development branches, I'd prefer keeping 
the out-of-mainline dependencies as small as possible.

> > - tags/drm-h3-es2-pinctrl-20170615 contains the pinctrl changes for the DU
> > and is based on top of sh-pfc-for-v4.13-tag1
> 
> Merges cleanly into next-20170616.
> 
> > - tags/drm-h3-es2-vsp-20170615 contains the VSP changes and is based on
> > top of v4.12-rc1
> 
> When merging this into next-20170616, there are two conflicts, in
> drivers/media/platform/vsp1/vsp1_dl.c and include/media/vsp1.h.

-- 
Regards,

Laurent Pinchart

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support
  2017-06-19  8:15   ` Laurent Pinchart
@ 2017-06-19  8:27     ` Geert Uytterhoeven
  0 siblings, 0 replies; 4+ messages in thread
From: Geert Uytterhoeven @ 2017-06-19  8:27 UTC (permalink / raw)
  To: Laurent Pinchart; +Cc: Linux-Renesas

Hi Laurent,

On Mon, Jun 19, 2017 at 10:15 AM, Laurent Pinchart
<laurent.pinchart@ideasonboard.com> wrote:
> On Friday 16 Jun 2017 10:03:57 Geert Uytterhoeven wrote:
>> On Thu, Jun 15, 2017 at 8:54 PM, Laurent Pinchart wrote:
>> > The following changes implement display support for the R-Car H3 ES2.0.
>> > They have been split in three distinct branches:
>>
>> Thanks for your branches!
>>
>> > - tags/drm-h3-es2-dt-20170615 contains the DT changes and is based on top
>> > of topic/r8a7795es2-integration
>>
>> When merging this into next-20170616, there are lots of conflicts.
>> Most are due to your tag being based on a one-month old version of
>> renesas-devel.
>>
>> As the relevant DT changes in topic/r8a7795es2-integration have been applied
>> to renesas-devel, you could rebase on top of the latter.
>
> Do you mean renesas-devel-20170616-v4.12-rc5 ? I don't want to pull the whole

For example.

> renesas-drivers tree as a base for my development branches, I'd prefer keeping

s/drivers/devel/?

> the out-of-mainline dependencies as small as possible.

For submission upstream, your DT patches must apply to renesas-devel, so you
will have to do the rebase anyway. Doing so before sending a pull request for
renesas-drivers saves me from duplicating that work.

If you don't want all of renesas-devel, you can rebase on top of Simon's tag
arm64-dt-for-v4.13, or arm64-dt-for-v4.14, which has just appeared.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-06-19  8:27 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-06-15 18:54 [GIT PULL FOR renesas-drivers] R-Car H3 ES2.0 display support Laurent Pinchart
2017-06-16  8:03 ` Geert Uytterhoeven
2017-06-19  8:15   ` Laurent Pinchart
2017-06-19  8:27     ` Geert Uytterhoeven

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.