From patchwork Thu Aug 18 16:04:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 9288773 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 53AEC607FF for ; Fri, 19 Aug 2016 00:59:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 453ED28FFB for ; Fri, 19 Aug 2016 00:59:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 39268291D9; Fri, 19 Aug 2016 00:59:52 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI 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 E56CE28FFB for ; Fri, 19 Aug 2016 00:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754532AbcHSA7n (ORCPT ); Thu, 18 Aug 2016 20:59:43 -0400 Received: from galahad.ideasonboard.com ([185.26.127.97]:49551 "EHLO galahad.ideasonboard.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754406AbcHSA7k (ORCPT ); Thu, 18 Aug 2016 20:59:40 -0400 Received: from localhost.localdomain (227.178-201-80.adsl-dyn.isp.belgacom.be [80.201.178.227]) by galahad.ideasonboard.com (Postfix) with ESMTPSA id 85B60208DD for ; Thu, 18 Aug 2016 18:03:34 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1471536214; bh=3yOnMdOABctqv2mQ6XUTuH40Ts1oL9Lx9hdtAw7rgrk=; h=From:To:Subject:Date:In-Reply-To:References:From; b=imTsUm6lc6o5uBWEn1U5SZUNx0pAIVqYRTMiqhfeGjTgdfKASpOPhBwvOQGqquPoy dikqnccx9/SifEE4XQbfjybQ1yiid15oF6piBiCnN2AZLJ8fBVnR3fv/lFgIP0Mv6v QdeOwDzoKlzibT1b66ffXNv5HK6t+qstLaDsUz4c= From: Laurent Pinchart To: linux-renesas-soc@vger.kernel.org Subject: [PATCH/HACK 7/7] [HACK] drm: rcar-du: Enable VSP source support for R8A7790 Date: Thu, 18 Aug 2016 19:04:00 +0300 Message-Id: <1471536240-25082-8-git-send-email-laurent.pinchart+renesas@ideasonboard.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1471536240-25082-1-git-send-email-laurent.pinchart+renesas@ideasonboard.com> References: <1471536240-25082-1-git-send-email-laurent.pinchart+renesas@ideasonboard.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 Pretend the R8A7790 requires usage of VSP composition to test the feature until Gen3 hardware is available. As the driver requires one VSP1 instance per CRTC, disable DU2. Signed-off-by: Laurent Pinchart --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 899ef7a2a7b4..93888e41487c 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -60,15 +60,16 @@ static const struct rcar_du_device_info rcar_du_r8a7779_info = { static const struct rcar_du_device_info rcar_du_r8a7790_info = { .gen = 2, .features = RCAR_DU_FEATURE_CRTC_IRQ_CLOCK - | RCAR_DU_FEATURE_EXT_CTRL_REGS, + | RCAR_DU_FEATURE_EXT_CTRL_REGS + | RCAR_DU_FEATURE_VSP1_SOURCE, .quirks = RCAR_DU_QUIRK_ALIGN_128B | RCAR_DU_QUIRK_LVDS_LANES, - .num_crtcs = 3, + .num_crtcs = 2, .routes = { /* R8A7790 has one RGB output, two LVDS outputs and one * (currently unsupported) TCON output. */ [RCAR_DU_OUTPUT_DPAD0] = { - .possible_crtcs = BIT(2) | BIT(1) | BIT(0), + .possible_crtcs = BIT(1) | BIT(0), .encoder_type = DRM_MODE_ENCODER_NONE, .port = 0, }, @@ -78,7 +79,7 @@ static const struct rcar_du_device_info rcar_du_r8a7790_info = { .port = 1, }, [RCAR_DU_OUTPUT_LVDS1] = { - .possible_crtcs = BIT(2) | BIT(1), + .possible_crtcs = BIT(1), .encoder_type = DRM_MODE_ENCODER_LVDS, .port = 2, },