History

drm/i915: fix hdmi portclock limits

In commit 325b9d048810f7689ec644595061c0b700e64bce Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Fri Apr 19 11:24:33 2013 +0200 drm/i915: fixup 12bpc hdmi dotclock handling I've errornously claimed that we don't yet support the hdmi 1.4 dotclocks > 225 MHz on Haswell. But a bug report and a closer look at the wrpll table showed that we've supported port clocks up to 300MHz. With the new code to dynamically compute wrpll limits we should have no issues going up to the full 340 MHz range of hdmi 1.4, so let's just use that to fix this regression. That'll allow 4k over hdmi for free! v2: Drop the random hunk that somehow slipped in. v3: Cantiga has the original HDMI dotclock limit of 165MHz. And also patch up the mode filtering. To do so extract the dotclock limits into a little helper function. v4: Use 300MHz (from Bspec) instead of 340MHz (upper limit for hdmi 1.3), apparently hw is not required to be able to drive the highest dotclocks. Suggested by Damien.

Daniel Vetter committed 13 years ago

Commit 7d148ef1 parent 058ca4a1 file · +16 −3Browse files

Unified · Split

drivers/gpu/drm/i915/intel_hdmi.c+16−3
@@ -785,10 +785,22 @@ static void intel_disable_hdmi(struct intel_encoder *encoder) · 784 unmodified lines
785785 }
786786 }
787787
788+static int hdmi_portclock_limit(struct intel_hdmi *hdmi)
789+{
790+ struct drm_device *dev = intel_hdmi_to_dev(hdmi);
791+
792+ if (IS_G4X(dev))
793+ return 165000;
794+ else if (IS_HASWELL(dev))
795+ return 300000;
796+ else
797+ return 225000;
798+}
799+
788800 static int intel_hdmi_mode_valid(struct drm_connector *connector,
789801 struct drm_display_mode *mode)
790802 {
791− if (mode->clock > 165000)
803+ if (mode->clock > hdmi_portclock_limit(intel_attached_hdmi(connector)))
792804 return MODE_CLOCK_HIGH;
793805 if (mode->clock < 20000)
794806 return MODE_CLOCK_LOW;
@@ -806,6 +818,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, · 11 unmodified lines
806818 struct drm_device *dev = encoder->base.dev;
807819 struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
808820 int clock_12bpc = pipe_config->requested_mode.clock * 3 / 2;
821+ int portclock_limit = hdmi_portclock_limit(intel_hdmi);
809822 int desired_bpp;
810823
811824 if (intel_hdmi->color_range_auto) {
@@ -829,7 +842,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, · 17 unmodified lines
829842 * outputs. We also need to check that the higher clock still fits
830843 * within limits.
831844 */
832− if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= 225000
845+ if (pipe_config->pipe_bpp > 8*3 && clock_12bpc <= portclock_limit
833846 && HAS_PCH_SPLIT(dev)) {
834847 DRM_DEBUG_KMS("picking bpc to 12 for HDMI output\n");
835848 desired_bpp = 12*3;
@@ -846,7 +859,7 @@ bool intel_hdmi_compute_config(struct intel_encoder *encoder, · 10 unmodified lines
846859 pipe_config->pipe_bpp = desired_bpp;
847860 }
848861
849− if (adjusted_mode->clock > 225000) {
862+ if (adjusted_mode->clock > portclock_limit) {
850863 DRM_DEBUG_KMS("too high HDMI clock, rejecting mode\n");
851864 return false;
852865 }

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t