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 801832BDC23 for ; Fri, 24 Apr 2026 15:12:12 +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=1777043535; cv=none; b=fDYT2nOWlAoJRcZ/0wl6t7Gw+ePkjLqC/N2PybF1WMp0XBEUbOPv0cxnTFbKoDgCTiaKZT/AbNMQCwsQsFKIi0JtgZdh83p7pE2rofsgGPxLQdh6XyTstjgFG9yMoVtQVA+a+6KueXBiCURVAcdSePFhZ0S6sbFKS9VuqxV+UMk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777043535; c=relaxed/simple; bh=bzzQ4aYxL3tMOEhcG6/I3PaERyeEXMJI+pElefAVGOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=HsU10euYCf6ipXAe5tJJH61WIWZ6/tYW6LDGHusSl4UOGrNNvRq6eMgVgeOT6+d8wyLeyiENvHv8egx+d0QJ0jLX1Mca+SpLKY/3kN+asUbbuN3/tlCCFXbK7A/kf1CZZMqr5OQFTo1X4XSAuzhn/SkKtE+wj9g9Uh4m9su8NYY= 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=H+fP8P0P; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=D82IxtfR; 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="H+fP8P0P"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="D82IxtfR" 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 63O9OUVk756892 for ; Fri, 24 Apr 2026 15:12:11 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=2tbDv2EIvIT EuQGnte4mfjJJTKVcwabfjQz6jqcfywA=; b=H+fP8P0PCGkZ4VKvQsiyXXH6pAI PWMDUQg3mPbCCkxLd61NwCxbx4AHOx2blz5ZOWB7nZL9kmcNzjLJ1EtXk7wxL3hN c/pVYbREtelpiif/vSuyvc3hWu29jtW+ji7JwmWvceHTyqU8FTm5+ygj7yBbSh0/ UVbYsYHNZ7ydvndsRtR/rNTzkHF/u/jzhya32hZK+B943SZGE3ogTLILjQnq1FSx DvOcyGccc5XrbE3qGDieMdBjBijYPnefESJko51p7N/OVaO/6ZJQkZxsbTiwaahx aMNdJqJzTchKpF8kvO7pesYac8whsR7WwLFLkxy9QnxUBwnfVL1GENTaZ3w== Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4dqr4bmn2r-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Fri, 24 Apr 2026 15:12:11 +0000 (GMT) Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-3594620fe97so17314531a91.1 for ; Fri, 24 Apr 2026 08:12:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1777043530; x=1777648330; 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=2tbDv2EIvITEuQGnte4mfjJJTKVcwabfjQz6jqcfywA=; b=D82IxtfRSvYFqGYLRcu65Ll8DZKNyfJ/QAwdIa0/tLrZU9h/nnferfKmb/kSMCQWFU MrXA9oW4vQ7mvWdbWQaWTSEKTEHrynCNdsYObTZt5GxWYEvg1LLZmPuhs+hLqTICTi5k wsBaJtrm8Ya7pXNJgAeWXiJMq3XXzh0Aq/diakzVg0kR/dstOJMS11SvFMBtWx4w1yCM ayOkemA5QG6gJ+OlY6OUY59GEWuiozLgFpFBXzkCvsabRTLxWQZ8wrqrnBxPnR6O1Stc CcwKXxEgqrr5BqnYGmIByS7jWNYU0MzUalvifL4l9LE1Scm6l0BOmWTmMP/E912cTJIp dabg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1777043530; x=1777648330; 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=2tbDv2EIvITEuQGnte4mfjJJTKVcwabfjQz6jqcfywA=; b=T5Qwg+enoTcVQH5b3FWgxlTb4XkDzeNq4c225/Q2fjB9BQp+aL0bx782YyTwKTaIoE iduCHSEUuVUZpx2IrC0639CeVd/euA+uRvB7n2FwGqLYPVP61QWueTZTdFyK0OxWFh/8 c1zKf2ftwCwEQTQCZ1gwxSYwErzsw2wphoJb2nZ0ERgNwETZxe9LZRnGg1fwseELcmyp bgRoAb/QM+zyABv6eZAx5lT9OUjT9mUdo/mJq6v4AZN1B02qWTS+IVs3tQJ3jurlPKJ/ mP+0Uh6tMxU4P6Ou3kPXUiD7mMRlvenYClgjSVGHC/+2rBiLXr+I1TrBUPDHy2HLaOK5 /s5g== X-Forwarded-Encrypted: i=1; AFNElJ+LVcS0bPhqmAKNol12jOQyiCKBhsFC15d5G662wFons0El7hO0Ytuq9yJzAO67D/4te52z4Y1iTKN/kjs=@vger.kernel.org X-Gm-Message-State: AOJu0YwbhtJ8JhDr11VaiKA2xoWFzPg6rQhvMkW9y1VbZnNpPmc+M265 tp2pq4wW4cIlX5Yo6/QQ+tUyKrOqHzcfn0BAsI4fd7hWzx3TOnMbM6CphCn2/mK19l2X+cromqY HtmlDq9uyTkJw96OFkXuKSLcyBxnoWsw8YGvFmwXqTALpnwtWc0K2bVThygtrUOPbUJM= X-Gm-Gg: AeBDietlLJbnVzh3l1XkKBS2WM+yuyh5EDeiOZgJ5pnIXx3cOrz8ibZ3SPTUYxnxYji MXboauHuTJs9Bw+c9fLl5U2FsIiLcTknSY5gf3WKV/tQDXrQGOqv+OM/izkfEaVIlxs7sGvcjQI uFOGLVi9HKMxILU/FzgYXcLDPHAUCmmSkQPUOdL0Dl2agODHUViPC8aJ8DjSdaUHM29LGQc8NB5 T0RUg7mKFJJ+qeYp2/FAthVjd3gjtm2KjPOa04WDxz0MHocivvgpKs6Uw1u3YsjWY1TxOgwudDh JHDbKGlCO/Co4uXR3QAHkk/7s+vYludOjrGNurVXGnik+W9W3BZwok9Em8R902OqpMb0LajvFks ZhC/oHvlM++GSZEFS+s0xstopTZ5R0w7keHQnfCuDrDA= X-Received: by 2002:a17:90b:1fc4:b0:359:8de8:1229 with SMTP id 98e67ed59e1d1-36140490bf8mr36783560a91.21.1777043530250; Fri, 24 Apr 2026 08:12:10 -0700 (PDT) X-Received: by 2002:a17:90b:1fc4:b0:359:8de8:1229 with SMTP id 98e67ed59e1d1-36140490bf8mr36783527a91.21.1777043529584; Fri, 24 Apr 2026 08:12:09 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b5fab20c4fsm285138165ad.59.2026.04.24.08.12.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Apr 2026 08:12:08 -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 v2 08/16] drm/msm/a6xx: Add yield & flush helper Date: Fri, 24 Apr 2026 08:10:43 -0700 Message-ID: <20260424151140.104093-9-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260424151140.104093-1-robin.clark@oss.qualcomm.com> References: <20260424151140.104093-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: AW1haW4tMjYwNDI0MDE0NyBTYWx0ZWRfX2+tlI9nbdAuV Sb5WRd54sGbrfk2p3n917QI41BbqLRxU4HiMJqsbgbTdS2gKBDCfT2W7PiaZjrVKcPwpAAIHtyH wsoK6+kcei/B5L9xhk/dYg6DfojUPj2epYzKOKA2UgtYGGcG56qnbnFw2yw5a5ls0wB4IcYQ2hy MNM1wP13d18va3p+WCXMa/7GZ04SMwUQXUzJSOKiMwFiGMMXRXJ2fg+qyCVNkZjC/IsqNxuQAeB bGMIpp/sk/xbLURmWiYAqkOeUhcUEV6M6ZiopyWGycUuUJdCUh3XoSgBav66dlo1Mjz2bIUNRje pBj7KUgXyeZHoUSEBKzn2VgZtdDorpfONz6tDtGF5rF22ZPTWINod+/qAIg2xfOawgT0/VJt/Fa XRl/iXjPajFm1iRMJ0au4iTiwRD1GwWccjmsW9cYOMJrNKt+DSMtNIrX3IFKGJ8QIVn+Ld2L8aI hsFQRG1u0OaGo71+hKw== X-Authority-Analysis: v=2.4 cv=TtnWQjXh c=1 sm=1 tr=0 ts=69eb884b cx=c_pps a=vVfyC5vLCtgYJKYeQD43oA==:117 a=xqWC_Br6kY4A:10 a=A5OVakUREuEA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=3WHJM1ZQz_JShphwDgj5:22 a=EUspDBNiAAAA:8 a=7a4_7rcHm0II5uOVc2AA:9 a=rl5im9kqc5Lf4LNbBjHf:22 X-Proofpoint-ORIG-GUID: tsfDa7nkCPP2p6M2vRs3O6tFYUvVQV1K X-Proofpoint-GUID: tsfDa7nkCPP2p6M2vRs3O6tFYUvVQV1K 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-04-24_01,2026-04-21_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 malwarescore=0 clxscore=1015 adultscore=0 spamscore=0 bulkscore=0 suspectscore=0 phishscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2604240147 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 --- 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.53.0