Skip to content

Commit 7a6c624

Browse files
vsyrjalarodrigovivi
authored andcommitted
drm/i915: Reject 446-480MHz HDMI clock on GLK
The BXT/GLK DPLL can't generate certain frequencies. We already reject the 233-240MHz range on both. But on GLK the DPLL max frequency was bumped from 300MHz to 594MHz, so now we get to also worry about the 446-480MHz range (double the original problem range). Reject any frequency within the higher problematic range as well. Cc: stable@vger.kernel.org Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/3000 Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20210203093044.30532-1-ville.syrjala@linux.intel.com Reviewed-by: Mika Kahola <mika.kahola@intel.com> (cherry picked from commit 41751b3) Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
1 parent d5109f7 commit 7a6c624

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

drivers/gpu/drm/i915/display/intel_hdmi.c

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2218,7 +2218,11 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi,
22182218
has_hdmi_sink))
22192219
return MODE_CLOCK_HIGH;
22202220

2221-
/* BXT DPLL can't generate 223-240 MHz */
2221+
/* GLK DPLL can't generate 446-480 MHz */
2222+
if (IS_GEMINILAKE(dev_priv) && clock > 446666 && clock < 480000)
2223+
return MODE_CLOCK_RANGE;
2224+
2225+
/* BXT/GLK DPLL can't generate 223-240 MHz */
22222226
if (IS_GEN9_LP(dev_priv) && clock > 223333 && clock < 240000)
22232227
return MODE_CLOCK_RANGE;
22242228

0 commit comments

Comments
 (0)