Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 269839
b: refs/heads/master
c: d9d444c
h: refs/heads/master
i:
  269837: cccc127
  269835: 8858f0b
  269831: fb55d89
  269823: 670fac9
v: v3
  • Loading branch information
Jesse Barnes authored and Keith Packard committed Oct 20, 2011
1 parent 00ba040 commit d0674b8
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 27f8227b1e2b326a9a0995dd9c1f14893c61ee01
refs/heads/master: d9d444cbc536050ef66e4cefcd55224c46cbbadf
39 changes: 35 additions & 4 deletions trunk/drivers/gpu/drm/i915/intel_display.c
Original file line number Diff line number Diff line change
Expand Up @@ -5241,6 +5241,40 @@ void ironlake_init_pch_refclk(struct drm_device *dev)
}
}

static int ironlake_get_refclk(struct drm_crtc *crtc)
{
struct drm_device *dev = crtc->dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_encoder *encoder;
struct drm_mode_config *mode_config = &dev->mode_config;
struct intel_encoder *edp_encoder = NULL;
int num_connectors = 0;
bool is_lvds = false;

list_for_each_entry(encoder, &mode_config->encoder_list, base.head) {
if (encoder->base.crtc != crtc)
continue;

switch (encoder->type) {
case INTEL_OUTPUT_LVDS:
is_lvds = true;
break;
case INTEL_OUTPUT_EDP:
edp_encoder = encoder;
break;
}
num_connectors++;
}

if (is_lvds && intel_panel_use_ssc(dev_priv) && num_connectors < 2) {
DRM_DEBUG_KMS("using SSC reference clock of %d MHz\n",
dev_priv->lvds_ssc_freq);
return dev_priv->lvds_ssc_freq * 1000;
}

return 120000;
}

static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode,
Expand Down Expand Up @@ -5300,10 +5334,7 @@ static int ironlake_crtc_mode_set(struct drm_crtc *crtc,
num_connectors++;
}

/*
* Every reference clock in a PCH system is 120MHz
*/
refclk = 120000;
refclk = ironlake_get_refclk(crtc);

/*
* Returns a set of divisors for the desired target clock with the given
Expand Down

0 comments on commit d0674b8

Please sign in to comment.