diff options
| author | Ville Syrjälä | 2015-12-01 22:28:55 +0100 |
|---|---|---|
| committer | Ville Syrjälä | 2015-12-02 10:23:32 +0100 |
| commit | 65e472e43355488a4727db5dc9ce667d7d05b35e (patch) | |
| tree | bc5ad65e2931f3edbfb7a3edb53a10d9b9a3f6e8 /drivers/gpu/drm/i915/intel_display.c | |
| parent | drm/i915: Use cached cdclk_freq for PWM calculations (diff) | |
| download | kernel-qcow2-linux-65e472e43355488a4727db5dc9ce667d7d05b35e.tar.gz kernel-qcow2-linux-65e472e43355488a4727db5dc9ce667d7d05b35e.tar.xz kernel-qcow2-linux-65e472e43355488a4727db5dc9ce667d7d05b35e.zip | |
drm/i915: Don't register the CRT connector when it's fused off on LPT-H
LPT-H has a strap bit for fused off CRT block. Check it to see if
we should register the CRT connector or not. Supposedly this also
forces the ADAP enable bit to 0, so the detection we added in
commit 6c03a6bd0dd8 ("drm/i915: Don't register CRT connector when it's fused off")
should already catch it, but checking the fuse bit should at least
do no harm.
v2: Use HAS_PCH_LPT_H() (Paulo)
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1449005335-15192-1-git-send-email-ville.syrjala@linux.intel.com
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 4aa4cadeaf31..bfb00e383587 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -14257,6 +14257,9 @@ static bool intel_crt_present(struct drm_device *dev) if (IS_CHERRYVIEW(dev)) return false; + if (HAS_PCH_LPT_H(dev) && I915_READ(SFUSE_STRAP) & SFUSE_STRAP_CRT_DISABLED) + return false; + if (IS_VALLEYVIEW(dev) && !dev_priv->vbt.int_crt_support) return false; |