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 1DBFA1AF0C7 for ; Thu, 24 Apr 2025 09:30:36 +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=1745487038; cv=none; b=KyR/eWh9ngbK+mAXKihrbktnFDXqwJwVLvQxNM62A98MqFc7/P7isPOziu+YZVw6MbZfk5LZabltm0ia4nxrbVmGnvIJE0yfbEfdCnpy73ODEjSB5qUExgA9vj+YcWLwKhAupWHaZVPkIIxCY7SRPShft+Oy2aTQ5uqVV/PrFB4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745487038; c=relaxed/simple; bh=JxFfxzAgO590taIYVsdC3ww1ICf9N0VyO1B86wmG0ns=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=R7u1l+hh2Vd5c2CYX/o+cKIFnnQ3sj/iII68GCReCsf1Na3ryzTz4HgTFN5hgx+XuqCsqs+TtsfYvukiEabdRok5mLs6+H1aJtBHuJA+xQ8x/UEziX5jprUwc6gXiUb8Eb/2vn2cjyFMkHaGdcjTSmCgyjN5UX/xCQw9ZvlEvhA= 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=ZDz3cGJC; 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="ZDz3cGJC" Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53O0F80q010284 for ; Thu, 24 Apr 2025 09:30:36 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= L2W9+B0ZnfjCFViTwk/uQhdvUhFo4znCgY6BQw1Faug=; b=ZDz3cGJC4SU2atd9 vr2Vys2AfbDJ8Wu3xqMDIjMfhfWIpejh/B5deVLJSBemUivPZuSS32jgTz4jzFRA fuHaOfn85E7c1LU8+AX/pU0QDKG4mQ2kgWWDLFjNt13gAokLLb9FBLXf0cG4JHNw C3DulBIV+JGn+FitBe22LRp4mBQMRI9OhScKkwFA7P9RdKA+wE7r7HaYRoLxYCIC MS+tnMfS4IXL3u3Ffpw5xrOUveuBzJWYSlKaU+v6nUWXmq/ojPXeBToLlJHbmVZl M3dTEKwl958C+Fct037tjGxxV47Mzz632jLwrSg2fiZHqkGmyNacfcOKfRNZ2lEj Nloe2g== Received: from mail-qk1-f198.google.com (mail-qk1-f198.google.com [209.85.222.198]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh3mymh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 24 Apr 2025 09:30:35 +0000 (GMT) Received: by mail-qk1-f198.google.com with SMTP id af79cd13be357-7c5cd0f8961so168726085a.1 for ; Thu, 24 Apr 2025 02:30:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745487035; x=1746091835; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=L2W9+B0ZnfjCFViTwk/uQhdvUhFo4znCgY6BQw1Faug=; b=xM9zaAzrYGA9uUGSdHxt0EdnRv7proXvJnag8nVVb3e53ZIMBvCubK06I6gArbM37U idpxhDS3R4K/5rzFn4HuRNR+KnOZDfzDejpPL/geEM/1LYFf5QpyvjjKYgPBwtEqM7ES aD9gmiLdadGyjzkspwWzphCYxbozVXCPLeemeo+7AzrxbED/TSmlKAR9X0KxCidqjhxU jBc/k2OENHiCJJtfCBZazV1UIxRsNz34D8LrzQ7ZftGKk407vUj3r9eO0fBE+qlS84NN JRWOgJe/fV5YAzz2nWywQ0A1RjqEKigO95Cw/a/AIoonqEhiQrSsxX6w/Yyd/t+S8sXH /zeg== X-Gm-Message-State: AOJu0YwQ2lvfQYfB0HE6s3X/uIubybD0BVnhauyD7fqn7dftgeNtQkWV vcmB/LWD5rIJQC43BcZxHqY2bu3g6XIJeqhk0jnA+BZWc7kh3jZEZ243ei8dyJ5Yceaa5j+h1Pw rd5rKyW4X7e+ymTjU3sgbSxTApht8E/0/B+U1QKtijaNV7T7ItTPRWdZFYOrP1voK X-Gm-Gg: ASbGncuUA9Tj8Xpg5fxErakX3RuU3RG7sgmJLAyCHH9YoOJKWIKjwSt4Tte5EnWwKRJ RswqsbskqqMyHI0GNwz143ivqJ+GpYrwGy6cNjpypnRolDNwnE1AGmhxYOOxoy3rWWLikODGzqV aEpyvxE2O78YtdFPjBRysmqAcTv9sm+FjePe4LIDMDMHjBBzaBSKWjrAZcIlPT2Z6dNEjYPlw09 AbLzlOlPKjOsyGtYbP0QNyjLFmHu6wJWs3PUQ+dpLVG47lkpBja/h5g+wGBFk2PNP5icTGEazZp uitFHYhkCKB7KLjJpMDQC8ssZWUSOsh5IXQprJN9/xa3Cw23IxsKMpkuoBcSXu+kElohv7EJHPt PpqFy6jRdW428wUPvnNt1DX/C X-Received: by 2002:ad4:5882:0:b0:6f4:c21b:cd9d with SMTP id 6a1803df08f44-6f4c21bd1e7mr13179196d6.29.1745487035117; Thu, 24 Apr 2025 02:30:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHxCZuAnggMj3l1bp3VhBBdZn7SikDu72aqo9cVDnc9ZZvE7kzgKSO3dAMP++P4RQGtn7Gcdg== X-Received: by 2002:ad4:5882:0:b0:6f4:c21b:cd9d with SMTP id 6a1803df08f44-6f4c21bd1e7mr13178936d6.29.1745487034802; Thu, 24 Apr 2025 02:30:34 -0700 (PDT) Received: from umbar.lan (2001-14ba-a0c3-3a00-264b-feff-fe8b-be8a.rev.dnainternet.fi. [2001:14ba:a0c3:3a00:264b:feff:fe8b:be8a]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-317d1b9a304sm1820461fa.99.2025.04.24.02.30.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Apr 2025 02:30:34 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 12:30:10 +0300 Subject: [PATCH v3 06/33] drm/msm/dpu: inline _setup_mixer_ops() Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250424-dpu-drop-features-v3-6-cdaca81d356f@oss.qualcomm.com> References: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v3-0-cdaca81d356f@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2099; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=7p9Y0N9fe5J+FNtNErF+g9/bY2UcR9C9Ev4Hmj1Hodk=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoCgSqFUrxRR+NGyuOJa9iZPcU0YKALTABfDjex qvwvQQi4leJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAoEqgAKCRCLPIo+Aiko 1f9cB/9gxIKyI+sJgil0eeT2ElX+Lg5NIqskYAtVXvqVFJrBFsxc7bM2fNfy/yAca75ktCpEQGT izFMD4d0TVSymz2DVDCTr8jEmFsNT6kTr4sYeHW64rvRuROHHxVtFhxii8TzzdWMx0eFFTFIYcy Z1cl0mNA9N7Uca5rf08k5HCjBPcRDi0eMV+eFzutkJPuXowU4tFGV6laG7uZKX60fFtqJATjwvZ XvUWYDl/7slG3eyAl8tquvIeK7yxE99hvbOiq+GS4jfB02o3qE16b0EpAajL3RsQwUl8320zhd6 qBL2Emz3OpptOvvBoq8gQ1TAeI4jGBD271WmlGZsFuESOJgQ X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: o13smUGj4L9e30TimKibZ7eKOKSInb-r X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDI0MDA2MiBTYWx0ZWRfX9eLdCIQ7LL+w sTkgjVG+OnqJRySANmalJZIOZ7H5/K4P1jSv2+3bkf0e8dAu7uUdns3zydYxirrpArm7dasChqs PaAkemP0PBRLRl303wNoizj1OIKvi5lsNIwxW38oMWyEqlAUn4S/wWx7aIw8RDKf1yoXArBgTK8 a4xN4oZiO13lhOSBw8SHCuhV7qQIqv23voBAgZPSCqMdFlNF68nU/ldqaj8fx5kQvj0etOEUvAJ fJaeVH3FWnongdZZOucKtwTYqEI90XXUrVfYojM+CiOjYgktiYOt2wQVzKRXkeB5EAnEYd0wrFt ixWDuxgwYTQwtpv/lX4ArGAA8R2u6MNS+9tN054CMHxr9sixjMYFjWVFptjISHto/KtsXouy0b2 7Nh84fIMGme+kcfcOmoI5Os9MovmwQdQXr3x0WsImCU10DsBD37w9FtVoBMuR8ve5KfHtYKg X-Authority-Analysis: v=2.4 cv=ELgG00ZC c=1 sm=1 tr=0 ts=680a04bb cx=c_pps a=qKBjSQ1v91RyAK45QCPf5w==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=KKAkSRfTAAAA:8 a=2ONPo-prfMSwqFkLVuAA:9 a=QEXdDO2ut3YA:10 a=NFOGd7dJGGMPyQGDc5-O:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-GUID: o13smUGj4L9e30TimKibZ7eKOKSInb-r X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.680,FMLib:17.12.80.40 definitions=2025-04-24_04,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 phishscore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 suspectscore=0 mlxlogscore=999 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504240062 From: Dmitry Baryshkov Inline the _setup_mixer_ops() function, it makes it easier to handle different conditions involving LM configuration. Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c index 81b56f066519a68c9e72f0b42df12652139ab83a..4f57cfca89bd3962e7e512952809db0300cb9baf 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c @@ -144,20 +144,6 @@ static void dpu_hw_lm_setup_color3(struct dpu_hw_mixer *ctx, DPU_REG_WRITE(c, LM_OP_MODE, op_mode); } -static void _setup_mixer_ops(struct dpu_hw_lm_ops *ops, - unsigned long features) -{ - ops->setup_mixer_out = dpu_hw_lm_setup_out; - if (test_bit(DPU_MIXER_COMBINED_ALPHA, &features)) - ops->setup_blend_config = dpu_hw_lm_setup_blend_config_combined_alpha; - else - ops->setup_blend_config = dpu_hw_lm_setup_blend_config; - ops->setup_alpha_out = dpu_hw_lm_setup_color3; - ops->setup_border_color = dpu_hw_lm_setup_border_color; - ops->setup_misr = dpu_hw_lm_setup_misr; - ops->collect_misr = dpu_hw_lm_collect_misr; -} - /** * dpu_hw_lm_init() - Initializes the mixer hw driver object. * should be called once before accessing every mixer. @@ -186,7 +172,15 @@ struct dpu_hw_mixer *dpu_hw_lm_init(struct drm_device *dev, /* Assign ops */ c->idx = cfg->id; c->cap = cfg; - _setup_mixer_ops(&c->ops, c->cap->features); + c->ops.setup_mixer_out = dpu_hw_lm_setup_out; + if (test_bit(DPU_MIXER_COMBINED_ALPHA, &c->cap->features)) + c->ops.setup_blend_config = dpu_hw_lm_setup_blend_config_combined_alpha; + else + c->ops.setup_blend_config = dpu_hw_lm_setup_blend_config; + c->ops.setup_alpha_out = dpu_hw_lm_setup_color3; + c->ops.setup_border_color = dpu_hw_lm_setup_border_color; + c->ops.setup_misr = dpu_hw_lm_setup_misr; + c->ops.collect_misr = dpu_hw_lm_collect_misr; return c; } -- 2.39.5