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 6F02D3F9F39 for ; Thu, 14 May 2026 13:54:30 +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=1778766872; cv=none; b=p+iV0Rmf4ZSzS6XUHXQEss8QL4Zph5ncxYykXyjfw/6mNRIe4fqsb21b9NFb0vCtrtFO4Butx0/74wEX4eYhvm/4Pdlj2lRlnjlbrtfr5gtlurtwDT03gvqklHxVBrDs7FFzDDesvDZhCTnl4eVZRi8whkg53wp+udGHdVvsAMw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778766872; c=relaxed/simple; bh=SUAMjZQYP9AOePOsiJrF8dJnyR56nPusuhXcE6GMh44=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dumrNSoQjotQnlCCmY70dTuswWPgnm/QY2mDb0Kxl+JlULctSHfyr91mKQhcG2ctfwvyco45/hFyjRLxhto/VlPsQpGfPlPD9e87J/P8MS33G+6x9NGJuaGbjtpTOMar6C5Tl4V4zHpn6obI6kY8aoOwqzTpNorUfYLDpYxqorc= 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=Ly+hBnf4; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=azEpis2l; 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="Ly+hBnf4"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="azEpis2l" 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 64EBf8uP2242527 for ; Thu, 14 May 2026 13:54:29 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=t3fkEBTd8c7 M226NlRdLECqyLGtXW1CncR7GLKvMNdQ=; b=Ly+hBnf40YrIKMaD5B+wj/bJsUf 6KzBDm39uQft+bc0Z8k/9w1WvaUuY1eFGFKZUocdP1h55ZoJLe5h2fgVH7RtAZcc M3b4+q0Qa9kjjmkkxevdRpGihQ04E7idgQbzXwV5VRB1N71PoYuB1D1BGr4o5rqS k9IwjGcsT66Sx4WRrxL9kYpY0OeNj86qRNVys1TJ6HAjHVoRvrc3UhZ1MfHgtWei XOEEG71If9J6/fSwHUDiueeOV2t7vIhpdFYf5fzrEb18z2cxaYOKYfEFMGHl8v9T PmXyQnNqXf/lWu/TGuxaNOiEr3NwB/5+K+Ep23XxiS0Jy00ZNRdXw42mmsw== Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4e513gavvv-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 14 May 2026 13:54:29 +0000 (GMT) Received: by mail-pf1-f197.google.com with SMTP id d2e1a72fcca58-8386367b23cso6308164b3a.3 for ; Thu, 14 May 2026 06:54:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1778766869; x=1779371669; 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=t3fkEBTd8c7M226NlRdLECqyLGtXW1CncR7GLKvMNdQ=; b=azEpis2lMlbgN+LrYPOQRYk8Hhkq/oZ11MKsdK7jM/3t1bcmz5x5qOQjxDwVi7eNIM bVfZXKSoZg5pubegvr5DIZtwKMsHtPU/03kDYXCu0rhU7XMkO2DzLD6Z0dBEOhqE7yn6 NOx3V51hDNjtpgFimlgz6nDECsigSWDh2uht5XGwtoxy0vaOIpBHF+LsmVyJJvvJ97Bn p9vOEzPsVpNIuMPS3qnQq6jBifo92oKzRigq/Q/3QnwiZZE/yB2FikU6SdV5p3EktZsl qnKWCJm53d1HLoTvUr20EODmDvrsnnpp3KjKEmibtuRYlnNNaP1tMEu0/wuliMQHDfKF BDFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778766869; x=1779371669; 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=t3fkEBTd8c7M226NlRdLECqyLGtXW1CncR7GLKvMNdQ=; b=MRS7eBjknql/O9YXcXN7J9cMbVyvWhTMLPpwdYs/Ab12SmNBW92FlDCC2k4BHKcSeq SYP0siVUY6XidEqzaaPzoeJbJpveFa0STI5D3fcPWsA7B30gq6BuLkEaOxxIABMaGPfX FA3JTYLS9uf8w3V2CY97x5ZLmasrnPzUcmQ/5OnE78MXo4qjVmwHu3WSaOiw2zq/4YWX 4CmYygjgUrQrhIGpS2DDw4MI2uRXy27eWcKXFZ/sXx8rvM0EB0NZripshUTMPtR/Kxq5 N1tObFbwxrkAFB8Q4+xCPLE3UajsqZ+I/eXo87Rksfwn4UJk5ypQr19jPrTyHvzt5IQb RYPA== X-Forwarded-Encrypted: i=1; AFNElJ9WQZBBTN5AqAJVmXRez14sqIhRn3qhPexNuqx4Z7NA4XBI9pLU13X6wvgBmcmnWVcx92ZcHebQekqPl9Y=@vger.kernel.org X-Gm-Message-State: AOJu0Yy1NtyI89Jg0Si1gq1t/iyZNlzz998WcGy6mMfQoHQ9dlfddIqH 2aRLfBEYbO++9TBQWgjOKuD036M35XdA0fWohq2PbrRnQ1efl3x7EJwiZGhtZGuML6a5pwIp7EK XkEfFvIOCNR5r7DnUpwAzK+3vPhJXKCAwBCdr1FxaB5We20JMIpkYWkAbjQh67SyDc9M= X-Gm-Gg: Acq92OHvwQB683ZbY4xttweeVj3HNxdBQv03WhNWq73cu6pOuHACWs37W6HgpYRgoai c7Tru0iSOUpA7gjJ7zZ/2/MaUixBo4GtPkl209DYdph+wzz/HUMb/WynEDrxRA0Gg0wwSnwAP5/ sbhOz0IJ+6Ab9z3KvEkQXQACbXxgfWiTqoxSKI2hXT3AR4Q+i6w39CoAnYCZYMuGy+JfNp82ww6 bSD5qEPrMyDCWNqBkubRYvrUDXo/KPmVZ9mVFyz05FWkCu4gptjhOwuc0dTkxEcu4UwBn8QTakD pjIvM9LMy9QgVO/tPj8UDIzvcyktq5QJu9nGT59ShIe617EosybreXqc+3jWiZKnl9vkedS9Lba Gb7btmu76/60NlMlyzuDFKYBftMe2PYYV X-Received: by 2002:a05:6a00:8088:b0:838:20b7:40ed with SMTP id d2e1a72fcca58-83f042bdaebmr8212903b3a.42.1778766868476; Thu, 14 May 2026 06:54:28 -0700 (PDT) X-Received: by 2002:a05:6a00:8088:b0:838:20b7:40ed with SMTP id d2e1a72fcca58-83f042bdaebmr8212852b3a.42.1778766867873; Thu, 14 May 2026 06:54:27 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-83f19664220sm2638819b3a.4.2026.05.14.06.54.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2026 06:54:27 -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 , Dmitry Baryshkov , 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 08/16] drm/msm/a6xx: Add yield & flush helper Date: Thu, 14 May 2026 06:39:56 -0700 Message-ID: <20260514134052.361771-9-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-Spam-Details-Enc: AW1haW4tMjYwNTE0MDE0MCBTYWx0ZWRfX40FUhnkpHf16 Le5b9pDtudzK4zJ+z65Pm73A8AlH/kd6n6kHB2wUMyo0lh6BlCKX6f1JCDtCgOXIQr9yHNBzyOf oi7hRWtDXVY6c4w2h7f+nLYcVIDoR7I2xjyl7A/68P+ZNgVDEtoEsnkYX1lzm47M2TX3s+AHSVE 6kWW2/EImRGfgsIwpsAmp/9IJYdueuylBmllNDt+ro1iMs79dYlrKJ/QtbJmgj8ByzXDZ+qEAj1 JR11D0YTz8TftmZBmpxRLayQtogyIjDOmC68gevSA/v73TMn98UkDfZEOIpMmnzDAslupzdc4mV VEv/eBNwCzblr6Bwn9xQ8qOEjB+zySyQD1JwjcRDqBATX5anRxZBtot8RlL6kZVogWnXwjDcFsp dVNzhumMJK5dBvlbz3ypIwU1bZ2c/gDZyv3n+RrzjjUs+wP/MqjhChKmWs4rVMwtBd8qGRYk1Kh lrXr6y89x5JCJAZKBYg== X-Proofpoint-ORIG-GUID: CuCQa9P2ogLGIiLuDSK5gF-UPgPQdcD1 X-Authority-Analysis: v=2.4 cv=Iba3n2qa c=1 sm=1 tr=0 ts=6a05d415 cx=c_pps a=rEQLjTOiSrHUhVqRoksmgQ==: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=7a4_7rcHm0II5uOVc2AA:9 a=2VI0MkxyNR6bbpdq8BZq:22 X-Proofpoint-GUID: CuCQa9P2ogLGIiLuDSK5gF-UPgPQdcD1 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 lowpriorityscore=0 impostorscore=0 bulkscore=0 clxscore=1015 spamscore=0 adultscore=0 malwarescore=0 suspectscore=0 priorityscore=1501 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605050000 definitions=main-2605140140 It's a common pattern, needing to insert a yield packet before flushing the rb. And we'll need this once again for configuring perfcntr SEL regs. So add a helper. Signed-off-by: Rob Clark Reviewed-by: Dmitry Baryshkov Reviewed-by: Anna Maniscalco --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 55 +++++++++++++-------------- drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 10 +---- 3 files changed, 28 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 71f54ab5425d..415902f6e5d7 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -189,6 +189,30 @@ void a6xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring) spin_unlock_irqrestore(&ring->preempt_lock, flags); } +void +a6xx_flush_yield(struct msm_gpu *gpu, struct msm_ringbuffer *ring) +{ + /* If preemption is enabled */ + if (gpu->nr_rings > 1) { + /* Yield the floor on command completion */ + OUT_PKT7(ring, CP_CONTEXT_SWITCH_YIELD, 4); + + /* + * If dword[2:1] are non zero, they specify an address for + * the CP to write the value of dword[3] to on preemption + * complete. Write 0 to skip the write + */ + OUT_RING(ring, 0x00); + OUT_RING(ring, 0x00); + /* Data value - not used if the address above is 0 */ + OUT_RING(ring, 0x01); + /* generate interrupt on preemption completion */ + OUT_RING(ring, 0x00); + } + + a6xx_flush(gpu, ring); +} + static void get_stats_counter(struct msm_ringbuffer *ring, u32 counter, u64 iova) { @@ -597,28 +621,9 @@ static void a7xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit) OUT_PKT7(ring, CP_SET_MARKER, 1); OUT_RING(ring, 0x100); /* IFPC enable */ - /* If preemption is enabled */ - if (gpu->nr_rings > 1) { - /* Yield the floor on command completion */ - OUT_PKT7(ring, CP_CONTEXT_SWITCH_YIELD, 4); - - /* - * If dword[2:1] are non zero, they specify an address for - * the CP to write the value of dword[3] to on preemption - * complete. Write 0 to skip the write - */ - OUT_RING(ring, 0x00); - OUT_RING(ring, 0x00); - /* Data value - not used if the address above is 0 */ - OUT_RING(ring, 0x01); - /* generate interrupt on preemption completion */ - OUT_RING(ring, 0x00); - } - - trace_msm_gpu_submit_flush(submit, adreno_gpu->funcs->get_timestamp(gpu)); - a6xx_flush(gpu, ring); + a6xx_flush_yield(gpu, ring); /* Check to see if we need to start preemption */ if (adreno_is_a8xx(adreno_gpu)) @@ -958,15 +963,7 @@ static int a7xx_preempt_start(struct msm_gpu *gpu) a6xx_emit_set_pseudo_reg(ring, a6xx_gpu, NULL); - /* Yield the floor on command completion */ - OUT_PKT7(ring, CP_CONTEXT_SWITCH_YIELD, 4); - OUT_RING(ring, 0x00); - OUT_RING(ring, 0x00); - OUT_RING(ring, 0x00); - /* Generate interrupt on preemption completion */ - OUT_RING(ring, 0x00); - - a6xx_flush(gpu, ring); + a6xx_flush_yield(gpu, ring); return a6xx_idle(gpu, ring) ? 0 : -EINVAL; } diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h index eb431e5e00b1..99c3e55f5ca8 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.h +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.h @@ -317,6 +317,7 @@ void a6xx_bus_clear_pending_transactions(struct adreno_gpu *adreno_gpu, bool gx_ void a6xx_gpu_sw_reset(struct msm_gpu *gpu, bool assert); int a6xx_fenced_write(struct a6xx_gpu *gpu, u32 offset, u64 value, u32 mask, bool is_64b); void a6xx_flush(struct msm_gpu *gpu, struct msm_ringbuffer *ring); +void a6xx_flush_yield(struct msm_gpu *gpu, struct msm_ringbuffer *ring); int a6xx_zap_shader_init(struct msm_gpu *gpu); void a8xx_bus_clear_pending_transactions(struct adreno_gpu *adreno_gpu, bool gx_off); diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c index e022c9a162a4..124d315b2469 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -488,15 +488,7 @@ static int a8xx_preempt_start(struct msm_gpu *gpu) a6xx_emit_set_pseudo_reg(ring, a6xx_gpu, NULL); - /* Yield the floor on command completion */ - OUT_PKT7(ring, CP_CONTEXT_SWITCH_YIELD, 4); - OUT_RING(ring, 0x00); - OUT_RING(ring, 0x00); - OUT_RING(ring, 0x00); - /* Generate interrupt on preemption completion */ - OUT_RING(ring, 0x00); - - a6xx_flush(gpu, ring); + a6xx_flush_yield(gpu, ring); return a8xx_idle(gpu, ring) ? 0 : -EINVAL; } -- 2.54.0