From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
To: Dave Airlie <airlied@gmail.com>
Cc: Simon Horman <horms@verge.net.au>, dri-devel@lists.freedesktop.org
Subject: Re: [GIT PULL FOR v3.12] R-Car DU DRM support for R8A7790 SoC
Date: Fri, 09 Aug 2013 23:25:25 +0200 [thread overview]
Message-ID: <8097028.toG0lsvmM7@avalon> (raw)
In-Reply-To: <CAPM=9tyGTvNPv9VJvacdDcej8D=hNhhxALT5GUvOQmTYykFcPw@mail.gmail.com>
Hi Dave,
On Saturday 10 August 2013 06:45:05 Dave Airlie wrote:
> On Thu, Aug 8, 2013 at 11:39 AM, Simon Horman <horms@verge.net.au> wrote:
> > On Thu, Aug 08, 2013 at 03:34:17AM +0200, Laurent Pinchart wrote:
> >> Hi Dave,
> >>
> >> (CC'ing Simon Horman, the shmobile tree maintainer)
> >>
> >> On Thursday 08 August 2013 10:57:33 Dave Airlie wrote:
> >> > On Thu, Aug 8, 2013 at 10:43 AM, Laurent Pinchart wrote:
> >> > > Hi Dave,
> >> > >
> >> > > I've got a couple of arch/arm/ patches that depend on this series and
> >> > > that I would like to get merged in v3.12. They should go upstream
> >> > > through the arm-soc tree. Would you be able to provide a stable
> >> > > branch with this patch set based on one of the 3.11-rcX tags ?
> >> > > Ideally that branch should have as little patches as possible other
> >> > > than this set.
> >> >
> >> > Yeah that shouldn't be a problem, though is there any interface changes
> >> > or things with this wrt drm-next?
> >> >
> >> > i.e. will this tree build on v3.11-rcX and drm-next?
> >>
> >> They depend on a fix that went in between -rc1 and -rc2. You can base the
> >> branch on any -rc >= 2.
> >
> > An rc2 or rc3 base would be ideal for me, but any rc would be fine.
>
> So the problem with making a stable branch is we have conflicts in other
> places that have already been solved in drm-next,
>
> is there any problem with using Laurent's tree directly as the stable point?
As agreed on IRC, I've rebased the patches on top of v3.11-rc3 and pushed the
result to
git://linuxtv.org/pinchartl/fbdev.git drm/next/du
b/drivers/gpu/drm/rcar-du/Kconfig | 7
b/drivers/gpu/drm/rcar-du/Makefile | 10 -
b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 255 +++++++++++++-------------
b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 13 -
b/drivers/gpu/drm/rcar-du/rcar_du_drv.c | 173 +++++++-----------
b/drivers/gpu/drm/rcar-du/rcar_du_drv.h | 63 +++++-
b/drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 202 ++++++++++++++++++++++
b/drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 49 +++++
b/drivers/gpu/drm/rcar-du/rcar_du_group.c | 187 ++++++++++++++++++++
b/drivers/gpu/drm/rcar-du/rcar_du_group.h | 50 +++++
b/drivers/gpu/drm/rcar-du/rcar_du_kms.c | 165 ++++++++++--------
b/drivers/gpu/drm/rcar-du/rcar_du_kms.h | 29 ---
b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 131 ++++++++++++++
b/drivers/gpu/drm/rcar-du/rcar_du_lvdscon.h | 25 ++
b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 196 +++++++++++++++++++++
b/drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 46 +++++
b/drivers/gpu/drm/rcar-du/rcar_du_plane.c | 170 +++++++++---------
b/drivers/gpu/drm/rcar-du/rcar_du_plane.h | 26 ++
b/drivers/gpu/drm/rcar-du/rcar_du_regs.h | 94 ++++++++--
b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 96 ++++++++++
b/drivers/gpu/drm/rcar-du/rcar_du_vgacon.h | 23 ++
b/drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 69 +++++++
b/include/linux/platform_data/rcar-du.h | 34 ++-
drivers/gpu/drm/rcar-du/rcar_du_lvds.c | 216 -----------------------
drivers/gpu/drm/rcar-du/rcar_du_lvds.h | 24 --
drivers/gpu/drm/rcar-du/rcar_du_vga.c | 149 ----------------
drivers/gpu/drm/rcar-du/rcar_du_vga.h | 24 --
27 files changed, 1665 insertions(+), 861 deletions(-)
Can you merge that into drm-next ? Simon, you can base the r8a7790 arch/
patches on top of this drm/next/du branch.
--
Regards,
Laurent Pinchart
next prev parent reply other threads:[~2013-08-09 21:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-07 11:23 [GIT PULL FOR v3.12] R-Car DU DRM support for R8A7790 SoC Laurent Pinchart
2013-08-08 0:43 ` Laurent Pinchart
2013-08-08 0:57 ` Dave Airlie
2013-08-08 1:34 ` Laurent Pinchart
2013-08-08 1:39 ` Simon Horman
2013-08-09 20:45 ` Dave Airlie
2013-08-09 21:25 ` Laurent Pinchart [this message]
2013-08-09 21:28 ` Dave Airlie
2013-08-13 2:18 ` Simon Horman
2013-08-21 8:36 ` Simon Horman
2013-08-21 11:31 ` Laurent Pinchart
2013-08-22 2:29 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8097028.toG0lsvmM7@avalon \
--to=laurent.pinchart@ideasonboard.com \
--cc=airlied@gmail.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=horms@verge.net.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.