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 56977401A13 for ; Tue, 26 May 2026 14:54:14 +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=1779807256; cv=none; b=gUdGFokABays4aKNd2k5G+xChy/h9bfAtRRcWGMN7JFW2H7LATgInS97tHh9I3dUuaxzWu0qM5Wi6xcTLAO0qxdpu4/3UvW5pZ7tCMPtVRa0tXLiiiWKO4zOIs22Zhg2Bgeom0Wc3GcN5nkHDVDhFz8WgELN4W0iO4RwLcRjhH8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779807256; c=relaxed/simple; bh=PkYlRSO+4GwvY9gWtu6YygmtEO/xzsMNSk3exUbtg6k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tIBXrhr/OeFbwMvmWiUd6vMYADt/r3oQUq78dR15HZT+4PxceivZ6oRlqhl+dku7pNBOc6RDOgJoJwgwT9Hu0hmkclRpdqJP4SuG9X8sQQaLSdnM6aRRbErDxRRiTtfqdvFrtAfneoHC4rBAxD7l2S7TWl2feMeBf+jPCOchwcs= 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=KSWXJ4sn; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=eN7qjLK8; 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="KSWXJ4sn"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="eN7qjLK8" 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 64QCsaei1575513 for ; Tue, 26 May 2026 14:54:13 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=haIOTU+oqzF 6UOOcaNNvH3Tb0Jkuoae2P6GBfreAHDE=; b=KSWXJ4snS0k7eaYIpdVP6XB5phT q+3aGXOfv0IH4DtmD30TJ5nmcmXLsKp+DAzdIJgKQX7a89a27Pm9QvVyNCSEceo7 mIpknnpjPYPat+mfvhhCrBGcIKDYeQ00Ho+M8kBMrGmC7VE7oxW0dEOSp1MLvJRk MbH9GNBQhH7qs9Llgu544ffOQXr9zyxQZ2ZSabYXCBAYVKWj/62sHU6CXG27MCQI 8ZJT4T8xkjV7qabkDYHL0ajjsodLcv7FJHtxTyD5+NRfazSUn6pbpQWC0ukEEXH/ 09CZm3JqR7IDQ2bagyFa+CUCaJNy3dxVwKWPTBOSLt6fYVHnxn6nJsrniyg== Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4ecqvwvp4u-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Tue, 26 May 2026 14:54:13 +0000 (GMT) Received: by mail-pl1-f198.google.com with SMTP id d9443c01a7336-2be9e0905a9so69633015ad.3 for ; Tue, 26 May 2026 07:54:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779807253; x=1780412053; 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=haIOTU+oqzF6UOOcaNNvH3Tb0Jkuoae2P6GBfreAHDE=; b=eN7qjLK8kV4U4mfqmI0crlz4I+K7BMq2f0BN9GvsoAg2p44RuHWgSDrMvsbskQZPb8 gKa0zvOef8AaLq9/Ydv+psQjn3625j0OzojNsiuxv98NgooPKzDNhB35xejDzFb6bv7k ji2AxZH2ObSpKSR6+TA8TXvvPm8h9iwBTSwu6MNP3kj+z3gEjfAQ50+P5vtEvaLs5K93 OLCETBbip1myllQP2cMdEYOO6fyqrCEzbCBspTToydgqG22SMNPoKqlalMJuwz1uBw1f 1UuUEnZ9heXwBiFPH72ssqjdHWKZfFz/cCxu5SmsZXFcK1oOWNRRYGKakC/q9+3v9iao s+aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779807253; x=1780412053; 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=haIOTU+oqzF6UOOcaNNvH3Tb0Jkuoae2P6GBfreAHDE=; b=sPPMXpTApJ0hPW8d1ueyiA/9njv+QxWjE3CCTDq11//bpCH1dbtZj2QLp4ouHMmNWX PFfQe+lvdMGWkdkdqAlyoeMyS8NJ73rsQflQfxIb+XHF6a5vBNBhbjLow6ZXo12JiQay PdgTh3tK0U8XG5MdbM22uCt9Q2RbZ5r1t46g6XjqMxCHnDdWbkkKF9V1SCcorrm3t6fx IYnddS7f7tQOUvR6jd4jHxDXdq28cGTWxQkfst/dmuiG1fuWEPii+JQOgv/qfoNmfxiF ITitT1+B+PlGgW6nU8j4O9miXrzvrovn2NWJOXHaktTeRjwKuM24XxMa4+5/epv97XnZ Jkrw== X-Forwarded-Encrypted: i=1; AFNElJ+HuJL+XydB17GxlTQUbbz2FuoSf1g44KUVU6Cj9vcQ00KLpr4ZTWUxIYwrvbOMPv58TokmkRlAjBoY3nY=@vger.kernel.org X-Gm-Message-State: AOJu0YwEziza7ymnz/GB2HGDY0ecqJy5J/vZFkv89oFdo9uVxguSQIxu exMJEIRCYAK8PEpOoQFH0RdganvlRslXR/Rdlb4RcGLtG9/8zaRtrrWTlXUPNJWuJNyZbMesDL2 HijAuDJziNJO8JU9qfku0oUzJagyf8rjjVInVbZBg6rnvdc59TZow7skDvPS3U2z2D5E= X-Gm-Gg: Acq92OG34T1A/Qt4nr3vSe+NxvWsDWRH/QqnLvSDIFPag69tw1zLYGNZ0yv4yWuWW+o 4S5VSs4D52Tw9CnTjOGP7gkNaIvJso9cBCXFCkA/PR0A6pLLmccwRfB2QIx2+JxyjQmsVqlkS7x KsATDOGZfg+rDv7L5lHLOax5MJYbEdh7IJDO3dT9+fcgwNhbr3wnkqBFSFS2QXJEquK2x6Wg3Cl LLDiVHbgZHj7xpX52fJZK147ID83HDP9ekGrjC70nO8Fq+vFJ1SE65UhWUt2bTpYdm5T+OjOkSx CUy0CPoIJz3/o8GdA9IeWD+E9PhNHOA+6E3HH+RytRgbTwBUk/GytnSI/NUtHf55DR3euneNN+U cRakmDSZRPBPCzcrmcLxsOKntHWIiQdR/ X-Received: by 2002:a17:902:db07:b0:2b4:5b82:a8e3 with SMTP id d9443c01a7336-2beb0631a36mr211003435ad.24.1779807252881; Tue, 26 May 2026 07:54:12 -0700 (PDT) X-Received: by 2002:a17:902:db07:b0:2b4:5b82:a8e3 with SMTP id d9443c01a7336-2beb0631a36mr211003055ad.24.1779807252363; Tue, 26 May 2026 07:54:12 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2beb5695c92sm129205235ad.7.2026.05.26.07.54.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 07:54:12 -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 , Dmitry Baryshkov , 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 08/16] drm/msm/a6xx: Add yield & flush helper Date: Tue, 26 May 2026 07:50:42 -0700 Message-ID: <20260526145137.160554-9-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: fTmH01i9I08eizt4EwgmHgPVEo4zlzXP X-Proofpoint-GUID: fTmH01i9I08eizt4EwgmHgPVEo4zlzXP X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTI2MDEyNyBTYWx0ZWRfX48oNUTz8J+us BRvUe9cuLpODSnJN/x2RkQ6cGxcir27wv7ABR/7DVZuXxYXF+l2TbYl3AN5If4HkJHNBARJX1K/ h6R5rRx+5wfTeYvGJrsn9q1ZwB6UH3jg/BZ5r9mL4ebHnekdSDwDwHNmMLTzyTgubZJSBJj1p4j iiByUVwonGpr99kR4f+Nd+zCq2OKy4BQ0+hFoXSR/sdIl7a8AQDtBvF2W8rhuBxiN0M1NORiDy6 wG93GI4O8lY25GuwwTl7AI7ltKliHVxw8Te6Gw+8gxKhh+nCwPECGiH2LBSKFp+bPIWfl5xqcDY /2kgMrMiYMN8Cgmn5GgYdXpFJ3qRZXpi5iKS1NikKpS08kZyrM0NPHVxRyKYkG+ND7pZ+Ht235d o2EQNb11pmY8TA3ShIxG57GZ88wttMKDapZC8/QjEdoM9UAX6QWbYxeEts1tPil0CsYzXP66VPw QMBGmZAu0kGJCfa8SnQ== X-Authority-Analysis: v=2.4 cv=M4l97Sws c=1 sm=1 tr=0 ts=6a15b415 cx=c_pps a=MTSHoo12Qbhz2p7MsH1ifg==: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=GvdueXVYPmCkWapjIL-Q: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 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 Reviewed-by: Akhil P Oommen --- 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