From patchwork Thu May 22 19:03:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 891751 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 D05AD26983B for ; Thu, 22 May 2025 19:03:45 +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=1747940628; cv=none; b=ThL8iQLtg1sFRgECIWxWp3gQB+Arjof2A9CikUuhfkC0mXRRswxTodhg+iKxlCK/jXQMLWb86nGd74ul2/HUCmTcj+6Wdr2mmhd1FE0prrINgEGqeR9SEcl9oY4xT4XrZGj4edAG1sR2lOpuZfJIloCtIvjZoZ4ZGLxBwSd2uuc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747940628; c=relaxed/simple; bh=YQ5B5oB0M1GxXXeGU1Mj5ulVe9j+iVrAat2kcJ+hCFA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=K+uMjF7217X6dqSFUuKERyNb4mU44Yh7UKCBJ2gZahEjuaESiYryKjEALjURf0qWVwAmREB4ojDnOW6aG7XoBAZdpBcW/wax3GO/0jPU3f14g0qvR93Mi9M2UEYyQkwQOyrevSR9Mb1S8XKm5iVtEuX5JrLVUpUkRA3M91NvJpI= 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=IlcOUh93; 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="IlcOUh93" Received: from pps.filterd (m0279868.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 54MIeqJe019394 for ; Thu, 22 May 2025 19:03:44 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= NYnzMBmIWlsfdGw4huDhs42iPHpQ0FxmQDjZ9WoLD+M=; b=IlcOUh93lYezYwvr LnNaooikxqLqZqK0nhWYlqBtp0+KvJzGWnuKiKwhst3hTiI66DCT0nk3OA7UbiAs Um5saEQowaO6UfWHo3vtnoZ5+Cbnq/EOJ+noo2V3s5k1hv69GN5U5uBBXVF2D8f1 6KxUQ80fbK9agHdRqmFBmhtNyjWedxvEOg6xNg2IYra2bULxcs93gcwCPF782DNH WKsLuXZqqCBCvkAHVDS+LQu9PByl5spGMeVIHm9J7Lzm+yvQGVPCj19VEJAIoKoi vF4xNLaIDznvSYo3nYGar1+j09lEHStHoUDhFiCV5MWevr03FkQdY7ccRzVavT54 m9xPYA== 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 46rwfb7b35-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Thu, 22 May 2025 19:03:44 +0000 (GMT) Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-7c544d2c34fso1251218185a.1 for ; Thu, 22 May 2025 12:03:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747940623; x=1748545423; 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=NYnzMBmIWlsfdGw4huDhs42iPHpQ0FxmQDjZ9WoLD+M=; b=azfUmkvyKU4OpLr31kueFvevyUVFkfv4I0uoi3qkS4TvdOmpSkS1o2VjJovX7l09kV 1oyc7oaobEgFzwXRMJdl4kUV3zR8ufjbjtN4J+uuwOScI9Sia13U5RGxLWywyfov/p6D SWctxOmboO8ME06aT2HC1kwg2MPVrOs6TdCK9eK2kTxIgIzzGFfmtbxJf1KaTchUnpTr zpbzSGLG+lQLxpVWZ44KD3Hj7faW/2zVyNs7+ERTmbYEAfa4hJynlF1gybKsDjaQtUAL 3k1dhfDwzKh5dJz1gv3pnTSynTrYGKVpVjlYH2ysniP1KMQc1HS+AgNKluOnjRhMayiT 6DNg== X-Forwarded-Encrypted: i=1; AJvYcCWf/hFAqHZgPMNBbNOisSdpiN4rzqAGYrBvG9MK+vA+GjNZB0BpZvWgIK+e3TIrKuigcobZoN+sl+DXMXqn@vger.kernel.org X-Gm-Message-State: AOJu0YxneCgLTcrE1uOokCuCs4P9SSaeGbcRYBzTh64L9qA0Z9QRO7qJ Yr2Rklvr/hGCLLpH2rUhyD5ofywyKV6ruKrkpp/wWxMmieGyDeO0sCWSscYEpmMSswi/3YMnrYo U9aghDIq1KNz+Wmi1x+TUUHGQh71FM+WSh2DfKqx49iZaIb9cjsxtu2o1z80G6xGUQZdp X-Gm-Gg: ASbGncvmxmmLdEfAgcGVjhTcZuAuggfS4BeZff9St0BwxAjTaqXgMjZKLVLnqeeYHoL LlJzcDeYkfLeVslNB80+13TzuvTYS13qm1YtidRVOx5TFaHex61o8AIM4w+VX6pQJPrY61kibGW 1l8WJPQVkLwjooUMAPxc1sCnQeCSMoPM2xQOBiELf3KFXmdL+x5xQdzCoXzVASW+TmdxU+mhmib XWBMpyIKKZZgOFw0jjyd5S6H91GdUMkgrIUtMLr5DO+NDcy2eEl8EBujGs/B2xz0xQY8cgRjsaW d8Pi0B3V77sJdx3XcXKKbejqYOGaCwbIInUyoyRo22erfF8WsHSM087RZkpZZy4R3OntSet1E3e cV6Na4mrEKtnjyoOylZS5I9b6 X-Received: by 2002:a05:620a:1994:b0:7c5:9a1b:4f22 with SMTP id af79cd13be357-7cd47fef371mr3705858385a.56.1747940623634; Thu, 22 May 2025 12:03:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6nclAd8Oh6p4d0w/pm4oPMdyXdN0sNQ9apgHVbjhlRv2lU1Ok/VlbVzdZAx2HRmhRyJKCKQ== X-Received: by 2002:a05:620a:1994:b0:7c5:9a1b:4f22 with SMTP id af79cd13be357-7cd47fef371mr3705854285a.56.1747940623235; Thu, 22 May 2025 12:03:43 -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-550e703c2f3sm3482506e87.214.2025.05.22.12.03.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 May 2025 12:03:42 -0700 (PDT) From: Dmitry Baryshkov Date: Thu, 22 May 2025 22:03:25 +0300 Subject: [PATCH v5 06/30] 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: <20250522-dpu-drop-features-v5-6-3b2085a07884@oss.qualcomm.com> References: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> In-Reply-To: <20250522-dpu-drop-features-v5-0-3b2085a07884@oss.qualcomm.com> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Vinod Koul , Konrad Dybcio Cc: Neil Armstrong , 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=2225; i=dmitry.baryshkov@oss.qualcomm.com; h=from:subject:message-id; bh=A0zH0+x9BjgKXdk/u2Bzaxpf3wDWrsUR19FXOhuXrqs=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBoL3T8kb8nDY5+e9egcdsa0xvZpYX+N37LDMokn E4Ml7Al2TeJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCaC90/AAKCRCLPIo+Aiko 1Td2CACR2bs5yQxdsmKpKEl3FQ+iiWkJS1b4rtxw0v6U0zh6ysU6ub9bMGofPrwEt+qhEbKUirz Vse7z/3QA26rziYAGFobQqS0hSd+LZUEQ3nL3YaVZNc0GdDvcr09AZVkhmA56F5mJaseZpALdGF 5SAMKJy5a7opD/LrJdr/v9iVb6pfEHsUubcXYhymk1AhdzUimgKqf5ULvgzqXuuAI0s4rd0UPGh +e6JIz4dWaUTyJqTSfgKQ07ocWf5IQ6czZtYqbH5rVnQd8JIQ+iFNqU/JYMPF8kyFKaOrDDGpPd AmczS+Bi5sZLavW7Q3h3FrCdzlWQXhKKMBqb6aUMvdf93tKL X-Developer-Key: i=dmitry.baryshkov@oss.qualcomm.com; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A X-Proofpoint-ORIG-GUID: v1uwdvxlnCS9lBu0BD_bigzff_3WQIsM X-Proofpoint-Spam-Details-Enc: AW1haW4tMjUwNTIyMDE5MSBTYWx0ZWRfXyBMf6QAfnjS4 xW/kdirmQM1julkhntdECuoFsGYLmA0A2XrurLo0ReHtkg/Eole805i1iTsGdipDfH7VCf0kU5e cfUIdY7WsF29yRHqhn/x1rIy90LHlJAgJes1mnaN2byZFXR4/J0qAnysESmTzqNKi5Naq8anObn 7tqA+9QWsKNK3o57lhMGCr1sjPmrzivL86AP9atkgUVic+viq748R9GYleL+KhSTlDgQkJGtNl6 xXagb5LvpS09J75DoTNtnhX2xdMmTFjaUrfHvIABEl+0OytOeaY7pd/5ybpRdwCowEXkHyAlL13 boMAB6IMPOWdhNSB+4aJhEsZ/iMOwegybrZelQbfedRA+G/fLHkOxB9RVNwl3BWw2XAUVFp8ajf FU+QIRg8uBJwmxQTDwlcp/AC317SvQbEvYcYC7321Q3w2KAXF4Bp+73Q/sLokf5c6zATQsyB X-Proofpoint-GUID: v1uwdvxlnCS9lBu0BD_bigzff_3WQIsM X-Authority-Analysis: v=2.4 cv=dLCmmPZb c=1 sm=1 tr=0 ts=682f7510 cx=c_pps a=hnmNkyzTK/kJ09Xio7VxxA==:117 a=xqWC_Br6kY4A:10 a=IkcTkHD0fZMA:10 a=dt9VzEwgFbYA:10 a=KKAkSRfTAAAA:8 a=EUspDBNiAAAA:8 a=2ONPo-prfMSwqFkLVuAA:9 a=QEXdDO2ut3YA:10 a=PEH46H7Ffwr30OY-TuGO:22 a=cvBusfyB2V15izCimMoJ:22 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1099,Hydra:6.0.736,FMLib:17.12.80.40 definitions=2025-05-22_09,2025-05-22_01,2025-03-28_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 mlxscore=0 clxscore=1015 adultscore=0 bulkscore=0 phishscore=0 suspectscore=0 impostorscore=0 malwarescore=0 lowpriorityscore=0 mlxlogscore=999 spamscore=0 priorityscore=1501 classifier=spam authscore=0 authtc=n/a authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2505160000 definitions=main-2505220191 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 Reviewed-by: Neil Armstrong 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; }