Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2213022iof; Tue, 7 Jun 2022 23:23:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxoNzee7il0gmXyNNx3RJZQBh+N8ZMG78lP5JdyR34Ma9moafOQMU3aeqM20qnPeh/Orpwk X-Received: by 2002:a63:90c8:0:b0:3fd:157f:3f6f with SMTP id a191-20020a6390c8000000b003fd157f3f6fmr23506502pge.316.1654669397981; Tue, 07 Jun 2022 23:23:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654669397; cv=none; d=google.com; s=arc-20160816; b=XAU+dTIDhWNL+iTVaBtynmy/bO6Sgu3yUNs6QTdQKnyTLU3iyDK7JH0fqC7lnTpBjY 1Cp1kzgvQeHvEPQAFzECxfB4qwIEQCRKyHXR7j1ziu7VBvy7jRwi/jmgZj+6qxjlstEW SGNatPeIPN0MJGldwn8rkeUOxpkODcvrGG9+LV1PFDcsicrgK6f5Jjv2kq2BhM8mLUho V+NLxZcUfIE/fbGG9Ti8olyDAORsfLbbPr0+TU+aFxRVgT5rIDhzuUeITkuHey7ONQbE yx9LjnUQ4Cg/zkkv//ZZTPkj57hcIZFggMe5nfePwYM/U+KCT+Mnui3Te2zQQlH0HR3/ Z21Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=fcbGZ0FoJB/+GLqF36Ex6Lqc37sOH0glf3TfnCiXdLE=; b=RkBe81E/9CidisAgBx2nbVyvB5skpG5a9rkuFZrI6zhpPV32KRo0t17PKjXeSRe3OC Qy/2pn9sHt05nm2aNObSm1nTKxz6z7k9A5nXUNFYW9Io6iHbCN+MYVrmflPU43ToHiPf I5H0NLQkqONPy8MBWmQkIAxqhAHIGh6SPuhy4D+WDCqj7QiYow4f8z6Mh7ovaX3OC9y9 gGZxqjtYGstITG+AR7vWuXuXGElCig7ALsGC8Oys+hgR7qEt81QG6/vnSD/rPhsHO3dT MockiLhVP3/vLT1SNGj5VyWN3Qq9H4QyFfB5GHl/P5x6HjzikQpYvUVOckCMA3PHrRwm 0ZgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ijUEF6CO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id gq13-20020a17090b104d00b001e095c5ec83si24335177pjb.165.2022.06.07.23.23.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 23:23:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ijUEF6CO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 4810F498D7F; Tue, 7 Jun 2022 22:43:48 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443621AbiFHCC4 (ORCPT + 99 others); Tue, 7 Jun 2022 22:02:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1843621AbiFHALP (ORCPT ); Tue, 7 Jun 2022 20:11:15 -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 7480726ACAA; Tue, 7 Jun 2022 12:22:17 -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 DBC3C60A1D; Tue, 7 Jun 2022 19:22:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5A69C385A5; Tue, 7 Jun 2022 19:22:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654629736; bh=3SrypJSqpHTOnMg7FaxQwgo1y/n+7Mnt8TkTGgLlH/w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ijUEF6CO5sCCnPhW5Q3XrVH9RJ4i/xxjSsgE66rrDAJ+shwOkdxKl68eMeA4d4W4T JdX+Le+j97BmfnERlLhs1Lo9ls5I8WBZzm8l0VvgEocQSSC8AHakL/XfPc5cIfDT3o noIKtvOBk3QLg6RFSe9pzJBa7AOsjwKZMuEydy2o= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ville Syrjala , Jani Nikula Subject: [PATCH 5.18 797/879] drm/i915/dsi: fix VBT send packet port selection for ICL+ Date: Tue, 7 Jun 2022 19:05:15 +0200 Message-Id: <20220607165025.994535157@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607165002.659942637@linuxfoundation.org> References: <20220607165002.659942637@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jani Nikula commit 0ea917819d12fed41ea4662cc26ffa0060a5c354 upstream. The VBT send packet port selection was never updated for ICL+ where the 2nd link is on port B instead of port C as in VLV+ DSI. First, single link DSI needs to use the configured port instead of relying on the VBT sequence block port. Remove the hard-coded port C check here and make it generic. For reference, see commit f915084edc5a ("drm/i915: Changes related to the sequence port no for") for the original VLV specific fix. Second, the sequence block port number is either 0 or 1, where 1 indicates the 2nd link. Remove the hard-coded port C here for 2nd link. (This could be a "find second set bit" on DSI ports, but just check the two possible options.) Third, sanity check the result with a warning to avoid a NULL pointer dereference. Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/5984 Cc: stable@vger.kernel.org # v4.19+ Cc: Ville Syrjala Signed-off-by: Jani Nikula Reviewed-by: Ville Syrjälä Link: https://patchwork.freedesktop.org/patch/msgid/20220520094600.2066945-1-jani.nikula@intel.com (cherry picked from commit 08c59dde71b73a0ac94e3ed2d431345b01f20485) Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 33 ++++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-) --- a/drivers/gpu/drm/i915/display/intel_dsi_vbt.c +++ b/drivers/gpu/drm/i915/display/intel_dsi_vbt.c @@ -124,9 +124,25 @@ struct i2c_adapter_lookup { #define ICL_GPIO_DDPA_CTRLCLK_2 8 #define ICL_GPIO_DDPA_CTRLDATA_2 9 -static enum port intel_dsi_seq_port_to_port(u8 port) +static enum port intel_dsi_seq_port_to_port(struct intel_dsi *intel_dsi, + u8 seq_port) { - return port ? PORT_C : PORT_A; + /* + * If single link DSI is being used on any port, the VBT sequence block + * send packet apparently always has 0 for the port. Just use the port + * we have configured, and ignore the sequence block port. + */ + if (hweight8(intel_dsi->ports) == 1) + return ffs(intel_dsi->ports) - 1; + + if (seq_port) { + if (intel_dsi->ports & PORT_B) + return PORT_B; + else if (intel_dsi->ports & PORT_C) + return PORT_C; + } + + return PORT_A; } static const u8 *mipi_exec_send_packet(struct intel_dsi *intel_dsi, @@ -148,15 +164,10 @@ static const u8 *mipi_exec_send_packet(s seq_port = (flags >> MIPI_PORT_SHIFT) & 3; - /* For DSI single link on Port A & C, the seq_port value which is - * parsed from Sequence Block#53 of VBT has been set to 0 - * Now, read/write of packets for the DSI single link on Port A and - * Port C will based on the DVO port from VBT block 2. - */ - if (intel_dsi->ports == (1 << PORT_C)) - port = PORT_C; - else - port = intel_dsi_seq_port_to_port(seq_port); + port = intel_dsi_seq_port_to_port(intel_dsi, seq_port); + + if (drm_WARN_ON(&dev_priv->drm, !intel_dsi->dsi_hosts[port])) + goto out; dsi_device = intel_dsi->dsi_hosts[port]->device; if (!dsi_device) {