[GIT PULL FOR renesas-drivers] du/for-renesas-drivers

[GIT PULL FOR renesas-drivers] du/for-renesas-drivers

[Kieran Bingham]

Hi Geert,

Please consider including this release in renesas-drivers.

--
Regards

Kieran

The following changes since commit 0f1d37e65a59e9db33ab85f6e2c9784768ef80f4:

  Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-03-14 12:15:02 +1000)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git du/for-renesas-drivers

for you to fetch changes up to 99deb47fa63bb9fc7bd691e358fea1c5bccc1da2:

  drm: rcar-du: Add group hooks for atomic-commit (2019-03-17 19:29:37 +0000)

----------------------------------------------------------------
Kieran Bingham (9):
      drm: Fix subtle spelling error in drm_crtc_state
      drm: rcar-du: crtc: Make local functions static
      drm: rcar-du: Remove unused prototypes
      drm: rcar-du: Link CRTCs to the DU device
      drm: rcar-du: Add CRTC standby helpers
      drm: rcar-du: Add pre/post commit CRTC helpers
      drm: rcar-du: Provide for_each_group helper
      drm: rcar-du: Create a group state object
      drm: rcar-du: Add group hooks for atomic-commit

Laurent Pinchart (1):
      drm: rcar-du: Support panels connected directly to the DPAD outputs

 drivers/gpu/drm/rcar-du/rcar_du_crtc.c    | 159 +++++++++++++++-----------
 drivers/gpu/drm/rcar-du/rcar_du_crtc.h    |  16 ++-
 drivers/gpu/drm/rcar-du/rcar_du_drv.h     |   5 +
 drivers/gpu/drm/rcar-du/rcar_du_encoder.c |  54 ++++++++-
 drivers/gpu/drm/rcar-du/rcar_du_group.c   | 182 ++++++++++++++++++++++++------
 drivers/gpu/drm/rcar-du/rcar_du_group.h   |  36 +++++-
 drivers/gpu/drm/rcar-du/rcar_du_kms.c     |  49 +++-----
 drivers/gpu/drm/rcar-du/rcar_du_vsp.c     |   2 +-
 include/drm/drm_crtc.h                    |   2 +-
 9 files changed, 359 insertions(+), 146 deletions(-)

Re: [GIT PULL FOR renesas-drivers] du/for-renesas-drivers

[Geert Uytterhoeven]

Hi Kieran, Laurent,

On Sun, Mar 17, 2019 at 9:09 PM Kieran Bingham
<kieran.bingham+renesas@ideasonboard.com> wrote:
> Please consider including this release in renesas-drivers.

Thanks for your pull request!

> The following changes since commit 0f1d37e65a59e9db33ab85f6e2c9784768ef80f4:
>
>   Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-03-14 12:15:02 +1000)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git du/for-renesas-drivers
>
> for you to fetch changes up to 99deb47fa63bb9fc7bd691e358fea1c5bccc1da2:
>
>   drm: rcar-du: Add group hooks for atomic-commit (2019-03-17 19:29:37 +0000)

This has a merge conflict in drivers/gpu/drm/rcar-du/rcar_du_encoder.c
with Laurent's pull request for
git://linuxtv.org/pinchartl/media.git drm/du/lvds/dual-link~2

> Laurent Pinchart (1):
>       drm: rcar-du: Support panels connected directly to the DPAD outputs

Both branches contain the above commit, but with different commit IDs,
and Laurent's "drm: rcar-du: Skip LVDS1 output on Gen3 when using
dual-link LVDS mode" builds on top of that.

Nothing I can't handle, though.

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

Re: [GIT PULL FOR renesas-drivers] du/for-renesas-drivers

[Geert Uytterhoeven]

Hi Laurent,

On Mon, Mar 18, 2019 at 9:14 AM Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> On Sun, Mar 17, 2019 at 9:09 PM Kieran Bingham
> <kieran.bingham+renesas@ideasonboard.com> wrote:
> > Please consider including this release in renesas-drivers.
>
> Thanks for your pull request!
>
> > The following changes since commit 0f1d37e65a59e9db33ab85f6e2c9784768ef80f4:
> >
> >   Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-03-14 12:15:02 +1000)
> >
> > are available in the Git repository at:
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git du/for-renesas-drivers
> >
> > for you to fetch changes up to 99deb47fa63bb9fc7bd691e358fea1c5bccc1da2:
> >
> >   drm: rcar-du: Add group hooks for atomic-commit (2019-03-17 19:29:37 +0000)
>
> This has a merge conflict in drivers/gpu/drm/rcar-du/rcar_du_encoder.c
> with Laurent's pull request for
> git://linuxtv.org/pinchartl/media.git drm/du/lvds/dual-link~2
>
> > Laurent Pinchart (1):
> >       drm: rcar-du: Support panels connected directly to the DPAD outputs
>
> Both branches contain the above commit, but with different commit IDs,
> and Laurent's "drm: rcar-du: Skip LVDS1 output on Gen3 when using
> dual-link LVDS mode" builds on top of that.

JFYI, I found a third copy in Laurent's drm/du/next branch.

> Nothing I can't handle, though.

Idem ditto.

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

Re: [GIT PULL FOR renesas-drivers] du/for-renesas-drivers

[Laurent Pinchart]

Hi Geert,

On Tue, Mar 19, 2019 at 10:04:02AM +0100, Geert Uytterhoeven wrote:
> On Mon, Mar 18, 2019 at 9:14 AM Geert Uytterhoeven wrote:
> > On Sun, Mar 17, 2019 at 9:09 PM Kieran Bingham wrote:
> >> Please consider including this release in renesas-drivers.
> >
> > Thanks for your pull request!
> >
> >> The following changes since commit 0f1d37e65a59e9db33ab85f6e2c9784768ef80f4:
> >>
> >>   Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-03-14 12:15:02 +1000)
> >>
> >> are available in the Git repository at:
> >>
> >>   git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git du/for-renesas-drivers
> >>
> >> for you to fetch changes up to 99deb47fa63bb9fc7bd691e358fea1c5bccc1da2:
> >>
> >>   drm: rcar-du: Add group hooks for atomic-commit (2019-03-17 19:29:37 +0000)
> >
> > This has a merge conflict in drivers/gpu/drm/rcar-du/rcar_du_encoder.c
> > with Laurent's pull request for
> > git://linuxtv.org/pinchartl/media.git drm/du/lvds/dual-link~2
> >
> >> Laurent Pinchart (1):
> >>       drm: rcar-du: Support panels connected directly to the DPAD outputs
> >
> > Both branches contain the above commit, but with different commit IDs,
> > and Laurent's "drm: rcar-du: Skip LVDS1 output on Gen3 when using
> > dual-link LVDS mode" builds on top of that.
> 
> JFYI, I found a third copy in Laurent's drm/du/next branch.

It's all work in progress I'm afraid, so this doesn't surprise me. I'll
send a pull request to Dave soon, all this will be fixed.

> > Nothing I can't handle, though.
> 
> Idem ditto.

-- 
Regards,

Laurent Pinchart

Re: [GIT PULL FOR renesas-drivers] du/for-renesas-drivers

[Geert Uytterhoeven]

Hi Kieran,

On Sun, Mar 17, 2019 at 9:09 PM Kieran Bingham
<kieran.bingham+renesas@ideasonboard.com> wrote:

> Please consider including this release in renesas-drivers.
>
> The following changes since commit 0f1d37e65a59e9db33ab85f6e2c9784768ef80f4:
>
>   Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next (2019-03-14 12:15:02 +1000)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/linux/kernel/git/kbingham/rcar.git du/for-renesas-drivers

Please rebase your branch. It conflicts due to newer versions of some commits
having been accepted in an upstream integration tree.

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