From patchwork Sat May 3 07:03:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil P Oommen X-Patchwork-Id: 887033 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB59F18035; Sat, 3 May 2025 07:04:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255875; cv=none; b=ctD4EZm7i5OBsN38IQvN0ORupWUPTCSuwZBphWfgQYAJ2vidgvIer/t+1CW0t07Xeb/QK0gboF7NprMGv/LEwWtJa24uAXO7h2LoCHQuqd60nZuthr4yNcZKPjanQ2iaB+oEw+DSec7q0x8muFMUCWvq0IqOp79K8/IGbz0/oEo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255875; c=relaxed/simple; bh=f9u0+Ix51mVl5RZeq5yBYLfURfC4Zth+WFoAJzLxhfU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=XWmdOwqHnPRtRq7eJwbp6zv+Ju1szlJGqEx2bEijHuoe7ZNsQHVC5YfqZMfz/1Eb6n9PnPSifZijZ9ghS3/+NY3Qb/wY+Yb3ZdLizuCYoYgWKeTngrug2+208X9mTKgDAgh+Ow8s/3JKVrpJwhLvmtGHvUR6Z3aExc8NkZN0A5w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=d24O8SUK; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="d24O8SUK" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5433SnNY016490; Sat, 3 May 2025 07:04:10 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= 8kl3HZjBL1Vzn19lsS5o5T/zhkviosaRg/HGzJfId2E=; b=d24O8SUKIdBpuhvI LvQ/MjU3eb33/qv80F5vgmYocXnhBTOtS50zLYqiiz7kZ2a+G4vUXLlNfx16RuJw 2pBzBT0r7fEJFbII+02utYAFcUMDZ3COL/vgAi9qfdPLxP6SnsD/YXae4S3gtOQ6 8XfPwklse2HbmUaadAEGloxi/FLvYv2vmxG66cWgjbvIO4nMmALd6h3p0bSXUW01 9tgCY6nwdUHtAVWqb4Fc7AO5doKTd+3udbPsGLH/fIs2x1GKB2425ngT9PkkpNjK xiPnvnQQ7Ty+jAX9IjFQ01wL9WgWXV2kmvH1uK6KM1R8qAvBeQFjkwjIZinMK6aF EO9mRg== Received: from nalasppmta02.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46d9ep0bra-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 May 2025 07:04:09 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA02.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 5437484M032307 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 3 May 2025 07:04:08 GMT Received: from [10.213.111.143] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Sat, 3 May 2025 00:04:02 -0700 From: Akhil P Oommen Date: Sat, 3 May 2025 12:33:32 +0530 Subject: [PATCH v6 1/7] drm/msm/adreno: Add support for ACD Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20250503-gpu-acd-v6-1-ab1b52866c64@quicinc.com> References: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> In-Reply-To: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> To: Rob Clark , Sean Paul , "Konrad Dybcio" , Abhinav Kumar , Marijn Suijten , David Airlie , Simona Vetter , Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Akhil P Oommen , Bjorn Andersson , "Maya Matuszczyk" , Anthony Ruhier , Dmitry Baryshkov CC: , , , , , , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746255835; l=7621; i=quic_akhilpo@quicinc.com; s=20240726; h=from:subject:message-id; bh=f9u0+Ix51mVl5RZeq5yBYLfURfC4Zth+WFoAJzLxhfU=; b=gxHaM8HJCTZCfK+mkY6HV+zsxRKHnc7J0WM0g91eyJmxyOyf4lYSsRNQqtj4jo64nlPbGNnC+ qL4+2fnlpM9CuvRaHRyW5z+lAGZKZ8KA7Id+VVoHyJCbI2QaZo3dUYQ X-Developer-Key: i=quic_akhilpo@quicinc.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Authority-Analysis: v=2.4 cv=EOUG00ZC c=1 sm=1 tr=0 ts=6815bfe9 cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=pGLkceISAAAA:8 a=b3CbU_ItAAAA:8 a=EUspDBNiAAAA:8 a=COk6AnOGAAAA:8 a=GDLOhHjzB82GPggqB9sA:9 a=QEXdDO2ut3YA:10 a=Rv2g8BkzVjQTVhhssdqe:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: 3frerGMz7wcuh1KVbZ7qKO_T-g_neSn1 X-Proofpoint-GUID: 3frerGMz7wcuh1KVbZ7qKO_T-g_neSn1 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTAzMDA1OSBTYWx0ZWRfX6kOOAr0YtWE5 mWishqyVB3hotGVZczhM78itSbtORQDKskTbcE+906fY0OSHCtgknw3AjgLDgh4TZQq8CiU5ysx OEwuZ4n7p219y9r5YYog0Jrbb2IlcqpG5CJPzixjnGzyjQayrjhVgEym25tLQEFphT0677HZ8k9 ufpT20tUJns8Arzs/ImXzH5uAcWsSDHTwdRjLb3vD1GZOOionOtFxrebhy6uXn6iV6ZaaDXV2El QRNYi6ScCxzlGB7pNQvYWBaA9C4bCP1Dyeln7S6SmgBsdxqUQIdBdnttjQZKOx/yqU6dpW+CL8l 99wqqJGtrCg5kplzaKhUK2cCMnoG+uR2rw42Z9bRFqU2E2Zddf7GZI8xL7rOmvE6AgRwVmhswCF SkK/PO1oopYmK+QcA0C0SqAC8O0/AE1EkbGlebN4ik/OpPikc7lxXIByHmbuUkOtdOsAj1LI X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-03_03,2025-04-30_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 clxscore=1015 impostorscore=0 spamscore=0 lowpriorityscore=0 bulkscore=0 phishscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 priorityscore=1501 malwarescore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505030059 ACD a.k.a Adaptive Clock Distribution is a feature which helps to reduce the power consumption. In some chipsets, it is also a requirement to support higher GPU frequencies. This patch adds support for GPU ACD by sending necessary data to GMU and AOSS. The feature support for the chipset is detected based on devicetree data. Tested-by: Maya Matuszczyk Tested-by: Anthony Ruhier Reviewed-by: Konrad Dybcio Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 84 ++++++++++++++++++++++++++++++----- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 36 +++++++++++++++ drivers/gpu/drm/msm/adreno/a6xx_hfi.h | 21 +++++++++ 4 files changed, 132 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index c8711938a5f4478ea02e7a4b336291c91e591358..6bd6d7c67f98b38cb1d23f926b5e6ccbd7f2ec53 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1064,14 +1064,6 @@ int a6xx_gmu_resume(struct a6xx_gpu *a6xx_gpu) gmu->hung = false; - /* Notify AOSS about the ACD state (unimplemented for now => disable it) */ - if (!IS_ERR(gmu->qmp)) { - ret = qmp_send(gmu->qmp, "{class: gpu, res: acd, val: %d}", - 0 /* Hardcode ACD to be disabled for now */); - if (ret) - dev_err(gmu->dev, "failed to send GPU ACD state\n"); - } - /* Turn on the resources */ pm_runtime_get_sync(gmu->dev); @@ -1671,6 +1663,68 @@ static int a6xx_gmu_pwrlevels_probe(struct a6xx_gmu *gmu) return a6xx_gmu_rpmh_votes_init(gmu); } +static int a6xx_gmu_acd_probe(struct a6xx_gmu *gmu) +{ + struct a6xx_gpu *a6xx_gpu = container_of(gmu, struct a6xx_gpu, gmu); + struct a6xx_hfi_acd_table *cmd = &gmu->acd_table; + struct adreno_gpu *adreno_gpu = &a6xx_gpu->base; + struct msm_gpu *gpu = &adreno_gpu->base; + int ret, i, cmd_idx = 0; + + cmd->version = 1; + cmd->stride = 1; + cmd->enable_by_level = 0; + + /* Skip freq = 0 and parse acd-level for rest of the OPPs */ + for (i = 1; i < gmu->nr_gpu_freqs; i++) { + struct dev_pm_opp *opp; + struct device_node *np; + unsigned long freq; + u32 val; + + freq = gmu->gpu_freqs[i]; + opp = dev_pm_opp_find_freq_exact(&gpu->pdev->dev, freq, true); + np = dev_pm_opp_get_of_node(opp); + + ret = of_property_read_u32(np, "qcom,opp-acd-level", &val); + of_node_put(np); + dev_pm_opp_put(opp); + if (ret == -EINVAL) + continue; + else if (ret) { + DRM_DEV_ERROR(gmu->dev, "Unable to read acd level for freq %lu\n", freq); + return ret; + } + + cmd->enable_by_level |= BIT(i); + cmd->data[cmd_idx++] = val; + } + + cmd->num_levels = cmd_idx; + + /* It is a problem if qmp node is unavailable when ACD is required */ + if (cmd->enable_by_level && IS_ERR_OR_NULL(gmu->qmp)) { + DRM_DEV_ERROR(gmu->dev, "Unable to send ACD state to AOSS\n"); + return -EINVAL; + } + + /* Otherwise, nothing to do if qmp is unavailable */ + if (IS_ERR_OR_NULL(gmu->qmp)) + return 0; + + /* + * Notify AOSS about the ACD state. AOSS is supposed to assume that ACD is disabled on + * system reset. So it is harmless if we couldn't notify 'OFF' state + */ + ret = qmp_send(gmu->qmp, "{class: gpu, res: acd, val: %d}", !!cmd->enable_by_level); + if (ret && cmd->enable_by_level) { + DRM_DEV_ERROR(gmu->dev, "Failed to send ACD state to AOSS\n"); + return ret; + } + + return 0; +} + static int a6xx_gmu_clocks_probe(struct a6xx_gmu *gmu) { int ret = devm_clk_bulk_get_all(gmu->dev, &gmu->clocks); @@ -1992,7 +2046,7 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) gmu->qmp = qmp_get(gmu->dev); if (IS_ERR(gmu->qmp) && adreno_is_a7xx(adreno_gpu)) { ret = PTR_ERR(gmu->qmp); - goto remove_device_link; + goto detach_gxpd; } init_completion(&gmu->pd_gate); @@ -2008,6 +2062,10 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) /* Get the power levels for the GMU and GPU */ a6xx_gmu_pwrlevels_probe(gmu); + ret = a6xx_gmu_acd_probe(gmu); + if (ret) + goto detach_gxpd; + /* Set up the HFI queues */ a6xx_hfi_init(gmu); @@ -2018,7 +2076,13 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) return 0; -remove_device_link: +detach_gxpd: + if (!IS_ERR_OR_NULL(gmu->gxpd)) + dev_pm_domain_detach(gmu->gxpd, false); + + if (!IS_ERR_OR_NULL(gmu->qmp)) + qmp_put(gmu->qmp); + device_link_del(link); detach_cxpd: diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h index 0c888b326cfb485400118f3601fa5f1949b03374..b2d4489b40249b1916ab4a42c89e3f4bdc5c4af9 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.h @@ -93,6 +93,7 @@ struct a6xx_gmu { int nr_gpu_freqs; unsigned long gpu_freqs[GMU_MAX_GX_FREQS]; u32 gx_arc_votes[GMU_MAX_GX_FREQS]; + struct a6xx_hfi_acd_table acd_table; int nr_gpu_bws; unsigned long gpu_bw_table[GMU_MAX_GX_FREQS]; diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c index 0989aee3dd2cf9bc3405c3b25a595c22e6f06387..b256092596fbab86d4eb8c17ac7c89cf94827105 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.c @@ -748,6 +748,38 @@ static int a6xx_hfi_send_bw_table(struct a6xx_gmu *gmu) NULL, 0); } +#define HFI_FEATURE_ACD 12 + +static int a6xx_hfi_enable_acd(struct a6xx_gmu *gmu) +{ + struct a6xx_hfi_acd_table *acd_table = &gmu->acd_table; + struct a6xx_hfi_msg_feature_ctrl msg = { + .feature = HFI_FEATURE_ACD, + .enable = 1, + .data = 0, + }; + int ret; + + if (!acd_table->enable_by_level) + return 0; + + /* Enable ACD feature at GMU */ + ret = a6xx_hfi_send_msg(gmu, HFI_H2F_FEATURE_CTRL, &msg, sizeof(msg), NULL, 0); + if (ret) { + DRM_DEV_ERROR(gmu->dev, "Unable to enable ACD (%d)\n", ret); + return ret; + } + + /* Send ACD table to GMU */ + ret = a6xx_hfi_send_msg(gmu, HFI_H2F_MSG_ACD, acd_table, sizeof(*acd_table), NULL, 0); + if (ret) { + DRM_DEV_ERROR(gmu->dev, "Unable to ACD table (%d)\n", ret); + return ret; + } + + return 0; +} + static int a6xx_hfi_send_test(struct a6xx_gmu *gmu) { struct a6xx_hfi_msg_test msg = { 0 }; @@ -845,6 +877,10 @@ int a6xx_hfi_start(struct a6xx_gmu *gmu, int boot_state) if (ret) return ret; + ret = a6xx_hfi_enable_acd(gmu); + if (ret) + return ret; + ret = a6xx_hfi_send_core_fw_start(gmu); if (ret) return ret; diff --git a/drivers/gpu/drm/msm/adreno/a6xx_hfi.h b/drivers/gpu/drm/msm/adreno/a6xx_hfi.h index 52ba4a07d7b9a709289acd244a751ace9bdaab5d..653ef720e2da4d2b0793c0b76e994b6f6dc524c7 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_hfi.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_hfi.h @@ -151,12 +151,33 @@ struct a6xx_hfi_msg_test { u32 header; }; +#define HFI_H2F_MSG_ACD 7 +#define MAX_ACD_STRIDE 2 + +struct a6xx_hfi_acd_table { + u32 header; + u32 version; + u32 enable_by_level; + u32 stride; + u32 num_levels; + u32 data[16 * MAX_ACD_STRIDE]; +}; + #define HFI_H2F_MSG_START 10 struct a6xx_hfi_msg_start { u32 header; }; +#define HFI_H2F_FEATURE_CTRL 11 + +struct a6xx_hfi_msg_feature_ctrl { + u32 header; + u32 feature; + u32 enable; + u32 data; +}; + #define HFI_H2F_MSG_CORE_FW_START 14 struct a6xx_hfi_msg_core_fw_start { From patchwork Sat May 3 07:03:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil P Oommen X-Patchwork-Id: 887032 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A2751A5B99; Sat, 3 May 2025 07:04:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255888; cv=none; b=V9YdfPiHVtnvrhoOaXQ0ziTAtc+rSzsF+PlPtYMQeMdUjuJi8ytRurXBJt9cIHQDza2BJgYuA+DQ8nkDNsD09QNVxpHoxA0WfgVYTfn1EQ+RZ627pGaXeLCyzaBKStpD9PG92FNlXgkH2GGT4WNkqaIQlmIK4npO4jlIjnzNals= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255888; c=relaxed/simple; bh=jr0Y/L0dOm7lfH0gAj8Y2O+9pG6wFEgDooYF+zi4ocw=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=Btr/cQkw3l5UAFZlBAaJd3otlb833XmdNZDSZa+fb9BYEx3M8o9SMdhV2GEPSoTbDnPXDxEcK070TpJYuhbRqyiFTyi7pBK3srrAWZ0srhI3V9SJ4zDtsIFG45InhTWJSym4rZoz2FU2dRBNUOJt3gM/fHKgCWq3Dkhtkdbwhjo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=RChbdqal; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="RChbdqal" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5435e56Y002850; Sat, 3 May 2025 07:04:23 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= JAOjHQD3QRiLKU8blYUYonCb38YgA1WLs6mujj0U9Sg=; b=RChbdqalXWjX8EXO I+1b9PpF9lBVkdxcU3/5FAt6wj9PBrSV00Zw9NgpsbyC3C4fNmDu++UQrXcOdgnn iLc39b+POb/TYtD3k/E4T+PKSTj++GnDzz9yDygN/yFHSBzb4sJILQTHxZeNMw6x HlLXx+EOPcbkOY8jU4vaiDOgjr+OmE6ope5gbFSFi3M7D3ttT/JDg7OU1X9P4ENI 729LOgBdcCzLkv18MDuc4X5Mvv9Yj0CRCbfkyCTFSz0V/bwZqjdpm0N0LLghSrOI 4PV6jJSuy0qUw9w90LP5RzmVePD17RDusAKRT5xyoF3BzyB78gZaZgthnLr39xyl Qkszfw== Received: from nalasppmta01.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46daqxg8ca-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 May 2025 07:04:23 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA01.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 54374LTl020449 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 3 May 2025 07:04:21 GMT Received: from [10.213.111.143] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Sat, 3 May 2025 00:04:15 -0700 From: Akhil P Oommen Date: Sat, 3 May 2025 12:33:34 +0530 Subject: [PATCH v6 3/7] drm/msm: a6x: Rework qmp_get() error handling Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20250503-gpu-acd-v6-3-ab1b52866c64@quicinc.com> References: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> In-Reply-To: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> To: Rob Clark , Sean Paul , "Konrad Dybcio" , Abhinav Kumar , Marijn Suijten , David Airlie , Simona Vetter , Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Akhil P Oommen , Bjorn Andersson , "Maya Matuszczyk" , Anthony Ruhier , Dmitry Baryshkov CC: , , , , , , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746255835; l=1244; i=quic_akhilpo@quicinc.com; s=20240726; h=from:subject:message-id; bh=jr0Y/L0dOm7lfH0gAj8Y2O+9pG6wFEgDooYF+zi4ocw=; b=Q3xK1xwEp9Zd8W+LoHM8oIemJgnZkwg+lJ/GiAqnfi+XerHam3K8aYN4NcQbrSqBse6Eo9RBm ghla3Zxwhn4BDIOx+/49NndbTGT517ZO8ioeQriRSIWoo4DLYFD+Yt9 X-Developer-Key: i=quic_akhilpo@quicinc.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-GUID: Hn9-R7ttS-yo3kccjBgMZTW6TKuke7DP X-Proofpoint-ORIG-GUID: Hn9-R7ttS-yo3kccjBgMZTW6TKuke7DP X-Authority-Analysis: v=2.4 cv=baZrUPPB c=1 sm=1 tr=0 ts=6815bff7 cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=b3CbU_ItAAAA:8 a=COk6AnOGAAAA:8 a=Q2ddA9Psw6g7R4ygXckA:9 a=QEXdDO2ut3YA:10 a=Rv2g8BkzVjQTVhhssdqe:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTAzMDA1OSBTYWx0ZWRfXwjIil6sGbKA6 225+Hk6ASnfSO8rZH+eRufHSsBXVJTDCe5+GsrLWXApWlPKizilW2us81IrQPY7nCbFPu/hMcs3 Wn/FK7Tc3UWLnT7sCPdhlF6YkixwJ2LoTJgg2vKJnMqMSlkUpoH52SLrLppoY0rQPzO5RdssqT+ +Z7QscBLI5LHeVuSkp4qWZ3hAuZsfFcnoI1GePnWEXzlDm0x5/p0tXslED1QqOH13Ve6aeS9zgS KAwz5XaR6mX41fpOYKGwn/3ZEcF3XUFvDVZvG3+jIFQj1p+JWUW3JpjKeSMOZ9NeW7CKanTkvru 3SLDARaX1I3+P9phhgUIWSU1ZLb11WsgGGh5oAAW/k1m/QPEHFh7rczR2BR/jb9fczNDz0M7z1M k1BZEYkEIc8KnGJUZCCq9bZqnODr9aK6OIb+WxF4h5uyYtlGrCUDnIKKTWaD5hI36FMYYI8w X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-03_03,2025-04-30_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 impostorscore=0 bulkscore=0 phishscore=0 mlxlogscore=999 clxscore=1015 suspectscore=0 spamscore=0 adultscore=0 mlxscore=0 lowpriorityscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505030059 Fix the following for qmp_get() errors: 1. Correctly handle probe defer for A6x GPUs 2. Ignore other errors because those are okay when GPU ACD is not required. They are checked again during gpu acd probe. Reviewed-by: Konrad Dybcio Tested-by: Maya Matuszczyk Tested-by: Anthony Ruhier Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 6bd6d7c67f98b38cb1d23f926b5e6ccbd7f2ec53..48b4ca8894ba38176481b62b7fd1406472369df1 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -2043,9 +2043,10 @@ int a6xx_gmu_init(struct a6xx_gpu *a6xx_gpu, struct device_node *node) goto detach_cxpd; } + /* Other errors are handled during GPU ACD probe */ gmu->qmp = qmp_get(gmu->dev); - if (IS_ERR(gmu->qmp) && adreno_is_a7xx(adreno_gpu)) { - ret = PTR_ERR(gmu->qmp); + if (PTR_ERR_OR_ZERO(gmu->qmp) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; goto detach_gxpd; } From patchwork Sat May 3 07:03:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil P Oommen X-Patchwork-Id: 887031 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D9DE31AA1D2; Sat, 3 May 2025 07:05:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.168.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255902; cv=none; b=uljFqC1trNWWcXN04Y1emK1SOfcmyuPp+spsScCWWsihGcV+llRP9FPVx6mzTRSO9dZhyQ78IxiE7HdIH2YTj8luFltJJapSNeYmSq1FFoB0qDZonYeIAyZiwxk81Z7CuLm/R49xKAOUKvkgcJxSDq6IDPi+FXMXTxrhBnTDox8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255902; c=relaxed/simple; bh=44E01bjnWusTnG6MhHB+xFx1Vb3V469PnIPdoBUnVeg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=aELf+NQjbNlef6QJcloswurvHpVigximaZonNXVr6buuagY26gzxZpmjLj97im1/RLEIfMnR7kEwk3qa5LBznzMmGogiSsZFBByRHHFn2SpikJJ1bx0gBttJbrM1qG6tdW5PdJox1hBZobq2opTxz8Et0k01QrgX21CT7jkq4tk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=YvAeFDt3; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="YvAeFDt3" Received: from pps.filterd (m0279867.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5436pgFn031056; Sat, 3 May 2025 07:04:29 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= f2qeULFLiJ0bP7dUf9gDhamCmgR3MsEK1Ai2tpricv0=; b=YvAeFDt3kII8IhLG Wn3kilGc8V8yRxqRJO0P7Y18fhtvoL6yrXCHlq6JrDalUn3bt8WPiJ+58XAVzwQG 2xizyWblqoyhUvdlfZ3woc6SOTHph0I+gQnyCdrnIwcNQ0cnN0h2PJDljWaqHjp7 W6c+mllLtiyxSge5AZnKgC0fzG3p5tmtQB9XSqlnKvt9U0/ai4OVLmsljhVTaimX OjNjPGpuQBhHH8LBQ/bHz2VBt7TR9EflR/RhHFVL5oJ6Lyu6PXsY7Dja6QFdV0s9 rctMWYySaOOErqXqEl9qHbB4Bb3UO3cFmCXm5/IAeGclDWsUKJpLVc7ncmDuv9o/ au1l0w== Received: from nalasppmta05.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46d9nkrb7v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 May 2025 07:04:29 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA05.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 54374Sx5002313 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 3 May 2025 07:04:28 GMT Received: from [10.213.111.143] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Sat, 3 May 2025 00:04:22 -0700 From: Akhil P Oommen Date: Sat, 3 May 2025 12:33:35 +0530 Subject: [PATCH v6 4/7] drm/msm/adreno: Add module param to disable ACD Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20250503-gpu-acd-v6-4-ab1b52866c64@quicinc.com> References: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> In-Reply-To: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> To: Rob Clark , Sean Paul , "Konrad Dybcio" , Abhinav Kumar , Marijn Suijten , David Airlie , Simona Vetter , Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Akhil P Oommen , Bjorn Andersson , "Maya Matuszczyk" , Anthony Ruhier , Dmitry Baryshkov CC: , , , , , , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746255835; l=1987; i=quic_akhilpo@quicinc.com; s=20240726; h=from:subject:message-id; bh=44E01bjnWusTnG6MhHB+xFx1Vb3V469PnIPdoBUnVeg=; b=hp5me4ORF1twA1HzIzupwhVXRDAhADTk1vzB3Mptlz7bGyRhzE78F0KQj+l/KsR3FF6t1VmfI Zn99Oj1URCQDIUjTsdzRHQPOXLW+t8dDP6GyDSJ7XAu/N7KuHrJLCUZ X-Developer-Key: i=quic_akhilpo@quicinc.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTAzMDA1OSBTYWx0ZWRfX+sb+dI1EvwR2 LA+l7H292DctUw9FT780ydVCMy9fqpmIFu6xLZfxC4BkJVLMmEWf1bsYnOiZ/3aXt+SaNWuKKrp U/ajzeR0NR1yZ0Xq7NAAsOk25eOvbgbLtyUhpTP8j6dVAmlM6v9u2j2S1BErNDfkxkYUV9w2Y1/ C5pDeVfm33eOk2pxX/wyv0cpqA+0DhY5UT1I5bRrKp0GfvdpldL47YbnVN9zDV58UrgpGF2RUZH 9vaz5G8SS1OKN3wCQt3CFC0XOS00taOMcSg9y3gJnsENNFmLkS7NncBNDm5IomVEazQcNvxUrVF qh/Apqjmv0nqOB15+YHqpt3EbW/Bk/9oeqEJtWWMMfOnpMxXW8aQ4qasPji7JlgGmmmhaaTzVRg ZinG559QXgPYcUjACgVljie9VPqCYvTul4TVqlrbsD2/RxAXn5Q4C2dK4SK23B16th6mj+dP X-Proofpoint-GUID: ORltK2tnST75yFwsRy6JRWxJHZT4ofWx X-Authority-Analysis: v=2.4 cv=LpeSymdc c=1 sm=1 tr=0 ts=6815bffd cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=pGLkceISAAAA:8 a=b3CbU_ItAAAA:8 a=EUspDBNiAAAA:8 a=COk6AnOGAAAA:8 a=adu2xZl7kSneRhG-aSEA:9 a=QEXdDO2ut3YA:10 a=Rv2g8BkzVjQTVhhssdqe:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-ORIG-GUID: ORltK2tnST75yFwsRy6JRWxJHZT4ofWx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-03_03,2025-04-30_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxlogscore=999 adultscore=0 lowpriorityscore=0 impostorscore=0 mlxscore=0 spamscore=0 malwarescore=0 priorityscore=1501 clxscore=1015 phishscore=0 bulkscore=0 suspectscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505030059 Add a module param to disable ACD which will help to quickly rule it out for any GPU issues. Tested-by: Maya Matuszczyk Tested-by: Anthony Ruhier Reviewed-by: Konrad Dybcio Signed-off-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 7 +++++++ drivers/gpu/drm/msm/adreno/adreno_device.c | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c index 48b4ca8894ba38176481b62b7fd1406472369df1..38c0f8ef85c3d260864541d83abe43e49c772c52 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gmu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gmu.c @@ -1670,6 +1670,13 @@ static int a6xx_gmu_acd_probe(struct a6xx_gmu *gmu) struct adreno_gpu *adreno_gpu = &a6xx_gpu->base; struct msm_gpu *gpu = &adreno_gpu->base; int ret, i, cmd_idx = 0; + extern bool disable_acd; + + /* Skip ACD probe if requested via module param */ + if (disable_acd) { + DRM_DEV_ERROR(gmu->dev, "Skipping GPU ACD probe\n"); + return 0; + } cmd->version = 1; cmd->stride = 1; diff --git a/drivers/gpu/drm/msm/adreno/adreno_device.c b/drivers/gpu/drm/msm/adreno/adreno_device.c index 236b25c094cd5d462f4b6653de7b7910985cccb6..f5e1490d07c1868fa21cddb38de44c28af5ca0d5 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_device.c +++ b/drivers/gpu/drm/msm/adreno/adreno_device.c @@ -24,6 +24,10 @@ int enable_preemption = -1; MODULE_PARM_DESC(enable_preemption, "Enable preemption (A7xx only) (1=on , 0=disable, -1=auto (default))"); module_param(enable_preemption, int, 0600); +bool disable_acd; +MODULE_PARM_DESC(disable_acd, "Forcefully disable GPU ACD"); +module_param_unsafe(disable_acd, bool, 0400); + extern const struct adreno_gpulist a2xx_gpulist; extern const struct adreno_gpulist a3xx_gpulist; extern const struct adreno_gpulist a4xx_gpulist; From patchwork Sat May 3 07:03:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akhil P Oommen X-Patchwork-Id: 887030 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A05B61B043F; Sat, 3 May 2025 07:05:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255912; cv=none; b=UUX7C6kT9H7HJcFbm1A/z3Ximo+IXvigzTWR4z7feAnHJgOvWNVE5uNBIVXQszBNUYq+lQ48aZLIHHY02xt5U8jcikh7tkqfJTOCUWZIIBmlDlPY4iC2XR663BPaAvEnO3ocwU5tWhNTJIUKogyh7YaXdJdeGL1bKYC2h7+Rgac= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746255912; c=relaxed/simple; bh=+8PcFlIp7sWXkaALKqBGcEDvBWNN8sFhJTyiG0fLlXk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-ID:References: In-Reply-To:To:CC; b=LNV1O2856d79bV/F9FtcgDc26NF3zRR/outQw45qsmrV0YkpoTwun19usIgVcoqacN7Z/C0HW22FWbNImhXtfMCnHlvWCVGGtgG9hMB9KJ+0uGKlspaSOyhtlYvpW1ri4bor+spfSBx/P2i9dn0jsHYf71/YUkapTAY2RD8XUW0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com; spf=pass smtp.mailfrom=quicinc.com; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b=myquGS8l; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=quicinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=quicinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=quicinc.com header.i=@quicinc.com header.b="myquGS8l" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 5433S09b029392; Sat, 3 May 2025 07:04:50 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= Cvsir2XQ4EtL7O2Ly/4UqhXBUkg0DpAs1uDQValKM4g=; b=myquGS8l8sDxrC83 sJUYWm6UnOceTMEfPBgL8OcfxZOauS4yNp/RnFxkkkO0KYDDHV1jIZf/nQB+fDeN U+MvSTGkC8MUqj+ZB+a2p3ANX5AVf4D+1yLgs9ccQ96K2M5qKkyu4ewZGahH5UHl YWRV0mwz7oHzV8Ack/Lr2J8mQEqSRNKIdC1QCoWzKuxkmOShCOtPsOCFSM3NXvG2 xs6SLq3VCYaVbaDALjvLBo6ucSaRJd9vrjpDaBm4ovYHmMx2VoVvmoONJ6MSjTTE N04Ji19ccyCTdHXBzIPnIE++tVnqMHETLOkAliSPBw5DMQLoPsaridZhz9Eg/W12 BvjDTw== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 46da55r9pr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 03 May 2025 07:04:49 +0000 (GMT) Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.18.1.2/8.18.1.2) with ESMTPS id 54374mNa026659 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Sat, 3 May 2025 07:04:48 GMT Received: from [10.213.111.143] (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.9; Sat, 3 May 2025 00:04:42 -0700 From: Akhil P Oommen Date: Sat, 3 May 2025 12:33:38 +0530 Subject: [PATCH v6 7/7] arm64: dts: qcom: x1e80100: Add OPPs up to Turbo L3 for GPU Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <20250503-gpu-acd-v6-7-ab1b52866c64@quicinc.com> References: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> In-Reply-To: <20250503-gpu-acd-v6-0-ab1b52866c64@quicinc.com> To: Rob Clark , Sean Paul , "Konrad Dybcio" , Abhinav Kumar , Marijn Suijten , David Airlie , Simona Vetter , Viresh Kumar , Nishanth Menon , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Akhil P Oommen , Bjorn Andersson , "Maya Matuszczyk" , Anthony Ruhier , Dmitry Baryshkov CC: , , , , , , Konrad Dybcio X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1746255835; l=1555; i=quic_akhilpo@quicinc.com; s=20240726; h=from:subject:message-id; bh=+8PcFlIp7sWXkaALKqBGcEDvBWNN8sFhJTyiG0fLlXk=; b=iEe08S1zpDVAJUH5HDE1MJnyOZ/OpjQzhGO5GuVvyJsXMOdlARUNCX7PCl6AHpUbm1O1U7RUZ 5RArasmtmi5B9PmHWyyGz1+Kzhl2AvN2WvzmfmKkr2mADgXtG/of4Tt X-Developer-Key: i=quic_akhilpo@quicinc.com; a=ed25519; pk=lmVtttSHmAUYFnJsQHX80IIRmYmXA4+CzpGcWOOsfKA= X-ClientProxiedBy: nasanex01a.na.qualcomm.com (10.52.223.231) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTAzMDA1OSBTYWx0ZWRfXw8vvl3TiOcGd VB82IJB01I0SWtvPkGVGOsGjtyku/WKg6HsEyx1MJqts223t7Wwg5jjD+Y/VEMASlOgtVEmrmMz czA8n3NPIDUgUUqqQ/R481wtrAfLpvUYRqSfBYrC8Oq6Z+ENVceFBXcaD01E4nJZr6aYsJ8qi7O YlswG4vsJpn7KH+ibMlO9WJ0ZKoeh04K26Mw9ImTvZGOQI/AtDL1Gu5J+XIWBd6OmUAJ40564Xl 5M8ZztXOjZuRxiCz7GyZvXhNJ5+jzp7y+Iz3iHaJZxX+9Sx5QvKcotW+hOeEMnp5sF+5LHuCbCt QR1m7BlGr8zpwm5JFBs4NIlHgwm+2BLlRMUJaP2x4ElESwxGyzGPzmJMYNXEi/A3iuycKK9B63q qf8TeOicRMo5FzV8TfYc8NfRsYeo/5ui3R2WPi84MEQrZMXEB4y0LKg85uP+kEvGUYin7+fy X-Authority-Analysis: v=2.4 cv=M9RNKzws c=1 sm=1 tr=0 ts=6815c012 cx=c_pps a=ouPCqIW2jiPt+lZRy3xVPw==:117 a=ouPCqIW2jiPt+lZRy3xVPw==:17 a=GEpy-HfZoHoA:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=b3CbU_ItAAAA:8 a=COk6AnOGAAAA:8 a=1Bjw1aJ-qlzXb4ygRX0A:9 a=QEXdDO2ut3YA:10 a=Rv2g8BkzVjQTVhhssdqe:22 a=TjNXssC_j7lpFel5tvFf:22 X-Proofpoint-GUID: PSpNBqtUlx61gkPrfXw66kyB3Io6JMW0 X-Proofpoint-ORIG-GUID: PSpNBqtUlx61gkPrfXw66kyB3Io6JMW0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-03_03,2025-04-30_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 mlxlogscore=926 priorityscore=1501 malwarescore=0 mlxscore=0 bulkscore=0 adultscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 phishscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2505030059 Now that we have ACD support for GPU, add additional OPPs up to Turbo L3 which are supported across all existing SKUs. Reviewed-by: Konrad Dybcio Tested-by: Maya Matuszczyk Tested-by: Anthony Ruhier Signed-off-by: Akhil P Oommen --- arch/arm64/boot/dts/qcom/x1e80100.dtsi | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/qcom/x1e80100.dtsi b/arch/arm64/boot/dts/qcom/x1e80100.dtsi index a9c8cca1c6356393962cef856b3dbd9420733999..8eddf0c9609871b8660587a22b008212a67604b3 100644 --- a/arch/arm64/boot/dts/qcom/x1e80100.dtsi +++ b/arch/arm64/boot/dts/qcom/x1e80100.dtsi @@ -3754,10 +3754,24 @@ zap-shader { gpu_opp_table: opp-table { compatible = "operating-points-v2-adreno", "operating-points-v2"; + opp-1250000000 { + opp-hz = /bits/ 64 <1250000000>; + opp-level = ; + opp-peak-kBps = <16500000>; + qcom,opp-acd-level = <0xa82a5ffd>; + }; + + opp-1175000000 { + opp-hz = /bits/ 64 <1175000000>; + opp-level = ; + opp-peak-kBps = <14398438>; + qcom,opp-acd-level = <0xa82a5ffd>; + }; + opp-1100000000 { opp-hz = /bits/ 64 <1100000000>; opp-level = ; - opp-peak-kBps = <16500000>; + opp-peak-kBps = <14398438>; qcom,opp-acd-level = <0xa82a5ffd>; };