Hi Dave, On Monday 22 February 2016 03:46:30 Laurent Pinchart wrote: > Hi Dave, > > The following changes since commit 4c4400504f6ada0cfed682fbe7e6c65efbda3952: > > Merge remote-tracking branch 'linuxtv/vsp1' into HEAD (2016-02-20 02:58:43 > +0200) > > are available in the git repository at: > > git://linuxtv.org/pinchartl/fbdev.git drm/next/du > > for you to fetch changes up to 6ef42232f8e03dd9da8c48650532c7eb50257718: > > drm: rcar-du: Add tri-planar memory formats support (2016-02-20 03:35:51 > +0200) > > Please note that, due to dependencies on the V4L2 vsp1 driver, the branch is > based on a merge of your latest drm-next branch and a stable V4L2 branch > provided by Mauro (available at git://linuxtv.org/pinchartl/media.git vsp1) > that is scheduled to be merged in v4.6 as well. If you haven't pulled yet, I've fixed a bisectibility issue by squashing patches "drm: rcar-du: Expose the VSP1 compositor through KMS planes" and "drm: rcar-du: Use the VSP atomic update API". I've pushed the result to the same branch, no other change has been made. The updated pull request is as follows. The following changes since commit 4c4400504f6ada0cfed682fbe7e6c65efbda3952: Merge remote-tracking branch 'linuxtv/vsp1' into HEAD (2016-02-20 02:58:43 +0200) are available in the git repository at: git://linuxtv.org/pinchartl/fbdev.git drm/next/du for you to fetch changes up to 7863ac504bc5473eb99c4356120aa372d453143e: drm: rcar-du: Add tri-planar memory formats support (2016-02-23 09:34:33 +0200) ---------------------------------------------------------------- Koji Matsuoka (4): drm: rcar-du: Fix compile warning on 64-bit platforms drm: rcar-du: Enable compilation on ARM64 drm: rcar-du: Support up to 4 CRTCs drm: rcar-du: lvds: Add R-Car Gen3 support Laurent Pinchart (19): drm: rcar-du: Perform initialization/cleanup at probe/remove time drm: rcar-du: Remove local CRTC enabled state drm: rcar-du: Don't update planes on disabled CRTCs drm: rcar-du: Compute plane DDCR4 register value directly drm: rcar-du: Refactor plane setup drm: rcar-du: Add VSP1 support to the planes allocator drm: rcar-du: Add VSP1 compositor support drm: rcar-du: Restart the DU group when a plane source changes drm: rcar-du: Move plane allocator to rcar_du_plane.c drm: rcar-du: Expose the VSP1 compositor through KMS planes drm: rcar-du: Drop LVDS double dependency on OF drm: rcar-du: Output the DISP signal on the DISP pin drm: rcar-du: Output the DISP signal on the ODDF pin drm: rcar-du: Add R8A7795 device support drm: rcar-du: lvds: Avoid duplication of clock clamp code drm: rcar-du: lvds: Fix PLL frequency-related configuration drm: rcar-du: lvds: Rename PLLEN bit to PLLON drm: rcar-du: Add probe deferral debug messages drm: rcar-du: Add tri-planar memory formats support .../devicetree/bindings/display/renesas,du.txt | 16 +- drivers/gpu/drm/rcar-du/Kconfig | 15 +- drivers/gpu/drm/rcar-du/Makefile | 2 + drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 75 ++-- drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 4 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 218 ++++++----- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 12 +- drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 6 +- drivers/gpu/drm/rcar-du/rcar_du_group.c | 74 +++- drivers/gpu/drm/rcar-du/rcar_du_group.h | 4 + drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 11 +- drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 16 +- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 313 ++++----------- drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 11 +- drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 142 ++++++-- drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 6 + drivers/gpu/drm/rcar-du/rcar_du_plane.c | 465 +++++++++++++-- drivers/gpu/drm/rcar-du/rcar_du_plane.h | 21 +- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 21 +- drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 11 +- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 384 +++++++++++++++ drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 76 ++++ drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 26 +- 23 files changed, 1394 insertions(+), 535 deletions(-) create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.c create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.h > ---------------------------------------------------------------- > Koji Matsuoka (4): > drm: rcar-du: Fix compile warning on 64-bit platforms > drm: rcar-du: Enable compilation on ARM64 > drm: rcar-du: Support up to 4 CRTCs > drm: rcar-du: lvds: Add R-Car Gen3 support > > Laurent Pinchart (20): > drm: rcar-du: Perform initialization/cleanup at probe/remove time > drm: rcar-du: Remove local CRTC enabled state > drm: rcar-du: Don't update planes on disabled CRTCs > drm: rcar-du: Compute plane DDCR4 register value directly > drm: rcar-du: Refactor plane setup > drm: rcar-du: Add VSP1 support to the planes allocator > drm: rcar-du: Add VSP1 compositor support > drm: rcar-du: Restart the DU group when a plane source changes > drm: rcar-du: Move plane allocator to rcar_du_plane.c > drm: rcar-du: Expose the VSP1 compositor through KMS planes > drm: rcar-du: Use the VSP atomic update API > drm: rcar-du: Drop LVDS double dependency on OF > drm: rcar-du: Output the DISP signal on the DISP pin > drm: rcar-du: Output the DISP signal on the ODDF pin > drm: rcar-du: Add R8A7795 device support > drm: rcar-du: lvds: Avoid duplication of clock clamp code > drm: rcar-du: lvds: Fix PLL frequency-related configuration > drm: rcar-du: lvds: Rename PLLEN bit to PLLON > drm: rcar-du: Add probe deferral debug messages > drm: rcar-du: Add tri-planar memory formats support > > .../devicetree/bindings/display/renesas,du.txt | 16 +- > drivers/gpu/drm/rcar-du/Kconfig | 15 +- > drivers/gpu/drm/rcar-du/Makefile | 2 + > drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 75 ++-- > drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 4 +- > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 218 ++++++----- > drivers/gpu/drm/rcar-du/rcar_du_drv.h | 12 +- > drivers/gpu/drm/rcar-du/rcar_du_encoder.c | 6 +- > drivers/gpu/drm/rcar-du/rcar_du_group.c | 74 +++- > drivers/gpu/drm/rcar-du/rcar_du_group.h | 4 + > drivers/gpu/drm/rcar-du/rcar_du_hdmicon.c | 11 +- > drivers/gpu/drm/rcar-du/rcar_du_hdmienc.c | 16 +- > drivers/gpu/drm/rcar-du/rcar_du_kms.c | 313 ++--------- > drivers/gpu/drm/rcar-du/rcar_du_lvdscon.c | 11 +- > drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 142 ++++++-- > drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.h | 6 + > drivers/gpu/drm/rcar-du/rcar_du_plane.c | 465 +++++++++---- > drivers/gpu/drm/rcar-du/rcar_du_plane.h | 21 +- > drivers/gpu/drm/rcar-du/rcar_du_regs.h | 21 +- > drivers/gpu/drm/rcar-du/rcar_du_vgacon.c | 11 +- > drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 384 +++++++++++++ > drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 76 ++++ > drivers/gpu/drm/rcar-du/rcar_lvds_regs.h | 26 +- > 23 files changed, 1394 insertions(+), 535 deletions(-) > create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.c > create mode 100644 drivers/gpu/drm/rcar-du/rcar_du_vsp.h -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel