From mboxrd@z Thu Jan 1 00:00:00 1970 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 BB07E421A0F for ; Thu, 14 May 2026 13:54:48 +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=1778766890; cv=none; b=nIXDyYE7/ZQxA21woZLYGhBZpr9OTCQ/YfGxRRyZpTlLJX8kucDlxvF09TCe+iP7Rs150hoZOzCSH8bq6setYxPpo/CCqvB8pT7nQNl8awxnjrGs7Oyr6dd88v0eQzI8nl07F9k4U1nJqu02/epCTBmlr8TbRQ6hW4yu+JBI0zc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778766890; c=relaxed/simple; bh=YXlsVRsxsY8HQJhxxv03/h8be909bFJIUchGlum4u/U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AZ74ru7Rw71u6o+1DtnBu/HYzuVgaTLsZ0zo2HP9StjYZbc8ynj0N01Gs4JF+Q3tfmJgVCNdLN3KIo9yQjX1VFhQ758Cg+OdtQTw131lpUK75zHvclqDsJ5NszejD9rzlel9ErjkKlotLhWiRzIyHoJQK/cPYzYI/qHqUN4NA+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=EMpKWF8V; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=PjEasyjd; arc=none smtp.client-ip=205.220.168.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="EMpKWF8V"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="PjEasyjd" Received: from pps.filterd (m0279864.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64EBeUMq3061899 for ; Thu, 14 May 2026 13:54:48 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=qcppdkim1; bh=lSG8Ggz0BAp HT/OdECps9ZrqwsJXbtBLlduou4IQHiI=; b=EMpKWF8VGMFXeilUYYHIIKOXwnL uHu8zdqGFvZIHkY7f4PJeeyULy9DMTTBh1L/tkXXqSSSKcDW3EudRCyipmHQHC5Y AkZjX98R1KAvikxyhPoYqZQ2LkeZCpK82X/GjnHIsINQcpybWOzYI1D4wTYVcbRV kMi8fRCORQDkUSVpA4FtqEeIUkbZOExEiSBXpvN25ZpWob4YC6H06cfRPv01plEz ZZkP5EPnc/h4NZAsljQNo8LO6/zGHtbyT4JQ0UvyDtRWeP1UE5a560Vig/HrI0vf HYEJrQLLsRQVahGmanwHxn631VAkM1Th73SAaZBSuE+73+gf1//vWhDbiLw== Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e554aa7x7-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 14 May 2026 13:54:48 +0000 (GMT) Received: by mail-pj1-f70.google.com with SMTP id 98e67ed59e1d1-3663d5e9bf4so7747282a91.1 for ; Thu, 14 May 2026 06:54:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778766887; x=1779371687; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lSG8Ggz0BApHT/OdECps9ZrqwsJXbtBLlduou4IQHiI=; b=PjEasyjdfvK63AjkcG5/9ex5giQb8uXWKpFGd8xsgF4qRzZeP6jquVzxDh7Y84Ckig Es9KoIxcHfb7A0Kr01dI/KsfAUSZDi5+QsfRZoy22udBouG9uDuipjP+xnpcQhys+wG/ wc6YmdTM1Z9tPRdX6/3nMmZqCIzmwPuWxzyQQvj/cVXoCxC3v26pu1wEupJLklGSs48R 2jVIwQv4CsXrNnAtTbImWHeQ24YeOL9Y/s5u3l+EDFlTH209lGRyrk5x3LqNcCr6LO3a BLplfi9hYiMueTzke3sLFWnKUaBq4zR/PyfO/r7wW1ZrqQgvz60XJIWKQCLvCgmG0mXG MWlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778766887; x=1779371687; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=lSG8Ggz0BApHT/OdECps9ZrqwsJXbtBLlduou4IQHiI=; b=dwZcHUuPi8y0qR8LiLGMoeXhUwT2xKuBGALpnd3nUP93Cc35cG2JXJzA8fY01OURjr k8R/H4W/aZCPJCXKVPTdM5gYu5v1Ghalh4EVWnFhr8ZSOJCw1m3unj0so3parz18YdlX hsNLWWfngXmc3QbcgQ0VFlTyDwbbasJvG7bRLYbJVd73NToYCKO1B1DTdjFSE/MnMRVT JukKUKiYY0eNLfc/jFL2mcyZbpNYUsmuoXpMiAVjvxUBKou2i9nIRl0HH3wV2Y7LhsSo nUcaQ44ebIbvtG/DBzQ9uvISGPmkuRE13EwnsAM7CChEDTmC7b+3y5Cwxhu7EIDaxj7R wm3Q== X-Gm-Message-State: AOJu0Yw0Siu34RXqeIg9JNWAju6QwPeDtWSDGtFeGK9q1EpCetd7OevE 0C+hWAS0E75nJXDMHE2bXAIesdSJZssnwfpT1kASJTC5B2SUfO9wf6mApbne9R8PWlAQgDXlBrH /G7UE1xD14i3rbF7IUknx+r/XoLL7Gka60mz4AAQ/ci2PQUvIK0nNYCC98fgDbGesi5E3 X-Gm-Gg: Acq92OFgt7rpHMAvIgnLCr0I/FGd6b04qaCXw9/mYi6kX+HSuAveVzppkIyCY6P4YCc HG2KVclCOeEH8pBSc1urjIKoEbxVJUnlmEXfVjQtCv/Sueue1IQciCV+CiiJeLsTMAcKq9i6CXT zgS0/PUha/2AA7pOve0U+WPR5Zyobdd78VKdBGhh9i1G93U6MHezEZ7vI2YF8a9b7X/SplRgQjr egcfOYRcOPHfo42yNhyx62pvylOU84GjjLZqsewG6ko9pV5ZjZwUBciw+fUoqPJMaQx2nydd1OL GMsPVptWObqJlVqER3nlhzi6jnkoLedQw2P/aN3pfp7BKgAFvl/ih5kD+tZzkHab0CKdt4QlgM3 c9VfQtW91fLvl5vWOIM8vrMfLqurG5Soexiz3gjRuW/U= X-Received: by 2002:a17:902:f54f:b0:2bd:7ca:e67d with SMTP id d9443c01a7336-2bd276dfda1mr91696625ad.29.1778766887233; Thu, 14 May 2026 06:54:47 -0700 (PDT) X-Received: by 2002:a17:902:f54f:b0:2bd:7ca:e67d with SMTP id d9443c01a7336-2bd276dfda1mr91696205ad.29.1778766886583; Thu, 14 May 2026 06:54:46 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2bd5cfe4935sm27139415ad.42.2026.05.14.06.54.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 06:54:45 -0700 (PDT) From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, Akhil P Oommen , Anna Maniscalco , Rob Clark , Sean Paul , Konrad Dybcio , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Marijn Suijten , David Airlie , Simona Vetter , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v6 15/16] drm/msm/a6xx: Append SEL regs to dyn pwrup reglist Date: Thu, 14 May 2026 06:40:03 -0700 Message-ID: <20260514134052.361771-16-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260514134052.361771-1-robin.clark@oss.qualcomm.com> References: <20260514134052.361771-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: Xo9gkQ8hNo_rtGUNPtdjVqg9Gi76Iums X-Authority-Analysis: v=2.4 cv=Wag8rUhX c=1 sm=1 tr=0 ts=6a05d428 cx=c_pps a=0uOsjrqzRL749jD1oC5vDA==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=DJpcGTmdVt4CTyJn9g5Z:22 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=gjKahejJLxXXi_JFjLAA:9 a=mQ_c8vxmzFEMiUWkPHU9:22 X-Proofpoint-ORIG-GUID: Xo9gkQ8hNo_rtGUNPtdjVqg9Gi76Iums X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTE0MDE0MCBTYWx0ZWRfXzIggxlFpdixP XHbivWOOMr/5zn2mwm+xpbQGrVkInJNvLzK8pPPb7jd7+9wfiXKMnT99UWtW8L/FWk84L4hZHdW fzQ11Q4jyYnUDwWNLON2bADvMnUf0eMbVsicRdekZfjXV/oeve/fUAfMaFe/aoo6FuoIPoYDHhk lTjnuLxN85Buu5PLEDno8YY5+/1xp+fP+y5GrHzn12tSZmuh4UC3rRo7fjYLLTWcPasx9lw3VTJ eOMl8p/9YhJE0aPxue8/xCzyKTmTQh5YY54rOEZMx9okPrHRhBuu6kcsxlUIVrZ+v8dLvb2b3WH yuyDaYBHdmdwATM1vEC79NFVFs1pfnuHxp7rCVq2a71p/6eTCmcjYJboH0XQCXNjs2bu9pN4o8J kI38sbrrbFtINMjuV+K6sFn26mQdG4pVqhibaCFruE9bxZRHP4svZrYRvwdGWmsOzdDG6KrUQfV aANmz6IU1AAoOM/ucIg== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-14_03,2026-05-13_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 adultscore=0 malwarescore=0 spamscore=0 bulkscore=0 impostorscore=0 lowpriorityscore=0 clxscore=1015 phishscore=0 priorityscore=1501 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605140140 This is needed so that SEL reg values are restored on exit from IFPC. Signed-off-by: Rob Clark Reviewed-by: Anna Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 82 +++++++++++++++++++++++++-- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 11 +++- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 1 + 3 files changed, 87 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 61c6b0e781ce..47627e76adcf 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -946,6 +946,7 @@ static void a7xx_patch_pwrup_reglist(struct msm_gpu *gpu) A7XX_CP_APERTURE_CNTL_HOST_PIPE(PIPE_NONE)); } lock->dynamic_list_len = dyn_pwrup_reglist_count; + a6xx_gpu->dynamic_sel_reglist_offset = dyn_pwrup_reglist_count; } static int a7xx_preempt_start(struct msm_gpu *gpu) @@ -2535,11 +2536,60 @@ static bool a6xx_progress(struct msm_gpu *gpu, struct msm_ringbuffer *ring) return progress; } +static void +perfcntr_select(struct msm_ringbuffer *ring, enum adreno_pipe pipe, + uint32_t regidx, uint32_t *countables, uint32_t nr, + uint32_t **reglist) +{ + OUT_PKT4(ring, regidx, nr); + for (unsigned i = 0; i < nr; i++) + OUT_RING(ring, countables[i]); + + if (!*reglist) + return; + + for (unsigned i = 0; i < nr; i++) { + /* + * Bitfield is in same position on a7xx, but only 2 bits.. + * which is sufficient for NONE/BR/BV: + */ + *(*reglist)++ = A8XX_CP_APERTURE_CNTL_HOST_PIPEID(pipe); + *(*reglist)++ = regidx + i; + *(*reglist)++ = countables[i]; + } +} + static void a6xx_perfcntr_configure(struct msm_gpu *gpu, struct msm_ringbuffer *ring, const struct msm_perfcntr_stream *stream) { + struct adreno_gpu *adreno_gpu = to_adreno_gpu(gpu); + struct a6xx_gpu *a6xx_gpu = to_a6xx_gpu(adreno_gpu); enum adreno_pipe pipe = PIPE_NONE; + uint32_t *reglist = NULL; + uint32_t *reglist_sel_start; + + if (to_adreno_gpu(gpu)->info->family >= ADRENO_7XX_GEN1) { + WARN_ON(!a6xx_gpu->pwrup_reglist_emitted); + + struct cpu_gpu_lock *lock = a6xx_gpu->pwrup_reglist_ptr; + int off = (2 * lock->ifpc_list_len) + + (2 * lock->preemption_list_len) + + (3 * a6xx_gpu->dynamic_sel_reglist_offset); + + reglist = (uint32_t *)&lock->regs[0]; + reglist += off; + reglist_sel_start = reglist; + + /* Clear any previously configured SEL reg entries: */ + lock->dynamic_list_len = a6xx_gpu->dynamic_sel_reglist_offset; + + /* + * Ensure CP sees the dynamic_list_len update before we + * start modifying the SEL entries: + */ + wmb(); + } for (unsigned i = 0; i < stream->nr_groups; i++) { unsigned group_idx = msm_perfcntr_group_idx(stream, i); @@ -2567,17 +2617,15 @@ a6xx_perfcntr_configure(struct msm_gpu *gpu, struct msm_ringbuffer *ring, const struct msm_perfcntr_counter *counter = &group->counters[base]; unsigned nr = group_state->allocated_counters; - OUT_PKT4(ring, counter->select_reg, nr); - for (unsigned c = 0; c < nr; c++) - OUT_RING(ring, group_state->countables[c]); + perfcntr_select(ring, pipe, counter->select_reg, + group_state->countables, nr, ®list); for (unsigned s = 0; s < ARRAY_SIZE(counter->slice_select_regs); s++) { if (!counter->slice_select_regs[s]) break; - OUT_PKT4(ring, counter->slice_select_regs[s], nr); - for (unsigned c = 0; c < nr; c++) - OUT_RING(ring, group_state->countables[c]); + perfcntr_select(ring, pipe, counter->slice_select_regs[s], + group_state->countables, nr, ®list); } } @@ -2591,6 +2639,28 @@ a6xx_perfcntr_configure(struct msm_gpu *gpu, struct msm_ringbuffer *ring, OUT_RING(ring, upper_32_bits(rbmemptr(ring, perfcntr_fence))); OUT_RING(ring, stream->sel_fence); + /* + * Update the pwrup reglist size before flushing. Kgsl does a shared- + * memory spinlock dance with SQE to avoid racing with IFPC exit. But + * we can skip that since the ringbuffer programming will be executed + * by SQE after dynamic reglist size is updated. So even if we lose + * the race, the register programming in the rb will overwrite/correct + * the SEL regs restored by SQE on IFPC exit, before sampling begins. + */ + if (reglist) { + struct cpu_gpu_lock *lock = a6xx_gpu->pwrup_reglist_ptr; + unsigned nr_regs = (reglist - reglist_sel_start) / 3; + + /* + * Ensure CP sees updates to the pwrup_reglist before it + * sees the new (increased) length: + */ + wmb(); + + /* Update dynamic reglist len to include new SEL reg programming: */ + lock->dynamic_list_len = a6xx_gpu->dynamic_sel_reglist_offset + nr_regs; + } + a6xx_flush_yield(gpu, ring); /* Check to see if we need to start preemption */ diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h index 3491a24a9320..f3cc9478b079 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h @@ -21,17 +21,19 @@ struct cpu_gpu_lock { uint32_t cpu_req; uint32_t turn; union { + /* a6xx: */ struct { uint16_t list_length; uint16_t list_offset; }; + /* a7xx+: */ struct { uint8_t ifpc_list_len; uint8_t preemption_list_len; uint16_t dynamic_list_len; }; }; - uint64_t regs[62]; + uint64_t regs[]; }; /** @@ -100,6 +102,13 @@ struct a6xx_gpu { uint64_t pwrup_reglist_iova; bool pwrup_reglist_emitted; + /* + * Offset of start of SEL regs appended to pwrup_reglist. This + * is equal to lock->dynamic_list_len if no SEL regs are appended + * to the end of the dynamic reglist. + */ + uint16_t dynamic_sel_reglist_offset; + bool has_whereami; void __iomem *llc_mmio; diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c index 6c040f718176..2ce7c6ac4521 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -468,6 +468,7 @@ static void a8xx_patch_pwrup_reglist(struct msm_gpu *gpu) } lock->dynamic_list_len = dyn_pwrup_reglist_count; + a6xx_gpu->dynamic_sel_reglist_offset = dyn_pwrup_reglist_count; done: a8xx_aperture_clear(gpu); -- 2.54.0