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 E789E36DA03 for ; Wed, 20 May 2026 16:25:33 +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=1779294335; cv=none; b=JF0ffaX5UKhKXHOqtWOG6Jb6iwKZOl7jM1SFKe44Yeoep9upEi/FFH0BO4f3MwobvMj8Qd8W6iK3KiqYr61g8zwKJTj1vjuvaBZ0zMpgp0Qm4RmzJT/SRrgVNoSXY0yByIzxDMXIIVmtM4ni1ujHwpCcWLkzNNtLgiA5PwEvpbA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779294335; c=relaxed/simple; bh=PkYlRSO+4GwvY9gWtu6YygmtEO/xzsMNSk3exUbtg6k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I+LJFmwHoH206O8V8KLVQfqE9SbGQJfOewBWTTs3zm4eFIIWh62RKv24FCuPnn9fN/zfvYElmJjRehrz+XbmFPZSiB8Y2PDQngAiP6tZqKSVkNzCd0VrU8MVx8WCANz/dNeCc6oekVhUyQ/5O7uhEtcfMiURekUwuXGNPkzeFsY= 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=Uq5Updeg; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=YL7VHVZ/; 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="Uq5Updeg"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="YL7VHVZ/" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64KCe2p4316412 for ; Wed, 20 May 2026 16:25:33 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=Uq5UpdegcJAADhzOglpaWbi6Vxi iDsNJqvYO06wpxExMvMDPsa5aGx3O6uillApvrr46Qo7cJwhWFnHBxldYgFYNgKJ yj0m3tPmrqPPxJIJmnHwD86QUw1I70ow3OUxbZdCnc+08DqnX97W1I4BEi1B3Jqx E7rO1BfdTnoE5nWkWBrcIWwaZlTi6uJguSKRaD+Y6d8wpfJdwjly6q1mRw6ovzzA IoLWJxsMHat+HwzOWhFbgAy95yFe4OBW7XzhnzrCm8MuMXalKZb363wCLoN0Sau/ 5mFSoIWnreXcEdnQssEBo3W2DwAXp5YUNscBzIC933dyOkHscEd1iuMVrUQ== 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 4e9d5qrxsy-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Wed, 20 May 2026 16:25:32 +0000 (GMT) Received: by mail-pg1-f198.google.com with SMTP id 41be03b00d2f7-c70ea91bfe1so2881725a12.1 for ; Wed, 20 May 2026 09:25:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1779294332; x=1779899132; 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=YL7VHVZ/4N2GuXo0BcXZ8XW62TdDT1+QJR1ujqtgU71T9ANriTcYV+XPiAAtxoneJ5 Lc07TIf3rDH6CdbkaFJ8+83WA7w4gGGcQWXE3JtIgc9RCewp0m6JJ7dLK1e3E8mHcQHV g+8VSC6Kv4w6mBkYyA8NIKnIYrG5q7/d0zBIFBF3cRcKV1DTRYGFQy7dr2t9u8BgXQVC AZMlmWJs6DvY3bFDYWufet7BVkCk630Tbb1w88JaUQB0aoqNFwNsdeJJjhxq9N294Cdt B58Xkp7B7bropajSkkiwi6fHi8FsVVuYy5c+6L3fkc+LElowPVgUb3NrNxEmr7/+K9Nc pGjQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779294332; x=1779899132; 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=MkDsdoufaTiyYUjXY+jcbMmnCA8WtU69mVfLCRzj13h4y9VekFC9YvWfXjtgT/Yinx qcqvxo3X870TSGWQcS0r12mRI6i0sPCs+QEd146v7+ww/aSBJ+6/R6d97+vaT5Y3ZAzn 1qKm+PHmAmMb/7vdQTGzV2hddh1XyCLp1RwLsVi15sJce86THWBlGP0zRMcUPeMdRI8n miVQGJaYs9bWrQT20cF7moKseWqllf7KEQUVI/nc5MOxy0YLKflF2aSoQqCo/e4q6eNe gkQ3HDgUq/STLR4LIcGubHMAkynSsBTy0zguCCu6WW9YOwWr7HekKM7Ls5pIN52WNAMI 2Izg== X-Forwarded-Encrypted: i=1; AFNElJ8b0xx68BbmgMx1VZCBf/mMQZVAl1jFtV4RrZ2Irn6EdKEergZzn/UVAz+iGXwqY1f3DcorAuR/WkKlJtw=@vger.kernel.org X-Gm-Message-State: AOJu0Yypj0iJB191YK5dSpSy/ZtsB31p4YzWgvk/BhoscEZiJiTSu27U fgkp7CjQ4e4Es+HOx5sBInpoWPxeWOf4tzLtQHspqQ4ez4NSEJaCpkyOQgybU8XFkbRcf0F1VZl G6PB+atZCgzqQDqY+vTa2GbT9L2oau9uxEKZ0WVJQm8td1+/IZRXQPnyyS3mKDCOcyZM= X-Gm-Gg: Acq92OH+nWHVg2YTIbTAOFQLHj4F3Si2KkW5gOOenyEhgY700G1NtvMb4V/eofQKU1p eAwc5l/hlKGZ9VE1vLQqOqzuvX6xQj6vEgv+bpFmE0QZlsa1PPeuIGXK2k4jeFeLT4+DEBz/bn2 JCeOANuGYOeSAgGwWof4LLJ9o3rRaRBMviL4IRhSp5BTtDrs3L+sCrUxGaiDIG4u20ZM7GjdqUz teaqilvqkjMBkEeSw9gZc2O9MzOmGMSyQQbmGB1ZLCYz1X4aFPj8RaSTXhksxImns8nl+qWfLWl lJVRl1EaQ4xcs4+p+N9xcG2GFG90AN0EMXoYO8YuXv1H/GAnCvB/TrieCvCoB2b829sVclaznmM yydfA7GRuKoYNa2ac/bvRWKD1ZZ4JGT8z X-Received: by 2002:a05:6a20:6a03:b0:3a2:bd1d:d684 with SMTP id adf61e73a8af0-3b22ebd373cmr25979006637.33.1779294331924; Wed, 20 May 2026 09:25:31 -0700 (PDT) X-Received: by 2002:a05:6a20:6a03:b0:3a2:bd1d:d684 with SMTP id adf61e73a8af0-3b22ebd373cmr25978928637.33.1779294331141; Wed, 20 May 2026 09:25:31 -0700 (PDT) Received: from localhost ([2601:1c0:5000:d5c:4ec8:83f5:8254:6891]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c82bb06875bsm19781102a12.3.2026.05.20.09.25.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 May 2026 09:25:30 -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 v8 08/16] drm/msm/a6xx: Add yield & flush helper Date: Wed, 20 May 2026 09:23:55 -0700 Message-ID: <20260520162454.18391-9-robin.clark@oss.qualcomm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260520162454.18391-1-robin.clark@oss.qualcomm.com> References: <20260520162454.18391-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: AW1haW4tMjYwNTIwMDE1OSBTYWx0ZWRfXyTm29la1a0x5 OtqyWwKYvctJCDu5UsKTOjLMrnV1g7QSFjdNYsefM5/QzVccwM5Ett1q0RcroEIeKy0/5k7g+6A wobG4+7s7q5XrFdi28dY0zcaJ1xa4ZE0WtM//uAyhpKdzdlzM7s78zLA6XwTyXQJ9bupLPXeDeN 4sEhgnWstzmq8Wvjyi9LALjtlIqh5KT81cp7+zqGlwCnmBOUuD+JqHfdsuRC4k5NmMJPRRo/JQu +YIGHUh0oxgcsSnM9WgJdKKe5Z2AYlwh4B7d/DdYAU3tb47M6eERihyhvd2oUFbolnpHIfzu0BR WGgR4X0nf/IZbvcyQo4WNvFhhbh8h74aicBi2STGdt5z+4E0wqkNw3fTXPdS8DSBIq9WXjlj0yz Z/qcSfKNfrO8Qy5SvaPcmcL0vJiJPAPlswXnshRC4tE9YkWKHYRl3KFY9xLO2dZ4pHIrd1W/mjc ZtgZgtOJwvaZHJuHmkw== X-Authority-Analysis: v=2.4 cv=QshuG1yd c=1 sm=1 tr=0 ts=6a0de07c 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=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=pGLkceISAAAA:8 a=7a4_7rcHm0II5uOVc2AA:9 a=x9snwWr2DeNwDh03kgHS:22 X-Proofpoint-GUID: D-hdlcQXm18Bv4Qr06gpry21rKs78lQF X-Proofpoint-ORIG-GUID: D-hdlcQXm18Bv4Qr06gpry21rKs78lQF 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-20_03,2026-05-18_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 impostorscore=0 clxscore=1015 phishscore=0 spamscore=0 suspectscore=0 bulkscore=0 adultscore=0 priorityscore=1501 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2605130000 definitions=main-2605200159 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