From mboxrd@z Thu Jan 1 00:00:00 1970 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 A83143EB808 for ; Mon, 11 May 2026 13:01:38 +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=1778504502; cv=none; b=Dtobj/eUWD6P3bI2h1RcmTW0CKdUghwNAkOkPnSSC55T9YEocRpCt3HK2azL8vOY0r6WfLeB8LxePyfeA3h0R0sHTPmGfgtkgYGUkdfYv/wtfbRIEeiFljomEu1jWdz691kI1m6WzSSi73umdPqxeAK6tO1G3sUZ4dRwJsjv7I8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778504502; c=relaxed/simple; bh=JIluNArF7RsZIAKl+uhBs6aRuY1YSq+4uknvBZzZdVM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YhSaermd3Bg/jxpWKK3W7w6bMPsabN9ip+I69MYnFJguUusZ/OhXcT4E54Hvix55c4oAom7x7L3Vy3WZWll4YMmMR5lIrzrgmArkyiW5FDtGy3OPo7oSirfLsI8Km7IHZmEs2KAaUj+dXv77RbWVRnd59+nMGfSXAYojlnIZUGk= 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=cRBqXdZW; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=ewMD2Qva; arc=none smtp.client-ip=205.220.180.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="cRBqXdZW"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="ewMD2Qva" Received: from pps.filterd (m0279871.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BCxQQP1258452 for ; Mon, 11 May 2026 13:01:37 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=iF+9PJLiAYx Yvbd4GKOtHlCv+ra6BRd9wFisnl+IW1w=; b=cRBqXdZWj5PROv3zQHsxVV+fu+J zHF8BBe7IMiOPTOe4Jl65IWd41x3g2YpfUWbYXb4u7cPUg5eY9hSxE/waJzCLf0A USmr15Gx5rvviCEdLgv7BZ6/17NGw/8bnhsnmmjggePnM3b08vd42PAYkOe7RAkM LHkugfj+3V19ZsiUGdUBMpSjM5AY8Frh7UPRdeyO0SZa3V5nokoXrv9tXnB9HQoC 42ISSTbAXW/kktPlHrT9Azp/bL+j4KIfm/EKfvGJtupeGsydBMNXd9KMqo/eD/JI CdEF5rza5DN9Heacg+pO7JRA4DDZoIyS5h0BcI7ZS0t/FtKpm+wUQkVMP9g== 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 4e3ag217m6-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Mon, 11 May 2026 13:01:36 +0000 (GMT) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-2ba7662827fso39159495ad.1 for ; Mon, 11 May 2026 06:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778504496; x=1779109296; 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=iF+9PJLiAYxYvbd4GKOtHlCv+ra6BRd9wFisnl+IW1w=; b=ewMD2QvaL+WZ+n2lTuQkTYlrx6JI3lywN9j4iaPSYZnO7g301pc+hwxfMDNnUO01pU 2FPtpDw2LCmSFEvL2l0tlu4mXAJRdXRvstUxHtE374HInbBE5Y93BLGIOagsxcngJo62 gRDQAdEZb2XoofazZzCHV0DTlvBtyh0aMWLooXBCFRRxdsWesuMEma3GB1AmpOM1FP/T ALNDL9JPw+s7o6WJ4rSpaKdAp4A81/LNZt76LmeNqSWB8xSvTrGjgPkWPM7t9Wm7BhYz F+UA/dJV3jGV9JEH1ztEV3rPAt5c6s7E8HgynJ3pprHlF531ZlH9OpxIjdEG6AGx/fgm HneA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778504496; x=1779109296; 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=iF+9PJLiAYxYvbd4GKOtHlCv+ra6BRd9wFisnl+IW1w=; b=Ok8Br5ROVA0I9cbsFjeXvGaJ3k/LqYaztxoudl6VV+LDXAPdNDohMniWb6Of1lwTYg v7a+oYCBgOskSEbdO3hiI46Y4xXVOVnhNUuP44nISG9R/8iPjKOUSoaNWf3P29PQ/66j J/1KukWRayl1vIhzh/RQv1Ta5SsLPxTgw41RGRtAJ9F6uiq160KuqmgbO/CgsB/HFKp2 nJdam1+kVKZsyrUyv9+bVcG681g0OOZ9FV2S2FfMzedTZaYhczQfCt5wuwX8ewN8WlTv tnVzN8gDvHdhst76phVa1z3JiXJcEZ1YVVDXz99IcEudYyAs5bQsorFZ9dmFR0B1TdWP QHfQ== X-Forwarded-Encrypted: i=1; AFNElJ8mP1Njautt89gEVnJmZlyyErPDDrRHJ4dRh4GOTmkxwvWnXn9g22yfiMLWLQ3m/53eYKYFAtvDR55svww=@vger.kernel.org X-Gm-Message-State: AOJu0YxVu7wY+W5A9JjAt0qEuIKCWSQENUTZ8k1iWoQm1kppG3Cuq/Yo Cz2/RFMc7Snt18rw6SE3LYsg/FLSRGSEONvOVNQr/2pc67rRSpbQhIKoLjclxUK34AV97ZTtNkf D6EgAYFqx/3hgKvzlv1m/T9CKET2mJlUcb7cTHzMjNnI+uiuThlfo8eUn/MzQOrYJAKI= X-Gm-Gg: Acq92OEwnVquFiX5vBkoKDJNvi9I/4MjVegAMEOgPiDEuPBxs4zeRVjABBO8wHOK17Z vklF+UV2tKvioC+dMqvhbvGZnYFmqhjOR2PvQMNGNQq2wfTnmamsPBUYix1T7utiMM3wLTkK/4Q E8nu7Nrz9Ptlzj5vGPm/xSdVNzjxxaushKMFcufD0if3b5n92vDvRcty/UrVjHuwv6h/zSuKeEk LYzOA0aSYzW8iNkeOpBqgrGswX0sIyI/VXA5wo7ApX1CEjno9Qdr2luK6Q3aONHWrEWJo00BCHH oEi5pFRexmbMqynlusLlV/uRZcrberU1nw74ObF6i1rd3NQomncj+bTpP/oMUKV5kVVr4xleCIW 0A8PsLR/0owujFzLLkVgVGqaCVxSZCkfn X-Received: by 2002:a17:903:320b:b0:2bc:b834:6ec7 with SMTP id d9443c01a7336-2bcb8346f43mr38716865ad.2.1778504495593; Mon, 11 May 2026 06:01:35 -0700 (PDT) X-Received: by 2002:a17:903:320b:b0:2bc:b834:6ec7 with SMTP id d9443c01a7336-2bcb8346f43mr38715875ad.2.1778504494798; Mon, 11 May 2026 06:01:34 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2baf1e35bcfsm102094915ad.38.2026.05.11.06.01.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 11 May 2026 06:01:34 -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 , 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 v5 15/16] drm/msm/a6xx: Append SEL regs to dyn pwrup reglist Date: Mon, 11 May 2026 05:59:28 -0700 Message-ID: <20260511130017.96867-16-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260511130017.96867-1-robin.clark@oss.qualcomm.com> References: <20260511130017.96867-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: sGHWb5frhuvmjQ9O1K4AgVjZEN_HjBdH X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE0NCBTYWx0ZWRfX8x7RTrbpAC3W GuJtkLIk7UgqN25zSKBrFP8jOCfFhIf2TKhSD+j5ZQ7m0CNl2+JpCyHJhmf6Z8TreccpI575OyB 4YfFCx7euYosEEwR1dclwU5/cI5/j2fC13fL9XSoFIGEySHNPTG84/znu+fxDgCajJOJZO25QAQ Vs1vpBS7BgnN4LT93JeegqJ9O556vhrv8YKpbNGWsqTaElDRHIVTqNE509IH0HpmQl/dedBOAWD vcWYWPsuzqAfBI7qY3lG9obIIK8vYp1DIL1OaO3DrH5W0zQuIkUV+7M5PV7dSkwlUiJ3CaxazIn w2iPNIa2PXwClMHM63P7/xy+fQqp1LjxHW/fOS71JNwrcvy4LnQAsO0w3zJDGFE/IdZkiALBvYf lGzpYMwW02eDjEGptMCPyuCDxxlwWVhKYHYVHBKNNV5Ecwz/xs56FNTPe92Tv8JLL1uOoCuTi19 8Jxph+FWliprXO6+93A== X-Proofpoint-GUID: sGHWb5frhuvmjQ9O1K4AgVjZEN_HjBdH X-Authority-Analysis: v=2.4 cv=NODlPU6g c=1 sm=1 tr=0 ts=6a01d330 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=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA: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.51,FMLib:17.12.100.49 definitions=2026-05-11_03,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 bulkscore=0 adultscore=0 suspectscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 phishscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110144 This is needed so that SEL reg values are restored on exit from IFPC. Signed-off-by: Rob Clark --- 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