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 0BCE8402BAE for ; Thu, 14 May 2026 13:54:36 +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=1778766881; cv=none; b=s8ZmVsTsV3Fu9Ypiq1Fm+MaDKMOK3VQypx3XjlulJ32ytWDVniA0tRkZ/Mj52vV9vw16cPAVOQ+ZzXwITljIq+HjDc5ftMBWwPUoBKELCx7Koge32ilOTcOKOAJwJ1/voo6S/22hB+oAxx3OIyzcMdANpw7JP1KT0MOy/pFBaSQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778766881; c=relaxed/simple; bh=6KGYZWLyS2FjrVAien+Mi5u9NQS/vFb5P8qdni4ohb4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=irrToZ1AU4MEJunLfxQjPz2Nls9u2vlc38UyDi9HKQGyKa+m5+tvqAKxiY0AzOV4rEGpc816HL7ehD0dxPh0HV3GNXVd5XwbW5h0PZadnrYnUi65M6VHmYMdBtXGeLf4SAZg5rjRsQJ/H8092IqmYIp015UAVqcCUAXTaY9oABQ= 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=CqbXjaWf; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=gTOhkfBZ; 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="CqbXjaWf"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="gTOhkfBZ" Received: from pps.filterd (m0279865.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64EBeQGe3951585 for ; Thu, 14 May 2026 13:54:36 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=ntrYj/Ki13u 4Ie8f2izhqt5WotaMwwL8t/FAwrisOvU=; b=CqbXjaWfVH7ccfrdW/KNfNnEyqq IQelHsCaIZrxNENvrjK8T1LI+y/MvKLZ9hlPFvOAypBZydJZo8RBr9YCa6JH/fCv 09WX4qByDbkHbmK2RRPbUydms3NFLH9mzKXyoclBASluTmqqB6gya0XI1BJ7eOAN QRp7V0viOJv3Ncc+lW+u2p44mN0XMGeY3Ko7a4z5ZAEJIs8fF4LU6i7+HTmFiFRj 183a6Ulxa2izGxsjjbCIVdK9Q6uaODlJVgt5qBpQHhQHTPGjmTs5oNIPbalG8gHo NWHMILKoYlasob7zrBvYlrWUSrw+PLJHXySG0JpFta7xKdFPw80AGqaxNUQ== Received: from mail-pg1-f198.google.com (mail-pg1-f198.google.com [209.85.215.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e57ksssf3-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 14 May 2026 13:54:36 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c828cee4fcdso2943432a12.3 for ; Thu, 14 May 2026 06:54:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778766875; x=1779371675; 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=ntrYj/Ki13u4Ie8f2izhqt5WotaMwwL8t/FAwrisOvU=; b=gTOhkfBZQZhFOOuexYIsTBIjkuU65tOIyXJbLVcj4ml+AoMNKwJpVJy8GJNCIBuk1b N37f9fLU7h7PqDV1sFSZvDnSbJHHUhNxy/+yj1u75ZeR7uEWV9ucs1px0gp254mVqXo/ lmTTgfqFjI88iQf4xympszqIRkIVkTV9nJSKbKYLhMlpy0+9doMmoG9+Dk2lwR8HTC76 Uzglsefz9XRVaIIrHSlXXNBZf3m8QUGOlhUb/XfyGrCjDAxdhcn1RB4BkbF+sE1HwtWi Lr+wfLTBxb5Xkx92d8xnwfCTCyP7d67KKV5och4fpEPlPu2R0QQey1mhgtbpYDNm5zIR U1IA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778766875; x=1779371675; 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=ntrYj/Ki13u4Ie8f2izhqt5WotaMwwL8t/FAwrisOvU=; b=TKNAUhBa5uSLZBr3aGrGq+OYDHsdIdzjxmqdRblSqLfcWB9K21H173yYxR6azY+csq NV3nubwVfbwvZyy7l0RfX1oe+1xrweRWn7Pj87y8AsUYRWt5CcNR4ZdFOoXqz6wq9UtG HluVInVt9GiO/RDH6lS5Otl1v9I8BJDmKftl88rnLgZoiSj7RbtRpC7WFTk7alLXx0lF vRQolaGMFkVUpsnzTYi4xeUz1++GcIXwuY0d0twERP4U8QIYezlX8C8S9QmzUWBUWv0S JrJXJ5h6xFMkO0t2A7IYbadsNsifBlPpVoQz04L8KrakPHqasvilRiooxVl8SotX2i/M rW6A== X-Forwarded-Encrypted: i=1; AFNElJ+W+s9rtD9/hHVuxNbRKgzzSCFXEuS5lAJGbwMXJAJRI2WK0bm2u7YgTT/O67NIY4VhgPmM63DYaLVExH8=@vger.kernel.org X-Gm-Message-State: AOJu0YxKtqlFqQkXqcFAKLKmIc6bu73qTsf4hp4YZKFWVxeNPFMmXvYl BWMbFpMdIKM5Nlp+XJiOAZ6IZW7z1TRxulOjycpIQ3JnGY+crS4RcEBFpSBD6O/Pc/+7bcDUn5j Gg8d2Tn/is/tvdt52ZMQ+5T8n3sAb8SDLwx0zNy71QsPHBeoaaWSyXXVW9MnHjsG7p1E= X-Gm-Gg: Acq92OHG2v0UwxmwHBpl+VsWczmn2h+SrOZ61/o54eB1rE8Q0SISCFrWnSRc9q3Uehi 2csEAojsnrMGYnkCuuvhavzsKdpV0WeETPZZWWnZ/aUKZDMn7MA6M0QyHNBb27nBRNjT0ggQyV5 CfUeirxvIKIy8qJbo8U+MlazhR4fF5jWhP5mjjAk90mXeyquXZs5NoyJKvj6K6sdIY0FWsnhv8B rxiWwNAlnzniayENuaiHgOOKgSzCQ0EBrQT8D8qE3pUB2mE/fqGUqWmcBetAayqLwBRAAweqAUm bhvnzyGWDZqlHWiHGdlSbUbpjN4C8d6qSLxGtHanZ4IBvBzwm1CUekAJZBxOSpX95PbsgdVLU/q q0yizitNkNBBt52WuhPLaJUqgpgAFFOaaJf9Lo5Q3HkE= X-Received: by 2002:a05:6a00:929a:b0:82d:29f:d003 with SMTP id d2e1a72fcca58-83f0578088bmr8503833b3a.12.1778766875408; Thu, 14 May 2026 06:54:35 -0700 (PDT) X-Received: by 2002:a05:6a00:929a:b0:82d:29f:d003 with SMTP id d2e1a72fcca58-83f0578088bmr8503791b3a.12.1778766874847; Thu, 14 May 2026 06:54:34 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f196818efsm3793780b3a.16.2026.05.14.06.54.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 06:54: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 , 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 11/16] drm/msm/a6xx+: Add support to configure perfcntrs Date: Thu, 14 May 2026 06:39:59 -0700 Message-ID: <20260514134052.361771-12-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-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Proofpoint-GUID: jk47NkXz8CVO2VtptiCptp_Xf9tn3dIy X-Authority-Analysis: v=2.4 cv=KZbidwYD c=1 sm=1 tr=0 ts=6a05d41c cx=c_pps a=Qgeoaf8Lrialg5Z894R3/Q==:117 a=xqWC_Br6kY4A:10 a=NGcC8JguVDcA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=Um2Pa8k9VHT-vaBCBUpS:22 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=F-OJb-hlSlUoWALVX24A:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTE0MDE0MCBTYWx0ZWRfX/vRKalNm0WeQ Wn7YpP61E0fUCgJM+PKlAGla3yPh43K1WZNcEyRY45P8LG1AjASVOgHyNy/lM/jUkfkWiCBj5Va TI65cllJnBNPtiWdkm4ywY6Icr8ZtUJe4jlSSFbFXihMeMoeH39NJxAMdayLhx6M/LBkRCjv5Xs Yme8OdBkCMF+oK5ySACVidrtyrBr9wI/I+Bi20LBQ/7+ZXaAiFMEFQec9mCHh08uqZ9+WrsrZYl D+Bhd7nTpksbIeR1MryPzx4ok8n7q07GSTbVLZBYUO2hAMZGOR1UnTUIFzFxAjn9tEYaBekOqpq p8ICVIgANE1f4r+mCif3tSa0+XCf6a4ahonHaCg16k/iGLkPrVpcGKVeRamtCDVPmmtzUa1jYSg aEq8zmb2BhCdD6xEoSBVMAk0Ye3yA5lsSIn7dcCs65B4UvAlOHNHK7pYU8DtSQn9g6usp2/K3D9 De/YEO/dB7bfkKpLCqA== X-Proofpoint-ORIG-GUID: jk47NkXz8CVO2VtptiCptp_Xf9tn3dIy 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 clxscore=1015 bulkscore=0 impostorscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605140140 Add support to configure counter SELect regs. In some cases the reg writes need to happen while the GPU is idle. And for a7xx+, in some cases SEL regs need to be configured from BV or BR aperture. The easiest way to deal with this is to configure from the RB. Signed-off-by: Rob Clark Reviewed-by: Anna Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 69 +++++++++++++++++++++++++++ drivers/gpu/drm/msm/msm_perfcntr.h | 3 ++ drivers/gpu/drm/msm/msm_ringbuffer.h | 2 + 3 files changed, 74 insertions(+) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 415902f6e5d7..30df9bfa9ef8 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -2535,6 +2535,71 @@ static bool a6xx_progress(struct msm_gpu *gpu, struct msm_ringbuffer *ring) return progress; } +static void +a6xx_perfcntr_configure(struct msm_gpu *gpu, struct msm_ringbuffer *ring, + const struct msm_perfcntr_stream *stream) +{ + enum adreno_pipe pipe = PIPE_NONE; + + for (unsigned i = 0; i < stream->nr_groups; i++) { + unsigned group_idx = msm_perfcntr_group_idx(stream, i); + unsigned base = msm_perfcntr_counter_base(stream, group_idx); + + const struct msm_perfcntr_group *group = + &gpu->perfcntr_groups[group_idx]; + + struct msm_perfcntr_group_state *group_state = + gpu->perfcntrs->groups[group_idx]; + + if (group->pipe != pipe) { + pipe = group->pipe; + + OUT_PKT7(ring, CP_THREAD_CONTROL, 1); + + if (pipe == PIPE_BR) { + OUT_RING(ring, CP_SET_THREAD_BR); + } else if (pipe == PIPE_BV) { + OUT_RING(ring, CP_SET_THREAD_BV); + } else { + OUT_RING(ring, CP_SET_THREAD_BOTH); + } + } + + 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]); + + 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]); + } + } + + if (pipe != PIPE_NONE) { + OUT_PKT7(ring, CP_THREAD_CONTROL, 1); + OUT_RING(ring, CP_SET_THREAD_BOTH); + } + + OUT_PKT7(ring, CP_MEM_WRITE, 3); + OUT_RING(ring, lower_32_bits(rbmemptr(ring, perfcntr_fence))); + OUT_RING(ring, upper_32_bits(rbmemptr(ring, perfcntr_fence))); + OUT_RING(ring, stream->sel_fence); + + a6xx_flush_yield(gpu, ring); + + /* Check to see if we need to start preemption */ + if (adreno_is_a8xx(to_adreno_gpu(gpu))) + a8xx_preempt_trigger(gpu); + else + a6xx_preempt_trigger(gpu); +} + static u32 fuse_to_supp_hw(const struct adreno_info *info, u32 fuse) { if (!info->speedbins) @@ -2753,6 +2818,7 @@ const struct adreno_gpu_funcs a6xx_gpu_funcs = { .get_rptr = a6xx_get_rptr, .progress = a6xx_progress, .sysprof_setup = a6xx_gmu_sysprof_setup, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a6xx_gmu_get_timestamp, @@ -2786,6 +2852,7 @@ const struct adreno_gpu_funcs a6xx_gmuwrapper_funcs = { .create_private_vm = a6xx_create_private_vm, .get_rptr = a6xx_get_rptr, .progress = a6xx_progress, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a6xx_get_timestamp, @@ -2822,6 +2889,7 @@ const struct adreno_gpu_funcs a7xx_gpu_funcs = { .get_rptr = a6xx_get_rptr, .progress = a6xx_progress, .sysprof_setup = a6xx_gmu_sysprof_setup, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a6xx_gmu_get_timestamp, @@ -2852,6 +2920,7 @@ const struct adreno_gpu_funcs a8xx_gpu_funcs = { .get_rptr = a6xx_get_rptr, .progress = a8xx_progress, .sysprof_setup = a6xx_gmu_sysprof_setup, + .perfcntr_configure = a6xx_perfcntr_configure, }, .init = a6xx_gpu_init, .get_timestamp = a8xx_gmu_get_timestamp, diff --git a/drivers/gpu/drm/msm/msm_perfcntr.h b/drivers/gpu/drm/msm/msm_perfcntr.h index bfda19e01535..14506bc37d05 100644 --- a/drivers/gpu/drm/msm/msm_perfcntr.h +++ b/drivers/gpu/drm/msm/msm_perfcntr.h @@ -45,6 +45,9 @@ struct msm_perfcntr_stream { /** @nr_groups: # of counter groups with enabled counters */ uint32_t nr_groups; + /** @sel_fence: Fence for SEL reg programming */ + uint32_t sel_fence; + /** * @group_idx: array of nr_groups * diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.h b/drivers/gpu/drm/msm/msm_ringbuffer.h index d1e49f701c81..28ca8c9f7463 100644 --- a/drivers/gpu/drm/msm/msm_ringbuffer.h +++ b/drivers/gpu/drm/msm/msm_ringbuffer.h @@ -37,6 +37,8 @@ struct msm_rbmemptrs { volatile struct msm_gpu_submit_stats stats[MSM_GPU_SUBMIT_STATS_COUNT]; volatile u64 ttbr0; volatile u32 context_idr; + + volatile u32 perfcntr_fence; }; struct msm_cp_state { -- 2.54.0