From patchwork Mon May 30 16:00:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulrich Hecht X-Patchwork-Id: 9143097 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 2325B60761 for ; Tue, 31 May 2016 00:35:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 152E41FF27 for ; Tue, 31 May 2016 00:35:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 09F4B2521F; Tue, 31 May 2016 00:35:30 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B730A1FF27 for ; Tue, 31 May 2016 00:35:29 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 499666E202; Tue, 31 May 2016 00:35:00 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf0-x243.google.com (mail-lf0-x243.google.com [IPv6:2a00:1450:4010:c07::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 793126E6B2 for ; Mon, 30 May 2016 16:00:57 +0000 (UTC) Received: by mail-lf0-x243.google.com with SMTP id h68so7203753lfh.3 for ; Mon, 30 May 2016 09:00:57 -0700 (PDT) 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=A+XTQyne2t1JXQkDbIv/xxHNmUTaxUqM11kTtUzcwHw=; b=T8AwTLGvzcs/+C2x/gYNKPXEBxvhVgXZZXdU4OEKwj6DiQLbOVDgO4mkerS5hXG89F vn0hA32ZpLO2bYur2ezhlvyAIXZwg4gyaSAJ2X0T5apj0ilysZj/WoeM4meRKnqpnSH/ GoDivJy9xuyQ37Nwdd0ewCpa7ahQinYPVgAi6PQ2q6ZS1/cnEMfQfgKMfFsXAiFaw9v9 QMlbc+qUiIYQe6+V6j/iJ3rz2HaVncc/3swzH2stNOLKejgYmqP+msq2da9ZCBZRfSiT XLYClUIt5uoYAOtWcAeFJDqp+U22EP1XHNfyhKCAzB3tsLqRD7V5Jfc8ty/hVlTF+7QK 6/rQ== 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=A+XTQyne2t1JXQkDbIv/xxHNmUTaxUqM11kTtUzcwHw=; b=fPyDXHpzmK5UisAMmMjBNALiwxPCMlBVag+0Sx/zvPDzOv1YE0U2zqUJEjl+bYsbHF /lgmVs8GXSHVTDUk5ymf0jnfp5kcSprzpAdn7wyr6U7Xhtbx2/fNxFKExPqDx+8HPFJ3 4KWQBV1H0MisUgZA8d7t4c7ugoFREQCEFDgNc9T0Lbg8dUTVkK7om8kDj8inCi5MkdNY 3dKkwR//YYR+uneIvQFSa7Q/Zl4gDPTpmn/zC+eui947wyxnEyrLce9SareWCAQCH0yv M0HiduZMeQsUZElrOGntaq3wPgyGrD7dMfawpUpjqqxKZtyUPPARlRPyoSwE6FB0Zxx0 olQg== X-Gm-Message-State: ALyK8tIG2tq14+KozXeih6XchmQDKpAH3ybO48WNXnVOFq62JuCEekzv6jBBVfvlmZAexQ== X-Received: by 10.46.71.213 with SMTP id u204mr5573248lja.15.1464624055525; Mon, 30 May 2016 09:00:55 -0700 (PDT) Received: from groucho.site (ip9234f47f.dynamic.kabel-deutschland.de. [146.52.244.127]) by smtp.gmail.com with ESMTPSA id b8sm4704926lbc.16.2016.05.30.09.00.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 May 2016 09:00:54 -0700 (PDT) From: Ulrich Hecht To: linux-renesas-soc@vger.kernel.org, geert@linux-m68k.org Subject: [RFC 10/21] drm: rcar-du: Fix VSP plane number per devices Date: Mon, 30 May 2016 18:00:09 +0200 Message-Id: <1464624020-27709-11-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464624020-27709-1-git-send-email-ulrich.hecht+renesas@gmail.com> References: <1464624020-27709-1-git-send-email-ulrich.hecht+renesas@gmail.com> X-Mailman-Approved-At: Tue, 31 May 2016 00:34:37 +0000 Cc: Geert Uytterhoeven , kuninori.morimoto.gx@renesas.com, koji.matsuoka.xm@renesas.com, dri-devel@lists.freedesktop.org, vz@mleia.com, laurent.pinchart@ideasonboard.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Koji Matsuoka Signed-off-by: Koji Matsuoka Signed-off-by: Geert Uytterhoeven --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 ++ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 3 ++- drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 3907461..26fd3ba 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -108,6 +108,7 @@ static const struct rcar_du_device_info rcar_du_r8a7791_info = { }, }, .num_lvds = 1, + .vsp_num = 4, }; static const struct rcar_du_device_info rcar_du_r8a7794_info = { @@ -167,6 +168,7 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = { }, .num_lvds = 1, .dpll_ch = BIT(1) | BIT(2), + .vsp_num = 5, }; static const struct of_device_id rcar_du_of_table[] = { diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index 790829b..6413b7e 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -70,12 +70,13 @@ struct rcar_du_device_info { struct rcar_du_output_routing routes[RCAR_DU_OUTPUT_MAX]; unsigned int num_lvds; unsigned int dpll_ch; + unsigned int vsp_num; }; #define RCAR_DU_MAX_CRTCS 4 #define RCAR_DU_MAX_GROUPS DIV_ROUND_UP(RCAR_DU_MAX_CRTCS, 2) #define RCAR_DU_MAX_LVDS 2 -#define RCAR_DU_MAX_VSPS 4 +#define RCAR_DU_MAX_VSPS 5 struct rcar_du_device { struct device *dev; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index 4927fb3..89176e6 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -349,7 +349,7 @@ int rcar_du_vsp_init(struct rcar_du_vsp *vsp) /* The VSP2D (Gen3) has 5 RPFs, but the VSP1D (Gen2) is limited to * 4 RPFs. */ - vsp->num_planes = rcdu->info->gen >= 3 ? 5 : 4; + vsp->num_planes = rcdu->info->vsp_num; vsp->planes = devm_kcalloc(rcdu->dev, vsp->num_planes, sizeof(*vsp->planes), GFP_KERNEL);