Received: by 2002:a05:6a10:a0d1:0:0:0:0 with SMTP id j17csp234575pxa; Tue, 4 Aug 2020 04:23:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxipKrmzgtph0VtCi8W2fgI15hR1+dIro1xoLj8n7oHmzR25j1XXQInxobag7Aw/NnvyY+a X-Received: by 2002:aa7:c0d8:: with SMTP id j24mr20330740edp.338.1596540236043; Tue, 04 Aug 2020 04:23:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596540236; cv=none; d=google.com; s=arc-20160816; b=sMRhjFZ+HCCHp+DAhQoPEvcjN+/Z4I5R7PCWyyW6940lPkjvWfiHoNPEG6Wz9smkXS lNAREnnJONZ4dDhJ5BOD1ES4mcLmKSt6SHyT4ZBe+JgB157TY6/ugTGURe23Zi35OkJi Lr4briu3qCD0Tp74OTPoCLEXZI8oNxfyVUGq975llnwBKo4B58SgTSJgA/Is9AObT0qA +IDp5Cn3rgxYZ3DGCF8+aBcmOxZYTFjBA2fgmHi5NEKMQ9rslXVBvgkMvAkIf6ZlfN7Y FMiBDgyI/pbh6ZCb18cTmIpE4gJpRa/JAasjY90Vi6wgHhXtoG8ff5f3VbfR539ejRK+ 0s9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3NBlv1VYRcJ4FEzI7JudA6/Ov5jhlWSFE3HvygtTg3k=; b=mQc1iWDkEn50INqfqxqpXAQLDMqJNcJ0fo7U9X/urCFjRYYn9Fe/pNkC91arb7V1k1 L23icWYw8w1bC5we0Xvy0aHvJ3ieV3g+oSO9rSPMKmi/Y+kjaFaUF3NO1dYGpv0bTgJK 5AGZTuLxebP+HLDSxwgLgTuCZA+d3qTYdv5qYQ+/rJg2V+U6pM6NGh2/YZm/0Kk/mF/9 8VR0a+eqv9a2duG4WPwe/UgkgQKZRjKNBxyRtxhtAf9Y0EQuJhAnoyl+OZRXchO9+f5I 0g0cEFJ3m6lJv5Qy9lYOpUNJlrPGZcoyenHxKH6qlUVychNR3hAysoNk6eqTqfTbqgOo IBrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mailerdienst.de header.s=20200217 header.b="v4BW27/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z24si11261011ejx.483.2020.08.04.04.23.33; Tue, 04 Aug 2020 04:23:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@mailerdienst.de header.s=20200217 header.b="v4BW27/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730266AbgHDLUX (ORCPT + 99 others); Tue, 4 Aug 2020 07:20:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726958AbgHDLF0 (ORCPT ); Tue, 4 Aug 2020 07:05:26 -0400 X-Greylist: delayed 348 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 04 Aug 2020 04:05:20 PDT Received: from mxwww.masterlogin.de (mxwww.masterlogin.de [IPv6:2a03:2900:1:1::b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E17BC06174A for ; Tue, 4 Aug 2020 04:05:12 -0700 (PDT) Received: from mxout4.routing.net (unknown [192.168.10.112]) by forward.mxwww.masterlogin.de (Postfix) with ESMTPS id 76F5396305; Tue, 4 Aug 2020 10:59:22 +0000 (UTC) Received: from mxbox3.masterlogin.de (unknown [192.168.10.78]) by mxout4.routing.net (Postfix) with ESMTP id 40254100039; Tue, 4 Aug 2020 10:59:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailerdienst.de; s=20200217; t=1596538762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3NBlv1VYRcJ4FEzI7JudA6/Ov5jhlWSFE3HvygtTg3k=; b=v4BW27/rwQcnr/yFbk+K/0wVuA9dOeZQ3rySlhRBgs5r5AaZ6htUHb1S2CaatTncZijM+B Lu6i9pKvn1+yYL+O0IGjhxBX+7+kWxm3+i7qrwl+WgNq5/CsGogiJ6PyNlZq3YbN9KBJBK 3uLrAHv4GGQeBVXgw0XIMROis/R/i8A= Received: from localhost.localdomain (fttx-pool-217.61.144.119.bambit.de [217.61.144.119]) by mxbox3.masterlogin.de (Postfix) with ESMTPSA id 9640B3603F1; Tue, 4 Aug 2020 10:59:21 +0000 (UTC) From: Frank Wunderlich To: linux-mediatek@lists.infradead.org Cc: Frank Wunderlich , Chun-Kuang Hu , Philipp Zabel , David Airlie , Daniel Vetter , Matthias Brugger , dri-devel@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/5] drm: mediatek: add ddp routing for mt7623 Date: Tue, 4 Aug 2020 12:58:45 +0200 Message-Id: <20200804105849.70876-2-linux@fw-web.de> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200804105849.70876-1-linux@fw-web.de> References: <20200804105849.70876-1-linux@fw-web.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Frank Wunderlich on BPi-R2/mt7623 main-path have to be routed to DPI0 (hdmi) instead of DSI0 using compatible "mt7623-mmsys" already defined in dts Signed-off-by: Frank Wunderlich --- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 6bd369434d9d..9e418b83be48 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -74,7 +74,20 @@ static const enum mtk_ddp_comp_id mt2701_mtk_ddp_ext[] = { DDP_COMPONENT_DPI0, }; -static const enum mtk_ddp_comp_id mt2712_mtk_ddp_main[] = { +static const enum mtk_ddp_comp_id mt7623_mtk_ddp_main[] = { + DDP_COMPONENT_OVL0, + DDP_COMPONENT_RDMA0, + DDP_COMPONENT_COLOR0, + DDP_COMPONENT_BLS, + DDP_COMPONENT_DPI0, +}; + +static const enum mtk_ddp_comp_id mt7623_mtk_ddp_ext[] = { + DDP_COMPONENT_RDMA1, + DDP_COMPONENT_DSI0, +}; + +static enum mtk_ddp_comp_id mt2712_mtk_ddp_main[] = { DDP_COMPONENT_OVL0, DDP_COMPONENT_COLOR0, DDP_COMPONENT_AAL0, @@ -127,6 +140,14 @@ static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = { .shadow_register = true, }; +static const struct mtk_mmsys_driver_data mt7623_mmsys_driver_data = { + .main_path = mt7623_mtk_ddp_main, + .main_len = ARRAY_SIZE(mt7623_mtk_ddp_main), + .ext_path = mt7623_mtk_ddp_ext, + .ext_len = ARRAY_SIZE(mt7623_mtk_ddp_ext), + .shadow_register = true, +}; + static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = { .main_path = mt2712_mtk_ddp_main, .main_len = ARRAY_SIZE(mt2712_mtk_ddp_main), @@ -422,6 +443,8 @@ static const struct of_device_id mtk_ddp_comp_dt_ids[] = { static const struct of_device_id mtk_drm_of_ids[] = { { .compatible = "mediatek,mt2701-mmsys", .data = &mt2701_mmsys_driver_data}, + { .compatible = "mediatek,mt7623-mmsys", + .data = &mt7623_mmsys_driver_data}, { .compatible = "mediatek,mt2712-mmsys", .data = &mt2712_mmsys_driver_data}, { .compatible = "mediatek,mt8173-mmsys", -- 2.25.1