From patchwork Fri Feb 23 13:17:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 10237651 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 7B76560390 for ; Fri, 23 Feb 2018 13:20:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6E8F5295BC for ; Fri, 23 Feb 2018 13:20:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 660C6295CA; Fri, 23 Feb 2018 13:20:37 +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]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id F2C4C295BC for ; Fri, 23 Feb 2018 13:20:24 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E62AC6F0E2; Fri, 23 Feb 2018 13:20:13 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-x243.google.com (mail-qk0-x243.google.com [IPv6:2607:f8b0:400d:c09::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id B666F6F0E2; Fri, 23 Feb 2018 13:20:12 +0000 (UTC) Received: by mail-qk0-x243.google.com with SMTP id v124so10670742qkh.11; Fri, 23 Feb 2018 05:20:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=zyYMOk5XiP9DmnYrol8cVDDWepS/TotwsL8YpE5rgh8=; b=sm0UTh60/oatkPlt5W+hgrSRxUl5k2i/IJEYjP3oDA+QVm3yr9REYqdSJzDD0HqNg0 HTyAUd8bsCd28ViiKpmWavoIA2bPHE7S5YBELpW8pjof6widOKHLugDH4UtAoPNRdebc vH/7oLe2gRXl76NHOcE2yXxc7bz+aAD/40r2Q0z5ebiOTPGfr1N+sFl9B84GbpeMJeg0 ufE+AlsZimfbJJUI8e14h2wJMWf2JWcDLyYtqprggGh3XYS4jqOgA/tFV5a6phucOBUv d2Eo8xRv2cilIrzrp8l/+FdF29XcBuMiXU1svii8Xq3b1KlycjwWQA47tYyvjr5xZNpO SeCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=zyYMOk5XiP9DmnYrol8cVDDWepS/TotwsL8YpE5rgh8=; b=nMz0/kVPZfNEh2RsOiIM/5KLG4Ul3lTvZhZAmZbC9VN3UsP+i4nlAS41sz9hGuM563 RNJ6i3OeYSx2gtian1lvzAWCuWlVaBg/Pu02+PhBXVUVK+KhVmsQAeIonyTQpeg2EPgi zqxm7CGg2QkjFwP1Oz/VWThTBq8lJKhdtudO9LQEDSWOBUuppPpfm4JpzE//owMln+33 airah8hjsP8UuesVt+14AtFD1ST0eVygLWWJ6itfTkL06H0BibAsQALikubnztvj81O2 BdZFThAaTT7NGRA7uTA/g6GeD1JSQBFFKEBWsM6LX/uDmZ9Gy3R2EFdz4e96LDQyrewZ OUEw== X-Gm-Message-State: APf1xPAhXLhbuKxvtyyTlklzUeDgcZ3Y1mohpqnr3epbKFbqsW9gmFxr n7B/cQeAUqIqqwY0zCSyz2/XedNc X-Google-Smtp-Source: AG47ELsQV7o7MqjYVk0MxHuYTQQX1ijTbI+K1/ZOEAq+u1sODQOlMtZSMpGaOcNwxAhROipctg0L1Q== X-Received: by 10.55.73.7 with SMTP id w7mr2313368qka.317.1519392011419; Fri, 23 Feb 2018 05:20:11 -0800 (PST) Received: from localhost ([144.121.20.162]) by smtp.gmail.com with ESMTPSA id u37sm1543905qtj.33.2018.02.23.05.20.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 23 Feb 2018 05:20:10 -0800 (PST) From: Rob Clark To: dri-devel@lists.freedesktop.org Subject: [RFC 3/4] drm/msm/mdp5: add config for writeback pipes Date: Fri, 23 Feb 2018 08:17:53 -0500 Message-Id: <20180223131758.18362-4-robdclark@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180223131758.18362-1-robdclark@gmail.com> References: <20180223131758.18362-1-robdclark@gmail.com> X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Neil Armstrong , David Airlie , linux-arm-msm@vger.kernel.org, Liviu Dudau , linux-kernel@vger.kernel.org, Daniel Vetter , freedreno@lists.freedesktop.org MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Note there seems to be a slight disagreement between public 8x16 HRD (which claims WB2 has offset of 0x65000, relative to start of MDP), and reality (which claims WB2 has offset of 0x64800). I sided with reality. There should also be a WB0 attached to LM0 (which routes to DSI interface). It isn't clear if this can be used at the same time as output to DSI, which would be hugely useful. I was unable to get this to work (with HDMI bridge chip on db410c, so DSI in video mode). This will be needed to implement writeback support, but also useful to remove a manual hack to the generated headers (since rnndb register docs for WB had been merged long ago). Also fixes LM3 offset. Signed-off-by: Rob Clark Reviewed-by: Sean Paul --- drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 2 -- drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 17 +++++++++++------ drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h | 11 +++++++++++ drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 1 + 4 files changed, 23 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h index d9c10e02ee41..bebcbabb1fe4 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h @@ -1391,13 +1391,11 @@ static inline uint32_t REG_MDP5_PP_FBC_LOSSY_MODE(uint32_t i0) { return 0x000000 static inline uint32_t __offset_WB(uint32_t idx) { switch (idx) { -#if 0 /* TEMPORARY until patch that adds wb.base[] is merged */ case 0: return (mdp5_cfg->wb.base[0]); case 1: return (mdp5_cfg->wb.base[1]); case 2: return (mdp5_cfg->wb.base[2]); case 3: return (mdp5_cfg->wb.base[3]); case 4: return (mdp5_cfg->wb.base[4]); -#endif default: return INVALID_IDX(idx); } } diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c index 824067d2d427..f92e68cdeeef 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c @@ -300,8 +300,8 @@ const struct mdp5_cfg_hw msm8x16_config = { }, }, .ctl = { - .count = 5, - .base = { 0x01000, 0x01200, 0x01400, 0x01600, 0x01800 }, + .count = 3, + .base = { 0x01000, 0x01200, 0x01400 }, .flush_hw_mask = 0x4003ffff, }, .pipe_vig = { @@ -324,7 +324,7 @@ const struct mdp5_cfg_hw msm8x16_config = { }, .lm = { .count = 2, /* LM0 and LM3 */ - .base = { 0x44000, 0x47000 }, + .base = { [0] = 0x44000, [3] = 0x47000 }, .instances = { { .id = 0, .pp = 0, .dspp = 0, .caps = MDP_LM_CAP_DISPLAY, }, @@ -338,12 +338,17 @@ const struct mdp5_cfg_hw msm8x16_config = { .dspp = { .count = 1, .base = { 0x54000 }, - + }, + .wb = { + .count = 1, + .base = { [0] = 0x64000, [2] = 0x64800 }, + .instances = { + { .id = 2, .lm = 3 }, + }, }, .intf = { - .base = { 0x00000, 0x6a800 }, + .base = { 0x6a000, 0x6a800, 0x6b000, 0x6b800 }, .connect = { - [0] = INTF_DISABLED, [1] = INTF_DSI, }, }, diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h index 75910d0f2f4c..2e529fb2f9ee 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h @@ -77,6 +77,16 @@ struct mdp5_mdp_block { uint32_t caps; /* MDP capabilities: MDP_CAP_xxx bits */ }; +struct mdp5_wb_instance { + int id; + int lm; +}; + +struct mdp5_wb_block { + MDP5_SUB_BLOCK_DEFINITION; + struct mdp5_wb_instance instances[MAX_BASES]; +}; + #define MDP5_INTF_NUM_MAX 5 struct mdp5_intf_block { @@ -100,6 +110,7 @@ struct mdp5_cfg_hw { struct mdp5_sub_block pp; struct mdp5_sub_block dsc; struct mdp5_sub_block cdm; + struct mdp5_wb_block wb; struct mdp5_intf_block intf; uint32_t max_clk; diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c index 6d8e3a9a6fc0..1f44d8f15ce1 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c @@ -652,6 +652,7 @@ struct msm_kms *mdp5_kms_init(struct drm_device *dev) pm_runtime_get_sync(&pdev->dev); for (i = 0; i < MDP5_INTF_NUM_MAX; i++) { if (mdp5_cfg_intf_is_virtual(config->hw->intf.connect[i]) || + (config->hw->intf.connect[i] == INTF_DISABLED) || !config->hw->intf.base[i]) continue; mdp5_write(mdp5_kms, REG_MDP5_INTF_TIMING_ENGINE_EN(i), 0);