From nobody Fri Dec 19 18:43:24 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 A7B1F20F23F; Sun, 24 Mar 2024 23:07:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321674; cv=none; b=PDSMm0A17xBJN5dJ98OLlN0KN+uT/zowc4SDIoiQBsXkmk5LV6cCtMm96lEtpUhwOCMg5BKJCX15fKWLOvVzcyQaX0XUKpBoC2d9ju80i5cimse1tumw9N1wrT14c/vKwDHohXt/fNlNaOk3ot98pYGC0RPKdkx0EdnVxatXmXg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321674; c=relaxed/simple; bh=tb7KMw3QYRC8PNCsmxHTx/4pYVLvQWihFzNqZmtNYrw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VeL0XymhFnntFnIeBOqXrnoXxlQL3zibeH3YW/DKKPJYI03DXGGA94WC6dA8e/e+bFvC3Cx28LRIQNWZXwMZoep3+Z6QU70YPuMUCXJcdPByXFH+lZaX7XnMRZ7cilA1ikokMSeDk//03xANm+PwbjxxW7E/Avz0HWgmnrj01QY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=cpBHVR3/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="cpBHVR3/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E48FDC433C7; Sun, 24 Mar 2024 23:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321673; bh=tb7KMw3QYRC8PNCsmxHTx/4pYVLvQWihFzNqZmtNYrw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cpBHVR3/CoX2k8Q8seGl7m+yTUTMr3e/7loKRV20+PROw2U2P8eTglrVbNC5GDvyd 1rM4L8fYPphq1u4Lt8M81ix6bWTNHKlfmLXYqmXb3HIJcCyMZwdg4zrmvj/xgXrZVI 8UREKzwffSzjP7ZYh18hsC81301iMfeaw8NSScxiiLXghHIv08+0vx3a6B32xoGh44 HoPr5AtPFopXAsjOa4Tg7qRozYND0gU0qNyxjQhrdSZa9eNozlI7SQx/7eWKrNlqaH jv2Gr1KgFc6z3RoFIqLG1tvV7yXV7Fji2Fb7IDsdD3xyvisS4b71mSYKRjgcfBbZXa LF7AuXd2FI7gw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Marijn Suijten , Dmitry Baryshkov , Sasha Levin Subject: [PATCH 6.6 402/638] drm/msm/dpu: Only enable DSC_MODE_MULTIPLEX if dsc_merge is enabled Date: Sun, 24 Mar 2024 18:57:19 -0400 Message-ID: <20240324230116.1348576-403-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Marijn Suijten [ Upstream commit 06267d22f9ee6fd34150b6dcdb2fa6983e1a85bc ] 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 Patchwork: https://patchwork.freedesktop.org/patch/577067/ Link: https://lore.kernel.org/r/20240204-dpu-dsc-multiplex-v1-1-080963233c5= 2@somainline.org Signed-off-by: Dmitry Baryshkov Signed-off-by: Sasha Levin --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 4 +++- 1 file changed, 3 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 89bd526f3990a..20e118546432d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1855,7 +1855,9 @@ static void dpu_encoder_prep_dsc(struct dpu_encoder_v= irt *dpu_enc, dsc_common_mode =3D 0; pic_width =3D dsc->pic_width; =20 - dsc_common_mode =3D DSC_MODE_MULTIPLEX | DSC_MODE_SPLIT_PANEL; + dsc_common_mode =3D DSC_MODE_SPLIT_PANEL; + if (dpu_encoder_use_dsc_merge(enc_master->parent)) + dsc_common_mode |=3D DSC_MODE_MULTIPLEX; if (enc_master->intf_mode =3D=3D INTF_MODE_VIDEO) dsc_common_mode |=3D DSC_MODE_VIDEO; =20 --=20 2.43.0