From patchwork Fri Dec 1 06:05:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 10086329 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 560E46037E for ; Fri, 1 Dec 2017 06:24:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 400EA2A509 for ; Fri, 1 Dec 2017 06:24:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 340FA2A50C; Fri, 1 Dec 2017 06:24:46 +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.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2CBDB2A509 for ; Fri, 1 Dec 2017 06:24:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=h3y0O0CDp7CsmgljcDgpzVC2oGWoet2BKXYfDT7zFcs=; b=fSmfPuQ8XMQTYJHX6k/dy9NH3r JcvqN/x+u0Kdzorq+c/U8Nw0ldobYDYC509IH8Yiy+E/tlrLDnC1pU0XJII98DXxPB2kOb2OCSfhz GXwA7wWDgcQH22ZRkCrGjqOlU8L/NKtEkxulbJNCGgf73rFkhMWlLmlR0gvthyu7VwDjAPoOJgNvc iRugmIp9lEw1hlvPJ/aj4m2Qyqgq1e/O3GQVBflczL8aYSnJZJv63MjVkzHNdaj3UsOtMREVZtdNg Y7I0WIrjZdHmogwoU7nIdGdxnGiHV5Zq4bLZqPGDPA/fPOPNfmFdaCy7CruTv8EyIbw7dCZGHv5DG cbxqEDIw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eKeke-0002Gf-9t; Fri, 01 Dec 2017 06:24:44 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKejg-0001In-8L for linux-arm-kernel@bombadil.infradead.org; Fri, 01 Dec 2017 06:23:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=E1koT1wJiZ79A01X7hI/3YIln6Vg4Rnsq7CKrywp+Zo=; b=oAgfQA8xWmYmtFXE/ruKcApGS K/Aw8ijN6W6Q7Y91uwAlKBwNtFsytz2BsVZdlhl4VS4BMyinu8btaRtQ9ZHp1lSjBoEW7IoCaoTO9 pxNwiFFVlfi0kmZNF2kcFfV1GdXtoG8ug3h3d2SYSnj7fXSO5uZny2lRvnyGugqqfzprEPD9yuBz+ 6C7rdCjKzTtYJMKgDElWXg6BRe2Nk8ep3FXaWxXX9AUoERFaHtcP+eIPReEkqjOBY+7iPd4eTm/eA fn4pdZKKoCnmX5JSTraLS93iXKj+sF28At01Ka2LDYB50xfhMj7o4DmrXeXeVQUEG2Q1mmvdJ+MDR 5DOMQrd0w==; Received: from mailoutvs3.siol.net ([213.250.19.136] helo=mail.siol.net) by casper.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1eKeU8-0008Nl-5Y for linux-arm-kernel@lists.infradead.org; Fri, 01 Dec 2017 06:07:45 +0000 Received: from localhost (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTP id 7204D520855; Fri, 1 Dec 2017 07:07:00 +0100 (CET) X-Virus-Scanned: amavisd-new at psrvmta09.zcs-production.pri Received: from mail.siol.net ([127.0.0.1]) by localhost (psrvmta09.zcs-production.pri [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id lVSj4vBGQI30; Fri, 1 Dec 2017 07:06:59 +0100 (CET) Received: from mail.siol.net (localhost [127.0.0.1]) by mail.siol.net (Postfix) with ESMTPS id DB0BB520802; Fri, 1 Dec 2017 07:06:59 +0100 (CET) Received: from localhost.localdomain (cpe-86-58-68-135.ftth.triera.net [86.58.68.135]) (Authenticated sender: 031275009) by mail.siol.net (Postfix) with ESMTPSA id 8679F520829; Fri, 1 Dec 2017 07:06:57 +0100 (CET) From: Jernej Skrabec To: maxime.ripard@free-electrons.com Subject: [PATCH v2 20/27] drm/sun4i: Add scaler configuration to DE2 mixers Date: Fri, 1 Dec 2017 07:05:43 +0100 Message-Id: <20171201060550.10392-21-jernej.skrabec@siol.net> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171201060550.10392-1-jernej.skrabec@siol.net> References: <20171201060550.10392-1-jernej.skrabec@siol.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171201_060740_245059_970DCCF8 X-CRM114-Status: GOOD ( 10.99 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: airlied@linux.ie, linux-sunxi@googlegroups.com, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, wens@csie.org, linux-arm-kernel@lists.infradead.org, icenowy@aosc.io MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP No all SoCs support scaling on all channels. For example, V3s support scaling only on VI channels. Because of that, add additional configuration bitmask which tells which channel support scaler. Signed-off-by: Jernej Skrabec --- drivers/gpu/drm/sun4i/sun8i_mixer.c | 1 + drivers/gpu/drm/sun4i/sun8i_mixer.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c index 888620b1d3f1..e3296a060352 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c @@ -336,6 +336,7 @@ static int sun8i_mixer_remove(struct platform_device *pdev) static const struct sun8i_mixer_cfg sun8i_v3s_mixer_cfg = { .vi_num = 2, .ui_num = 1, + .scaler_mask = 0x3, }; static const struct of_device_id sun8i_mixer_of_table[] = { diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.h b/drivers/gpu/drm/sun4i/sun8i_mixer.h index bad0969ac105..a6270b307ae5 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.h +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.h @@ -94,9 +94,19 @@ struct de2_fmt_info { u32 de2_fmt; }; +/** + * struct sun8i_mixer_cfg - mixer HW configuration + * @vi_num: number of VI channels + * @ui_num: number of UI channels + * @scaler_mask: bitmask which tells which channel supports scaling + * First, scaler supports for VI channels is defined and after that, scaler + * support for UI channels. For example, if mixer has 2 VI channels without + * scaler and 2 UI channels with scaler, bitmask would be 0xC. + */ struct sun8i_mixer_cfg { int vi_num; int ui_num; + int scaler_mask; }; struct sun8i_mixer {