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 E6A8640DFCF for ; Tue, 26 May 2026 14:54:26 +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=1779807269; cv=none; b=RGkFjzoXuzML3VSMqKnrgbg26fVyEeewhQJ7DS0srvT+0hDIxtaJRk6q3EHK/qBDdWNXaC7ejQcx+nAafwpl5NbQ4l4b1wXBNMSYh5aFCNdeat6oPrSnaTsDgVk/NMSRK7lP/awuiFaP0v6DWR9TTU2iNLW56nA7ZQXeo2Ylpsc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779807269; c=relaxed/simple; bh=b40BHbOfSg07/gxw3Tyz2UHI27x2OYYbIZG4BOlfw4w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RVrTDCjsdbfx9UUyAyXe2K7c5+1JFnNhUIMBc0W3OInUz5g0xftevOCSoqSeXmvo3CzTiU5QAffzx3kBEdUqsB6h+7ALxP7GJ33Yprxf5WgILsLz078RPbAhx/S1M7fDnrNm+ovL3OqfJtk00PhzEyD3kg/erWwc5GJgW9Lz4Lk= 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=Dbg6vf+v; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=bH5UJoAE; 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="Dbg6vf+v"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="bH5UJoAE" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64QCsZwJ1575458 for ; Tue, 26 May 2026 14:54:26 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=OlrCc+t7CrC NbDyoSUL1NFgB6ARlkR4nNT8vRThHknA=; b=Dbg6vf+vFEl8ZiTZpsab0OHehin sVEGOXecXy8rTn/LMbJYeQ3oiL2AOrolljzvgLxxDJWpkEx0rC1xGTQV0chjXkEt JXFVM4VM+nahxP0qzK7lLuPbxjcpAjrp1Jm/pS/+dlv7h0qCAxxOnUGLdbZWj/Cb GUPJz6o5+GiqudBzFjjGzI5ODkTNFSePwbjtHV7Kn/1/3oJHMjii7SvTfjv8ti5I voorpSm+3j0ccKHzJobbtgWfbL0jB44DJ+ju4JoctzkWKIsGPnTnz59NEQpaOdmb oNZyOpAy9NTobK07Jx6J3QV7suLav0W43MjDx/CNZgDQ6DC3YQoRMxBt6kg== Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ecqvwvp5h-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 26 May 2026 14:54:26 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2ba054e0304so93878015ad.0 for ; Tue, 26 May 2026 07:54:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779807265; x=1780412065; 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=OlrCc+t7CrCNbDyoSUL1NFgB6ARlkR4nNT8vRThHknA=; b=bH5UJoAEaWXLhtfsQOXL77UwJnsyyZkqfK5XvOorIYx59nW86hyAdBFZHHMf9J/Sw1 GPBXI5iE6PW1L/eGWmyCLlbMpDu9bx6KBfVTw1xZaULcX7ZELenP0WF4yCCH2albpGZq DCqzKegix5hkYDvQSNJm1KWXC148lx7WB6jtbRKYrzGVXk68JUU1X/Z1By8m1Pq7/Hfj 05kmzSRCuaYUrOa8QPxqEN5e879vq20ekTVeAZenQtfIF4qtlBwVY9LCfoKOPfJBg7ju nMex3cRNP4a1irEgcqstkSyAc3OthyQZ/JFMAyhopv8G8vIP+uoaMrVowmElr7TshUUR gazA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779807265; x=1780412065; 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=OlrCc+t7CrCNbDyoSUL1NFgB6ARlkR4nNT8vRThHknA=; b=HXmJi5C4FEsVCMXHflqCVmeY3odn6YNJaH1TEq2w+L7bR3rCs2oyqQkOioef1tjIW2 SWcf3iz/dhLuc9/AlFaQ3t2nUKmXFQ29XVzNNSWt7X2z04IlPRJ6R1wnfI+SJ+gquAyq Zoh0TWCI6CQjfglesb2bM80Nw1fYS+0pxr/1N1UvCSmBw31FoX9lsPZnSQhfLRQ4eY57 w3DesH32XPTcKiji/fTHkehL+CH2lpUAJEMRDAZ8qAbrS8p6jiXXLzH3KyYRQVnoogUF MwbJDmp/DNj5W6qJnHcVv/1XzFsVM9K+15/ys3dXkvUG1aL7So0C0IB0Rf9zqaeqhy/0 rlEw== X-Forwarded-Encrypted: i=1; AFNElJ/SBHFhkVAvr55F0lDm+GhPBl6cW6Le4ac188Z6jbtOOVNj53hX4n7yfoHnhxfOp+b5E2SMxGoalJiyX74=@vger.kernel.org X-Gm-Message-State: AOJu0YzE1nnV8rqb+EpbNtFPAS//tJ3nEueSAiZNPe8bZeAzNPQlwHKM /Vx8VJjQxzCSzAemU86Og+eVE/5X8EtHN30QyRAV8CCmGNnt03L5QHSoYCwxw2FfMlSUmFPumCr z6z8yIbkT403Iv8LpJjcZhLHVebH3NQDPTiDEhu7iLGHoXzpH4HPbFwcpPuo03WCPgXo= X-Gm-Gg: Acq92OGWztUlwFmo5M2SZXIpy+ApxtkqBmUvKvAKYW8Wi9SsKx1I4D5u3bOsKgMFCup L1/9coYPDyWNfIVE6LrMTpK/H2GQb6hVvjNaHT2PiBL0kyyD+IIVx4ahs4UsFOhxoOi1hw/xjIr V46L9W8OHmwRvcK+/pz6b2CHfCX9A7bO0K0DiAfjBsDtmJ6EGbpzc38mWBYdVqbvBiP5yD9S69h kDNE5oLGTuVFf4jfD9nJtIMYP3PYs1x/xEVaKgqTo/hVxbCamAVN4WJHncr4lE17ZcDja/2NL2k nsOvRB0sXCuqnm+wYTOKOinIJxxMpW7mdGMfqhAkIIgQ5zBkq3ExB9hQPdzgkR/k8xjMFP20dnY 1Wq/yeLa5jMb8ng8AXIsZ4du+aikFTHce X-Received: by 2002:a17:902:f546:b0:2bc:8e7d:3dce with SMTP id d9443c01a7336-2bea23e2057mr203790335ad.27.1779807265370; Tue, 26 May 2026 07:54:25 -0700 (PDT) X-Received: by 2002:a17:902:f546:b0:2bc:8e7d:3dce with SMTP id d9443c01a7336-2bea23e2057mr203790015ad.27.1779807264811; Tue, 26 May 2026 07:54:24 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb56b5886sm114221225ad.20.2026.05.26.07.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:54:24 -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 , Rob Clark , Anna Maniscalco , 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 v10 15/16] drm/msm/a6xx: Append SEL regs to dyn pwrup reglist Date: Tue, 26 May 2026 07:50:49 -0700 Message-ID: <20260526145137.160554-16-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526145137.160554-1-robin.clark@oss.qualcomm.com> References: <20260526145137.160554-1-robin.clark@oss.qualcomm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-ORIG-GUID: uHY7F_3cAxeR1rTAMJmVdOEh1wXJZTzi X-Proofpoint-GUID: uHY7F_3cAxeR1rTAMJmVdOEh1wXJZTzi X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI2MDEyNyBTYWx0ZWRfX0p2vznGdnro2 ViV2zjTVvuMl1+QJD8QlVBdJnjLuUZ0aMnl22pSJ4sBrv5fXeOCsmlgDjVgqpGeIO/SMgCmnAMk J4LbqFYR09YrADxTK6tBpRvK1d0FoyxGazMZkosvMEffI+N5t5ShUUuUltxx1aJr70P7+9UWqk5 d50+lvwGg8fsKDzWw397d4VmXedzgAYveLIRY/esSx3YSSLK7e4B8H5tKVMGA3vq2agN0SC5+Yu nzfeRS2oVKEhCNo1ieKzmjFR9AzLEHN12W525yH7iLxLzr6HBNzWn9fAvIuac/Rn3ffkXgtElLF wgkxo6suefPfzcvcknMv19oLRT36+df0fbYfcZIYuD+GcOfUVPW/XCw79ta+xiIoNGImiPvqwPy WtE92cUDFtb+7TjveXZH/PAHLn6tGKKkXyxuXni2nLKhSRs6bfGefPLF+YoQIdiXIEY0yjYkRNq 5BTMfKzPcO12AHV9HEg== X-Authority-Analysis: v=2.4 cv=M4l97Sws c=1 sm=1 tr=0 ts=6a15b422 cx=c_pps a=IZJwPbhc+fLeJZngyXXI0A==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yOCtJkima9RkubShWh1s:22 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=gjKahejJLxXXi_JFjLAA:9 a=uG9DUKGECoFWVXl0Dc02:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.125,FMLib:17.12.100.49 definitions=2026-05-26_03,2026-05-26_03,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 lowpriorityscore=0 suspectscore=0 clxscore=1015 malwarescore=0 impostorscore=0 spamscore=0 phishscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605260127 This is needed so that SEL reg values are restored on exit from IFPC. Signed-off-by: Rob Clark Reviewed-by: Anna Maniscalco Reviewed-by: Akhil P Oommen --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 84 +++++++++++++++++++++++++-- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 11 +++- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 1 + 3 files changed, 89 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index e6c362c55dee..af524130d5c4 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: + */ + dma_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,30 @@ 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: + */ + dma_wmb(); + + /* Update dynamic reglist len to include new SEL reg programming: */ + lock->dynamic_list_len = a6xx_gpu->dynamic_sel_reglist_offset + nr_regs; + + WARN_ON_ONCE(reglist > (uint32_t *)((uint8_t *)lock + PWRUP_REGLIST_SIZE)); + } + 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 d3f0b40787db..b72fb58bf223 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[]; }; /** @@ -101,6 +103,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