From patchwork Tue Jun 23 19:57:27 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 223512 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03896C433DF for ; Tue, 23 Jun 2020 20:19:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D747F217D9 for ; Tue, 23 Jun 2020 20:19:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943592; bh=FEBNMVsQfbahJqBSgdhnH+a1KU53iGwucQZwhHPz97k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yG4WmD2P2zenNEE8bfDt0Gmt4oKcPdiqEcENn7CxRUxUAPukttd/jOptvEuAr1/GM OsKmR5eFt8QLrK7VXP7Rpy6gy2444ss6vnI/SphC/GGsrDL1jfnVNh1hwB81vX3Ftg 6xyVfePvm1vV118abQQQNFWRv6dN1jxNCjuLHTlc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389850AbgFWUTr (ORCPT ); Tue, 23 Jun 2020 16:19:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:36900 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389846AbgFWUTq (ORCPT ); Tue, 23 Jun 2020 16:19:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0337C20EDD; Tue, 23 Jun 2020 20:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592943585; bh=FEBNMVsQfbahJqBSgdhnH+a1KU53iGwucQZwhHPz97k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=V1BsTJ4kS4tvQ3YGb7GTwUNxT9hqEW4UFRB2vVhdSKKmMD2Lz8PAxwcwcmhVoy8nD IBTmy+P/gcw7Oyj1U5un9ukbSp4yoReAMmwzs4kUI4bOFc/MPknq4AcVrLajSsBVRd GVzK6ON6soXMabKEFeaz1VoB1ErC7Y5hL2RaX/DE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Khaled Almahallawy , =?utf-8?q?Jos=C3=A9_Roberto_de_Souza?= , Imre Deak , Joonas Lahtinen Subject: [PATCH 5.7 450/477] drm/i915/tc: fix the reset of ln0 Date: Tue, 23 Jun 2020 21:57:27 +0200 Message-Id: <20200623195428.807845801@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195407.572062007@linuxfoundation.org> References: <20200623195407.572062007@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Khaled Almahallawy commit a43555ac908c604f45ed98628805aec9355b9737 upstream. Setting ln0 similar to ln1 Fixes: 3b51be4e4061b ("drm/i915/tc: Update DP_MODE programming") Cc: # v5.5+ Signed-off-by: Khaled Almahallawy Reviewed-by: José Roberto de Souza Signed-off-by: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20200608204537.28468-1-khaled.almahallawy@intel.com (cherry picked from commit 4f72a8ee819d57d7329d88f487a2fc9b45153177) Signed-off-by: Joonas Lahtinen Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/gpu/drm/i915/display/intel_ddi.c +++ b/drivers/gpu/drm/i915/display/intel_ddi.c @@ -2866,7 +2866,7 @@ icl_program_mg_dp_mode(struct intel_digi ln1 = intel_de_read(dev_priv, MG_DP_MODE(1, tc_port)); } - ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X1_MODE); + ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE); ln1 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE); /* DPPATC */