diff options
| author | Chris Wilson | 2010-12-14 20:21:29 +0100 |
|---|---|---|
| committer | Chris Wilson | 2010-12-23 10:51:37 +0100 |
| commit | 4d3024428f5c3ef5295e6f6fb257ae118b3f93a1 (patch) | |
| tree | 1f5fc37e71e0514d977aa249246e2800154b3795 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915, intel_ips: When i915 loads after IPS, make IPS relink to i915. (diff) | |
| download | kernel-qcow2-linux-4d3024428f5c3ef5295e6f6fb257ae118b3f93a1.tar.gz kernel-qcow2-linux-4d3024428f5c3ef5295e6f6fb257ae118b3f93a1.tar.xz kernel-qcow2-linux-4d3024428f5c3ef5295e6f6fb257ae118b3f93a1.zip | |
drm/i915: Verify Ironlake eDP presence on DP_A using the capability fuse
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 97e374ec7f72..fca523288aca 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5379,6 +5379,23 @@ static int intel_encoder_clones(struct drm_device *dev, int type_mask) return index_mask; } +static bool has_edp_a(struct drm_device *dev) +{ + struct drm_i915_private *dev_priv = dev->dev_private; + + if (!IS_MOBILE(dev)) + return false; + + if ((I915_READ(DP_A) & DP_DETECTED) == 0) + return false; + + if (IS_GEN5(dev) && + (I915_READ(ILK_DISPLAY_CHICKEN_FUSES) & ILK_eDP_A_DISABLE)) + return false; + + return true; +} + static void intel_setup_outputs(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; @@ -5396,7 +5413,7 @@ static void intel_setup_outputs(struct drm_device *dev) if (HAS_PCH_SPLIT(dev)) { dpd_is_edp = intel_dpd_is_edp(dev); - if (IS_MOBILE(dev) && (I915_READ(DP_A) & DP_DETECTED)) + if (has_edp_a(dev)) intel_dp_init(dev, DP_A); if (dpd_is_edp && (I915_READ(PCH_DP_D) & DP_DETECTED)) |