From patchwork Thu Mar 14 01:10:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13592022 Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B82394A1B for ; Thu, 14 Mar 2024 01:10:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378649; cv=none; b=m3ri2cTtHijxK5xuMpxuYn2j/iDhsdc0RMFZdzRe9P39qp5rs3jiK2bTGv6fOe84KIxpYTe6wgXS5GICXTNsziig5fP2IUdDXqG1MRi0yofjheM3NYj8EZJByrKrBH/dMn8CENZRLfo+0VkS7E2TisF4L3GJkBA9/NW8TcREVfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378649; c=relaxed/simple; bh=jkx8QeT632cJYJKjDVA7lP5qA9kMxj5ChekVZ1pgV/A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nNsQeseHrLlL/PQXS6GNfIL3N8krRa/4B0RU9FrUKZPABPAMGwNDUdDiT5/6Py3OxV4Ozr9MnNU1Lr28H8NNWWjvQ6DDXTcWZLMI6STkT9T3EWaJQgPT6hLcka1OIp1dFtgQES6pQDl5u5bXXTB1wPCVr2zni1+y3GiZ/aEQQmk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=rYSt/9U5; arc=none smtp.client-ip=209.85.208.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="rYSt/9U5" Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2d2509c66daso4408801fa.3 for ; Wed, 13 Mar 2024 18:10:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710378646; x=1710983446; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=Zxdr/mpui1hYVgn1hATuqyEXzqZWkDVcTe72ce1oxoA=; b=rYSt/9U5Gqylu0hEZrikVpSmDWWrjipUAEUOT+xdDwEEqOptdmN8MaynqOrTB02C7u 6OFkE65w1sbAkGoCNMPsFThwApxXDELVOT5tQvwogtLJOQIrsUpl0w40qYulfsYODlXd B10PBD1K4VnZ5P2/iQzOTZ2UAGELlVwGvZFMtj//iLGtdkbJndpwgWtOgVeV41PHdZEH PkLj69o7wnbTDoumH9q2PSECMHQXE5xbcKOW3+QmFlAkmQIK9D1CdBsf0GSWjuWoRn51 yjIukwWOS99rxTIuBpszxlE8+CqvtnOeH19PnYefD73Blo5IZA6a3JBxG1yjeThWa+qE SXIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710378646; x=1710983446; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zxdr/mpui1hYVgn1hATuqyEXzqZWkDVcTe72ce1oxoA=; b=Q7cV22UHSnxkwbnveBqpJ85HBUyfcgYABwwLv72EGavzBKXwR3WNUr8EnKFykRrmDw YAKE8kztdhXwOt/DdFhTgjpc1xxTybNWbn5+JVX8dt7XLv7Imhu0VKu/jLDcWItzmcTg gCkDuZDDo2GiT4BLD7lKykynk3e6dvBVsJv9BBNe1occpyPryEPwo+mdgLW0NylcaBy0 naRqpm3lm3Jsodl3fphDVmWcQMvMxkKsSboMKRtJu05wLE/Hsjq7AYgXeTU4C/scCF5f 145sTwXCa2gcGLEvTRk0ubvNMkSQ72xFvJSnpn2EoRfTmEnzJodK69zJYPZbRPsnUxi2 5FDA== X-Gm-Message-State: AOJu0YwxImZHIACdTOLEjbFQ8Lk/Rr9Z9ywp8Tgo6Xm2uUV2dt9Jl8Nn YUVt7IEXAx3ooA4Ak1ZZkt+kSEj43fPHMvu00uCzPbu4CYU6rqBpxyjpoLq6be8= X-Google-Smtp-Source: AGHT+IHCUJmoYn9jI50GYYIrQhEEZr2dXcfoR+wFJNhsonpJAZ8FGcHSZtzK/NG5ppzW2cGCp28OgQ== X-Received: by 2002:a2e:9b99:0:b0:2d4:7756:3549 with SMTP id z25-20020a2e9b99000000b002d477563549mr110990lji.16.1710378645969; Wed, 13 Mar 2024 18:10:45 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a2e91d3000000b002d2ab6ae675sm48917ljg.137.2024.03.13.18.10.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 18:10:45 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 14 Mar 2024 03:10:41 +0200 Subject: [PATCH v3 1/5] drm/msm/dpu: don't allow overriding data from catalog Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240314-dpu-perf-rework-v3-1-79fa4e065574@linaro.org> References: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> In-Reply-To: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1831; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=jkx8QeT632cJYJKjDVA7lP5qA9kMxj5ChekVZ1pgV/A=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8k6SaiBAo9biqgSROXWBG9JOaT2gSR6NNM1gh rLTYn6o59CJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfJOkgAKCRCLPIo+Aiko 1TYsCACm/8pvdQnme+edeFf6jF9cCNURSjDk4BGjb7bgjZKUe9tXt33VNrUPfjO0bhwsako1KR3 obQmzwXxfZy6NcTFP4FxqyJBUsAqpyADelajr+98gbDM45cU+KgXN+/P7poEjnUAh0MMeAx5EH+ TYKZY6PfJJ3DR0+RF1Ns5s3iFPljn7to7/iR+8v1FJDPauYU1uiQSA/pGLWaYGJdhB30K0hyffk 66e0UDmS49YG093eSEHaMJg93YLO6xYeHZBuzR4UYsrD3+17FZd3hazxJ1AGFFIEaF9vC2zxvvR r2ok0315QhHToQeoL+6xkvY7NHEFizL6ZxatKwH9tsY20eZK X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The data from catalog is marked as const, so it is a part of the RO segment. Allowing userspace to write to it through debugfs can cause protection faults. Set debugfs file mode to read-only for debug entries corresponding to perf_cfg coming from catalog. Fixes: abda0d925f9c ("drm/msm/dpu: Mark various data tables as const") Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c index ef871239adb2..68fae048a9a8 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c @@ -459,15 +459,15 @@ int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent) &perf->core_clk_rate); debugfs_create_u32("enable_bw_release", 0600, entry, (u32 *)&perf->enable_bw_release); - debugfs_create_u32("threshold_low", 0600, entry, + debugfs_create_u32("threshold_low", 0400, entry, (u32 *)&perf->perf_cfg->max_bw_low); - debugfs_create_u32("threshold_high", 0600, entry, + debugfs_create_u32("threshold_high", 0400, entry, (u32 *)&perf->perf_cfg->max_bw_high); - debugfs_create_u32("min_core_ib", 0600, entry, + debugfs_create_u32("min_core_ib", 0400, entry, (u32 *)&perf->perf_cfg->min_core_ib); - debugfs_create_u32("min_llcc_ib", 0600, entry, + debugfs_create_u32("min_llcc_ib", 0400, entry, (u32 *)&perf->perf_cfg->min_llcc_ib); - debugfs_create_u32("min_dram_ib", 0600, entry, + debugfs_create_u32("min_dram_ib", 0400, entry, (u32 *)&perf->perf_cfg->min_dram_ib); debugfs_create_file("perf_mode", 0600, entry, (u32 *)perf, &dpu_core_perf_mode_fops); From patchwork Thu Mar 14 01:10:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13592023 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8EFCCEDE for ; Thu, 14 Mar 2024 01:10:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378650; cv=none; b=ZSkLmnMcpeBL3BhTr27JPMmrJ+jcVgAzYlQL8CawmUPftn60DSDnbX/5IThl8ZmOVoi1O4CGGwyLuH8TP1QvulyUKkQzzaNc4FzK3dc3NqvZdc3Rsi4CpzSzbmVcl6ALeFONni8nW+pxCmd5i2jhfZNJTG8mokdcESuolLodeR0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378650; c=relaxed/simple; bh=XB5qQZ6AM1gMdqH09M2m8W3Q7FcCw/TC5ffKreIP0Lc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=oVZm/UXjKPT3zry8xlKMwdA8etqg2QLtQPVFnbr6K0yYrHfAvqwLmiX7NZHybpuMBLDSncV5KMHWjKjGGcsOWE9FvvbqK8cRFA4TLL4zcFLbL+sm7VmtU1HjvH1In1jtMUcKihymqWeke8a9kEmUlSXIf3YKOhcwEi2rjYUo4B8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=t9AgWM2K; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="t9AgWM2K" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2d204e102a9so4726261fa.0 for ; Wed, 13 Mar 2024 18:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710378647; x=1710983447; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=H05lkKyWbPVJPRRlJwmLAAiEv2sm+h09AW5BdkwY1QU=; b=t9AgWM2Kv8MWLh/HUzn9swDPH+XE0WjCZEegtTwGUq9CkvkqsT15gVRQ5oR27FyqBA NIhqioPbRHLgoUPWD/XRcHmOTUMmSz12nZ3cEP/KDVERby/fERtoHB4hVqBdISG688lD FvSmxxprnWC/q5gvaLtzUyJnah5/uZzR+OUf9i3X3eJBVQtQJ7sdZpAdXrM6E/dRR42c AjLlXs3cJ146foggLuW9vP1csfLXZo0IrKmmiwFBbfNe34Rs1NQI1vyZd6c88Y+CxUhQ xk5NGdilYWvusiwd8NUmIZrdau64eInqs4Z0KTtK25ev/ccvwYdGsf2PJJ1oPBRiIJ2j r1lw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710378647; x=1710983447; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H05lkKyWbPVJPRRlJwmLAAiEv2sm+h09AW5BdkwY1QU=; b=CTpFZHABTdgnUHIB8jd+h93UOjQLxIRKe1r/0LhsL96Cs7P3OxZNN8jZidpsXysGsG wEm2fi9NSjWufBujlXu9Dxlx3I1OFDi7esz2FH0y7pVHTMV7M43NJ4mP2wkoZsQ1WGPb 2nm0YKGKkqK3+w+hwnV/WxBvmgi8p0MK2kKpgJAEEXj+2Rd6L4QyHIv142QRf44ArOLZ 4dqTTgReT/JcQ24itERb058YPldhuk57jkKFYIy6+t/ZwvkN7Tq3uPmxwacxa920OZQ4 FTlobU9gPgnNpI5A+95YsdSw4u2g/tZs4jEhL1i3Fqt0E6J270cMwejWEtYXqTDgYuB0 boTQ== X-Gm-Message-State: AOJu0YxrokfrnmlOGJeFA7U9+dBp2wGldnrx6kVOdNcJaYjYrWJKgdwk FG/QXWuikwWEpxWUy1jX8HKUThF3bFqdU57xOxky/b59x52rSklY58hOuEwgofqZPpfmBsj0V+k j X-Google-Smtp-Source: AGHT+IGW4KP56dB8kSZt72D48OJV+VAsUXapGyd7phHEUjL0KU73SEVc2EAO3GOCJO0b2LhW1PtD8Q== X-Received: by 2002:a2e:be83:0:b0:2d4:64b1:25e2 with SMTP id a3-20020a2ebe83000000b002d464b125e2mr124380ljr.44.1710378646791; Wed, 13 Mar 2024 18:10:46 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a2e91d3000000b002d2ab6ae675sm48917ljg.137.2024.03.13.18.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 18:10:46 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 14 Mar 2024 03:10:42 +0200 Subject: [PATCH v3 2/5] drm/msm/dpu: core_perf: extract bandwidth aggregation function Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240314-dpu-perf-rework-v3-2-79fa4e065574@linaro.org> References: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> In-Reply-To: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2547; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=XB5qQZ6AM1gMdqH09M2m8W3Q7FcCw/TC5ffKreIP0Lc=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ+onv0kXr8re+i35+SlTdqBy1spZr5luMYQ+snYTuNj6O 6JZfClnJ6MxCwMjF4OsmCKLT0HL1JhNyWEfdkythxnEygQyhYGLUwAmkqbI/ovJbPuPd+LrnBLP Tzjj+pppSZDAq3k2HdHLK9qCywxrw9/c6V5y+t237E2zk/2+xlQpRP5e/OeBUA1v0IEpz1feM4h Z0R9XlnT6WMya/UpCbr7JgUZyu1Vsi8sXZib8047gDkg6qL4pdXlnwIOde01Xzlg+02oh27aUe4 b7uqYtEyh+v8aSyYHbS2We+vwJ3HosssyhCXUZH0z/Jkm0q7PtrHoZ773c8ADLA8kbp45YF0XUH Gwp0GNJdcn9u9BOVb3z/6f+O7ZzjFIu2QpM+CKa1md/rLSNaVFz3mnrHfxSCVHuJWzHygWzAo+J Razje3jyZcabDgb/JtE3vgkf/eR+typM5tRJqTm8aW4mAA== X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A In preparation to refactoring the dpu_core_perf debugfs interface, extract the bandwidth aggregation function from _dpu_core_perf_crtc_update_bus(). Signed-off-by: Dmitry Baryshkov Reviewed-by: Abhinav Kumar --- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 45 +++++++++++++++------------ 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c index 68fae048a9a8..87b892069526 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c @@ -204,36 +204,41 @@ int dpu_core_perf_crtc_check(struct drm_crtc *crtc, return 0; } -static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms, - struct drm_crtc *crtc) +static void dpu_core_perf_aggregate(struct drm_device *ddev, + enum dpu_crtc_client_type curr_client_type, + struct dpu_core_perf_params *perf) { - struct dpu_core_perf_params perf = { 0 }; - enum dpu_crtc_client_type curr_client_type - = dpu_crtc_get_client_type(crtc); - struct drm_crtc *tmp_crtc; struct dpu_crtc_state *dpu_cstate; - int i, ret = 0; - u64 avg_bw; - - if (!kms->num_paths) - return 0; + struct drm_crtc *tmp_crtc; - drm_for_each_crtc(tmp_crtc, crtc->dev) { + drm_for_each_crtc(tmp_crtc, ddev) { if (tmp_crtc->enabled && - curr_client_type == - dpu_crtc_get_client_type(tmp_crtc)) { + curr_client_type == dpu_crtc_get_client_type(tmp_crtc)) { dpu_cstate = to_dpu_crtc_state(tmp_crtc->state); - perf.max_per_pipe_ib = max(perf.max_per_pipe_ib, - dpu_cstate->new_perf.max_per_pipe_ib); + perf->max_per_pipe_ib = max(perf->max_per_pipe_ib, + dpu_cstate->new_perf.max_per_pipe_ib); - perf.bw_ctl += dpu_cstate->new_perf.bw_ctl; + perf->bw_ctl += dpu_cstate->new_perf.bw_ctl; - DRM_DEBUG_ATOMIC("crtc=%d bw=%llu paths:%d\n", - tmp_crtc->base.id, - dpu_cstate->new_perf.bw_ctl, kms->num_paths); + DRM_DEBUG_ATOMIC("crtc=%d bw=%llu\n", + tmp_crtc->base.id, + dpu_cstate->new_perf.bw_ctl); } } +} + +static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms, + struct drm_crtc *crtc) +{ + struct dpu_core_perf_params perf = { 0 }; + int i, ret = 0; + u64 avg_bw; + + if (!kms->num_paths) + return 0; + + dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf); avg_bw = perf.bw_ctl; do_div(avg_bw, (kms->num_paths * 1000)); /*Bps_to_icc*/ From patchwork Thu Mar 14 01:10:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13592024 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A3FBB2F43 for ; Thu, 14 Mar 2024 01:10:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378651; cv=none; b=UWS/sIp0SVPihN2VbGqxdnaNuinVcIc6Hgm2YmF14AGH+7Nx+NrRUciJ2sQKAvlRrc5PWC7cXT1I4sBwB8h2ayO7SE6xGvTFoZSy8G6G9Z8l4tgYkFst88Zv/PKx8ukjQo9ZHZfXM89XoyZyHJl0UoliCYxw8/hhCU/fn19chBo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378651; c=relaxed/simple; bh=thk7wK1FydPIdoBcFyLFgX//qapGQtCBVVmk3tJhOWI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=a1F3rE064o4d3RMMqtot8wUxLyvOCB2LLg1+GPkdAz7EoUsXcfeLM+XhjfO99gUIUYX3JfODRaZS4USkOtQabDcV1EssqIv0ZIQ3hIsG5ACYmdAKiPzCgg2AMsJKvuYPBWqUmLwqvRBlJf9megIYR5aTMt0r1lQR9i/HN+V/PZw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=ixYmp7Bj; arc=none smtp.client-ip=209.85.208.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="ixYmp7Bj" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2d4360ab3daso4772091fa.3 for ; Wed, 13 Mar 2024 18:10:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710378648; x=1710983448; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=t+mg/QgGY9aZHLSlX/LvtBL3FjmiyE45LaEWnMCzc0I=; b=ixYmp7BjJidtXgtLvyYHnSnt1/t3o2K7S4c3Daf3N7qJXMnHzqCdVk9e8I1t84sCB7 2K38nUEyz7ncZ5OhxedpqZ42QYhjc7/gqqVq/36vYcabJKr+ytKTM/LevUYAc39tHuMm ligcdFe0Op31uz+re89Mn3O2hXHDhuOFFB3VMVXAY84oLl8hTOrmhQpfqM4K/ETqsY1n MYPivoiahVQ8Fv+75ea3Kfua3F1OPhsazF35i1CaDF7/w+7xWxbK1IlKtj1IMw1IRpXX XGubSe4+tJTC20he8lPTY4TOXTqs6PogRmLTGrVd8yKtiHw74hAgN1fCjwDKHo9XQ6Qp 8UEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710378648; x=1710983448; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t+mg/QgGY9aZHLSlX/LvtBL3FjmiyE45LaEWnMCzc0I=; b=tS697Yti8y1xxiWb2qTvXtPJ3TvZo9pyzWxFEn1HZgs4H9yXWXYO1ItGhwaf8ZnFlV lwytpOqtYbNXJpyl5Ggo0k/7iS8S8naYP5l4oQMILGEgSkGRZr0mb2y2kWDjVz2luZ13 jlFnAiejbvt/kPndXmusb0PPm+uKQo1LPPim2aYDmyBl88xzbA5WL0dk/3R1DWIc7zXR 0vkCNOXug+6iTTIUZGqZY0Y6kNNWzUnwev7opzP9NEARIKhMPWkqTn6VhHd8476pY/vA Ei9LWg09G7z/gUGAhmnX5GPxJHcZNY3XG5EpOzAdo6RJiqLOaDaM/MpCKt0FGTXg1SGQ EJ1Q== X-Gm-Message-State: AOJu0YxMCclpHqTAeEKZE4FHujApDPqrg4V4EA8hmwfnBsVjwz0R3ChU YaEw9YucDBqD4gnqqNych7j8XW+ixC3aDsCOIqYNWlsWvLpK6w0u/VC8bTwE9uk= X-Google-Smtp-Source: AGHT+IHBe82yWu81fztcxeSaXu7xVdPyduDpAFU3wzVXa2k2jd69py2qrnLPHlLMY+WKqqnY9ZTvKw== X-Received: by 2002:a2e:9c07:0:b0:2d2:eeda:c019 with SMTP id s7-20020a2e9c07000000b002d2eedac019mr128385lji.28.1710378647800; Wed, 13 Mar 2024 18:10:47 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a2e91d3000000b002d2ab6ae675sm48917ljg.137.2024.03.13.18.10.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 18:10:47 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 14 Mar 2024 03:10:43 +0200 Subject: [PATCH v3 3/5] drm/msm/dpu: handle perf mode in _dpu_core_perf_crtc_update_bus() Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240314-dpu-perf-rework-v3-3-79fa4e065574@linaro.org> References: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> In-Reply-To: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2836; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=thk7wK1FydPIdoBcFyLFgX//qapGQtCBVVmk3tJhOWI=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8k6ScKobsIPOE/hOw550JGULOX1nrrox+Dnov CdrJ/Ys+TOJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfJOkgAKCRCLPIo+Aiko 1f8JCACr/qopx9NwwqC7LgXMdW2hItrEVb5W9z3cNXNh3so9MAaCV0oldYq6/rlgHUzwjYaBBzJ atC7SM1afc56E5BHWLyj+2NfkXNGVunm7Lr8VxJsAW09ABAZaT10aDEHbTWBA4igCWO21uffIvs Iabcf9CzR0a2plZaBiiU53p2/9iXHkrEne4BNykBunLXVdniMnWu6FbEYDOQciWY9RMG+IzMmRC 6oIq1ThDUdCbqQpgRKLdWB8NULAEunTVu5ZgZ95j71LvTOquQCd7MHmzjN8bqt0vh7S/8P0GBg7 undfAeSrJClKMOotZjNenQe8QNl5IXy2jtK9z68aHAuxOrPi X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Move perf mode handling for the bandwidth to _dpu_core_perf_crtc_update_bus() rather than overriding per-CRTC data and then aggregating known values. Note, this changes the fix_core_ab_vote. Previously it would be multiplied per the CRTC number, now it will be used directly for interconnect voting. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 39 +++++++++++++-------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c index 87b892069526..ff2942a6a678 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c @@ -118,21 +118,9 @@ static void _dpu_core_perf_calc_crtc(const struct dpu_core_perf *core_perf, return; } - memset(perf, 0, sizeof(struct dpu_core_perf_params)); - - if (core_perf->perf_tune.mode == DPU_PERF_MODE_MINIMUM) { - perf->bw_ctl = 0; - perf->max_per_pipe_ib = 0; - perf->core_clk_rate = 0; - } else if (core_perf->perf_tune.mode == DPU_PERF_MODE_FIXED) { - perf->bw_ctl = core_perf->fix_core_ab_vote; - perf->max_per_pipe_ib = core_perf->fix_core_ib_vote; - perf->core_clk_rate = core_perf->fix_core_clk_rate; - } else { - perf->bw_ctl = _dpu_core_perf_calc_bw(perf_cfg, crtc); - perf->max_per_pipe_ib = perf_cfg->min_dram_ib; - perf->core_clk_rate = _dpu_core_perf_calc_clk(perf_cfg, crtc, state); - } + perf->bw_ctl = _dpu_core_perf_calc_bw(perf_cfg, crtc); + perf->max_per_pipe_ib = perf_cfg->min_dram_ib; + perf->core_clk_rate = _dpu_core_perf_calc_clk(perf_cfg, crtc, state); DRM_DEBUG_ATOMIC( "crtc=%d clk_rate=%llu core_ib=%llu core_ab=%llu\n", @@ -233,18 +221,29 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms, { struct dpu_core_perf_params perf = { 0 }; int i, ret = 0; - u64 avg_bw; + u32 avg_bw; + u32 peak_bw; if (!kms->num_paths) return 0; - dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf); + if (kms->perf.perf_tune.mode == DPU_PERF_MODE_MINIMUM) { + avg_bw = 0; + peak_bw = 0; + } else if (kms->perf.perf_tune.mode == DPU_PERF_MODE_FIXED) { + avg_bw = kms->perf.fix_core_ab_vote; + peak_bw = kms->perf.fix_core_ib_vote; + } else { + dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf); + + avg_bw = div_u64(perf.bw_ctl, 1000); /*Bps_to_icc*/ + peak_bw = perf.max_per_pipe_ib; + } - avg_bw = perf.bw_ctl; - do_div(avg_bw, (kms->num_paths * 1000)); /*Bps_to_icc*/ + avg_bw /= kms->num_paths; for (i = 0; i < kms->num_paths; i++) - icc_set_bw(kms->path[i], avg_bw, perf.max_per_pipe_ib); + icc_set_bw(kms->path[i], avg_bw, peak_bw); return ret; } From patchwork Thu Mar 14 01:10:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13592025 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4F1A4683 for ; Thu, 14 Mar 2024 01:10:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378652; cv=none; b=LWJ0gcsjqaDyQ11cXIW/r13YqBLNCXszBodRpPS7HL8XkUlClueEff6bKnE4a19/NEDs3tqNrQSw7sYmEMalrNH6FROi+hAT7jMLwA8hiiWM0aX/k/E1V5WoWjaKzE8643MDqne9PCGFOHPjN26295bVFJ/UGVU3jQ4BdMQD8qI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378652; c=relaxed/simple; bh=YsE1Cp7o2/VYepcndYMfJwYo6XOZZyfG72U7gsT/rjc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q00rfHiJfgDNkaOq6fmf0f4YkqJps0iGPx6akEymFl/No0jkg2u5sCZycgVIwRPnGc9xZf3miB/lKKYzIvNMwXs37zVgbvmfDL8pxg9UMZjNPR0ij4b5EdD4qhJCxMvbVKUd1MbXn9RHSSNW574WVvGCg+4JyZXZ+HmpfOq/afY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Q4nCVVLK; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Q4nCVVLK" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-2d476d7972aso3470821fa.1 for ; Wed, 13 Mar 2024 18:10:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710378649; x=1710983449; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=vIoXYbu3MygYy7U6DbcLTmPcPWwgndAXgG/VdYHaBOk=; b=Q4nCVVLKM8ivoWVYz79eNSz0Sn8W7P7I2aoYEY0nf1PUpM29ZtqH4Vk/nRLbf29fcl +Gc1agL0NiIjwKNGOg0z/aiOXjbYcLSlebvVpFEEAjQcZTngLm9c2BsPcluR6nNwLL6e ZvQQABX6WB5sS33ebWLPvfy3cZHaoxnbu0zvlFxGem7NZmfA3Eg7AqZF0TBpEwlCzku1 kzDh9Z3N5iGm7KEXPbGi+6szM0TPuw2+Ba9qS1OEE8HpCVvvJ3OjM5ttKLVkW+u5nWRj qFMJQ+OGe62EwFUfx7DM0FNXl6FiWteBFSFaDMHjzr/XiIej4krEI+CfsztVPG9EVkAE TSuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710378649; x=1710983449; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vIoXYbu3MygYy7U6DbcLTmPcPWwgndAXgG/VdYHaBOk=; b=IwYODQtGKAhrEMv/MQ0CDzRJ5Zy+Byx5I1SVhVdozjXPLZS0Wsz6hL0u+aJVNVnoIV t+Gt97uXP7K2zTwt/X+eodeHPIainxSAd3b7GODblBfjERQFXQTWZv8kc84BlBkN7USJ zD4abtenWnTjLP+wxvImJLO0Jx7Nm5ilsVMFB8+w98aYftgXqGdDWDnbaDsV3TQv9krt O37rCgK/2+w+m/TUZUU/XEc8dWtHugsws1FCGpUoSkw6iDWOWmRxc/zmpaN1KWRhmBVI xBTu+TUZrADO4JE6DYLAKbds+zg/GMq48owB6Ia7HzWh+hf5EOgSdeBuN4RjEqKX6S74 u6pA== X-Gm-Message-State: AOJu0YwYb8Y/PmGvoM1RfWpOSPstQVzHsFV9j3RI8W72sY2QPvDoxpmb WTp26EPE+XlwbHsPMtZc4U90Ps1wPAJ/owiTWLhgoCk/1K2r9b3w0EyFt9IqLQ4= X-Google-Smtp-Source: AGHT+IGq9lqZjLRsr1HGz2LENujhC5IVIdwuN01iFheK8+jN3o594B/n/y/dYcd1AfeMDzDEuMw/Jg== X-Received: by 2002:a05:651c:204a:b0:2d2:7702:cb74 with SMTP id t10-20020a05651c204a00b002d27702cb74mr120452ljo.20.1710378648902; Wed, 13 Mar 2024 18:10:48 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a2e91d3000000b002d2ab6ae675sm48917ljg.137.2024.03.13.18.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 18:10:48 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 14 Mar 2024 03:10:44 +0200 Subject: [PATCH v3 4/5] drm/msm/dpu: rework core_perf debugfs overrides Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240314-dpu-perf-rework-v3-4-79fa4e065574@linaro.org> References: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> In-Reply-To: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=6047; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=YsE1Cp7o2/VYepcndYMfJwYo6XOZZyfG72U7gsT/rjc=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8k6TPJ73CcFgvbMkQBgykdG8ysiSDjorTTk2D 2TA8Oavs2OJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfJOkwAKCRCLPIo+Aiko 1XZeB/9hmGxD8GltmoQnMnjJdW7u/veufebGarszbXeg4m+VVW5rkTGFgb0bFTynIf1c/OwaEZe XnGALFa1nD5B686QnkBTzXkzo7ZNKrUPU7zqlm2q7BvC/yQiyhb01MgdkdUGvag4u3zge6GxB5D 8Z0gw+Tu//B9vFeS8ipaF803pW+HrVP9TKo7x8xJvljb880oV/VJQ1ZNYShNjzZoULCT8QuwnhN M67C5WVu5khZQABLoytiH3jTHQKUghQe+Q0OBmNcaHM0oAWiSwloVvPoaSKvfUNov5jMSSOZ7X/ kRJfWx/pA+dizwt8eCAuHDifCINGFMaYZqdx2vfT7yW83gE0 X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A Currently debugfs provides separate 'modes' to override calculated MDP_CLK rate and interconnect bandwidth votes. Change that to allow overriding individual values (e.g. one can override just clock or just average bandwidth vote). Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 87 +++------------------------ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 10 --- 2 files changed, 9 insertions(+), 88 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c index ff2942a6a678..2e78e57665fc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c @@ -17,20 +17,6 @@ #include "dpu_crtc.h" #include "dpu_core_perf.h" -/** - * enum dpu_perf_mode - performance tuning mode - * @DPU_PERF_MODE_NORMAL: performance controlled by user mode client - * @DPU_PERF_MODE_MINIMUM: performance bounded by minimum setting - * @DPU_PERF_MODE_FIXED: performance bounded by fixed setting - * @DPU_PERF_MODE_MAX: maximum value, used for error checking - */ -enum dpu_perf_mode { - DPU_PERF_MODE_NORMAL, - DPU_PERF_MODE_MINIMUM, - DPU_PERF_MODE_FIXED, - DPU_PERF_MODE_MAX -}; - /** * _dpu_core_perf_calc_bw() - to calculate BW per crtc * @perf_cfg: performance configuration @@ -227,18 +213,16 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms, if (!kms->num_paths) return 0; - if (kms->perf.perf_tune.mode == DPU_PERF_MODE_MINIMUM) { - avg_bw = 0; - peak_bw = 0; - } else if (kms->perf.perf_tune.mode == DPU_PERF_MODE_FIXED) { + dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf); + + avg_bw = div_u64(perf.bw_ctl, 1000); /*Bps_to_icc*/ + peak_bw = perf.max_per_pipe_ib; + + if (kms->perf.fix_core_ab_vote) avg_bw = kms->perf.fix_core_ab_vote; - peak_bw = kms->perf.fix_core_ib_vote; - } else { - dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf); - avg_bw = div_u64(perf.bw_ctl, 1000); /*Bps_to_icc*/ - peak_bw = perf.max_per_pipe_ib; - } + if (kms->perf.fix_core_ib_vote) + peak_bw = kms->perf.fix_core_ib_vote; avg_bw /= kms->num_paths; @@ -287,12 +271,9 @@ static u64 _dpu_core_perf_get_core_clk_rate(struct dpu_kms *kms) struct drm_crtc *crtc; struct dpu_crtc_state *dpu_cstate; - if (kms->perf.perf_tune.mode == DPU_PERF_MODE_FIXED) + if (kms->perf.fix_core_clk_rate) return kms->perf.fix_core_clk_rate; - if (kms->perf.perf_tune.mode == DPU_PERF_MODE_MINIMUM) - return kms->perf.max_core_clk_rate; - clk_rate = 0; drm_for_each_crtc(crtc, kms->dev) { if (crtc->enabled) { @@ -402,54 +383,6 @@ int dpu_core_perf_crtc_update(struct drm_crtc *crtc, #ifdef CONFIG_DEBUG_FS -static ssize_t _dpu_core_perf_mode_write(struct file *file, - const char __user *user_buf, size_t count, loff_t *ppos) -{ - struct dpu_core_perf *perf = file->private_data; - u32 perf_mode = 0; - int ret; - - ret = kstrtouint_from_user(user_buf, count, 0, &perf_mode); - if (ret) - return ret; - - if (perf_mode >= DPU_PERF_MODE_MAX) - return -EINVAL; - - if (perf_mode == DPU_PERF_MODE_FIXED) { - DRM_INFO("fix performance mode\n"); - } else if (perf_mode == DPU_PERF_MODE_MINIMUM) { - /* run the driver with max clk and BW vote */ - DRM_INFO("minimum performance mode\n"); - } else if (perf_mode == DPU_PERF_MODE_NORMAL) { - /* reset the perf tune params to 0 */ - DRM_INFO("normal performance mode\n"); - } - perf->perf_tune.mode = perf_mode; - - return count; -} - -static ssize_t _dpu_core_perf_mode_read(struct file *file, - char __user *buff, size_t count, loff_t *ppos) -{ - struct dpu_core_perf *perf = file->private_data; - int len; - char buf[128]; - - len = scnprintf(buf, sizeof(buf), - "mode %d\n", - perf->perf_tune.mode); - - return simple_read_from_buffer(buff, count, ppos, buf, len); -} - -static const struct file_operations dpu_core_perf_mode_fops = { - .open = simple_open, - .read = _dpu_core_perf_mode_read, - .write = _dpu_core_perf_mode_write, -}; - int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent) { struct dpu_core_perf *perf = &dpu_kms->perf; @@ -473,8 +406,6 @@ int dpu_core_perf_debugfs_init(struct dpu_kms *dpu_kms, struct dentry *parent) (u32 *)&perf->perf_cfg->min_llcc_ib); debugfs_create_u32("min_dram_ib", 0400, entry, (u32 *)&perf->perf_cfg->min_dram_ib); - debugfs_create_file("perf_mode", 0600, entry, - (u32 *)perf, &dpu_core_perf_mode_fops); debugfs_create_u64("fix_core_clk_rate", 0600, entry, &perf->fix_core_clk_rate); debugfs_create_u64("fix_core_ib_vote", 0600, entry, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h index 4186977390bd..5a3d18ca9555 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h @@ -24,20 +24,11 @@ struct dpu_core_perf_params { u64 core_clk_rate; }; -/** - * struct dpu_core_perf_tune - definition of performance tuning control - * @mode: performance mode - */ -struct dpu_core_perf_tune { - u32 mode; -}; - /** * struct dpu_core_perf - definition of core performance context * @perf_cfg: Platform-specific performance configuration * @core_clk_rate: current core clock rate * @max_core_clk_rate: maximum allowable core clock rate - * @perf_tune: debug control for performance tuning * @enable_bw_release: debug control for bandwidth release * @fix_core_clk_rate: fixed core clock request in Hz used in mode 2 * @fix_core_ib_vote: fixed core ib vote in bps used in mode 2 @@ -47,7 +38,6 @@ struct dpu_core_perf { const struct dpu_perf_cfg *perf_cfg; u64 core_clk_rate; u64 max_core_clk_rate; - struct dpu_core_perf_tune perf_tune; u32 enable_bw_release; u64 fix_core_clk_rate; u64 fix_core_ib_vote; From patchwork Thu Mar 14 01:10:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13592026 Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CFAFA4A15 for ; Thu, 14 Mar 2024 01:10:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378653; cv=none; b=FAt85e3MAYOz4e3wNI7zeAaYSpAI0HhIN61xxqB9hIAKuXH7Nt7VqNBDRo3eUPh8eYoVj3aRNd0ZhEXQBLGWAozpGCPR/wtdRZDtdC9ZiTOpc/YpfBucCtPdUaVURsuv+9wemn9FDHPHhDejE6MPB5++klUzmbWRSaPfFgP0rEc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710378653; c=relaxed/simple; bh=HtjO3+r4eD0Q2obHhXvuyUuLiZ1mp8ct03mOrvFNMx0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=khzVbIw3EYabOLIyNYVW/OGfqYUsvqSOJkEkO7VaC6oa18fMf//GutFgcl95LjMX7zFbqUIgpjNqvYCajuc0JI8HFFywgMFXCUvIUnfcq3opOJUI5Ql+DCPUpVEsu1dzYCXjcaoYJBDmbJS/MbfQleuAa4VRiR+1wmAe79C14yY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=Fcs8yGXj; arc=none smtp.client-ip=209.85.208.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Fcs8yGXj" Received: by mail-lj1-f181.google.com with SMTP id 38308e7fff4ca-2d46dd8b0b8so4286651fa.2 for ; Wed, 13 Mar 2024 18:10:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1710378650; x=1710983450; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=AkT0b7xRMHVuIJC0eNZGFO5wcpvp57gRfpmlCIxi9Y4=; b=Fcs8yGXjKU0d3dY0rUQk6QigazY0c97p22WA9ToFwILFu2zx/UM+IhWSUrBVs6f8Yy JaDvW63Fxty26muqPfr7SsrzyG9dZTFRc8cTo0SyMo6MGlKc+36T+JVtSnRw5orcAHud zuf3Or3XxkERpQ3Y5pWDb8NwraPOGrj9LEfKCICUYegYiZnCKw+I4blJeeM6ScFz/UxN nRqSa416Q1MO2O8aQl09FmwHPWzZ9cT9EJxXAj2bcEk5JLShieNUDUjdrx5pmResd2dk 1iETBOvfcFe3kqMILn5qJvhtbN/Vm71rlB024pB4xSnKC3rjsMqLylzy6psPjynQFC0D r7Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710378650; x=1710983450; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AkT0b7xRMHVuIJC0eNZGFO5wcpvp57gRfpmlCIxi9Y4=; b=UCSz7gUyc7cExbYMOqntctMDUyqskxJpjDkr69r2I1zrqlANak86ea6DJJGFETeZD9 28jQPSuwnBmw6+tNbqaJS3hrEmJ6ced8LA6tIieGj3ppbf4QDf8sgXM2/HgrAOBzG24g UkXU85hCWT9r+TnD1lo8ZcnbBPcg4JJ8euFcgCt7qgAYyepMP8rnLMQB0ejsL70BWTif JXOcvqiqllWJGtHEMBdhY//jihRGYkgnsw4NBOY2uQtDW05qZGnbmsKn2Mb/NrRgZoUx ljQr0l4qet0fJVTiNn5jj8A1Lf4ur7GdIKXQ3BuLytoiYQtp5vbklE6HfQ3GpVLuuqJj mOgA== X-Gm-Message-State: AOJu0YzlvDlsxWChzeXydCa/UooOatVul3bx9cF7XkPwvyPb9tzJ9WC3 rFu0WtaUB0MGoXUGAfE/DFR7bmekYtK74VzNS2Tx+X/j/bFa7G5k72xdivmSgDk= X-Google-Smtp-Source: AGHT+IHbftlvUJD0VKntserQOB+EnscF+o7ttbHZCzElms73MiWTPm5j4W35pZLrGaf/0ry1Bv4xvg== X-Received: by 2002:a2e:8187:0:b0:2d4:5d56:e559 with SMTP id e7-20020a2e8187000000b002d45d56e559mr94218ljg.47.1710378649994; Wed, 13 Mar 2024 18:10:49 -0700 (PDT) Received: from umbar.lan ([192.130.178.91]) by smtp.gmail.com with ESMTPSA id u19-20020a2e91d3000000b002d2ab6ae675sm48917ljg.137.2024.03.13.18.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 18:10:49 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 14 Mar 2024 03:10:45 +0200 Subject: [PATCH v3 5/5] drm/msm/dpu: drop dpu_core_perf_params::max_per_pipe_ib Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240314-dpu-perf-rework-v3-5-79fa4e065574@linaro.org> References: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> In-Reply-To: <20240314-dpu-perf-rework-v3-0-79fa4e065574@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Daniel Vetter , Stephen Boyd Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, Konrad Dybcio X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4144; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=HtjO3+r4eD0Q2obHhXvuyUuLiZ1mp8ct03mOrvFNMx0=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBl8k6TPD8BbtAUQpZUbTD3Z/1YlsRo8D0pPIlbn OullnlyTpWJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZfJOkwAKCRCLPIo+Aiko 1QZcB/9VgPlKys7jt/lpRgWB5rrxlnQ5HZMGHoClHsG0Q1rsFCxp6+pdLWyZvuagrhUp+fNXGDL t+193uvDqf2swJeUWWBNdChGRgEZHPnXMHmodThOTq9cYfTFogx8HBwzXVSTIunAAGogNTWBhTB VGULPe71s6UNu32IPcbHfYX5AVU3Ny1N2P6YihRpH9RGxf+gk+i4hVe5srVVOPhmG+WbCxbdgEI 9qT4bWQlzaf4JoM2oPmSxybHJ2F90gf84yzck6z+uKXxhQeKl3yz+mfLrj7U33AB3c4eMbhYAxv bPVGgskCjTDZdS//uQIldaPIkypgpyVcadUblq27F38w3s8w X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A The max_per_pipe_ib is a constant across all CRTCs and is read from the catalog. Drop corresponding calculations and read the value directly at icc_set_bw() time. Suggested-by: Konrad Dybcio Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 17 +++++------------ drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 -- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c index 2e78e57665fc..2fc05665dc7a 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c @@ -105,13 +105,12 @@ static void _dpu_core_perf_calc_crtc(const struct dpu_core_perf *core_perf, } perf->bw_ctl = _dpu_core_perf_calc_bw(perf_cfg, crtc); - perf->max_per_pipe_ib = perf_cfg->min_dram_ib; perf->core_clk_rate = _dpu_core_perf_calc_clk(perf_cfg, crtc, state); DRM_DEBUG_ATOMIC( - "crtc=%d clk_rate=%llu core_ib=%llu core_ab=%llu\n", + "crtc=%d clk_rate=%llu core_ab=%llu\n", crtc->base.id, perf->core_clk_rate, - perf->max_per_pipe_ib, perf->bw_ctl); + perf->bw_ctl); } int dpu_core_perf_crtc_check(struct drm_crtc *crtc, @@ -190,9 +189,6 @@ static void dpu_core_perf_aggregate(struct drm_device *ddev, curr_client_type == dpu_crtc_get_client_type(tmp_crtc)) { dpu_cstate = to_dpu_crtc_state(tmp_crtc->state); - perf->max_per_pipe_ib = max(perf->max_per_pipe_ib, - dpu_cstate->new_perf.max_per_pipe_ib); - perf->bw_ctl += dpu_cstate->new_perf.bw_ctl; DRM_DEBUG_ATOMIC("crtc=%d bw=%llu\n", @@ -216,7 +212,7 @@ static int _dpu_core_perf_crtc_update_bus(struct dpu_kms *kms, dpu_core_perf_aggregate(crtc->dev, dpu_crtc_get_client_type(crtc), &perf); avg_bw = div_u64(perf.bw_ctl, 1000); /*Bps_to_icc*/ - peak_bw = perf.max_per_pipe_ib; + peak_bw = kms->catalog->perf->min_dram_ib; if (kms->perf.fix_core_ab_vote) avg_bw = kms->perf.fix_core_ab_vote; @@ -321,15 +317,12 @@ int dpu_core_perf_crtc_update(struct drm_crtc *crtc, * 2. new bandwidth vote - "ab or ib vote" is lower * than current vote at end of commit or stop. */ - if ((params_changed && ((new->bw_ctl > old->bw_ctl) || - (new->max_per_pipe_ib > old->max_per_pipe_ib))) || - (!params_changed && ((new->bw_ctl < old->bw_ctl) || - (new->max_per_pipe_ib < old->max_per_pipe_ib)))) { + if ((params_changed && new->bw_ctl > old->bw_ctl) || + (!params_changed && new->bw_ctl < old->bw_ctl)) { DRM_DEBUG_ATOMIC("crtc=%d p=%d new_bw=%llu,old_bw=%llu\n", crtc->base.id, params_changed, new->bw_ctl, old->bw_ctl); old->bw_ctl = new->bw_ctl; - old->max_per_pipe_ib = new->max_per_pipe_ib; update_bus = true; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h index 5a3d18ca9555..a5a9c3389718 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.h @@ -14,12 +14,10 @@ /** * struct dpu_core_perf_params - definition of performance parameters - * @max_per_pipe_ib: maximum instantaneous bandwidth request * @bw_ctl: arbitrated bandwidth request * @core_clk_rate: core clock rate request */ struct dpu_core_perf_params { - u64 max_per_pipe_ib; u64 bw_ctl; u64 core_clk_rate; }; diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 88c2e51ab166..771c04c1a5ea 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -1389,8 +1389,6 @@ static int dpu_crtc_debugfs_state_show(struct seq_file *s, void *v) seq_printf(s, "core_clk_rate: %llu\n", dpu_crtc->cur_perf.core_clk_rate); seq_printf(s, "bw_ctl: %llu\n", dpu_crtc->cur_perf.bw_ctl); - seq_printf(s, "max_per_pipe_ib: %llu\n", - dpu_crtc->cur_perf.max_per_pipe_ib); return 0; }