From mboxrd@z Thu Jan 1 00:00:00 1970 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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DBD96C98328 for ; Fri, 25 Sep 2026 19:11:17 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 800FF10FC26; Fri, 25 Sep 2026 19:11:16 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FrTEqPjb"; dkim-atps=neutral Received: from mail-wm2-f12.google.com (mail-wm2-f12.google.com [74.125.225.140]) by gabe.freedesktop.org (Postfix) with ESMTPS id D504E10F7B4 for ; Thu, 24 Sep 2026 21:19:30 +0000 (UTC) Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-49ce364488dso859565e9.0 for ; Thu, 24 Sep 2026 14:19:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790284769; x=1790889569; darn=lists.freedesktop.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=3b2nna4xnlk7YBC6uF1VaaYbEm9ppYIUbn/RXDv0QcY=; b=FrTEqPjblL1/z7NXBMMi29ZkNGTKIcpBeUe/VrJMpOMrbaUW3mmNTvPgkVMBBYy6yJ qiAr0+sd1ZGSWivH7m5aMJztJGHRZjwMBBb1pycPb4irzL9EaUqwB1qKgOdv11rKR2Sy R8/A6MN1l094otNpAmi+R58Wh1QxOHpg9wHItREqPB228GyNLv2XMsQsOotiBTGvZt7u EqA8dwCwdEcyfKGFdG5gXQFkJ5JUrWFAQjN/4uhBJI4UNCF057Qs8rExQt0j1iNbg4xM dbXjPYpNbm00tbO93S7mLEUjYLgDzbGzlmzMozBgqEGJlLMTexSNgqZ1ssGRwkwRqonq ZBoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790284769; x=1790889569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=3b2nna4xnlk7YBC6uF1VaaYbEm9ppYIUbn/RXDv0QcY=; b=A51vgShxjBeEEa/GWZSy0H7PXpCzXLfgMvrebNfhPvHoceQOCupNYiNmXve9pl7mjL qIQQ0uHSQT1SYhkz4sopWNVMRCfna9Ka/O8tlOPWghYcQNjcr6hT8rU8vlD6yEfE5Jo/ PAmOPiqmlQQ2JuNuA1Hs/rXALFAQbGiGXaS1ihh2bc3ilOH8/qqBquDblP7liX3H/aFI dqYn2xvHr1IIhmV/pkpm3/LgYMK2QPTwFPWp6WJqmcM0PLmc54xKhZu19G2x72iMx7w+ bkNGFast0Ex3gtnCZ9qqBNHdWpj1StMRDtUJpKXAv47R4sieaYbcsYlGZpa2bCSP9ha7 C7cQ== X-Gm-Message-State: AFuF++lDGjnsdaEpYsttb6mz5FRmWoDlyWRg9cE3NXnYT64wtMNtXbv3 jmi559mlySjhEsG4ih47E7WMzbrxaVKTvjPRFazNxJKlfQZsBVy+CniDnIDE7RY0rlY= X-Gm-Gg: AYBFou3OUlig1n8zOyIA/X/1dxEeRFK4/JmXOdVeH1fVd0pPcOtytlQPbJiB5rHs29c vSj4OjcIiJ3j8Ib/Igs9vUT7/rRN+y3zir3z5LbbGJuh5k78Rewnoe6kL7fq7CxYQIeyIEO7K0+ KjRF0WyOtoOUWjbRgf611q7xnI+9hL1ujvbQnvY2XfrUf2dm03Fjrt52kifw9hwNIX9/D3wlk+5 xViUznmAxbA3B4n1hCETsTrevvYRb/qL10XEYGXEHUZ1CD/Lc0JryNtxL4HzeIz9RnQwrTbPIs9 wrHhVSkHIF2+Rtky+WHa74dbRHQ2f3d9yacR2S644f2Pk4sVGlcBZtgpHKYT23cS+CIXqHpOcCp b5XAWzFvwudXTm6tGSJ3QvbJ35Bp8gNGx6BS19Y6u/yuRpsHcDt+RuDJSxoDUyf8MvMzVQgzgT/ 54ekOhSaPYNRRVAtKiPdvdNRRcSWrYEbov/RGOxqLUSa1GBc5GJF7HOWrvbhnAwRJlcE3Ai1h/q yA/taUclka7KNNffL9l4rQ/kDAP0xgdhFfWrWt8OwQhGFma/ef7YdjgcBZHi5WhfIPWTDMidXqJ baXM3sgcQ0L5HCGnphlFx5QjOUqJZ73PrCVyB35qYPOi+G4= X-Received: by 2002:a05:600c:c096:b0:49f:f099:6f92 with SMTP id 5b1f17b1804b1-49ff0997108mr2146345e9.9.1790284768860; Thu, 24 Sep 2026 14:19:28 -0700 (PDT) Received: from tulkas.localdomain (95f12971.skybroadband.com. [149.241.41.113]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fef5f876esm6403155e9.2.2026.09.24.14.19.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2026 14:19:28 -0700 (PDT) From: Conor Svensson To: intel-gfx@lists.freedesktop.org Cc: Conor Svensson , intel-xe@lists.freedesktop.org, dri-devel@lists.freedesktop.org, jani.nikula@linux.intel.com, rodrigo.vivi@intel.com, joonas.lahtinen@linux.intel.com, tursulin@ursulin.net, airlied@gmail.com, simona@ffwll.ch, linux-kernel@vger.kernel.org Subject: [PATCH] drm/i915/dp: Configure protocol converter only for TMDS outputs Date: Thu, 24 Sep 2026 22:18:09 +0100 Message-ID: <20260924211852.436787-1-conor10@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <5893371ab206c97d5d2f1d72eb149d5ace4250e2@intel.com> References: <5893371ab206c97d5d2f1d72eb149d5ace4250e2@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Mailman-Approved-At: Fri, 25 Sep 2026 19:11:15 +0000 X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" intel_dp_configure_protocol_converter() currently writes the HDMI/DVI output-selection control for every DP 1.3+ branch. The write is only meaningful for a TMDS downstream output; a native DisplayPort output should not be switched to the HDMI/DVI protocol-converter mode. An Anker 565 branch (Synaptics OUI 90:cc:24) changes its downstream port descriptor from DisplayPort to DVI immediately after this write. i915 then derives a 165 MHz TMDS limit on the next hotplug probe and drops the monitor's native modes. Skipping the write for non-TMDS outputs prevents the transition. The existing dfp.min_tmds_clock classification is nonzero for HDMI/DVI outputs and zero for native DisplayPort outputs, so retain the write for the protocol-converter cases that need it. Colour-conversion controls are unchanged. Tested on a ThinkPad L14 Gen 4 with an Anker 565 A8388 hub and a Dell S3422DWG: - native 3440x1440@59.973 after DP recovery - three USB-C reconnects on the first USB-C port - one test on the second USB-C port - suspend/resume on the second port - HDMI through the hub at 3440x1440@59.973, with HDMI-specific modes present On the unpatched control kernel, the live descriptor changed from 08 f0 01 1e 00 00 00 00 to 0a 42 00 00 00 00 00 00 across the 0x3050 write. Link: https://gitlab.freedesktop.org/drm/i915/kernel/-/work_items/17180 Root-cause findings and validation details were added to the linked issue. Assisted-by: LLM Codex GPT-6 Signed-off-by: Conor Svensson --- drivers/gpu/drm/i915/display/intel_dp.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index ffddf4b33..cdc3d7786 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -4422,14 +4422,17 @@ void intel_dp_configure_protocol_converter(struct intel_dp *intel_dp, if (!drm_dp_is_branch(intel_dp->dpcd)) return; - tmp = intel_dp_has_hdmi_sink(intel_dp) ? DP_HDMI_DVI_OUTPUT_CONFIG : 0; + /* HDMI/DVI output selection only applies to TMDS downstream ports. */ + if (intel_dp->dfp.min_tmds_clock) { + tmp = intel_dp_has_hdmi_sink(intel_dp) ? DP_HDMI_DVI_OUTPUT_CONFIG : 0; - ret = drm_dp_dpcd_write_byte(&intel_dp->aux, - DP_PROTOCOL_CONVERTER_CONTROL_0, tmp); - if (ret < 0) - drm_dbg_kms(display->drm, - "Failed to %s protocol converter HDMI mode\n", - str_enable_disable(intel_dp_has_hdmi_sink(intel_dp))); + ret = drm_dp_dpcd_write_byte(&intel_dp->aux, + DP_PROTOCOL_CONVERTER_CONTROL_0, tmp); + if (ret < 0) + drm_dbg_kms(display->drm, + "Failed to %s protocol converter HDMI mode\n", + str_enable_disable(intel_dp_has_hdmi_sink(intel_dp))); + } if (crtc_state->sink_format == INTEL_OUTPUT_FORMAT_YCBCR420) { switch (crtc_state->output_format) { base-commit: 703cd271db3a35088460ab3fec0a96bd48e7fe04 -- 2.55.0