From patchwork Fri Feb 28 04:14:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13995655 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 44A1CC282C1 for ; Fri, 28 Feb 2025 04:14:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id A49E610E128; Fri, 28 Feb 2025 04:14:25 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="iD57KnAR"; dkim-atps=neutral Received: from mail-lf1-f52.google.com (mail-lf1-f52.google.com [209.85.167.52]) by gabe.freedesktop.org (Postfix) with ESMTPS id CC19310EBF1 for ; Fri, 28 Feb 2025 04:14:21 +0000 (UTC) Received: by mail-lf1-f52.google.com with SMTP id 2adb3069b0e04-548409cd2a8so1688738e87.3 for ; Thu, 27 Feb 2025 20:14:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740716060; x=1741320860; 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=qlvs3krFui5VM4RI+RTWfvb2I0najIuzQ1OGaYdSCdA=; b=iD57KnARCGGYllb/6JHygwWbJmdMjkZa+YTOgBnbv7qqLUUApqSguIa4FHIpnidqBq OvIlXaBxvMb8ebXuezaGvEQ+Ff1BFUQgXUeCWoThWmWoCmctvj4jJ4WoppdX2dSJiXu1 N6ZscQIl3WUJE5Wl1kD6y7ABO5XTpU71Z1dvdhLvBd97XpUeXYkVfa617Bbp8XCD2znT aBq7bmq4nEuQUPtPunVBLuOtropYupwzrVDcrTooBm/AC3RpeDump4W1XTotTBbO7SGz F7McJRzllXiNYYXBTgh6rItuReEwilNibH7DoizE0OZLaL2+TF6AoJDjnGc/SSYdIkW2 opYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740716060; x=1741320860; 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=qlvs3krFui5VM4RI+RTWfvb2I0najIuzQ1OGaYdSCdA=; b=Km6QHbvMDJtmbfKN45W6w+YHNyvD7QpG1Bh/bqmuWLkgd0OQXO/dS4afsrpjx09Q03 W7L9gwUkV3eEy1klyiyqoT+sgSr6G/LakCvQ3TGtx/HqRJ64vxd/RinVnrOT7Ei/bT9E fl8rUbiH586pcf5leCz144ko0BYKw0183zuHeMrzM7hRt9nGIV4P3cU2R06T9KC3V0n3 lPYrjXaR0dhhGQZ5rwrNbHh59FP4bX5eaBuv4M2mNwcgr8UcuNRNQrEEZk3El/r09Of0 940dO0e9Jkw71XigAC9yMNetR0MIkkjfmdFpUYP1xAEtEhy/v/dN1Plbxoqjmi3nIRpE Blaw== X-Forwarded-Encrypted: i=1; AJvYcCWY5d3ZxifLC0tRnEgk1q2F+CpciOMsJUD+no8MYCHlNuyxIoWiZppH2UMuvUddCX6J1Dxv4m0NAYI=@lists.freedesktop.org X-Gm-Message-State: AOJu0Yzqq/lz1Bz6ceVqth1dOmoxFxeuYhPTkmvWGHOS2Lg5HLRoxOTJ B2t63WB9WxybIxnvnF06+mgKCcQLMBDH2KHNXMM9s4XMeTPJ9naCOhEvQ3KeYq4= X-Gm-Gg: ASbGncst4SwikhlwEPKjybCcA0ELJv4+tkq8fWN458K44M4SrNr0lBKJirBaEXyxk49 9UlHHjTl4QO7ZHlpWy3dnUiKt+A53OnjoiUBG6iDtPEsTBhhtAp73x5dQNuLx6C0RP3NzBZCwnA oCfGReoI1c1Tvd6/FIE1ZtHzzGNTkm0p4oH76XIJm1GV2E4m/SgX7/c2cWMnzYWuEbx9zVLCy/o cheuJzNLUK63k/6lNdMUDBJDOiCpSUON7lbHwO+H8Ed8YNUt9OSlnwOaDQJa5cT2/xQApboxh7f cB7Ru6+kgAwEidx699q+SWqAjIK8srnLjw== X-Google-Smtp-Source: AGHT+IGrnEWMPE2WkcbT7JIvexF88rB0I+CKgbkhNnFe45kc4J3u2IM/i+GrBzAjghv03i/XJfxOOA== X-Received: by 2002:a05:6512:3d19:b0:544:e61:a1f1 with SMTP id 2adb3069b0e04-5494c11a280mr714153e87.14.1740716060111; Thu, 27 Feb 2025 20:14:20 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-549441262b9sm361101e87.0.2025.02.27.20.14.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Feb 2025 20:14:18 -0800 (PST) From: Dmitry Baryshkov Date: Fri, 28 Feb 2025 06:14:08 +0200 Subject: [PATCH v2 4/8] drm/msm/dpu: use single CTL if it is the only CTL returned by RM MIME-Version: 1.0 Message-Id: <20250228-dpu-active-ctl-v2-4-9a9df2ee5193@linaro.org> References: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> In-Reply-To: <20250228-dpu-active-ctl-v2-0-9a9df2ee5193@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter 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.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1258; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=GhhCZJjEajy0jFOjY9R54kVOCzIOaWWu2XrVcVmmfhQ=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBnwTgO3RF6v4/ky5eEIRQSKeqiOSPOMFzE4bKwP 7MT1jG0WbSJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ8E4DgAKCRCLPIo+Aiko 1T/vB/0Wymc/HhBvJljvIgyIsJdh3NY6aNpzKXKMO+cdPwVsVqJkFWOoTCpDCbEllSIJv/TrwyK WnWQr9oOj0lTApx3SG/Of/mzx9UBElIAhdwyjiY3oM/fkG94DGyrhD6xmyjbS4O2GOY+5QlJQkN vVTgDQGjqKD/L8hzGzztmeVG734r9jCkB9iFgm4vJ3ktwPNfuaUjrID44OT0gEyAcbrkgu+mgKO 6Culz7HEx40OG9eOecbTfYuaAQh5QI8agbkpVzh5HLjJPVYH9sRGA4H5cghPbPnxNQFJe0tczyJ T5fIyQQiSunfcEflM1qHEgna8v1MdyyQHqUUMaCplzmV/w9Z X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A 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" On DPU >= 5.0 CTL blocks were reworked in order to support using a single CTL for all outputs. In preparation of reworking the RM code to return single CTL make sure that dpu_encoder can cope with that. Reviewed-by: Marijn Suijten Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 32992e9525530ea4dec2f46643fc06d40d3bca7b..e7dad94d91a7b6e99adb9aadb48aa8cd164babfa 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1288,7 +1288,11 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, return; } - phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; + /* Use first (and only) CTL if active CTLs are supported */ + if (num_ctl == 1) + phys->hw_ctl = to_dpu_hw_ctl(hw_ctl[0]); + else + phys->hw_ctl = i < num_ctl ? to_dpu_hw_ctl(hw_ctl[i]) : NULL; if (!phys->hw_ctl) { DPU_ERROR_ENC(dpu_enc, "no ctl block assigned at idx: %d\n", i);