From patchwork Wed Apr 23 21:10:02 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 885006 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 DA56626FA4D for ; Wed, 23 Apr 2025 21:10:38 +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=1745442641; cv=none; b=LS7nbeWVgJ9R2hK9Fe5XGLFP1H/RgpSTO909pIJM3TxpSRPJT+nuzsjuQ91lcXL+uq2z/zxegpag6PTbEUvMd2yb8mK/6IfRnb3d/wM0nRyWMH2BwUbca4x6Ont/wXXSk+BxCLxgPoLxiDRhzknsg4FCJXJpQmOLcF2LTWnDk08= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745442641; c=relaxed/simple; bh=CAaKBgr1B4H4/XfgBqgZrClsJ2RATVjIFrYJ7M/x0cA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=RafpkclbwbkcGbidYbOuHa8ka38CAMhMhzTBaRLyhSvOgCK5aRWAGsC2oyEafW85f2a8XHadby5aaZRxunJFZdZlYCb5/xl7KIgCwEZYkTKs39v/S3hZyLyAxYPay22HjxxPdPxEAwvuTVymX4F91KgqSAutm5YUUnYdyNpr374= 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=HToZoNro; 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="HToZoNro" Received: from pps.filterd (m0279863.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 53NArvMD022445 for ; Wed, 23 Apr 2025 21:10:38 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= AE4lzFJnqWE5e+eBkiWINHStPJHmgBESpSkQsX62/xk=; b=HToZoNroAKEI2Jpt N7niKb53rvBwcuc6uuzlwHsZw3XKPmwAW1tLLIImoJ5z52am2ResNGXzB/O6Ovzn m7jVlAqFkf6Vh8Hp953WrSPLeljcbLf1GpFI6plc/TrZQ0JUpjgmFMw/Ba9vw/Cw kRWLiEnzH9lYLkY1ApIL9ioiUfE6ojNqybKc9z1QOs/6VSv3EsuYDtKrXtAilvFN UeZV20xht+6NzALRD9cWRqsbKUOyrD+CNAFpDqhSYzlvUyEXJe2azd93eYaFhJIu topAX2HBj8nj1Re7bdZDpMHs+OU+CCrWsM9rlfE0i7IdV4x73gEldVJ+4wc0tza/ Y4hWLA== Received: from mail-qv1-f69.google.com (mail-qv1-f69.google.com [209.85.219.69]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 466jh2be3n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Wed, 23 Apr 2025 21:10:37 +0000 (GMT) Received: by mail-qv1-f69.google.com with SMTP id 6a1803df08f44-6e90b13f5c3so7360546d6.0 for ; Wed, 23 Apr 2025 14:10:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745442623; x=1746047423; 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=AE4lzFJnqWE5e+eBkiWINHStPJHmgBESpSkQsX62/xk=; b=SlNFFG4GSJQ5KE5XeANU9XBEbDtpEG9dgeJrLMNyJQ96zHYywmIt3xylFbqRr/QRza xMPE8TEfxqA+E0HUBil+PYXSUv+ZLA5d4dzs3OTRfYBQ2EZyW5ANauZUOaeMNI+ETfcs Yl5XEUDDN0yNJkziguQa8LCsSe+y1YVMzM3WuclVtcARlnALHAulZPObMQ3lEgS81sjO Ham3YHTJikzpal4Iy2aXNfBuS41Awdu0rA6GJVGTHiYOW3f655G3rPQLR8VjlobcpqfO Sop8rESu1k4vQf/DiJzONA0V3i6+eWd+OJfAvzKAREjF8Q1ixg9DRw8vBSIWjVXgLMgs XBzQ== X-Gm-Message-State: AOJu0YyiWc0YxBajjD9qayLcFmX8lK2yfYo19wxwFIwDazuqLmYwB3FR p13u6sktIno5vV0sPDLCuWVch+HKIkVxM4/ebvBnMXhBYqAuzr4gM7ZLHCHlhQGi5qSTzTz+Ns1 xSBsZcLd8vcD4IdLod6NZQHA+dckDotmfsMs4h9EuX9mw7dPIqk7RufR4PMs1OOCo X-Gm-Gg: ASbGncuRqoZ3b2B+a0M8cBO14yVsPdsOI4oIye+pngVF45GtcKzgdLAouDLdjkWIi1O SOy0pcxmCWpCyYBLUd97q3RSkfcFJBOm8Z2cDPAGMychgWZa0b92wvJ2rLBQW2p41ATXW6NxmQU CrXUHqbsuZp43pVgzM3lClUlcA5yGHhJZYKR0wpz17jt/BSdqokegbiMjzAMjk6Nft1xKrbR3ui /Cy6qgOdKhi8aMeRmUBD7aeJHmOog+bREZDq+wfgf08CZSJxdifv3ZfIgm3O/284nBVL0UFkYCT FqFf9IJdHlXyFJhUkGMy/8BZuvyInWojeffN6q42gFV88WnJ8L1FO60BPmiSVVkVZh8MWkLe0cQ J66IuLU5i0v8bTU7l1eBXE0ax X-Received: by 2002:a05:6214:4012:b0:6f0:e2d4:5936 with SMTP id 6a1803df08f44-6f4bfc1a25dmr4264196d6.22.1745442622745; Wed, 23 Apr 2025 14:10:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHOQ15h1AP0JAje3cYQCQWZ3mel914n0yFh//+go6tWwThRbRFFMxzg8Pu/UU1Bbz0rKcWT0A== X-Received: by 2002:a05:6214:4012:b0:6f0:e2d4:5936 with SMTP id 6a1803df08f44-6f4bfc1a25dmr4263986d6.22.1745442622412; Wed, 23 Apr 2025 14:10:22 -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 2adb3069b0e04-54e7cb3987csm3852e87.59.2025.04.23.14.10.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Apr 2025 14:10:20 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 24 Apr 2025 00:10:02 +0300 Subject: [PATCH v2 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 Message-Id: <20250424-dpu-drop-features-v2-6-0a9a66a7b3a2@oss.qualcomm.com> References: <20250424-dpu-drop-features-v2-0-0a9a66a7b3a2@oss.qualcomm.com> In-Reply-To: <20250424-dpu-drop-features-v2-0-0a9a66a7b3a2@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 , 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/pANAwAKAYs8ij4CKSjVAcsmYgBoCVcqxEjOTPcOCtC1Ywlim/Lp5IZnIZC5/K2Bc K7hte49N6OJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaAlXKgAKCRCLPIo+Aiko 1dRgCACwnKb26HlQN7DsIQ7Im1BVHZQbjtHP45Mk/ElrkI4xXujeRO6BKcEr6jWjGHsGuy2PwdE G5fx+vQHPQzN7hCzR+qjhsOMk9HVrL1aaqNTFrk5YNDuT/PmV813I1+xzmchZ35z6YJ3IZOPNIj zz2XlK//mp7l7CylJzLNesxbpsolSikrCcpefTIR6XSJceQMCpcoAZNFVNv9QeHLjyDtcGKfJfn jdqmCJXbySt+CK2a448bZJp5GTg6TpX1T5w4HXPlLQiZP4tn1qWLe2NOhJZotR8sT0c+iVxqF2e MEyc2EEEM0WEPsH0ipUK7m4mWiH9ZP6iLKWdtdgm4wFBMK66 X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-GUID: ypEcZACuG-i5E2XADlS4EQbRJwWu5sW7 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNDIzMDE0NCBTYWx0ZWRfX3LSj2WskLlgD y0KT4NC9BA1rhlzIiugjb2m9qQDbmss6U7xWe6jOQKIYszCTL0VA6hD+kTcZIBG4oezGbvGQK0r 504NFS7SwR6Ej0H5vNyAEssjqwMRQTaoSiCGXzBvbBw4I8BP5nWyuAJ4ebs9VcTBmHFAf40O1Za v4WGvwOHCOrOoFVBK1tgcqaM+Lj5du8ZpS4/78SwA6Tebe2nUwrb/tUFdjV1NhJ17gS8xb3IEUT kJdZpUJJlNTYTNcKeV+6jGqe9k2+YjKMo2XrrqjvYWqY5DtpOKbGTaFOGxUq8s+BFoTyU7Z5Atg aEFE6Z6DutkltzNI4lMlQd3OoCpztxEzwu3ykP4xC4fI9jLOiDge7eYU0iJ+W8u+LL6q3uWyVie Qnz97X34XX3OYEz6BdDHtibo3lZj1eQG7Al1JcRGkRsrNzgkW5bkST651pwroxeKS88xgzzM X-Authority-Analysis: v=2.4 cv=Tu/mhCXh c=1 sm=1 tr=0 ts=6809574d cx=c_pps a=wEM5vcRIz55oU/E2lInRtA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=XR8D0OoHHMoA:10 a=VwQbUJbxAAAA:8 a=KKAkSRfTAAAA:8 a=2ONPo-prfMSwqFkLVuAA:9 a=QEXdDO2ut3YA:10 a=OIgjcC2v60KrkQgK7BGD:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-ORIG-GUID: ypEcZACuG-i5E2XADlS4EQbRJwWu5sW7 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-23_11,2025-04-22_01,2025-02-21_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 impostorscore=0 adultscore=0 phishscore=0 mlxlogscore=999 bulkscore=0 mlxscore=0 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2504070000 definitions=main-2504230144 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; }