From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from galahad.ideasonboard.com ([185.26.127.97]:60004 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752398AbdCFAOk (ORCPT ); Sun, 5 Mar 2017 19:14:40 -0500 From: Laurent Pinchart To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org Subject: [PATCH v3 9/9] drm: rcar-du: Add HDMI outputs to R8A7795 device description Date: Mon, 6 Mar 2017 02:03:02 +0200 Message-Id: <20170306000302.14149-10-laurent.pinchart+renesas@ideasonboard.com> In-Reply-To: <20170306000302.14149-1-laurent.pinchart+renesas@ideasonboard.com> References: <20170306000302.14149-1-laurent.pinchart+renesas@ideasonboard.com> Sender: linux-renesas-soc-owner@vger.kernel.org List-ID: From: Koji Matsuoka Update the device description with the two available HDMI outputs. Signed-off-by: Koji Matsuoka Signed-off-by: Laurent Pinchart --- drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 4 +++- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 12 ++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h index a7194812997e..15871fae7445 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.h @@ -1,7 +1,7 @@ /* * rcar_du_crtc.h -- R-Car Display Unit CRTCs * - * Copyright (C) 2013-2014 Renesas Electronics Corporation + * Copyright (C) 2013-2015 Renesas Electronics Corporation * * Contact: Laurent Pinchart (laurent.pinchart@ideasonboard.com) * @@ -61,6 +61,8 @@ enum rcar_du_output { RCAR_DU_OUTPUT_DPAD1, RCAR_DU_OUTPUT_LVDS0, RCAR_DU_OUTPUT_LVDS1, + RCAR_DU_OUTPUT_HDMI0, + RCAR_DU_OUTPUT_HDMI1, RCAR_DU_OUTPUT_TCON, RCAR_DU_OUTPUT_MAX, }; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 3d789e68ec13..846971fdc196 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -149,13 +149,21 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = { | RCAR_DU_FEATURE_VSP1_SOURCE, .num_crtcs = 4, .routes = { - /* R8A7795 has one RGB output, one LVDS output and two - * (currently unsupported) HDMI outputs. + /* R8A7795 has one RGB output, two HDMI outputs and one + * LVDS output. */ [RCAR_DU_OUTPUT_DPAD0] = { .possible_crtcs = BIT(3), .port = 0, }, + [RCAR_DU_OUTPUT_HDMI0] = { + .possible_crtcs = BIT(1), + .port = 1, + }, + [RCAR_DU_OUTPUT_HDMI1] = { + .possible_crtcs = BIT(2), + .port = 2, + }, [RCAR_DU_OUTPUT_LVDS0] = { .possible_crtcs = BIT(0), .port = 3, -- Regards, Laurent Pinchart From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Pinchart Subject: [PATCH v3 9/9] drm: rcar-du: Add HDMI outputs to R8A7795 device description Date: Mon, 6 Mar 2017 02:03:02 +0200 Message-ID: <20170306000302.14149-10-laurent.pinchart+renesas@ideasonboard.com> References: <20170306000302.14149-1-laurent.pinchart+renesas@ideasonboard.com> 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 [185.26.127.97]) by gabe.freedesktop.org (Postfix) with ESMTPS id A60436E32E for ; Mon, 6 Mar 2017 00:02:37 +0000 (UTC) In-Reply-To: <20170306000302.14149-1-laurent.pinchart+renesas@ideasonboard.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: linux-renesas-soc@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org RnJvbTogS29qaSBNYXRzdW9rYSA8a29qaS5tYXRzdW9rYS54bUByZW5lc2FzLmNvbT4KClVwZGF0 ZSB0aGUgZGV2aWNlIGRlc2NyaXB0aW9uIHdpdGggdGhlIHR3byBhdmFpbGFibGUgSERNSSBvdXRw dXRzLgoKU2lnbmVkLW9mZi1ieTogS29qaSBNYXRzdW9rYSA8a29qaS5tYXRzdW9rYS54bUByZW5l c2FzLmNvbT4KU2lnbmVkLW9mZi1ieTogTGF1cmVudCBQaW5jaGFydCA8bGF1cmVudC5waW5jaGFy dCtyZW5lc2FzQGlkZWFzb25ib2FyZC5jb20+Ci0tLQogZHJpdmVycy9ncHUvZHJtL3JjYXItZHUv cmNhcl9kdV9jcnRjLmggfCAgNCArKystCiBkcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1 X2Rydi5jICB8IDEyICsrKysrKysrKystLQogMiBmaWxlcyBjaGFuZ2VkLCAxMyBpbnNlcnRpb25z KCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1 L3JjYXJfZHVfY3J0Yy5oIGIvZHJpdmVycy9ncHUvZHJtL3JjYXItZHUvcmNhcl9kdV9jcnRjLmgK aW5kZXggYTcxOTQ4MTI5OTdlLi4xNTg3MWZhZTc0NDUgMTAwNjQ0Ci0tLSBhL2RyaXZlcnMvZ3B1 L2RybS9yY2FyLWR1L3JjYXJfZHVfY3J0Yy5oCisrKyBiL2RyaXZlcnMvZ3B1L2RybS9yY2FyLWR1 L3JjYXJfZHVfY3J0Yy5oCkBAIC0xLDcgKzEsNyBAQAogLyoKICAqIHJjYXJfZHVfY3J0Yy5oICAt LSAgUi1DYXIgRGlzcGxheSBVbml0IENSVENzCiAgKgotICogQ29weXJpZ2h0IChDKSAyMDEzLTIw MTQgUmVuZXNhcyBFbGVjdHJvbmljcyBDb3Jwb3JhdGlvbgorICogQ29weXJpZ2h0IChDKSAyMDEz LTIwMTUgUmVuZXNhcyBFbGVjdHJvbmljcyBDb3Jwb3JhdGlvbgogICoKICAqIENvbnRhY3Q6IExh dXJlbnQgUGluY2hhcnQgKGxhdXJlbnQucGluY2hhcnRAaWRlYXNvbmJvYXJkLmNvbSkKICAqCkBA IC02MSw2ICs2MSw4IEBAIGVudW0gcmNhcl9kdV9vdXRwdXQgewogCVJDQVJfRFVfT1VUUFVUX0RQ QUQxLAogCVJDQVJfRFVfT1VUUFVUX0xWRFMwLAogCVJDQVJfRFVfT1VUUFVUX0xWRFMxLAorCVJD QVJfRFVfT1VUUFVUX0hETUkwLAorCVJDQVJfRFVfT1VUUFVUX0hETUkxLAogCVJDQVJfRFVfT1VU UFVUX1RDT04sCiAJUkNBUl9EVV9PVVRQVVRfTUFYLAogfTsKZGlmZiAtLWdpdCBhL2RyaXZlcnMv Z3B1L2RybS9yY2FyLWR1L3JjYXJfZHVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9y Y2FyX2R1X2Rydi5jCmluZGV4IDNkNzg5ZTY4ZWMxMy4uODQ2OTcxZmRjMTk2IDEwMDY0NAotLS0g YS9kcml2ZXJzL2dwdS9kcm0vcmNhci1kdS9yY2FyX2R1X2Rydi5jCisrKyBiL2RyaXZlcnMvZ3B1 L2RybS9yY2FyLWR1L3JjYXJfZHVfZHJ2LmMKQEAgLTE0OSwxMyArMTQ5LDIxIEBAIHN0YXRpYyBj b25zdCBzdHJ1Y3QgcmNhcl9kdV9kZXZpY2VfaW5mbyByY2FyX2R1X3I4YTc3OTVfaW5mbyA9IHsK IAkJICB8IFJDQVJfRFVfRkVBVFVSRV9WU1AxX1NPVVJDRSwKIAkubnVtX2NydGNzID0gNCwKIAku cm91dGVzID0gewotCQkvKiBSOEE3Nzk1IGhhcyBvbmUgUkdCIG91dHB1dCwgb25lIExWRFMgb3V0 cHV0IGFuZCB0d28KLQkJICogKGN1cnJlbnRseSB1bnN1cHBvcnRlZCkgSERNSSBvdXRwdXRzLgor CQkvKiBSOEE3Nzk1IGhhcyBvbmUgUkdCIG91dHB1dCwgdHdvIEhETUkgb3V0cHV0cyBhbmQgb25l CisJCSAqIExWRFMgb3V0cHV0LgogCQkgKi8KIAkJW1JDQVJfRFVfT1VUUFVUX0RQQUQwXSA9IHsK IAkJCS5wb3NzaWJsZV9jcnRjcyA9IEJJVCgzKSwKIAkJCS5wb3J0ID0gMCwKIAkJfSwKKwkJW1JD QVJfRFVfT1VUUFVUX0hETUkwXSA9IHsKKwkJCS5wb3NzaWJsZV9jcnRjcyA9IEJJVCgxKSwKKwkJ CS5wb3J0ID0gMSwKKwkJfSwKKwkJW1JDQVJfRFVfT1VUUFVUX0hETUkxXSA9IHsKKwkJCS5wb3Nz aWJsZV9jcnRjcyA9IEJJVCgyKSwKKwkJCS5wb3J0ID0gMiwKKwkJfSwKIAkJW1JDQVJfRFVfT1VU UFVUX0xWRFMwXSA9IHsKIAkJCS5wb3NzaWJsZV9jcnRjcyA9IEJJVCgwKSwKIAkJCS5wb3J0ID0g MywKLS0gClJlZ2FyZHMsCgpMYXVyZW50IFBpbmNoYXJ0CgpfX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpkcmktZGV2ZWwgbWFpbGluZyBsaXN0CmRyaS1kZXZl bEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5vcmcvbWFp bG1hbi9saXN0aW5mby9kcmktZGV2ZWwK