drm/i915: Ditch SUPPORTS_INTEGRATED_HDMI|DP and use IS_G4X instead

Since that's really what we want to test for. Note remove the gen5
case doesn't change anything: In intel_setup_outputs ilk is handled
already in the HAS_PCH_SPLIT case, and the register save/restore code
touches registers which simply doesn't exist anymore at all.

v2: Drop UMS parts.

v3: Update commit message to reflect that the reg save/restore code is
gone (Ville).

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index eb50f59d7840..99bf147b2f68 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -14312,12 +14312,12 @@ static void intel_setup_outputs(struct drm_device *dev)
                 if (I915_READ(GEN3_SDVOB) & SDVO_DETECTED) {
                         DRM_DEBUG_KMS("probing SDVOB\n");
                         found = intel_sdvo_init(dev, GEN3_SDVOB, true);
-                        if (!found && SUPPORTS_INTEGRATED_HDMI(dev)) {
+                        if (!found && IS_G4X(dev)) {
                                 DRM_DEBUG_KMS("probing HDMI on SDVOB\n");
                                 intel_hdmi_init(dev, GEN4_HDMIB, PORT_B);
                         }
 
-                        if (!found && SUPPORTS_INTEGRATED_DP(dev))
+                        if (!found && IS_G4X(dev))
                                 intel_dp_init(dev, DP_B, PORT_B);
                 }
 
@@ -14330,15 +14330,15 @@ static void intel_setup_outputs(struct drm_device *dev)
 
                 if (!found && (I915_READ(GEN3_SDVOC) & SDVO_DETECTED)) {
 
-                        if (SUPPORTS_INTEGRATED_HDMI(dev)) {
+                        if (IS_G4X(dev)) {
                                 DRM_DEBUG_KMS("probing HDMI on SDVOC\n");
                                 intel_hdmi_init(dev, GEN4_HDMIC, PORT_C);
                         }
-                        if (SUPPORTS_INTEGRATED_DP(dev))
+                        if (IS_G4X(dev))
                                 intel_dp_init(dev, DP_C, PORT_C);
                 }
 
-                if (SUPPORTS_INTEGRATED_DP(dev) &&
+                if (IS_G4X(dev) &&
                     (I915_READ(DP_D) & DP_DETECTED))
                         intel_dp_init(dev, DP_D, PORT_D);
         } else if (IS_GEN2(dev))