From nobody Tue Dec 2 00:05:07 2025 Received: from mail.0la.ch (mail.0la.ch [78.47.82.197]) (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 8E33A2877FC for ; Wed, 26 Nov 2025 06:54:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=78.47.82.197 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764140070; cv=none; b=BM4vBXmtijSMX8OnmBAM8xLn+bu4fVgz6Q4t+M4FwoXy/TA8WFX2TmTqCd/wpYGLmCJVjWer91IIJYwnmMmUj3g/nCjTW3r6Sed2rAGug+beP2VSVrywo1mtkmUeeWMi4fzrIRS3zL59kBFKdNR0CgHYoCOvWwBu05RO7B4zLv4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764140070; c=relaxed/simple; bh=wpqeicRH4J7UBZ43wid91weo9Qfjz2n+Nug+NaKzW6c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wkje2+Rqz8IrDTph0fHn2fz8FzZMzSx6h4FCWw2pWhgvrAA7s2kvU2rqDhXpUcf9kmpFKv3MlcB9jjoESIujwt8pSxmiRuvNkxoWa+a4cEUyNsletBWT5+05N3gjR4/Z700AHjEuHeoMKl+SwqA0DNuzSVrOq5Oq3T+erRneiwM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lach.pw; spf=pass smtp.mailfrom=lach.pw; dkim=pass (2048-bit key) header.d=lach.pw header.i=@lach.pw header.b=YJE1fSsI; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b=z+CS2b+F; arc=none smtp.client-ip=78.47.82.197 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=lach.pw Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lach.pw Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=lach.pw header.i=@lach.pw header.b="YJE1fSsI"; dkim=permerror (0-bit key) header.d=lach.pw header.i=@lach.pw header.b="z+CS2b+F" DKIM-Signature: v=1; a=rsa-sha256; s=202502r; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764139912; bh=AvKT6oJijpCEbMgflv6462W DrB/s3kB+K5PshE5hKtY=; b=YJE1fSsI6tntFWIBjjfAE2ySxNfLnfQjdYdInz1vfwPbmIxYk0 cRlcnOyxGuF0Pq2zoFjNBIcGSpYllnwFujk0ZWqDFfwBeLxdEDphM0P4Ct15brG/yhItL19wuxl m1wMzuVVuN26NXaE464RQkw1F8mdKu6BVnkt7CkdXcPLzBxVEkCrIBp5FmSgU/aJ+lQlfVjbUFG US5HQYmFYLcub0NE284FyZRFz7TSnab88svCFhpx6vn0ytsHdseykI2gL7LE3jxsQJyhUv0mqoF 1ZYvk+Jyvr4EspFEWxfgn/n7QFwZU0XqU0buaon2ms2rNBS1T/DTc9zExrdKwfxVEVg==; DKIM-Signature: v=1; a=ed25519-sha256; s=202502e; d=lach.pw; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1764139912; bh=AvKT6oJijpCEbMgflv6462W DrB/s3kB+K5PshE5hKtY=; b=z+CS2b+FYOWCUDjpMGs7LvAPYwy9aMoZYja3EZDOD3806E3XqM Q8S5KjMAPvDoHZp0glpipwpMmte78KNFuSBQ==; From: Yaroslav Bolyukin To: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter Cc: Harry Wentland , Leo Li , Rodrigo Siqueira , Alex Deucher , =?UTF-8?q?Christian=20K=C3=B6nig?= , Wayne Lin , amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Yaroslav Bolyukin Subject: [PATCH v6 3/7] drm/edid: MSO should only be used for non-eDP displays Date: Wed, 26 Nov 2025 07:51:22 +0100 Message-ID: <20251126065126.54016-4-iam@lach.pw> X-Mailer: git-send-email 2.51.2 In-Reply-To: <20251126065126.54016-1-iam@lach.pw> References: <20251126065126.54016-1-iam@lach.pw> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" As per DisplayID v2.1a spec: If Offset 06h[2:0] is programmed to 001b (External DisplayPort), this field shall be cleared to 00b (Not supported). Link: https://lore.kernel.org/lkml/3abc1087618c822e5676e67a3ec2e64e506dc5ec= @intel.com/ Signed-off-by: Yaroslav Bolyukin --- drivers/gpu/drm/drm_displayid_internal.h | 4 +++ drivers/gpu/drm/drm_edid.c | 36 +++++++++++++++--------- 2 files changed, 27 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_displayid_internal.h b/drivers/gpu/drm/drm= _displayid_internal.h index 5b1b32f73516..72f107ae832f 100644 --- a/drivers/gpu/drm/drm_displayid_internal.h +++ b/drivers/gpu/drm/drm_displayid_internal.h @@ -142,9 +142,13 @@ struct displayid_formula_timing_block { struct displayid_formula_timings_9 timings[]; } __packed; =20 +#define DISPLAYID_VESA_DP_TYPE GENMASK(2, 0) #define DISPLAYID_VESA_MSO_OVERLAP GENMASK(3, 0) #define DISPLAYID_VESA_MSO_MODE GENMASK(6, 5) =20 +#define DISPLAYID_VESA_DP_TYPE_EDP 0 +#define DISPLAYID_VESA_DP_TYPE_DP 1 + struct displayid_vesa_vendor_specific_block { struct displayid_block base; u8 oui[3]; diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index a52fd6de9327..348aa31aea1b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6533,6 +6533,7 @@ static void drm_parse_vesa_specific_block(struct drm_= connector *connector, struct displayid_vesa_vendor_specific_block *vesa =3D (struct displayid_vesa_vendor_specific_block *)block; struct drm_display_info *info =3D &connector->display_info; + int dp_type; =20 if (block->num_bytes < 3) { drm_dbg_kms(connector->dev, @@ -6551,20 +6552,29 @@ static void drm_parse_vesa_specific_block(struct dr= m_connector *connector, return; } =20 - switch (FIELD_GET(DISPLAYID_VESA_MSO_MODE, vesa->mso)) { - default: - drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Reserved MSO mode value\n= ", + dp_type =3D FIELD_GET(DISPLAYID_VESA_DP_TYPE, vesa->data_structure_type); + if (dp_type > 1) { + drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Reserved dp type value\n", connector->base.id, connector->name); - fallthrough; - case 0: - info->mso_stream_count =3D 0; - break; - case 1: - info->mso_stream_count =3D 2; /* 2 or 4 links */ - break; - case 2: - info->mso_stream_count =3D 4; /* 4 links */ - break; + } + + /* MSO is not supported for eDP */ + if (dp_type !=3D DISPLAYID_VESA_DP_TYPE_EDP) { + switch (FIELD_GET(DISPLAYID_VESA_MSO_MODE, vesa->mso)) { + default: + drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] Reserved MSO mode value\= n", + connector->base.id, connector->name); + fallthrough; + case 0: + info->mso_stream_count =3D 0; + break; + case 1: + info->mso_stream_count =3D 2; /* 2 or 4 links */ + break; + case 2: + info->mso_stream_count =3D 4; /* 4 links */ + break; + } } =20 if (info->mso_stream_count) { --=20 2.51.2