diff options
author | Damien Lespiau <damien.lespiau@intel.com> | 2013-12-03 13:56:23 +0000 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-09-24 14:39:46 +0200 |
commit | 884497edd9e982eaf5c7e1216029625cec3c5f5e (patch) | |
tree | b5f9332474caaac58721c9c7cc1c9dbf4efcd8b6 /drivers/gpu/drm/i915/intel_display.c | |
parent | 70d21f0e914415c39bfdffdcaebb6bc8fb6ce79c (diff) | |
download | lwn-884497edd9e982eaf5c7e1216029625cec3c5f5e.tar.gz lwn-884497edd9e982eaf5c7e1216029625cec3c5f5e.zip |
drm/i915/skl: Don't create a VGA connector on Skylake
v2: Rebase on top of the intel_crt_present() addition
v3: Fix rebase error (we were patching the wrong function)
Reviewed-by: Thomas Wood <thomas.wood@intel.com>
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
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 65f4ff668208..3c3656cd797d 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -12322,6 +12322,9 @@ static bool intel_crt_present(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; + if (INTEL_INFO(dev)->gen >= 9) + return false; + if (IS_ULT(dev)) return false; |