diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-04-11 04:08:38 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2022-04-11 04:08:38 +0000 |
commit | 35c270528d0d9e22819de5ed2924eb1cf5f000aa (patch) | |
tree | 06d0898772c9bbf5152b2d50778eaa15b372a13c /sys/dev | |
parent | 2706690be925216471f65aa7b260dd1833eeaade (diff) |
drm/i915: Reject unsupported TMDS rates on ICL+
From Ville Syrjala
f5a0cf225f8d3cf06aff181b291a0ff32f4ad2c8 in linux 5.15.y/5.15.33
9cddf03b2af07443bebdc73cba21acb360c079e8 in mainline linux
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/pci/drm/i915/display/intel_hdmi.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/i915/display/intel_hdmi.c b/sys/dev/pci/drm/i915/display/intel_hdmi.c index 1754a788e0c..2a70c515976 100644 --- a/sys/dev/pci/drm/i915/display/intel_hdmi.c +++ b/sys/dev/pci/drm/i915/display/intel_hdmi.c @@ -1831,6 +1831,7 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, bool has_hdmi_sink) { struct drm_i915_private *dev_priv = intel_hdmi_to_i915(hdmi); + enum phy phy = intel_port_to_phy(dev_priv, hdmi_to_dig_port(hdmi)->base.port); if (clock < 25000) return MODE_CLOCK_LOW; @@ -1851,6 +1852,14 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi, if (IS_CHERRYVIEW(dev_priv) && clock > 216000 && clock < 240000) return MODE_CLOCK_RANGE; + /* ICL+ combo PHY PLL can't generate 500-533.2 MHz */ + if (intel_phy_is_combo(dev_priv, phy) && clock > 500000 && clock < 533200) + return MODE_CLOCK_RANGE; + + /* ICL+ TC PHY PLL can't generate 500-532.8 MHz */ + if (intel_phy_is_tc(dev_priv, phy) && clock > 500000 && clock < 532800) + return MODE_CLOCK_RANGE; + /* * SNPS PHYs' MPLLB table-based programming can only handle a fixed * set of link rates. |