Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp1584639imu; Wed, 23 Jan 2019 21:10:53 -0800 (PST) X-Google-Smtp-Source: ALg8bN4Aro+sdI/stfxWCu+nJGSactEiTEhhgwDJ9XNsmnx7ipiGGJU7chElSq/yIC063bm8PZR3 X-Received: by 2002:a17:902:8ec8:: with SMTP id x8mr5195338plo.210.1548306653097; Wed, 23 Jan 2019 21:10:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1548306653; cv=none; d=google.com; s=arc-20160816; b=VG0iRY7dH5A1XX0k9MSXLRWi0oXrRQA1qZ409KfIE7YfMAf9vbxoiF1SNiqnVss13s obtlIw/yRgONaIqSN4fna4mkVjxt+vj7tKGa++qBTvAghZcZSmt+6XGi73DucE2OL6YG fJQbQdnqLATqPJzMHqg3pjvk/9BVSfCIweWDgwYg2rS31LnEfmUwap7RntyPkrJwsrkn cVAXPnH14Y7ZpYk5LzR9sF4CHJkesEhO1NtRYak5t1zyaj321npETEzs4PROgvLH5OpB QQDwt/eoLVPCsffbcNeA5WCmMGQWAPBZ7Dn9qoDKdGXe1Mwqu2bTTL9B/HuMyQayNDWr 0ESQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dmarc-filter:dkim-signature:dkim-signature; bh=xweYYpRxdzOBXQsdpMq/aYTupRtuxF0iNQcUv/vl9nU=; b=dFzsRds7HBGC4EnTDtdrORoAi8q10RAszgUODnun0vGuQ/VzkOL0YZ29gla7oQ4LEv rdBmQwm73pyCsyJA7tUnjdqxnINvaJ3zjm1tNjHg1NNtunsreTs3QjtDbU/cLmimZCXG 4emr5aB/5RUxytny8gEPKfNtWm5MPv0ktHEYDVGuTTT/KdZgADKT5fo2g3ugFC9fFNcS lupfy9UgqROTxSblb/nUsBWPinp19vIVSJXT69ZD1PsAgsm4nUnuWI0AaoFmc8Gjlhxn ROzN035ghTmjp8vszBw6e/CWEfuVy1P3CBiaX95eW01bfxDddINThtm48Ioi0kPsja1d KypA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=pDECScCA; dkim=pass header.i=@codeaurora.org header.s=default header.b=PB4WgXJa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a17si20249091pgv.456.2019.01.23.21.10.38; Wed, 23 Jan 2019 21:10:53 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@codeaurora.org header.s=default header.b=pDECScCA; dkim=pass header.i=@codeaurora.org header.s=default header.b=PB4WgXJa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726233AbfAXFK0 (ORCPT + 99 others); Thu, 24 Jan 2019 00:10:26 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:36906 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725290AbfAXFKZ (ORCPT ); Thu, 24 Jan 2019 00:10:25 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 0DBCA608CD; Thu, 24 Jan 2019 05:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1548306624; bh=66IBQoiC6i1TRAAZoykiUpyRRqHMjilhL397fe6XWNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pDECScCAleSdza19OPi1nzeFzV68UYRcEaioPWCYpHMxq11+TW9SQHsQKWzjiH0D6 1FvNiY6nSB12UAOxADcwr5OLDedeJHwbY6+UmVP5M/q4nUuWcv4cayyvEvSMHBvCW8 0RJX5UnBbjrjEAWnojUaBgybHQB3MOf1HGFuLq9k= X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on pdx-caf-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=ALL_TRUSTED,BAYES_00, DKIM_INVALID,DKIM_SIGNED autolearn=no autolearn_force=no version=3.4.0 Received: from jshekhar-linux.qualcomm.com (blr-c-bdr-fw-01_globalnat_allzones-outside.qualcomm.com [103.229.19.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jshekhar@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 10E966085C; Thu, 24 Jan 2019 05:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1548306623; bh=66IBQoiC6i1TRAAZoykiUpyRRqHMjilhL397fe6XWNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=PB4WgXJaMSarqUbqJg2WtoWQQwpnbEl93lVkb2P3U/jkEQjZ0SW65VffuWPosPDQT gc6BS3LRXm7kduQb3E2g5hw2Bt1IuXzoFrGfDfmEYDydBYBhHPGDZ0Z5ZWRKFr7EtX A8zv3IOZspv4Zx3AlrPZ9u73+3kZGWkt782MghPk= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 10E966085C Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jshekhar@codeaurora.org From: Jayant Shekhar To: dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, devicetree@vger.kernel.org Cc: Jayant Shekhar , linux-kernel@vger.kernel.org, robdclark@gmail.com, seanpaul@chromium.org, hoegsberg@chromium.org, abhinavk@codeaurora.org, jsanka@codeaurora.org, chandanu@codeaurora.org, nganji@codeaurora.org, Sravanthi Kollukuduru Subject: [v7 2/3] drm/msm/dpu: Integrate interconnect API in MDSS Date: Thu, 24 Jan 2019 10:39:51 +0530 Message-Id: <1548306592-4708-3-git-send-email-jshekhar@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1548306592-4708-1-git-send-email-jshekhar@codeaurora.org> References: <1548306592-4708-1-git-send-email-jshekhar@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The interconnect framework is designed to provide a standard kernel interface to control the settings of the interconnects on a SoC. The interconnect API uses a consumer/provider-based model, where the providers are the interconnect buses and the consumers could be various drivers. MDSS is one of the interconnect consumers which uses the interconnect APIs to get the path between endpoints and set its bandwidth requirement for the given interconnected path. Changes in v2: - Remove error log and unnecessary check (Jordan Crouse) Changes in v3: - Code clean involving variable name change, removal of extra paranthesis and variables (Matthias Kaehlcke) Changes in v4: - Add comments, spacings, tabs, proper port name and icc macro (Georgi Djakov) Changes in v5: - Commit text and parenthesis alignment (Georgi Djakov) Changes in v6: - Change to new icc_set API's (Doug Anderson) Changes in v7: - Fixed a typo Signed-off-by: Sravanthi Kollukuduru Signed-off-by: Jayant Shekhar --- drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c | 49 +++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c index 38576f8..38daf8a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_mdss.c @@ -4,11 +4,15 @@ */ #include "dpu_kms.h" +#include #define to_dpu_mdss(x) container_of(x, struct dpu_mdss, base) #define HW_INTR_STATUS 0x0010 +/* Max BW defined in KBps */ +#define MAX_BW 6800000 + struct dpu_mdss { struct msm_mdss base; void __iomem *mmio; @@ -16,8 +20,30 @@ struct dpu_mdss { u32 hwversion; struct dss_module_power mp; struct dpu_irq_controller irq_controller; + struct icc_path *path[2]; + u32 num_paths; }; +static int dpu_mdss_parse_data_bus_icc_path(struct drm_device *dev, + struct dpu_mdss *dpu_mdss) +{ + struct icc_path *path0 = of_icc_get(dev->dev, "mdp0-mem"); + struct icc_path *path1 = of_icc_get(dev->dev, "mdp1-mem"); + + if (IS_ERR(path0)) + return PTR_ERR(path0); + + dpu_mdss->path[0] = path0; + dpu_mdss->num_paths = 1; + + if (!IS_ERR(path1)) { + dpu_mdss->path[1] = path1; + dpu_mdss->num_paths++; + } + + return 0; +} + static irqreturn_t dpu_mdss_irq(int irq, void *arg) { struct dpu_mdss *dpu_mdss = arg; @@ -127,7 +153,11 @@ static int dpu_mdss_enable(struct msm_mdss *mdss) { struct dpu_mdss *dpu_mdss = to_dpu_mdss(mdss); struct dss_module_power *mp = &dpu_mdss->mp; - int ret; + int ret, i; + u64 avg_bw = dpu_mdss->num_paths ? MAX_BW / dpu_mdss->num_paths : 0; + + for (i = 0; i < dpu_mdss->num_paths; i++) + icc_set_bw(dpu_mdss->path[i], avg_bw, kBps_to_icc(MAX_BW)); ret = msm_dss_enable_clk(mp->clk_config, mp->num_clk, true); if (ret) @@ -140,12 +170,15 @@ static int dpu_mdss_disable(struct msm_mdss *mdss) { struct dpu_mdss *dpu_mdss = to_dpu_mdss(mdss); struct dss_module_power *mp = &dpu_mdss->mp; - int ret; + int ret, i; ret = msm_dss_enable_clk(mp->clk_config, mp->num_clk, false); if (ret) DPU_ERROR("clock disable failed, ret:%d\n", ret); + for (i = 0; i < dpu_mdss->num_paths; i++) + icc_set_bw(dpu_mdss->path[i], 0, 0); + return ret; } @@ -155,6 +188,7 @@ static void dpu_mdss_destroy(struct drm_device *dev) struct msm_drm_private *priv = dev->dev_private; struct dpu_mdss *dpu_mdss = to_dpu_mdss(priv->mdss); struct dss_module_power *mp = &dpu_mdss->mp; + int i; pm_runtime_disable(dev->dev); _dpu_mdss_irq_domain_fini(dpu_mdss); @@ -162,6 +196,9 @@ static void dpu_mdss_destroy(struct drm_device *dev) msm_dss_put_clk(mp->clk_config, mp->num_clk); devm_kfree(&pdev->dev, mp->clk_config); + for (i = 0; i < dpu_mdss->num_paths; i++) + icc_put(dpu_mdss->path[i]); + if (dpu_mdss->mmio) devm_iounmap(&pdev->dev, dpu_mdss->mmio); dpu_mdss->mmio = NULL; @@ -200,6 +237,10 @@ int dpu_mdss_init(struct drm_device *dev) } dpu_mdss->mmio_len = resource_size(res); + ret = dpu_mdss_parse_data_bus_icc_path(dev, dpu_mdss); + if (ret) + return ret; + mp = &dpu_mdss->mp; ret = msm_dss_parse_clock(pdev, mp); if (ret) { @@ -221,14 +262,14 @@ int dpu_mdss_init(struct drm_device *dev) goto irq_error; } + priv->mdss = &dpu_mdss->base; + pm_runtime_enable(dev->dev); pm_runtime_get_sync(dev->dev); dpu_mdss->hwversion = readl_relaxed(dpu_mdss->mmio); pm_runtime_put_sync(dev->dev); - priv->mdss = &dpu_mdss->base; - return ret; irq_error: -- The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project