From patchwork Fri Nov 11 17:07:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9423283 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E07F8601C0 for ; Fri, 11 Nov 2016 17:08:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCA1529B7F for ; Fri, 11 Nov 2016 17:08:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C17AC29BA7; Fri, 11 Nov 2016 17:08:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 423E129B7F for ; Fri, 11 Nov 2016 17:08:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934500AbcKKRIG (ORCPT ); Fri, 11 Nov 2016 12:08:06 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:33129 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934472AbcKKRIG (ORCPT ); Fri, 11 Nov 2016 12:08:06 -0500 Received: by mail-wm0-f67.google.com with SMTP id u144so10731279wmu.0 for ; Fri, 11 Nov 2016 09:08:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=57D7wmkTVcP5bfiTprsjw3H5JwQ5YObRV3n8CPrSWDU=; b=Q/FPgtRcUaDkjS9GW542rAwpbKybLX/+lJBRBYBby4pM+Honkxoskhb45JP3TH+IE+ uZfcXv0YauPQdx0XuFpya6mTp+HN/u+CGwjOfsiH6u+OH5mD3bEcV6cBNEIFuZT8wDqM +U33BwMovgVWJMS9uFECMzPwbGvhx7r5Lu3PSq6y27fcKapmeWYVCNkcC6IJmolwjDuu UUfy6GvxdljAS+rLU1tX/VDe46oHeXKBpsNj5JVruVqY9C/ll9PQNhvHC3KY9WjP0X5g drF1P478Dp/Yp/pRW6+Vq694Eb0mRr9YNDWApPYb8RMB5MLEo9FnZdgBBp/UbT/4FiMa 4X2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=57D7wmkTVcP5bfiTprsjw3H5JwQ5YObRV3n8CPrSWDU=; b=VCOX1t6MBgHcENw1A7qRCBMOUELmRdr1voiLVoBNaNJN6S7hdos1PzOSiIwdjL8W/A dJe+jrnb3KUdWxurX2FbKs48RARmEn1vsH6qoDoFA6AqepekPldBcahwW/VM7D7goeZZ vGRiEdWFOUhVzcS6EGRQtRm+vGtVPnCinaF/Wu7VcvL+wW8wU29U9IZnLtnxpoIJMG3a bUsrF7+AqOC5HT2GIHXPohIqNQarhaHrUj5Zg2zXD97TcxPotQe9xmuPS12nA/R/g1Rl rl5ZjCMfHdmeCA9zmQi/Fcoi7/tIz/BFysRkeHkVQmyWbUnfjAjAQNvt9NKFDSoNWn+y IdkA== X-Gm-Message-State: ABUngvczmf3dTFB6rRzYupzpWHiD2w4gSkvfV+tPdUvCNq7WQjgMAbS/mHysdL3uaaDJCQ== X-Received: by 10.28.35.205 with SMTP id j196mr13064055wmj.62.1478884084671; Fri, 11 Nov 2016 09:08:04 -0800 (PST) Received: from groucho.site (ipb21bf290.dynamic.kabel-deutschland.de. [178.27.242.144]) by smtp.gmail.com with ESMTPSA id m1sm12486896wjk.22.2016.11.11.09.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 11 Nov 2016 09:08:04 -0800 (PST) From: Ulrich Hecht To: linux-renesas-soc@vger.kernel.org, laurent.pinchart@ideasonboard.com, dri-devel@lists.freedesktop.org Cc: kuninori.morimoto.gx@renesas.com, geert@linux-m68k.org, airlied@linux.ie, koji.matsuoka.xm@renesas.com Subject: [PATCH 03/10] drm: rcar-du: Add R8A7795 device support Date: Fri, 11 Nov 2016 18:07:39 +0100 Message-Id: <1478884066-1090-4-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1478884066-1090-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1478884066-1090-1-git-send-email-ulrich.hecht+renesas@gmail.com> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Koji Matsuoka Signed-off-by: Koji Matsuoka --- drivers/gpu/drm/rcar-du/rcar_du_crtc.h | 4 +++- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 14 ++++++++++++-- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 ++ 3 files changed, 17 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 6f08b7e..459e539 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 73c971e..4d0ae8a 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -140,14 +140,24 @@ 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), .encoder_type = DRM_MODE_ENCODER_NONE, .port = 0, }, + [RCAR_DU_OUTPUT_HDMI0] = { + .possible_crtcs = BIT(1), + .encoder_type = RCAR_DU_ENCODER_HDMI, + .port = 1, + }, + [RCAR_DU_OUTPUT_HDMI1] = { + .possible_crtcs = BIT(2), + .encoder_type = RCAR_DU_ENCODER_HDMI, + .port = 2, + }, [RCAR_DU_OUTPUT_LVDS0] = { .possible_crtcs = BIT(0), .encoder_type = DRM_MODE_ENCODER_LVDS, diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index c843c31..c9db610 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -20,6 +20,7 @@ #include "rcar_du_crtc.h" #include "rcar_du_group.h" #include "rcar_du_vsp.h" +#include "rcar_du_encoder.h" struct clk; struct device; @@ -31,6 +32,7 @@ struct rcar_du_lvdsenc; #define RCAR_DU_FEATURE_CRTC_IRQ_CLOCK (1 << 0) /* Per-CRTC IRQ and clock */ #define RCAR_DU_FEATURE_EXT_CTRL_REGS (1 << 1) /* Has extended control registers */ #define RCAR_DU_FEATURE_VSP1_SOURCE (1 << 2) /* Has inputs from VSP1 */ +#define RCAR_DU_FEATURE_GEN3_REGS (1 << 3) /* Use Gen3 registers */ #define RCAR_DU_QUIRK_ALIGN_128B (1 << 0) /* Align pitches to 128 bytes */ #define RCAR_DU_QUIRK_LVDS_LANES (1 << 1) /* LVDS lanes 1 and 3 inverted */