Merge remote branch 'anholt/drm-intel-next' into drm-linus

This merges the upstream Intel tree and fixes up numerous conflicts
due to patches merged into Linus tree later in -rc cycle.

Conflicts:
	drivers/char/agp/intel-agp.c
	drivers/gpu/drm/drm_dp_i2c_helper.c
	drivers/gpu/drm/i915/i915_irq.c
	drivers/gpu/drm/i915/i915_suspend.c

1 files changed, 47 insertions, 11 deletions

diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index 9ca917931afb..552ec110b741 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1213,20 +1213,17 @@ intel_tv_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode,
                 tv_ctl |= TV_TRILEVEL_SYNC;
         if (tv_mode->pal_burst)
                 tv_ctl |= TV_PAL_BURST;
+
         scctl1 = 0;
-        /* dda1 implies valid video levels */
-        if (tv_mode->dda1_inc) {
+        if (tv_mode->dda1_inc)
                 scctl1 |= TV_SC_DDA1_EN;
-        }
-
         if (tv_mode->dda2_inc)
                 scctl1 |= TV_SC_DDA2_EN;
-
         if (tv_mode->dda3_inc)
                 scctl1 |= TV_SC_DDA3_EN;
-
         scctl1 |= tv_mode->sc_reset;
-        scctl1 |= video_levels->burst << TV_BURST_LEVEL_SHIFT;
+        if (video_levels)
+                scctl1 |= video_levels->burst << TV_BURST_LEVEL_SHIFT;
         scctl1 |= tv_mode->dda1_inc << TV_SCDDA1_INC_SHIFT;
 
         scctl2 = tv_mode->dda2_size << TV_SCDDA2_SIZE_SHIFT |
@@ -1416,16 +1413,16 @@ intel_tv_detect_type (struct drm_crtc *crtc, struct intel_output *intel_output)
          *  0 0 0 Component
          */
         if ((tv_dac & TVDAC_SENSE_MASK) == (TVDAC_B_SENSE | TVDAC_C_SENSE)) {
-                DRM_DEBUG("Detected Composite TV connection\n");
+                DRM_DEBUG_KMS("Detected Composite TV connection\n");
                 type = DRM_MODE_CONNECTOR_Composite;
         } else if ((tv_dac & (TVDAC_A_SENSE|TVDAC_B_SENSE)) == TVDAC_A_SENSE) {
-                DRM_DEBUG("Detected S-Video TV connection\n");
+                DRM_DEBUG_KMS("Detected S-Video TV connection\n");
                 type = DRM_MODE_CONNECTOR_SVIDEO;
         } else if ((tv_dac & TVDAC_SENSE_MASK) == 0) {
-                DRM_DEBUG("Detected Component TV connection\n");
+                DRM_DEBUG_KMS("Detected Component TV connection\n");
                 type = DRM_MODE_CONNECTOR_Component;
         } else {
-                DRM_DEBUG("No TV connection detected\n");
+                DRM_DEBUG_KMS("No TV connection detected\n");
                 type = -1;
         }
 
@@ -1702,6 +1699,41 @@ static const struct drm_encoder_funcs intel_tv_enc_funcs = {
         .destroy = intel_tv_enc_destroy,
 };
 
+/*
+ * Enumerate the child dev array parsed from VBT to check whether
+ * the integrated TV is present.
+ * If it is present, return 1.
+ * If it is not present, return false.
+ * If no child dev is parsed from VBT, it assumes that the TV is present.
+ */
+static int tv_is_present_in_vbt(struct drm_device *dev)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct child_device_config *p_child;
+        int i, ret;
+
+        if (!dev_priv->child_dev_num)
+                return 1;
+
+        ret = 0;
+        for (i = 0; i < dev_priv->child_dev_num; i++) {
+                p_child = dev_priv->child_dev + i;
+                /*
+                 * If the device type is not TV, continue.
+                 */
+                if (p_child->device_type != DEVICE_TYPE_INT_TV &&
+                        p_child->device_type != DEVICE_TYPE_TV)
+                        continue;
+                /* Only when the addin_offset is non-zero, it is regarded
+                 * as present.
+                 */
+                if (p_child->addin_offset) {
+                        ret = 1;
+                        break;
+                }
+        }
+        return ret;
+}
 
 void
 intel_tv_init(struct drm_device *dev)
@@ -1717,6 +1749,10 @@ intel_tv_init(struct drm_device *dev)
         if ((I915_READ(TV_CTL) & TV_FUSE_STATE_MASK) == TV_FUSE_STATE_DISABLED)
                 return;
 
+        if (!tv_is_present_in_vbt(dev)) {
+                DRM_DEBUG_KMS("Integrated TV is not present.\n");
+                return;
+        }
         /* Even if we have an encoder we may not have a connector */
         if (!dev_priv->int_tv_support)
                 return;