From mboxrd@z Thu Jan 1 00:00:00 1970 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 D61921BDCF; Mon, 10 Mar 2025 17:18:15 +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=1741627095; cv=none; b=QCtWjtkldfhZClrIED/3xmyV+bOmUXU8Asgru/hD2AjG1ag3KfhapYT2t+i4zg1+LI4JUM5Ef82gwsml2oFA5Im4KqzVzOOWaVdi5PyJkq374p0AJ7f5OMZk3Q0Tav0a2D8njEYz55b8hhqRB2QVLn8+bIVaazKFMLE60lSkee0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741627095; c=relaxed/simple; bh=9mbAoSKBVrJNxXlpLaXdDbY4vN/LteQoXo5lXhSQn10=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cD+SBwRNTxhtAyyfF4FnHyUN4aMnHwwuF2+0B0FhDyQC3I8UOH8gAQZO9g63/TwmkxHMyvunJAKODdVFA7Saa6PoOJ+l62v0jjjBLiCi6RXzcUQd6/gDrcBVIiKZm9IZPwUverEoIxpzF5iVOhyP6IXJQzHo9m1V+ICiTpaF7mk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=C/ojUWEt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="C/ojUWEt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5BC2CC4CEE5; Mon, 10 Mar 2025 17:18:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741627095; bh=9mbAoSKBVrJNxXlpLaXdDbY4vN/LteQoXo5lXhSQn10=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C/ojUWEtOsB7OsS4plKWtScKHDw0qokCAbGpiPboSMc5buiAQ88igvuS1QMlCHIqb IEE72Hqs3XSPzjxpHC8I8llqAa0FNuNFAFR7mlGOrQbL6Wl7k/FVZBHnzpKgRR/2M6 T2cmFky9I27fcmz4b3uvfbFS6vQr+yY9BK5W597E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jani Nikula , Imre Deak , Rodrigo Vivi , Sasha Levin Subject: [PATCH 6.12 004/269] drm/i915/dsi: Use TRANS_DDI_FUNC_CTLs own port width macro Date: Mon, 10 Mar 2025 18:02:37 +0100 Message-ID: <20250310170457.880793137@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170457.700086763@linuxfoundation.org> References: <20250310170457.700086763@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Imre Deak [ Upstream commit 879f70382ff3e92fc854589ada3453e3f5f5b601 ] The format of the port width field in the DDI_BUF_CTL and the TRANS_DDI_FUNC_CTL registers are different starting with MTL, where the x3 lane mode for HDMI FRL has a different encoding in the two registers. To account for this use the TRANS_DDI_FUNC_CTL's own port width macro. Cc: # v6.5+ Fixes: b66a8abaa48a ("drm/i915/display/mtl: Fill port width in DDI_BUF_/TRANS_DDI_FUNC_/PORT_BUF_CTL for HDMI") Reviewed-by: Jani Nikula Signed-off-by: Imre Deak Link: https://patchwork.freedesktop.org/patch/msgid/20250214142001.552916-2-imre.deak@intel.com (cherry picked from commit 76120b3a304aec28fef4910204b81a12db8974da) Signed-off-by: Rodrigo Vivi Signed-off-by: Sasha Levin --- drivers/gpu/drm/i915/display/icl_dsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/i915/display/icl_dsi.c b/drivers/gpu/drm/i915/display/icl_dsi.c index e2a88e5a97479..4e95b8eda23f7 100644 --- a/drivers/gpu/drm/i915/display/icl_dsi.c +++ b/drivers/gpu/drm/i915/display/icl_dsi.c @@ -806,8 +806,8 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, /* select data lane width */ tmp = intel_de_read(display, TRANS_DDI_FUNC_CTL(display, dsi_trans)); - tmp &= ~DDI_PORT_WIDTH_MASK; - tmp |= DDI_PORT_WIDTH(intel_dsi->lane_count); + tmp &= ~TRANS_DDI_PORT_WIDTH_MASK; + tmp |= TRANS_DDI_PORT_WIDTH(intel_dsi->lane_count); /* select input pipe */ tmp &= ~TRANS_DDI_EDP_INPUT_MASK; -- 2.39.5