From patchwork Sun Feb 9 21:42:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 863606 Received: from relay02.th.seeweb.it (relay02.th.seeweb.it [5.144.164.163]) (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 EE54B1E9B3C; Sun, 9 Feb 2025 21:43:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=5.144.164.163 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739137385; cv=none; b=gX0T8gPDxgFYjVhSMwvehAUHf7CHdgDwLvxEV8sHTUtJOOXob+N+ET6NZEnvs4ef45o8xhFGCr3lrHnsvTd7s7oeg6MUP3SURJhovPXCndVKXe3Wgo/XuTnQimsLnbWg1EpFlNvf0d5661I0b7q2jPx5OKC3wbrQaoemMKBcylo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739137385; c=relaxed/simple; bh=MISpjNQDduNCQaMv+FDe9UPH/b1M9QDcUgD33v4LDzE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Oc63uBwoVZ2g3C4cVve624CiuMvb7P7Yth8pnLzlzy826nOLQsiOi/UM4GpnEQJt2cmFOm596iIywY0O0eB38UaFVpA6P04k2MKoHbKPatHOkyK9dsu5eItXHfXalTPlAuL1tLE9d0MhvBDjQrirQ3jZ3ULcokHbJFs/5kth6kQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=somainline.org; spf=pass smtp.mailfrom=somainline.org; arc=none smtp.client-ip=5.144.164.163 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=somainline.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=somainline.org Received: from Marijn-Arch-PC.localdomain (94-211-6-86.cable.dynamic.v4.ziggo.nl [94.211.6.86]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by m-r1.th.seeweb.it (Postfix) with ESMTPSA id 62CA0201A0; Sun, 9 Feb 2025 22:43:01 +0100 (CET) From: Marijn Suijten Date: Sun, 09 Feb 2025 22:42:54 +0100 Subject: [PATCH v2 3/3] drm/msm/dpu: Remove arbitrary limit of 1 interface in DSC topology Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250209-drm-msm-initial-dualpipe-dsc-fixes-v2-3-9a60184fdc36@somainline.org> References: <20250209-drm-msm-initial-dualpipe-dsc-fixes-v2-0-9a60184fdc36@somainline.org> In-Reply-To: <20250209-drm-msm-initial-dualpipe-dsc-fixes-v2-0-9a60184fdc36@somainline.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Vinod Koul , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jordan Crouse , ~postmarketos/upstreaming@lists.sr.ht, AngeloGioacchino Del Regno , Martin Botka , Jami Kettunen , Konrad Dybcio , Marijn Suijten X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=1941; i=marijn.suijten@somainline.org; h=from:subject:message-id; bh=MISpjNQDduNCQaMv+FDe9UPH/b1M9QDcUgD33v4LDzE=; b=owEBbQKS/ZANAwAIAfFi0jHH5IZ2AcsmYgBnqSFiMrpbQ6WiYf+MMArHU1I7Px3DbgZzKq8lk 3W9qK7uUI2JAjMEAAEIAB0WIQROiwG5pb6la1/WZxbxYtIxx+SGdgUCZ6khYgAKCRDxYtIxx+SG diK6D/9E7oN6A/G/3pmaZELoM0OFBnd+tUkLTENa+EUGxCiRrM9Jl9UZdpdDgI4Ea0n7WysXog3 Lw61q1clOL7e13anQXZwr9dhyKqnKrkFAU9mbYuS3Nb0SUhlDPOSTjhw79fR3eOe/iep5/8g17y hnQrAhRafDc2WOYxqNgqtVYtMeIDR+fzfkjyxG7VaHWmUTJWHXZEUfDC0G2pAy07yJlmNr+H8ym 9ektnEPZWOHZg4fVhAsa+NoXvOIFeEVINX8Bv7ggNID6fiCCjQFbFRgCowxbz5K16lEBWeHKkoa G6JygUN4ckbRVLpkCpfkxBQWul7F+HM0ulQr+/tiWNsozzYwiCOESiK9kQhxboJe0hqiqJVYYey r52TeK9RrlQEspoheHJ2jU1HJwZNLRz9E+8qX+lhBNZZDmnhftfCf9WZq9C3tkIqvgwwLReyZq4 KuHY48uvJ5IPKz0lxrp+bXrQIv5XqHjLJGn5PSjUiuWkYS3R/Ypt6o3kdHGAh01WsMKTIShJt4R /UPrPdo70PPc443pwR7v6UPt3Ws2Zl/SjpCM01YG0p6hwW/ZkssdK7K7OsF9NnoeK4w/wopBe8R S2jWDYD60LANft8bu6rvF6m8rk+3Fu+g0ElU9vvzrup6KKj2d+j1DZgqC9AAXvWwzA1p+8CyKaV iC4T4SNPjMj9shA== X-Developer-Key: i=marijn.suijten@somainline.org; a=openpgp; fpr=4E8B01B9A5BEA56B5FD66716F162D231C7E48676 When DSC is enabled the number of interfaces is forced to be 1, and documented that it is a "power-optimal" layout to use two DSC encoders together with two Layer Mixers. However, the same layout (two DSC hard-slice encoders with two LMs) is also used when the display is fed with data over two instead of one interface (common on 4k@120Hz smartphone panels with Dual-DSI). Solve this by simply removing the num_intf = 1 assignment as the count is already calculated by computing the number of physical encoders within the virtual encoder. Fixes: 7e9cc175b159 ("drm/msm/disp/dpu1: Add support for DSC in topology") Signed-off-by: Marijn Suijten --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index b585cd17462345f94bcc2ddd57902cc7c312ae63..b0870318471bd7cceda70fd15ea7bcc8658af604 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -686,20 +686,21 @@ static struct msm_display_topology dpu_encoder_get_topology( if (dsc) { /* - * Use 2 DSC encoders and 2 layer mixers per single interface + * Use 2 DSC encoders, 2 layer mixers and 1 or 2 interfaces * when Display Stream Compression (DSC) is enabled, * and when enough DSC blocks are available. * This is power-optimal and can drive up to (including) 4k * screens. */ - if (dpu_kms->catalog->dsc_count >= 2) { + WARN(topology.num_intf > 2, + "DSC topology cannot support more than 2 interfaces\n"); + if (intf_count >= 2 || dpu_kms->catalog->dsc_count >= 2) { topology.num_dsc = 2; topology.num_lm = 2; } else { topology.num_dsc = 1; topology.num_lm = 1; } - topology.num_intf = 1; } return topology;