From patchwork Thu Feb 20 10:26:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 13983665 Received: from mail-lf1-f54.google.com (mail-lf1-f54.google.com [209.85.167.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 163381F2BB5 for ; Thu, 20 Feb 2025 10:26:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740047193; cv=none; b=g2hOcsDNhpNnd2Ywkd04X0iOzAO+YEhTbDw39ORleLp3UNZxxWZswBjCJt42jJVB/IJCzDeMkoS+l0J9LJMrtZmd1T6IvBq1ukaIRfMGZq652l3LEtFTJe1zq2DUFWqNSFQCguAxmvax+gqnF7tt778Ls8zXAgSoSCrUbrh62lI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740047193; c=relaxed/simple; bh=R+chS185SijcfPYYCgAaRcXeK8VYBg1VE8B3d9ZjF0k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lZWWPUK/2rjPqP23e1KA3GE2JOWhSbBHuo8sLVoGPuC9xk3+3vZSruCrMsDAQyMN0sKXve5qhxqlGZxz52ImT6aW251aFQB2I0LFPBwOtNzV6n8/mGJUrKRTFBtZ90jFwiukLQttthC4tyTjRM9anBroP0hBmVtwx1/30XqgBTE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=HhlLcV3k; arc=none smtp.client-ip=209.85.167.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="HhlLcV3k" Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5452ed5b5b2so846605e87.0 for ; Thu, 20 Feb 2025 02:26:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740047190; x=1740651990; darn=vger.kernel.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=ff7ItJ+SnMHnASEHcZ5O+TpGECb0jLJ30NNOzaJgwmg=; b=HhlLcV3kCqxD9LX7+YGNmUwUgCGkk4JHVzNeC8f0m1qDJS647pxcmEdzXo4bZgOUAk 9c5WjAHFLhEoDbHTEf+ixS0rDc9kcpSM60kzTXIXo7TDVTtLA14bqZBbj1n/2xyntxv8 SInlOwDVpGsE5ilCDBSDb68FKP+bW70Zf5SoYdxZTRKdn1y2Wl8dEbH9HBLlE7tZ0Jfy EsyCRw+FbcgQlsxeYoGO20NsWYZPrMVXHLhksDeIL8aQspGxNpX9gkxVQASxRZZowTM7 g50ofM9SG/FbpC3gBkox12e1Llzjv8wUe33dod8QZwF3Pu/YbeiBIT/0flfUq/7ifre1 BxrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740047190; x=1740651990; 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=ff7ItJ+SnMHnASEHcZ5O+TpGECb0jLJ30NNOzaJgwmg=; b=VINcMhSN9misbjFWMfyxR4Caf3dja0azAAYQWwmswX+7Nh6QGxTKhrpseU6vGSysVT lMWpoJflmzq7v+dFIpHQgtxkPQikrGae5nV+jbB3FIm6PGOtDWko30+nHnDj8evKZW1+ cfIgD8KYvL1b09O8vvKkIW93mG4V8SKtW4sEd7+vN5oXwjl+1Gb7pQFkOT+FlfHFkGc+ PbPdqkJx3s3JFsO3t8DvUFyv6D+D1YctEm6Fkqi/s15KL5WcQ0Eoz0DYb02Dp48s74CF hzBGNhdwWkPEcWmh3kra+pLpblEkbulRHn57mfR4V+/sE7Bg0Rqdn+hvcBb73DIt+sGc AVPg== X-Gm-Message-State: AOJu0YzBD5oUJAOhrlyIdgVVprrWcMF7N2nS8wfHgZWbYAQ0nq8CHzf5 ZkzS8R0H+6rmfU40fgK+QJEkghOryni6I8Tsta1UEG/MhORY3fQcHdoz55hzik87735igJsNkYV h X-Gm-Gg: ASbGnctdCa//dG+pM46s2FZxySY9l6hfjcsFjgosUBz/Gvep8nlfiSrz0Zo1koJPfHH sNsU4uEWygHW92XTIyRZ1zwdxKySsttGZjXtAfv/clpMjkzl62+KPEOa5JeFGdEL52mVIDsjuTE XKq7AO2xaT1jqSDcldk+mexj9Qv5sBs/y4qxpoBl6A8fw5iRm8c34VWqfchp9X52sljR2AsG4Rh eIkdEbWbqMVgHpBKAYHsqKt/comKrW6ARhLwo3t3bVxv2Cqd1y7lLOzXqUoOdzspCJCZTA+1fz+ QKo3q8pLfMcQpieBEMnOnyY= X-Google-Smtp-Source: AGHT+IHBt9HzRKY8jmkakzOnUvvbEh4NOe+or6nzqbYZMeRyoIBCIJTZbNW9HUfXavUHGy8LrqzxzA== X-Received: by 2002:a19:5f1e:0:b0:546:2ea4:8e72 with SMTP id 2adb3069b0e04-5462ea490bamr2874449e87.49.1740047190016; Thu, 20 Feb 2025 02:26:30 -0800 (PST) Received: from umbar.lan ([192.130.178.90]) by smtp.gmail.com with ESMTPSA id 2adb3069b0e04-545e939224esm1588052e87.135.2025.02.20.02.26.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Feb 2025 02:26:28 -0800 (PST) From: Dmitry Baryshkov Date: Thu, 20 Feb 2025 12:26:21 +0200 Subject: [PATCH 4/7] drm/msm/dpu: use single CTL if it is the only CTL returned by RM Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250220-dpu-active-ctl-v1-4-71ca67a564f8@linaro.org> References: <20250220-dpu-active-ctl-v1-0-71ca67a564f8@linaro.org> In-Reply-To: <20250220-dpu-active-ctl-v1-0-71ca67a564f8@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=1197; i=dmitry.baryshkov@linaro.org; h=from:subject:message-id; bh=R+chS185SijcfPYYCgAaRcXeK8VYBg1VE8B3d9ZjF0k=; b=owEBbQGS/pANAwAKAYs8ij4CKSjVAcsmYgBntwNKH5HPpczCu9L/5cp+mmYPkPzXuoJvH2zlI /BJSbMIVtaJATMEAAEKAB0WIQRMcISVXLJjVvC4lX+LPIo+Aiko1QUCZ7cDSgAKCRCLPIo+Aiko 1U/bB/oDpQQYxShoHXWOQQeQDRt4B7KsbhHYKFXsqWyzLIMbrhA2+AYfan+s3Yq5pdKzRTf3LyU 0hiFB09nCcmi8MDPcXtCiN+eDDJWkISat3ZWao6vEH81ToCIcb5opY0qewxzHsl2BB6ytR4DrrP tZLETlHLLEHNswnxDMFE3oQuVO18wQdNR8OItn7QnvTFV4vRr2OZly04xb6qfeWXVSaIs2TTu/q n038iCfbHa4xGdJ7qeiIybTB2quagcnpfdvPMe4onA/rgYIOlI3BSXZZtpWIhvX1VokAzA1oZX8 zg4wRffj7liG//1uxiAL25vyvqYRTEGtI3vPaZmZhoWIYRcb X-Developer-Key: i=dmitry.baryshkov@linaro.org; a=openpgp; fpr=8F88381DD5C873E4AE487DA5199BF1243632046A 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. Signed-off-by: Dmitry Baryshkov Reviewed-by: Marijn Suijten --- 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 5172ab4dea995a154cd88d05c3842d7425fc34ce..666a755dc74b41b79fa1bb2878339592478e4333 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1283,7 +1283,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);