From nobody Fri Dec 19 05:25:49 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BC3E3C00140 for ; Mon, 15 Aug 2022 18:53:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244318AbiHOSxK (ORCPT ); Mon, 15 Aug 2022 14:53:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243618AbiHOSs6 (ORCPT ); Mon, 15 Aug 2022 14:48:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B172131DF2; Mon, 15 Aug 2022 11:28:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B343160FD0; Mon, 15 Aug 2022 18:28:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BA244C433C1; Mon, 15 Aug 2022 18:28:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1660588121; bh=KcEV8SKvsjL468XkPQvCHNAT9nTCGEg25sQJaScv6vE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UeCv0/Ekv/Wrz3UWBkSg0TUZjqUGEE9gJsfnWbfzWvHBx46r+DkiDwkTrC0r8bUKG DlU55Z36BroX5owM5VJTsizMMipA2gcQkh3WPBFafr9jX9YXwg+swvppC++qzBHNVi BNE7N/ct3yVWg14QDZLd/Vaa9fvAIfaCex1xAZAU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Stevenson , Maxime Ripard , Sasha Levin Subject: [PATCH 5.15 302/779] drm/vc4: dsi: Register dsi0 as the correct vc4 encoder type Date: Mon, 15 Aug 2022 19:59:06 +0200 Message-Id: <20220815180350.197867110@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220815180337.130757997@linuxfoundation.org> References: <20220815180337.130757997@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Dave Stevenson [ Upstream commit 4d9273c978d4c1af15d7874c10c732ec83d444d0 ] vc4_dsi was registering both dsi0 and dsi1 as VC4_ENCODER_TYPE_DSI1 which seemed to work OK for a single DSI display, but fails if there are two DSI displays connected. Update to register the correct type. Fixes: 4078f5757144 ("drm/vc4: Add DSI driver") Signed-off-by: Dave Stevenson Link: https://lore.kernel.org/r/20220613144800.326124-15-maxime@cerno.tech Signed-off-by: Maxime Ripard Signed-off-by: Sasha Levin --- drivers/gpu/drm/vc4/vc4_dsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index 81a6c4e9576d..97a258c934af 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c @@ -1518,7 +1518,8 @@ static int vc4_dsi_bind(struct device *dev, struct de= vice *master, void *data) return -ENOMEM; =20 INIT_LIST_HEAD(&dsi->bridge_chain); - vc4_dsi_encoder->base.type =3D VC4_ENCODER_TYPE_DSI1; + vc4_dsi_encoder->base.type =3D dsi->variant->port ? + VC4_ENCODER_TYPE_DSI1 : VC4_ENCODER_TYPE_DSI0; vc4_dsi_encoder->dsi =3D dsi; dsi->encoder =3D &vc4_dsi_encoder->base.base; =20 --=20 2.35.1