Hi Dave,
The following changes since commit 32c913e4369ce7bd1d16a9b6983f7b8975c13f5a:
Merge tag 'drm-intel-next-2013-07-26-fixed' of git://people.freedesktop.org/~danvet/drm-intel into drm-next (2013-08-07 18:11:35 +1000)
are available in the git repository at:
git://linuxtv.org/pinchartl/fbdev.git drm/next/du
for you to fetch changes up to 59e8f92fca87577b0f43516503f2abde9790a3a6:
drm/rcar-du: Add FBDEV emulation support (2013-08-07 13:04:44 +0200)
---------------------------------------------------------------- Laurent Pinchart (23): drm/rcar-du: Add missing alpha plane register definitions drm/rcar-du: Use devm_ioremap_resource() drm/rcar-du: Add platform module device table drm/rcar-du: Support per-CRTC clock and IRQ drm/rcar-du: Clarify comment regarding plane Y source coordinate drm/rcar-du: Split LVDS encoder and connector drm/rcar-du: Split VGA encoder and connector drm/rcar-du: Merge LVDS and VGA encoder code drm/rcar-du: Rename platform data fields to match what they describe drm/rcar-du: Create rcar_du_planes structure drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_* drm/rcar-du: Introduce CRTCs groups drm/rcar-du: Use dynamic number of CRTCs instead of CRTCs array size drm/rcar-du: Remove register definitions for the second channel drm/rcar-du: Move output routing configuration to group drm/rcar-du: Add support for the R8A7790 DU drm/rcar-du: Fix buffer pitch alignment for R8A7790 DU drm/rcar-du: Add support for multiple groups drm/rcar-du: Add support for DEFR8 register drm/rcar-du: Rework output routing support drm/rcar-du: Configure RGB output routing to DPAD0 drm/rcar-du: Add internal LVDS encoder support drm/rcar-du: Add FBDEV emulation support
drivers/gpu/drm/rcar-du/Kconfig | 7 + drivers/gpu/drm/rcar-du/Makefile | 10 +- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 255 +++++++++------ drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 13 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 173 +++++++-------- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 63 ++++-- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 202 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 49 +++++ drivers/gpu/drm/rcar-du/rcar_du_group.c | 187 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_group.h | 50 +++++ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 165 ++++++++------- drivers/gpu/drm/rcar-du/rcar_du_kms.h | 29 +-- .../drm/rcar-du/{rcar_du_lvds.c => rcar_du_lvdscon.c} | 101 +--------- .../drm/rcar-du/{rcar_du_lvds.h => rcar_du_lvdscon.h} | 17 +- drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 196 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 46 +++++ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 170 +++++++-------- drivers/gpu/drm/rcar-du/rcar_du_plane.h | 26 ++- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 94 +++++++-- .../gpu/drm/rcar-du/{rcar_du_vga.c => rcar_du_vgacon.c} | 65 +----- .../gpu/drm/rcar-du/{rcar_du_vga.h => rcar_du_vgacon.h} | 15 +- drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 69 +++++++ include/linux/platform_data/rcar-du.h | 34 +++- 23 files changed, 1420 insertions(+), 616 deletions(-) create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.h create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.h rename drivers/gpu/drm/rcar-du/{rcar_du_lvds.c => rcar_du_lvdscon.c} (57%) rename drivers/gpu/drm/rcar-du/{rcar_du_lvds.h => rcar_du_lvdscon.h} (53%) create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h rename drivers/gpu/drm/rcar-du/{rcar_du_vga.c => rcar_du_vgacon.c} (59%) rename drivers/gpu/drm/rcar-du/{rcar_du_vga.h => rcar_du_vgacon.h} (56%) create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds_regs.h
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.
On Wednesday 07 August 2013 13:23:08 Laurent Pinchart wrote:
Hi Dave,
The following changes since commit 32c913e4369ce7bd1d16a9b6983f7b8975c13f5a:
Merge tag 'drm-intel-next-2013-07-26-fixed' of git://people.freedesktop.org/~danvet/drm-intel into drm-next (2013-08-07 18:11:35 +1000)
are available in the git repository at:
git://linuxtv.org/pinchartl/fbdev.git drm/next/du
for you to fetch changes up to 59e8f92fca87577b0f43516503f2abde9790a3a6:
drm/rcar-du: Add FBDEV emulation support (2013-08-07 13:04:44 +0200)
Laurent Pinchart (23): drm/rcar-du: Add missing alpha plane register definitions drm/rcar-du: Use devm_ioremap_resource() drm/rcar-du: Add platform module device table drm/rcar-du: Support per-CRTC clock and IRQ drm/rcar-du: Clarify comment regarding plane Y source coordinate drm/rcar-du: Split LVDS encoder and connector drm/rcar-du: Split VGA encoder and connector drm/rcar-du: Merge LVDS and VGA encoder code drm/rcar-du: Rename platform data fields to match what they describe drm/rcar-du: Create rcar_du_planes structure drm/rcar-du: Rename rcar_du_plane_(init|register) to rcar_du_planes_* drm/rcar-du: Introduce CRTCs groups drm/rcar-du: Use dynamic number of CRTCs instead of CRTCs array size drm/rcar-du: Remove register definitions for the second channel drm/rcar-du: Move output routing configuration to group drm/rcar-du: Add support for the R8A7790 DU drm/rcar-du: Fix buffer pitch alignment for R8A7790 DU drm/rcar-du: Add support for multiple groups drm/rcar-du: Add support for DEFR8 register drm/rcar-du: Rework output routing support drm/rcar-du: Configure RGB output routing to DPAD0 drm/rcar-du: Add internal LVDS encoder support drm/rcar-du: Add FBDEV emulation support
drivers/gpu/drm/rcar-du/Kconfig | 7 + drivers/gpu/drm/rcar-du/Makefile | 10 +- drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 255 +++++++++------ drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 13 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 173 +++++++-------- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 63 ++++-- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 202 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_encoder.h | 49 +++++ drivers/gpu/drm/rcar-du/rcar_du_group.c | 187 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_group.h | 50 +++++ drivers/gpu/drm/rcar-du/rcar_du_kms.c | 165 ++++++++------- drivers/gpu/drm/rcar-du/rcar_du_kms.h | 29 +-- .../drm/rcar-du/{rcar_du_lvds.c => rcar_du_lvdscon.c} | 101 +--------- .../drm/rcar-du/{rcar_du_lvds.h => rcar_du_lvdscon.h} | 17 +- drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 196 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 46 +++++ drivers/gpu/drm/rcar-du/rcar_du_plane.c | 170 +++++++-------- drivers/gpu/drm/rcar-du/rcar_du_plane.h | 26 ++- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 94 +++++++-- .../gpu/drm/rcar-du/{rcar_du_vga.c => rcar_du_vgacon.c} | 65 +----- .../gpu/drm/rcar-du/{rcar_du_vga.h => rcar_du_vgacon.h} | 15 +- drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 69 +++++++ include/linux/platform_data/rcar-du.h | 34 +++- 23 files changed, 1420 insertions(+), 616 deletions(-) create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_encoder.h create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_group.h rename drivers/gpu/drm/rcar-du/{rcar_du_lvds.c => rcar_du_lvdscon.c} (57%) rename drivers/gpu/drm/rcar-du/{rcar_du_lvds.h => rcar_du_lvdscon.h} (53%) create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h rename drivers/gpu/drm/rcar-du/{rcar_du_vga.c => rcar_du_vgacon.c} (59%) rename drivers/gpu/drm/rcar-du/{rcar_du_vga.h => rcar_du_vgacon.h} (56%) create mode 100644 drivers/gpu/drm/rcar-du/rcar_lvds_regs.h
On Thu, Aug 8, 2013 at 10:43 AM, Laurent Pinchart laurent.pinchart@ideasonboard.com 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?
Dave.
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.
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.
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?
Dave.
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.
On Sat, Aug 10, 2013 at 7:25 AM, Laurent Pinchart laurent.pinchart@ideasonboard.com wrote:
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/dub/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.
Actually small change
Simon can you use
git://git.freedesktop.org/~airlied/linux drm-rcar-for-v3.12
as I've merged this tree with an S-o-b on the merge commit, so other people will know it has gone via me.
Dave.
On Sat, Aug 10, 2013 at 07:28:30AM +1000, Dave Airlie wrote:
On Sat, Aug 10, 2013 at 7:25 AM, Laurent Pinchart laurent.pinchart@ideasonboard.com wrote:
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/dub/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.
Actually small change
Simon can you use
git://git.freedesktop.org/~airlied/linux drm-rcar-for-v3.12
as I've merged this tree with an S-o-b on the merge commit, so other people will know it has gone via me.
Thanks, got it.
On Sat, Aug 10, 2013 at 07:28:30AM +1000, Dave Airlie wrote:
On Sat, Aug 10, 2013 at 7:25 AM, Laurent Pinchart laurent.pinchart@ideasonboard.com wrote:
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/dub/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.
Actually small change
Simon can you use
git://git.freedesktop.org/~airlied/linux drm-rcar-for-v3.12
as I've merged this tree with an S-o-b on the merge commit, so other people will know it has gone via me.
Sorry for the delayed response.
I had assumed that the reason I was having trouble fetching the remote above was related to the internet connection at the end of the world that I was in turn at the end while on holidays.
However, it seems that I am unable to fetch the remote from my office either. This may well be a fault at my end, but its not something I can readily think of a work around for other than trying from home a little later.
# git remote add airlied git://git.freedesktop.org/~airlied/linux # git fetch airlied fatal: Could not read from remote repository.
Please make sure you have the correct access rights and the repository exists.
Hi Simon,
On Wednesday 21 August 2013 17:36:12 Simon Horman wrote:
On Sat, Aug 10, 2013 at 07:28:30AM +1000, Dave Airlie wrote:
On Sat, Aug 10, 2013 at 7:25 AM, Laurent Pinchart wrote:
On Saturday 10 August 2013 06:45:05 Dave Airlie wrote:
On Thu, Aug 8, 2013 at 11:39 AM, Simon Horman 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/dub/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.
Actually small change
Simon can you use
git://git.freedesktop.org/~airlied/linux drm-rcar-for-v3.12
as I've merged this tree with an S-o-b on the merge commit, so other people will know it has gone via me.
Sorry for the delayed response.
I had assumed that the reason I was having trouble fetching the remote above was related to the internet connection at the end of the world that I was in turn at the end while on holidays.
However, it seems that I am unable to fetch the remote from my office either. This may well be a fault at my end, but its not something I can readily think of a work around for other than trying from home a little later.
# git remote add airlied git://git.freedesktop.org/~airlied/linux # git fetch airlied fatal: Could not read from remote repository.
Please make sure you have the correct access rights and the repository exists.
The URL I use is git://people.freedesktop.org/~airlied/linux
On Wed, Aug 21, 2013 at 01:31:42PM +0200, Laurent Pinchart wrote:
Hi Simon,
On Wednesday 21 August 2013 17:36:12 Simon Horman wrote:
On Sat, Aug 10, 2013 at 07:28:30AM +1000, Dave Airlie wrote:
On Sat, Aug 10, 2013 at 7:25 AM, Laurent Pinchart wrote:
On Saturday 10 August 2013 06:45:05 Dave Airlie wrote:
On Thu, Aug 8, 2013 at 11:39 AM, Simon Horman 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/dub/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.
Actually small change
Simon can you use
git://git.freedesktop.org/~airlied/linux drm-rcar-for-v3.12
as I've merged this tree with an S-o-b on the merge commit, so other people will know it has gone via me.
Sorry for the delayed response.
I had assumed that the reason I was having trouble fetching the remote above was related to the internet connection at the end of the world that I was in turn at the end while on holidays.
However, it seems that I am unable to fetch the remote from my office either. This may well be a fault at my end, but its not something I can readily think of a work around for other than trying from home a little later.
# git remote add airlied git://git.freedesktop.org/~airlied/linux # git fetch airlied fatal: Could not read from remote repository.
Please make sure you have the correct access rights and the repository exists.
The URL I use is git://people.freedesktop.org/~airlied/linux
Thanks, that seems to work.
dri-devel@lists.freedesktop.org
-
Dave Airlie -
Laurent Pinchart -
Simon Horman