From patchwork Sun Feb 4 17:45:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marijn Suijten X-Patchwork-Id: 196558 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp462260dyb; Sun, 4 Feb 2024 09:51:45 -0800 (PST) X-Google-Smtp-Source: AGHT+IFjGF86CnwnQQub3Cgtc7YwrlQ6JOm1RepM/BCVntvYCXKzC4VFP26Z43ZFs4Q8/mp25nGK X-Received: by 2002:a19:5204:0:b0:511:4cb7:3963 with SMTP id m4-20020a195204000000b005114cb73963mr964323lfb.30.1707069105383; Sun, 04 Feb 2024 09:51:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707069105; cv=pass; d=google.com; s=arc-20160816; b=tnoEbZQRV6HrD/lLtOS9UetP1l6QD2PYbPdaXMzwF5mpQuvk8cNfNap1xLk4edmbAR UbF9YK5i3HlJ2B6LLUVjJ30iKuUkHPxCIY+zJg1DULJEBctVwz8VcZz64+wJfwp2iBNd q/7v6hD/GDPD+bqeukPnIjmbke70C0g72nyniauD1fCEObKCGPbB4yaW4SEA2IWuC+tn KBQ147QJF9Gva++0gMlr6sngp//L84txIE2/n8t4G+5rMRZwKJr9GHq29NNa9+ldzh9U ybj1hz1wbwEHUat8S2dfrkqKrU4ftBCH+Wq82oWEzIUi2ULF2obgZC3o/2G77OcWf4FJ eKiA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:message-id:content-transfer-encoding:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:subject:date :from; bh=443CpEi/PpJ/GrQRlUwAWjmZcCgkKGifvIw+ggQQZrM=; fh=+1t2+rrqY5TBMtCGN7SqO2PEUIaaMJxsxiiOkdpn1qs=; b=JSPkfidiUM2+Om9eoZ7FuUuH7FRQE73RVwAqEDgdhVuZ7u6+NtuUjJ+RgsYgwT2Jdt dlY0SxgLNnLIX7tbrrvWVz2zAOwoRyZIHSPKr7ZrWjy9odtO8jyhhjWTY6WCKty+ndDH s0iyQqxUi4BW78NyWGPj65QQ977bp19OkE21EQf7S1cu2GfshZuV4C25WmVz5h6qxQZ5 XQkWsdJOnfTkGMpgJirRi/t/U3pxeHJuGwqsojorjvwLdxUSI71mkAary6nDjxmBRXC0 PMw8h66eER8Q/4q3g5CUTt20XJCa+wz9kUAGFaxsygRr2628dRE6o0Pggy/FyZBBml5C J/ww==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=somainline.org); spf=pass (google.com: domain of linux-kernel+bounces-51833-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51833-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCUbuuE2VOH/ilML+GUiT1OV1WUzB2ALKqJWLiVSCdtaBrMLgYrgqHxRKuo47GgRwsoFHQdGSVV7lGMdHuh8XEE/q7qHig== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id lt14-20020a170906fa8e00b00a37319aada7si2258313ejb.351.2024.02.04.09.51.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Feb 2024 09:51:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-51833-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=somainline.org); spf=pass (google.com: domain of linux-kernel+bounces-51833-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51833-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 5CD911F23999 for ; Sun, 4 Feb 2024 17:45:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D629224A0E; Sun, 4 Feb 2024 17:45:35 +0000 (UTC) Received: from relay05.th.seeweb.it (relay05.th.seeweb.it [5.144.164.166]) (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 DB91224205 for ; Sun, 4 Feb 2024 17:45:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=5.144.164.166 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707068734; cv=none; b=TECRpzy0sD5I4cI5yd878xGUcgx7VrhK2x7tlI92TkkYkmYu2+53Ik0Rxw1AfP7YHWL6xJEDb9BykUwwV19DV+ryztSiK11jf6w11J5rXMSByfegX2yMO97wclSjUQtMemQEfYruZWvR6arPaazPm1f/3y3s6kenjspAptYGrK8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707068734; c=relaxed/simple; bh=eJbZT3mdrNA2RzxGIe/uKdeOxu+kH6M/tWk7d/atqWM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:To:Cc; b=RqEECSrmSVrL36dRLEvpN8TaRlDrqWx1PGv5RubrpMPuuyhymDiwX3hkSkwaHM9LFxohMNfFeT70sQt5zrESq1rPq8darU3qMlWogIxt8NG7PeMMcbpWPL/mFBO6CcXMoGufcBATvDBlURA4WGFX1MJFwxrYJyhl9xuEfek4t54= 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.166 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-Book.localdomain (2a02-a420-67-c93f-164f-8aff-fee4-5930.mobile6.kpn.net [IPv6:2a02:a420:67:c93f:164f:8aff:fee4:5930]) (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-r2.th.seeweb.it (Postfix) with ESMTPSA id 7360D3F092; Sun, 4 Feb 2024 18:45:28 +0100 (CET) From: Marijn Suijten Date: Sun, 04 Feb 2024 18:45:27 +0100 Subject: [PATCH] drm/msm/dpu: Only enable DSC_MODE_MULTIPLEX if dsc_merge is enabled Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240204-dpu-dsc-multiplex-v1-1-080963233c52@somainline.org> X-B4-Tracking: v=1; b=H4sIADbNv2UC/x3MQQqAIBBA0avErBswE6KuEi1KxxowE80IorsnL d/i/wcSRaYEQ/VApIsTH76gqSvQ2+xXQjbFIIVUQgqFJmQ0SeOe3cnB0Y2q141auta2JKB0IZL l+3+O0/t+A1HiRmMAAAA= To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , David Airlie , Daniel Vetter , Vinod Koul Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Luca Weiss , Marijn Suijten X-Mailer: b4 0.12.4 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789991694348641785 X-GMAIL-MSGID: 1789991694348641785 When the topology calls for two interfaces on the current fixed topology of 2 DSC blocks, or uses 1 DSC block for a single interface (e.g. SC7280 with only one DSC block), there should be no merging of DSC output. This is already represented by the return value of dpu_encoder_use_dsc_merge(), but not yet used to correctly configure this flag. Fixes: 58dca9810749 ("drm/msm/disp/dpu1: Add support for DSC in encoder") Signed-off-by: Marijn Suijten Reviewed-by: Dmitry Baryshkov --- Note that more changes are needed to properly support the proposed 2:2:2 and 1:1:1 topology (in contrast to the already-supported 2:2:1 topology), but this could be a trivial patch to get going separately before all that extra work is done. --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- base-commit: 01af33cc9894b4489fb68fa35c40e9fe85df63dc change-id: 20240204-dpu-dsc-multiplex-49c14b73f3e0 Best regards, diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 83380bc92a00..6d3ed4d870d7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1857,7 +1857,9 @@ static void dpu_encoder_prep_dsc(struct dpu_encoder_virt *dpu_enc, dsc_common_mode = 0; pic_width = dsc->pic_width; - dsc_common_mode = DSC_MODE_MULTIPLEX | DSC_MODE_SPLIT_PANEL; + dsc_common_mode = DSC_MODE_SPLIT_PANEL; + if (dpu_encoder_use_dsc_merge(enc_master->parent)) + dsc_common_mode |= DSC_MODE_MULTIPLEX; if (enc_master->intf_mode == INTF_MODE_VIDEO) dsc_common_mode |= DSC_MODE_VIDEO;