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@xxxxxxxxxxxx> 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 _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/dri-devel
