From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: [GIT PUL FOR v4.14] R-Car DU changes Date: Thu, 03 Aug 2017 16:31:52 +0300 Message-ID: <5217228.MDybz51Srh@avalon> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from galahad.ideasonboard.com (galahad.ideasonboard.com [IPv6:2001:4b98:dc2:45:216:3eff:febb:480d]) by gabe.freedesktop.org (Postfix) with ESMTPS id E21986E1D6 for ; Thu, 3 Aug 2017 13:31:38 +0000 (UTC) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: Dave Airlie Cc: Mauro Carvalho Chehab , dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org SGkgRGF2ZSwKClRoZSBmb2xsb3dpbmcgY2hhbmdlcyBzaW5jZSBjb21taXQgZTY3NDJlMTAyMWE1 Y2VjNTVmYWI1MGEwYjExNWM2NTIxNzQ4OGVkYToKCiAgZHJtOiBsaW51eC1uZXh0OiBidWlsZCBm YWlsdXJlIGFmdGVyIG1lcmdlIG9mIHRoZSBkcm0tbWlzYyB0cmVlICgyMDE3LTA3LTI3IAowODoy NzoxMSArMTAwMCkKCmFyZSBhdmFpbGFibGUgaW4gdGhlIGdpdCByZXBvc2l0b3J5IGF0OgoKICBn aXQ6Ly9saW51eHR2Lm9yZy9waW5jaGFydGwvbWVkaWEuZ2l0IHRhZ3MvZHJtLW5leHQtZHUtMjAx NzA4MDMKCmZvciB5b3UgdG8gZmV0Y2ggY2hhbmdlcyB1cCB0byBhMDFjZTY2NzhiYWQ1NDhiZTQw NjMyODZiZmQxMmNjYmEzODA4YTJlOgoKICBkcm06IHJjYXItZHU6IFVzZSBuZXcgaXRlcmF0b3Ig bWFjcm9zICgyMDE3LTA4LTAzIDE2OjE3OjM1ICswMzAwKQoKVGhlIGJyYW5jaCBjb250YWlucyBw YXRjaGVzIGZvciB0aGUgVlNQIGRyaXZlciB3aGljaCB3b3VsZCBub3JtYWxseSBnbyB0aHJvdWdo IAp0aGUgVjRMMiBzdWJzeXN0ZW0uIEFzIHNvbWUgRFUgcGF0Y2hlcyBkZXBlbmQgb24gdGhlbSAo YW5kIGFzIG9uZSBvZiB0aGUgCnBhdGNoZXMgaW4gdGhlIHNlcmllcyB0b3VjaGVzIHRoZSB0d28g ZHJpdmVycyksIGl0IHdhcyBhZ3JlZWQgd2l0aCBNYXVybyB0byAKZ2V0IHRoZSB3aG9sZSBzZXJp ZXMgbWVyZ2VkIHRocm91Z2ggeW91ciB0cmVlIChhbGwgdGhlIHBhdGNoZXMgdGhhdCB0b3VjaCBW NEwyIApjYXJyeSBoaXMgQWNrZWQtYnkpLgoKSSBoYXZlIGJhc2VkIHRoZSBzZXJpZXMgb24gdG9w IG9mIHRoZSB2NC4xMy1yYzIgYmFja21lcmdlIGluIHlvdXIgdHJlZSAocGx1cyAKb25lIGNvbXBp bGF0aW9uIGZpeCBmcm9tIC1uZXh0KSwgYXMgaXQgZGVwZW5kcyBvbiAiZHJtOiBBZGQgCmRybV9h dG9taWNfaGVscGVyX3dhaXRfZm9yX2ZsaXBfZG9uZSgpIiB0aGF0IHlvdSBoYXZlIG1lcmdlZCBh ZnRlciB2NC4xMy1yYzEuCgpUaGVyZSBpcyBjdXJyZW50bHkgbm8gcGF0Y2ggaW4gdGhlIGxpbnV4 LW1lZGlhLCBkcm0gb3IgZHJtLW1pc2MgdHJlZXMgdGhhdCAKY29uZmxpY3Qgd2l0aCB0aGUgc2Vy aWVzLiBXZSBoYXZlIG90aGVyIFZTUCBwYXRjaGVzIHBlbmRpbmcgZm9yIHY0LjE0IHRoYXQgCndp bGwgZ2V0IG1lcmdlZCB0aHJvdWdoIHRoZSBWNEwyIHRyZWUuIElmIGFueSBjb25mbGljdCBvY2N1 cnMsIEknbGwgbWFrZSBzdXJlIAp0byBiYXNlIHRoZW0gb24gdG9wIG9mIHRoaXMgdGFnLCBhbmQg dGVsbCBNYXVybyB0byBwdWxsIGRpcmVjdGx5LgoKLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpEYW4gQ2FycGVudGVyICgxKToK ICAgICAgZHJtOiByY2FyLWR1OiBSZW1vdmUgYW4gdW5uZWVkZWQgTlVMTCBjaGVjawoKS2llcmFu IEJpbmdoYW0gKDEpOgogICAgICBkcm06IHJjYXItZHU6IFJlcGFpciB2YmxhbmsgZm9yIERSTSBw YWdlIGZsaXBzIHVzaW5nIHRoZSBWU1AKCkt1bmlub3JpIE1vcmltb3RvICgxKToKICAgICAgZHJt OiByY2FyLWR1OiBVc2Ugb2ZfZ3JhcGhfZ2V0X3JlbW90ZV9lbmRwb2ludCgpCgpMYXVyZW50IFBp bmNoYXJ0ICgyMCk6CiAgICAgIHY0bDogdnNwMTogRmlsbCBkaXNwbGF5IGxpc3QgaGVhZGVycyB3 aXRob3V0IGhvbGRpbmcgZGxtIHNwaW5sb2NrCiAgICAgIHY0bDogdnNwMTogRG9uJ3QgcmVjeWNs ZSBhY3RpdmUgbGlzdCBhdCBkaXNwbGF5IHN0YXJ0CiAgICAgIHY0bDogdnNwMTogRG9uJ3Qgc2V0 IFdQRiBzaW5rIHBvaW50ZXIKICAgICAgdjRsOiB2c3AxOiBTdG9yZSBzb3VyY2UgYW5kIHNpbmsg cG9pbnRlcnMgYXMgdnNwMV9lbnRpdHkKICAgICAgdjRsOiB2c3AxOiBEb24ndCBjcmVhdGUgbGlu a3MgZm9yIERSTSBwaXBlbGluZQogICAgICB2NGw6IHZzcDE6IEFkZCBwaXBlIGluZGV4IGFyZ3Vt ZW50IHRvIHRoZSBWU1AtRFUgQVBJCiAgICAgIHY0bDogdnNwMTogQWRkIHN1cHBvcnQgZm9yIHRo ZSBCUlMgZW50aXR5CiAgICAgIHY0bDogdnNwMTogQWRkIHN1cHBvcnQgZm9yIG5ldyBWU1AyLUJT LCBWU1AyLURMIGFuZCBWU1AyLUQgaW5zdGFuY2VzCiAgICAgIHY0bDogdnNwMTogQWRkIHN1cHBv cnQgZm9yIG11bHRpcGxlIExJRiBpbnN0YW5jZXMKICAgICAgdjRsOiB2c3AxOiBBZGQgc3VwcG9y dCBmb3IgbXVsdGlwbGUgRFJNIHBpcGVsaW5lcwogICAgICB2NGw6IHZzcDE6IEFkZCBzdXBwb3J0 IGZvciBoZWFkZXIgZGlzcGxheSBsaXN0cyBpbiBjb250aW51b3VzIG1vZGUKICAgICAgZHJtOiBy Y2FyLWR1OiBGaXggY29tbWVudHMgdG8gY29tcGx5IHdpdGggdGhlIGtlcm5lbCBjb2Rpbmcgc3R5 bGUKICAgICAgZHJtOiByY2FyLWR1OiBTdXBwb3J0IG11bHRpcGxlIHNvdXJjZXMgZnJvbSB0aGUg c2FtZSBWU1AKICAgICAgZHJtOiByY2FyLWR1OiBSZXN0cmljdCBEUExMIGR1dHkgY3ljbGUgd29y a2Fyb3VuZCB0byBIMyBFUzEueAogICAgICBkcm06IHJjYXItZHU6IENvbmZpZ3VyZSBEUEFEMCBy b3V0aW5nIHRocm91Z2ggbGFzdCBncm91cCBvbiBHZW4zCiAgICAgIGRybTogcmNhci1kdTogU2V0 dXAgcGxhbmVzIGJlZm9yZSBlbmFibGluZyBDUlRDIHRvIGF2b2lkIGZsaWNrZXIKICAgICAgZHJt OiByY2FyLWR1OiBBZGQgSERNSSBvdXRwdXRzIHRvIFI4QTc3OTYgZGV2aWNlIGRlc2NyaXB0aW9u CiAgICAgIGRybTogcmNhci1kdTogVXNlIHRoZSBWQksgaW50ZXJydXB0IGZvciB2YmxhbmsgZXZl bnRzCiAgICAgIGRybTogcmNhci1kdTogV2FpdCBmb3IgZmxpcCBjb21wbGV0aW9uIGluc3RlYWQg b2YgdmJsYW5rIGluIGNvbW1pdCB0YWlsCiAgICAgIGRybTogcmNhci1kdTogRml4IHJhY2UgY29u ZGl0aW9uIHdoZW4gZGlzYWJsaW5nIHBsYW5lcyBhdCBDUlRDIHN0b3AKCk1hYXJ0ZW4gTGFua2hv cnN0ICgxKToKICAgICAgZHJtOiByY2FyLWR1OiBVc2UgbmV3IGl0ZXJhdG9yIG1hY3JvcwoKIGRy aXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5jICAgIHwgMTg5ICsrKysrKysrKysr KysrKysrKy0tLS0tLS0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5oICAg IHwgIDE3ICsrLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9kcnYuYyAgICAgfCAg MjggKystLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9ncm91cC5jICAgfCAgMzgg KysrLS0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfa21zLmMgICAgIHwgMTEzICsr KysrKysrKysrKy0tLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9sdmRzZW5jLmMg fCAgMTIgKy0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfcGxhbmUuYyAgIHwgMTE0 ICsrKysrKysrLS0tLS0tLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9wbGFuZS5o ICAgfCAgIDMgKy0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfdnNwLmMgICAgIHwg IDUxICsrKystLS0KIGRyaXZlcnMvZ3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfdnNwLmggICAgIHwg IDEwICstCiBkcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R3X2hkbWkuYyAgICB8ICAgMiAr LQogZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDEuaCAgICAgICAgfCAgIDcgKy0KIGRy aXZlcnMvbWVkaWEvcGxhdGZvcm0vdnNwMS92c3AxX2JydS5jICAgIHwgIDQ1ICsrKystLQogZHJp dmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDFfYnJ1LmggICAgfCAgIDQgKy0KIGRyaXZlcnMv bWVkaWEvcGxhdGZvcm0vdnNwMS92c3AxX2RsLmMgICAgIHwgMjA1ICsrKysrKysrKysrKysrKyst LS0tLS0tLS0tLQogZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDFfZGwuaCAgICAgfCAg IDEgLQogZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDFfZHJtLmMgICAgfCAyODYgKysr KysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0KIGRyaXZlcnMvbWVkaWEvcGxhdGZvcm0vdnNwMS92 c3AxX2RybS5oICAgIHwgIDM4ICsrLS0tCiBkcml2ZXJzL21lZGlhL3BsYXRmb3JtL3ZzcDEvdnNw MV9kcnYuYyAgICB8IDExNSArKysrKysrKysrLS0tLS0KIGRyaXZlcnMvbWVkaWEvcGxhdGZvcm0v dnNwMS92c3AxX2VudGl0eS5jIHwgIDQwICsrKystLQogZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92 c3AxL3ZzcDFfZW50aXR5LmggfCAgIDUgKy0KIGRyaXZlcnMvbWVkaWEvcGxhdGZvcm0vdnNwMS92 c3AxX2xpZi5jICAgIHwgICA1ICstCiBkcml2ZXJzL21lZGlhL3BsYXRmb3JtL3ZzcDEvdnNwMV9s aWYuaCAgICB8ICAgMiArLQogZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDFfcGlwZS5j ICAgfCAgMjcgKystLQogZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDFfcGlwZS5oICAg fCAgIDIgKy0KIGRyaXZlcnMvbWVkaWEvcGxhdGZvcm0vdnNwMS92c3AxX3JlZ3MuaCAgIHwgIDQ2 ICsrKystLQogZHJpdmVycy9tZWRpYS9wbGF0Zm9ybS92c3AxL3ZzcDFfdmlkZW8uYyAgfCAgNjkg KysrKystLS0tCiBkcml2ZXJzL21lZGlhL3BsYXRmb3JtL3ZzcDEvdnNwMV93cGYuYyAgICB8ICAg NCArLQogaW5jbHVkZS9tZWRpYS92c3AxLmggICAgICAgICAgICAgICAgICAgICAgfCAgMTIgKy0K IDI5IGZpbGVzIGNoYW5nZWQsIDk0OSBpbnNlcnRpb25zKCspLCA1NDEgZGVsZXRpb25zKC0pCi0t IApSZWdhcmRzLAoKTGF1cmVudCBQaW5jaGFydAoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlz dHMuZnJlZWRlc2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4v bGlzdGluZm8vZHJpLWRldmVsCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from galahad.ideasonboard.com ([185.26.127.97]:55528 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751244AbdHCNbj (ORCPT ); Thu, 3 Aug 2017 09:31:39 -0400 From: Laurent Pinchart To: Dave Airlie Cc: dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, Mauro Carvalho Chehab Subject: [GIT PUL FOR v4.14] R-Car DU changes Date: Thu, 03 Aug 2017 16:31:52 +0300 Message-ID: <5217228.MDybz51Srh@avalon> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-media-owner@vger.kernel.org List-ID: Hi Dave, The following changes since commit e6742e1021a5cec55fab50a0b115c65217488eda: drm: linux-next: build failure after merge of the drm-misc tree (2017-07-27 08:27:11 +1000) are available in the git repository at: git://linuxtv.org/pinchartl/media.git tags/drm-next-du-20170803 for you to fetch changes up to a01ce6678bad548be4063286bfd12ccba3808a2e: drm: rcar-du: Use new iterator macros (2017-08-03 16:17:35 +0300) The branch contains patches for the VSP driver which would normally go through the V4L2 subsystem. As some DU patches depend on them (and as one of the patches in the series touches the two drivers), it was agreed with Mauro to get the whole series merged through your tree (all the patches that touch V4L2 carry his Acked-by). I have based the series on top of the v4.13-rc2 backmerge in your tree (plus one compilation fix from -next), as it depends on "drm: Add drm_atomic_helper_wait_for_flip_done()" that you have merged after v4.13-rc1. There is currently no patch in the linux-media, drm or drm-misc trees that conflict with the series. We have other VSP patches pending for v4.14 that will get merged through the V4L2 tree. If any conflict occurs, I'll make sure to base them on top of this tag, and tell Mauro to pull directly. ---------------------------------------------------------------- Dan Carpenter (1): drm: rcar-du: Remove an unneeded NULL check Kieran Bingham (1): drm: rcar-du: Repair vblank for DRM page flips using the VSP Kuninori Morimoto (1): drm: rcar-du: Use of_graph_get_remote_endpoint() Laurent Pinchart (20): v4l: vsp1: Fill display list headers without holding dlm spinlock v4l: vsp1: Don't recycle active list at display start v4l: vsp1: Don't set WPF sink pointer v4l: vsp1: Store source and sink pointers as vsp1_entity v4l: vsp1: Don't create links for DRM pipeline v4l: vsp1: Add pipe index argument to the VSP-DU API v4l: vsp1: Add support for the BRS entity v4l: vsp1: Add support for new VSP2-BS, VSP2-DL and VSP2-D instances v4l: vsp1: Add support for multiple LIF instances v4l: vsp1: Add support for multiple DRM pipelines v4l: vsp1: Add support for header display lists in continuous mode drm: rcar-du: Fix comments to comply with the kernel coding style drm: rcar-du: Support multiple sources from the same VSP drm: rcar-du: Restrict DPLL duty cycle workaround to H3 ES1.x drm: rcar-du: Configure DPAD0 routing through last group on Gen3 drm: rcar-du: Setup planes before enabling CRTC to avoid flicker drm: rcar-du: Add HDMI outputs to R8A7796 device description drm: rcar-du: Use the VBK interrupt for vblank events drm: rcar-du: Wait for flip completion instead of vblank in commit tail drm: rcar-du: Fix race condition when disabling planes at CRTC stop Maarten Lankhorst (1): drm: rcar-du: Use new iterator macros drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 189 ++++++++++++++++++------- drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 17 ++- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 28 ++-- drivers/gpu/drm/rcar-du/rcar_du_group.c | 38 +++-- drivers/gpu/drm/rcar-du/rcar_du_kms.c | 113 ++++++++++++--- drivers/gpu/drm/rcar-du/rcar_du_lvdsenc.c | 12 +- drivers/gpu/drm/rcar-du/rcar_du_plane.c | 114 ++++++++------- drivers/gpu/drm/rcar-du/rcar_du_plane.h | 3 +- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 51 ++++--- drivers/gpu/drm/rcar-du/rcar_du_vsp.h | 10 +- drivers/gpu/drm/rcar-du/rcar_dw_hdmi.c | 2 +- drivers/media/platform/vsp1/vsp1.h | 7 +- drivers/media/platform/vsp1/vsp1_bru.c | 45 ++++-- drivers/media/platform/vsp1/vsp1_bru.h | 4 +- drivers/media/platform/vsp1/vsp1_dl.c | 205 ++++++++++++++++----------- drivers/media/platform/vsp1/vsp1_dl.h | 1 - drivers/media/platform/vsp1/vsp1_drm.c | 286 +++++++++++++---------------- drivers/media/platform/vsp1/vsp1_drm.h | 38 ++--- drivers/media/platform/vsp1/vsp1_drv.c | 115 ++++++++++----- drivers/media/platform/vsp1/vsp1_entity.c | 40 ++++-- drivers/media/platform/vsp1/vsp1_entity.h | 5 +- drivers/media/platform/vsp1/vsp1_lif.c | 5 +- drivers/media/platform/vsp1/vsp1_lif.h | 2 +- drivers/media/platform/vsp1/vsp1_pipe.c | 27 ++-- drivers/media/platform/vsp1/vsp1_pipe.h | 2 +- drivers/media/platform/vsp1/vsp1_regs.h | 46 ++++-- drivers/media/platform/vsp1/vsp1_video.c | 69 +++++---- drivers/media/platform/vsp1/vsp1_wpf.c | 4 +- include/media/vsp1.h | 12 +- 29 files changed, 949 insertions(+), 541 deletions(-) -- Regards, Laurent Pinchart