From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 93F94105A59E for ; Thu, 12 Mar 2026 13:30:03 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5126A10EA2F; Thu, 12 Mar 2026 13:30:02 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=qualcomm.com header.i=@qualcomm.com header.b="Rdfy4LiU"; dkim=pass (2048-bit key; unprotected) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="Rnh0x9fT"; dkim-atps=neutral Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4E3E610EA2F for ; Thu, 12 Mar 2026 13:30:00 +0000 (UTC) Received: from pps.filterd (m0279872.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 62C99npR263416 for ; Thu, 12 Mar 2026 13:29:59 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= BRGxG3/EH5DbV/qm/ujSo28MLbGNL8h5SekKq5Cws5g=; b=Rdfy4LiUFOr/CHJC ZXwzD8Kdes47Ov2XgqR0+fQDpKJY0ADsjsStABKGPGKU3cWJImPLqaVbURDduaGf PwOqW5zvIDr6XuvcGhbuXwp+GqgTXZ4o4XVsskf2SCPHbzcf5GXtc6EF8R2GatgB QFIZnrnAZeCPxVhey0FXciy534ci5K6NVDaPZm4pwpNOVsDs0TPjyN2hdXmz+EcM VW4CT2l2t5dn6PFIyOK6NpsezUsOt4SnlDpUoUHVdBJrnEI8hxClQfjuV5x+yg2F HnjjeN451LJTqQsvwOeOfO5kscfXv64xAEBqeOJfufZa140j3RhG1wx8fqbtzGww tGLt4A== Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4cuh4yj66w-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Thu, 12 Mar 2026 13:29:59 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-8cd98d96382so120212185a.0 for ; Thu, 12 Mar 2026 06:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1773322199; x=1773926999; darn=lists.freedesktop.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=BRGxG3/EH5DbV/qm/ujSo28MLbGNL8h5SekKq5Cws5g=; b=Rnh0x9fTVV5WeBnyniklThGyyUtLCG3WPpNicfGfEb4ENznsjCtljwGv+ZYyK+2ucA jxwWPdN3ivoZQADBsE9U+UyDnH3O6xfFs5rVGePy9UMxX2c/aLS+W06QJ8bQCQMxFlm/ jQmEQXf70/twsnt0KAqL6LA/KtQsMnTbolCpJQPKJZ14IktrvnU4UIu9T7A0iQBJhQyY TWV4nEw3OulM9+c4Tkf63O4CdXvXTbb7Zs/Nn7Jqr8PAcqyXZeAfOXOLTUuQ19oYMppF Gmq7zrgH+2JEThuJXFfCGbYOSrfF9jNEMLZ9TEC5uWOYd29isS5qhyu8G5ywK6keAXtl vOQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773322199; x=1773926999; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BRGxG3/EH5DbV/qm/ujSo28MLbGNL8h5SekKq5Cws5g=; b=xH+2uOhtqS/Ig32WOCokt2OFKzvhY5+W1T0TbVHlmpW1gp7OYusNENBRXEO4SKVMz1 /EBrtYcm1U4yzfsyysXM8JSoKMGYaR5EayiO6dFcn3/3Do3H47FqzfNH8sVEWXmurPS5 dGPcSDhOlOvPpLSrOa2obRjHrcq15hoMAlgM0rBLiisuywB1an9S1EIrRjfWv3IFDGtB bLFsa5uOWmVitL0S524vOsQWv8ZPIzUXuVG37vfoOkLuAJpAHmpKs51wsSTJ3YsbwMAt rsNnn7eGyZs0QFHzwYhz+5fcvKWOyewZmgHBbq4nnmQiIZWGeW1WAKDEm+DgSExmmY0A LBxw== X-Forwarded-Encrypted: i=1; AJvYcCWPfubxxP1Fng/k7Iun+jRHTsDE94Jmz4HllZwQCHN/O/1qNoxWLbluN/mPafD7mdHl7W/4FU4ubzs=@lists.freedesktop.org X-Gm-Message-State: AOJu0YwtS48vXT+qyq4U73ZnxYV7VCQXVIHt4qUQUpFfoO+w9hrnVtPF FukuuZkljoGQUWCTQLeLU744D3yPzzhuTAzfcAZx1wySVD8my0hRkAPSRKTMqVbXM2ddRX+LmjC Mgu4vmElMYkbPAjoFfRtTgbUXWkglnp7CUz25Hxv0Yu+i5o0X10/tGUbfrTCVz6l1dKVRpUU= X-Gm-Gg: ATEYQzznJ4hOlT/9Kkfo6jHtR0vrYbL4mNA5oqUsm87wsdiyu0aEC2055V98jIlziXP Jbn3uXsR5d3xql4Rgq5lP1Bt5foNauPOrv3IbNyhBNc2+TeXlJZm+DDGkbvX+PeoMrWWuOoDhKB DIMos+RGM7nKkb+5KavRJMIr6OpnpFWd5wzC/+vl2pP0rdFZ+cnF+UV4I8KRcuuMPy7DsPWBMd2 MCorX8omQ0OCakPZ/J2b3yn6WPe2V/jXX+A3Ov2Q0UvynrbZE7A3nXGu0KnfKdzcKUewuNEkCW3 mRceikG1ML8i2q6SdClEBy5Xl0Kb49m9nG1ZgsL+Dz22xxNGCFXZloTXGRDliXhUBDEaN2+WHjZ U4efXOWzsd8yhSTmfFjL6MR5ComnO6bJIcXggTpTyvGxZXAn9Bk+LsN6dSVVPyOAk/lCOL35I67 yTJA79OZvIsjTeUYRZ5yQ26rRFt5wxloJbnKg= X-Received: by 2002:a05:620a:4692:b0:8cd:8fb7:7aee with SMTP id af79cd13be357-8cda1935caamr806942985a.4.1773322198792; Thu, 12 Mar 2026 06:29:58 -0700 (PDT) X-Received: by 2002:a05:620a:4692:b0:8cd:8fb7:7aee with SMTP id af79cd13be357-8cda1935caamr806939185a.4.1773322198316; Thu, 12 Mar 2026 06:29:58 -0700 (PDT) Received: from umbar.lan (2001-14ba-a073-af00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a073:af00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-38a67d617e1sm8646671fa.9.2026.03.12.06.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Mar 2026 06:29:56 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 12 Mar 2026 15:29:37 +0200 Subject: [PATCH v3 16/27] drm/msm/adreno: use new helper to set amsbc MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260312-ubwc-rework-v3-16-b7e8f800176a@oss.qualcomm.com> References: <20260312-ubwc-rework-v3-0-b7e8f800176a@oss.qualcomm.com> In-Reply-To: <20260312-ubwc-rework-v3-0-b7e8f800176a@oss.qualcomm.com> To: Rob Clark , Dmitry Baryshkov , Abhinav Kumar , Jessica Zhang , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Bjorn Andersson , Konrad Dybcio , Akhil P Oommen Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=1854; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=TtYxTDlV4ADdZSME8a7mAAI2svRlACyoCBLVOWAbvo8=; b=owGbwMvMwMXYbdNlx6SpcZXxtFoSQ+am/dvbtp+eW7DQsPfqI+kzNWrBh67frSmTWV4xXSxk5 ouztfuZOxmNWRgYuRhkxRRZfApapsZsSg77sGNqPcwgViaQKQxcnAIwkbWP2P/pcF70bfol8eTf hcUWUw/HbL+inXi76P7c6e2neKYGeFe1HFxx/dOSKTXbpVpfbNqU8bar0vq9pNzjTwwHHiebhqT Z5U3g/yK/LWpndtAWxSyhFwlvV4uVN4T3rotJCGJN9gw82pT6tiTlhrQfp3Q5p9DCp1cZvKcFM5 Vo1rj1a2lsUWgrLmthMvq37kxFVcrl8vApyawvFurb3l54PrXOc3Pvsak6y8Xq03aZFwd+lNYTv bMkcGlAgOSs9imrLKovKCmmRm7RvrhBWupKbNnPh+4Pl5ZKmXkGLTLKk5Rssyrl3Wusu8Rk1XrV xFj5H8khHc6bH7u3Lv4oGpc0SUJrH5t4xGpHXTfDPAM/AA== X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMzEyMDEwNyBTYWx0ZWRfX2uiTS8oFO7XQ U+wav/3lNA4jaj4+ybngI4tAzKN3CJhryeGfuUZyF08wM9gj9yjlzHiJX+qkCpA6V3rE+q0Gine g9oJ1c1UJxnJlS/iTRSyADltWcNPoN9ZImku92yLOfjYvFb0jJvuS959rqVHjujD629CnBEQXmT wu3vtnRd/ApMM/TMWEOcoivmUGPsnirtXxezX3QbcuGVwF/nekwgLLmmgwFupVLrlOk7vvcai2s q5xolKy56c2aTS1KLQDENtamKh4ZcSgORanswbmooFonYXBtDGSgJ1/zS8rznw4KyDsIAwjng15 OU46eINZkQuvreuW1E4lBhNZ87yYGcwmNO6bZ+fmihW13isf0sZVk3zDWxRPlm5Z6o0qpiPb9AJ hvgDzVjLttxV25U25QbLHFFr2yVHn0Xdqt+TDmhLkxO+MJT4ahWrnEokkTBJ7G2OtbEglNH9gN7 xQXlQhWCDYRCRJlhRLw== X-Proofpoint-ORIG-GUID: 0fBPyOaWal05HQffxPOEo1AbUC80OGo8 X-Authority-Analysis: v=2.4 cv=C+7kCAP+ c=1 sm=1 tr=0 ts=69b2bfd7 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=Yq5XynenixoA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=yx91gb_oNiZeI1HMLzn7:22 a=EUspDBNiAAAA:8 a=PQquZ71z7Ybx5dfXpIIA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 X-Proofpoint-GUID: 0fBPyOaWal05HQffxPOEo1AbUC80OGo8 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-03-12_01,2026-03-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 priorityscore=1501 phishscore=0 adultscore=0 suspectscore=0 bulkscore=0 lowpriorityscore=0 clxscore=1015 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2603050001 definitions=main-2603120107 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Use freshly defined helper instead of checking the UBWC version directly. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 7be31de3b525..f6bd906f2ac9 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -743,7 +743,7 @@ static void a6xx_set_ubwc_config(struct msm_gpu *gpu) bool rgb565_predicator = cfg->ubwc_enc_version >= UBWC_4_0; u32 level2_swizzling_dis = !(qcom_ubwc_swizzle(cfg) & UBWC_SWIZZLE_ENABLE_LVL2); bool ubwc_mode = qcom_ubwc_get_ubwc_mode(cfg); - bool amsbc = cfg->ubwc_enc_version >= UBWC_3_0; + bool amsbc = qcom_ubwc_enable_amsbc(cfg); bool min_acc_len_64b; u8 uavflagprd_inv = 0; u32 hbb_hi = hbb >> 2; diff --git a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c index 680f0b1803a1..63934d21c831 100644 --- a/drivers/gpu/drm/msm/adreno/a8xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a8xx_gpu.c @@ -275,22 +275,22 @@ static void a8xx_set_ubwc_config(struct msm_gpu *gpu) u32 hbb, hbb_hi, hbb_lo, mode; u8 uavflagprd_inv = 2; + if (ubwc_version < UBWC_6_0) + amsbc = qcom_ubwc_enable_amsbc(cfg); + switch (ubwc_version) { case UBWC_6_0: yuvnotcomptofc = true; break; case UBWC_5_0: - amsbc = true; rgb565_predicator = true; break; case UBWC_4_0: - amsbc = true; rgb565_predicator = true; fp16compoptdis = true; rgba8888_lossless = true; break; case UBWC_3_0: - amsbc = true; break; default: dev_err(&gpu->pdev->dev, "Unknown UBWC version: 0x%x\n", ubwc_version); -- 2.47.3