summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_display.c
diff options
context:
space:
mode:
authorDaniel Vetter2015-07-07 11:44:32 +0200
committerDaniel Vetter2015-07-07 13:27:07 +0200
commit09da55dc84782b9b3fd8291719460da2d13bd27c (patch)
treee565d7a3c3801eb188614a1fb1ad4ec9292f41d8 /drivers/gpu/drm/i915/intel_display.c
parentdrm/i915: s/mdelay/msleep/ (diff)
downloadkernel-qcow2-linux-09da55dc84782b9b3fd8291719460da2d13bd27c.tar.gz
kernel-qcow2-linux-09da55dc84782b9b3fd8291719460da2d13bd27c.tar.xz
kernel-qcow2-linux-09da55dc84782b9b3fd8291719460da2d13bd27c.zip
drm/i915: Inline SUPPORTS_DIGITAL_OUTPUTS
After the register save/restore code is gone there's just one user left and it just obfuscates that one. Remove it. Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> 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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 737e939cf0f4..3c2425f5366d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14306,7 +14306,7 @@ static void intel_setup_outputs(struct drm_device *dev)
}
intel_dsi_init(dev);
- } else if (SUPPORTS_DIGITAL_OUTPUTS(dev)) {
+ } else if (!IS_GEN2(dev) && !IS_PINEVIEW(dev)) {
bool found = false;
if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {