7 files changed, 322 insertions, 7 deletions

diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
index dd57a5bd4572..793cba39d832 100644
--- a/drivers/gpu/drm/i915/Makefile
+++ b/drivers/gpu/drm/i915/Makefile
@@ -13,6 +13,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o i915_mem.o \
           intel_crt.o \
           intel_lvds.o \
           intel_bios.o \
+          intel_hdmi.o \
           intel_sdvo.o \
           intel_modes.o \
           intel_i2c.o \
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 4756e5cd6b5e..563de18063fd 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -664,6 +664,7 @@ extern void intel_modeset_cleanup(struct drm_device *dev);
                                  writel(upper_32_bits(val), dev_priv->regs + \
                                         (reg) + 4))
 #endif
+#define POSTING_READ(reg)       (void)I915_READ(reg)
 
 #define I915_VERBOSE 0
 
@@ -760,6 +761,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
                         IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev))
 
 #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev))
+#define SUPPORTS_INTEGRATED_HDMI(dev)   (IS_G4X(dev))
 
 #define PRIMARY_RINGBUFFER_SIZE         (128*1024)
 
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index 47e6bafeb743..102431577dbb 100644
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -549,6 +549,8 @@
 /** GM965 GM45 render standby register */
 #define MCHBAR_RENDER_STANDBY   0x111B8
 
+#define PEG_BAND_GAP_DATA       0x14d68
+
 /*
  * Overlay regs
  */
@@ -612,6 +614,9 @@
 
 /* Hotplug control (945+ only) */
 #define PORT_HOTPLUG_EN         0x61110
+#define   HDMIB_HOTPLUG_INT_EN                  (1 << 29)
+#define   HDMIC_HOTPLUG_INT_EN                  (1 << 28)
+#define   HDMID_HOTPLUG_INT_EN                  (1 << 27)
 #define   SDVOB_HOTPLUG_INT_EN                  (1 << 26)
 #define   SDVOC_HOTPLUG_INT_EN                  (1 << 25)
 #define   TV_HOTPLUG_INT_EN                     (1 << 18)
@@ -619,6 +624,9 @@
 #define   CRT_HOTPLUG_FORCE_DETECT              (1 << 3)
 
 #define PORT_HOTPLUG_STAT       0x61114
+#define   HDMIB_HOTPLUG_INT_STATUS              (1 << 29)
+#define   HDMIC_HOTPLUG_INT_STATUS              (1 << 28)
+#define   HDMID_HOTPLUG_INT_STATUS              (1 << 27)
 #define   CRT_HOTPLUG_INT_STATUS                (1 << 11)
 #define   TV_HOTPLUG_INT_STATUS                 (1 << 10)
 #define   CRT_HOTPLUG_MONITOR_MASK              (3 << 8)
@@ -648,7 +656,16 @@
 #define   SDVO_PHASE_SELECT_DEFAULT     (6 << 19)
 #define   SDVO_CLOCK_OUTPUT_INVERT      (1 << 18)
 #define   SDVOC_GANG_MODE               (1 << 16)
+#define   SDVO_ENCODING_SDVO            (0x0 << 10)
+#define   SDVO_ENCODING_HDMI            (0x2 << 10)
+/** Requird for HDMI operation */
+#define   SDVO_NULL_PACKETS_DURING_VSYNC (1 << 9)
 #define   SDVO_BORDER_ENABLE            (1 << 7)
+#define   SDVO_AUDIO_ENABLE             (1 << 6)
+/** New with 965, default is to be set */
+#define   SDVO_VSYNC_ACTIVE_HIGH        (1 << 4)
+/** New with 965, default is to be set */
+#define   SDVO_HSYNC_ACTIVE_HIGH        (1 << 3)
 #define   SDVOB_PCIE_CONCURRENCY        (1 << 3)
 #define   SDVO_DETECTED                 (1 << 2)
 /* Bits to be preserved when writing */
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1204d26b50db..67d06fd29d8c 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -751,6 +751,7 @@ static void intel_crtc_mode_set(struct drm_crtc *crtc,
                         is_lvds = true;
                         break;
                 case INTEL_OUTPUT_SDVO:
+                case INTEL_OUTPUT_HDMI:
                         is_sdvo = true;
                         break;
                 case INTEL_OUTPUT_DVO:
@@ -1443,8 +1444,15 @@ static void intel_setup_outputs(struct drm_device *dev)
                 intel_lvds_init(dev);
 
         if (IS_I9XX(dev)) {
-                intel_sdvo_init(dev, SDVOB);
-                intel_sdvo_init(dev, SDVOC);
+                int found;
+
+                found = intel_sdvo_init(dev, SDVOB);
+                if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
+                        intel_hdmi_init(dev, SDVOB);
+
+                found = intel_sdvo_init(dev, SDVOC);
+                if (!found && SUPPORTS_INTEGRATED_HDMI(dev))
+                        intel_hdmi_init(dev, SDVOC);
         } else
                 intel_dvo_init(dev);
 
@@ -1458,6 +1466,11 @@ static void intel_setup_outputs(struct drm_device *dev)
 
                 /* valid crtcs */
                 switch(intel_output->type) {
+                case INTEL_OUTPUT_HDMI:
+                        crtc_mask = ((1 << 0)|
+                                     (1 << 1));
+                        clone_mask = ((1 << INTEL_OUTPUT_HDMI));
+                        break;
                 case INTEL_OUTPUT_DVO:
                 case INTEL_OUTPUT_SDVO:
                         crtc_mask = ((1 << 0)|
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index 94981ee7b8bd..8a4cc50c5b4e 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -53,6 +53,7 @@
 #define INTEL_OUTPUT_SDVO 3
 #define INTEL_OUTPUT_LVDS 4
 #define INTEL_OUTPUT_TVOUT 5
+#define INTEL_OUTPUT_HDMI 6
 
 #define INTEL_DVO_CHIP_NONE 0
 #define INTEL_DVO_CHIP_LVDS 1
@@ -109,7 +110,8 @@ int intel_ddc_get_modes(struct intel_output *intel_output);
 extern bool intel_ddc_probe(struct intel_output *intel_output);
 
 extern void intel_crt_init(struct drm_device *dev);
-extern void intel_sdvo_init(struct drm_device *dev, int output_device);
+extern void intel_hdmi_init(struct drm_device *dev, int sdvox_reg);
+extern bool intel_sdvo_init(struct drm_device *dev, int output_device);
 extern void intel_dvo_init(struct drm_device *dev);
 extern void intel_tv_init(struct drm_device *dev);
 extern void intel_lvds_init(struct drm_device *dev);
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
new file mode 100644
index 000000000000..b06a4a3ff08d
--- /dev/null
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -0,0 +1,280 @@
+/*
+ * Copyright 2006 Dave Airlie <airlied@linux.ie>
+ * Copyright © 2006-2009 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *      Eric Anholt <eric@anholt.net>
+ *      Jesse Barnes <jesse.barnes@intel.com>
+ */
+
+#include <linux/i2c.h>
+#include <linux/delay.h>
+#include "drmP.h"
+#include "drm.h"
+#include "drm_crtc.h"
+#include "intel_drv.h"
+#include "i915_drm.h"
+#include "i915_drv.h"
+
+struct intel_hdmi_priv {
+        u32 sdvox_reg;
+        u32 save_SDVOX;
+        int has_hdmi_sink;
+};
+
+static void intel_hdmi_mode_set(struct drm_encoder *encoder,
+                                struct drm_display_mode *mode,
+                                struct drm_display_mode *adjusted_mode)
+{
+        struct drm_device *dev = encoder->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_crtc *crtc = encoder->crtc;
+        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
+        struct intel_output *intel_output = enc_to_intel_output(encoder);
+        struct intel_hdmi_priv *hdmi_priv = intel_output->dev_priv;
+        u32 sdvox;
+
+        sdvox = SDVO_ENCODING_HDMI |
+                SDVO_BORDER_ENABLE |
+                SDVO_VSYNC_ACTIVE_HIGH |
+                SDVO_HSYNC_ACTIVE_HIGH;
+
+        if (hdmi_priv->has_hdmi_sink)
+                sdvox |= SDVO_AUDIO_ENABLE;
+
+        if (intel_crtc->pipe == 1)
+                sdvox |= SDVO_PIPE_B_SELECT;
+
+        I915_WRITE(hdmi_priv->sdvox_reg, sdvox);
+        POSTING_READ(hdmi_priv->sdvox_reg);
+}
+
+static void intel_hdmi_dpms(struct drm_encoder *encoder, int mode)
+{
+        struct drm_device *dev = encoder->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_output *intel_output = enc_to_intel_output(encoder);
+        struct intel_hdmi_priv *hdmi_priv = intel_output->dev_priv;
+        u32 temp;
+
+        if (mode != DRM_MODE_DPMS_ON) {
+                temp = I915_READ(hdmi_priv->sdvox_reg);
+                I915_WRITE(hdmi_priv->sdvox_reg, temp & ~SDVO_ENABLE);
+        } else {
+                temp = I915_READ(hdmi_priv->sdvox_reg);
+                I915_WRITE(hdmi_priv->sdvox_reg, temp | SDVO_ENABLE);
+        }
+        POSTING_READ(hdmi_priv->sdvox_reg);
+}
+
+static void intel_hdmi_save(struct drm_connector *connector)
+{
+        struct drm_device *dev = connector->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_output *intel_output = to_intel_output(connector);
+        struct intel_hdmi_priv *hdmi_priv = intel_output->dev_priv;
+
+        hdmi_priv->save_SDVOX = I915_READ(hdmi_priv->sdvox_reg);
+}
+
+static void intel_hdmi_restore(struct drm_connector *connector)
+{
+        struct drm_device *dev = connector->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_output *intel_output = to_intel_output(connector);
+        struct intel_hdmi_priv *hdmi_priv = intel_output->dev_priv;
+
+        I915_WRITE(hdmi_priv->sdvox_reg, hdmi_priv->save_SDVOX);
+        POSTING_READ(hdmi_priv->sdvox_reg);
+}
+
+static int intel_hdmi_mode_valid(struct drm_connector *connector,
+                                 struct drm_display_mode *mode)
+{
+        if (mode->clock > 165000)
+                return MODE_CLOCK_HIGH;
+        if (mode->clock < 20000)
+                return MODE_CLOCK_HIGH;
+
+        if (mode->flags & DRM_MODE_FLAG_DBLSCAN)
+                return MODE_NO_DBLESCAN;
+
+        return MODE_OK;
+}
+
+static bool intel_hdmi_mode_fixup(struct drm_encoder *encoder,
+                                  struct drm_display_mode *mode,
+                                  struct drm_display_mode *adjusted_mode)
+{
+        return true;
+}
+
+static enum drm_connector_status
+intel_hdmi_detect(struct drm_connector *connector)
+{
+        struct drm_device *dev = connector->dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct intel_output *intel_output = to_intel_output(connector);
+        struct intel_hdmi_priv *hdmi_priv = intel_output->dev_priv;
+        u32 temp, bit;
+
+        temp = I915_READ(PORT_HOTPLUG_EN);
+
+        I915_WRITE(PORT_HOTPLUG_EN,
+                   temp |
+                   HDMIB_HOTPLUG_INT_EN |
+                   HDMIC_HOTPLUG_INT_EN |
+                   HDMID_HOTPLUG_INT_EN);
+
+        POSTING_READ(PORT_HOTPLUG_EN);
+
+        switch (hdmi_priv->sdvox_reg) {
+        case SDVOB:
+                bit = HDMIB_HOTPLUG_INT_STATUS;
+                break;
+        case SDVOC:
+                bit = HDMIC_HOTPLUG_INT_STATUS;
+                break;
+        default:
+                return connector_status_unknown;
+        }
+
+        if ((I915_READ(PORT_HOTPLUG_STAT) & bit) != 0)
+                return connector_status_connected;
+        else
+                return connector_status_disconnected;
+}
+
+static int intel_hdmi_get_modes(struct drm_connector *connector)
+{
+        struct intel_output *intel_output = to_intel_output(connector);
+
+        /* We should parse the EDID data and find out if it's an HDMI sink so
+         * we can send audio to it.
+         */
+
+        return intel_ddc_get_modes(intel_output);
+}
+
+static void intel_hdmi_destroy(struct drm_connector *connector)
+{
+        struct intel_output *intel_output = to_intel_output(connector);
+
+        if (intel_output->i2c_bus)
+                intel_i2c_destroy(intel_output->i2c_bus);
+        drm_sysfs_connector_remove(connector);
+        drm_connector_cleanup(connector);
+        kfree(intel_output);
+}
+
+static const struct drm_encoder_helper_funcs intel_hdmi_helper_funcs = {
+        .dpms = intel_hdmi_dpms,
+        .mode_fixup = intel_hdmi_mode_fixup,
+        .prepare = intel_encoder_prepare,
+        .mode_set = intel_hdmi_mode_set,
+        .commit = intel_encoder_commit,
+};
+
+static const struct drm_connector_funcs intel_hdmi_connector_funcs = {
+        .save = intel_hdmi_save,
+        .restore = intel_hdmi_restore,
+        .detect = intel_hdmi_detect,
+        .fill_modes = drm_helper_probe_single_connector_modes,
+        .destroy = intel_hdmi_destroy,
+};
+
+static const struct drm_connector_helper_funcs intel_hdmi_connector_helper_funcs = {
+        .get_modes = intel_hdmi_get_modes,
+        .mode_valid = intel_hdmi_mode_valid,
+        .best_encoder = intel_best_encoder,
+};
+
+static void intel_hdmi_enc_destroy(struct drm_encoder *encoder)
+{
+        drm_encoder_cleanup(encoder);
+}
+
+static const struct drm_encoder_funcs intel_hdmi_enc_funcs = {
+        .destroy = intel_hdmi_enc_destroy,
+};
+
+
+void intel_hdmi_init(struct drm_device *dev, int sdvox_reg)
+{
+        struct drm_i915_private *dev_priv = dev->dev_private;
+        struct drm_connector *connector;
+        struct intel_output *intel_output;
+        struct intel_hdmi_priv *hdmi_priv;
+
+        intel_output = kcalloc(sizeof(struct intel_output) +
+                               sizeof(struct intel_hdmi_priv), 1, GFP_KERNEL);
+        if (!intel_output)
+                return;
+        hdmi_priv = (struct intel_hdmi_priv *)(intel_output + 1);
+
+        connector = &intel_output->base;
+        drm_connector_init(dev, connector, &intel_hdmi_connector_funcs,
+                           DRM_MODE_CONNECTOR_DVID);
+        drm_connector_helper_add(connector, &intel_hdmi_connector_helper_funcs);
+
+        intel_output->type = INTEL_OUTPUT_HDMI;
+
+        connector->interlace_allowed = 0;
+        connector->doublescan_allowed = 0;
+
+        /* Set up the DDC bus. */
+        if (sdvox_reg == SDVOB)
+                intel_output->ddc_bus = intel_i2c_create(dev, GPIOE, "HDMIB");
+        else
+                intel_output->ddc_bus = intel_i2c_create(dev, GPIOD, "HDMIC");
+
+        if (!intel_output->ddc_bus)
+                goto err_connector;
+
+        hdmi_priv->sdvox_reg = sdvox_reg;
+        intel_output->dev_priv = hdmi_priv;
+
+        drm_encoder_init(dev, &intel_output->enc, &intel_hdmi_enc_funcs,
+                         DRM_MODE_ENCODER_TMDS);
+        drm_encoder_helper_add(&intel_output->enc, &intel_hdmi_helper_funcs);
+
+        drm_mode_connector_attach_encoder(&intel_output->base,
+                                          &intel_output->enc);
+        drm_sysfs_connector_add(connector);
+
+        /* For G4X desktop chip, PEG_BAND_GAP_DATA 3:0 must first be written
+         * 0xd.  Failure to do so will result in spurious interrupts being
+         * generated on the port when a cable is not attached.
+         */
+        if (IS_G4X(dev) && !IS_GM45(dev)) {
+                u32 temp = I915_READ(PEG_BAND_GAP_DATA);
+                I915_WRITE(PEG_BAND_GAP_DATA, (temp & ~0xf) | 0xd);
+        }
+
+        return;
+
+err_connector:
+        drm_connector_cleanup(connector);
+        kfree(intel_output);
+
+        return;
+}
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index fbbaa4f414a0..407215469102 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -978,7 +978,7 @@ static const struct drm_encoder_funcs intel_sdvo_enc_funcs = {
 };
 
 
-void intel_sdvo_init(struct drm_device *dev, int output_device)
+bool intel_sdvo_init(struct drm_device *dev, int output_device)
 {
         struct drm_connector *connector;
         struct intel_output *intel_output;
@@ -991,7 +991,7 @@ void intel_sdvo_init(struct drm_device *dev, int output_device)
 
         intel_output = kcalloc(sizeof(struct intel_output)+sizeof(struct intel_sdvo_priv), 1, GFP_KERNEL);
         if (!intel_output) {
-                return;
+                return false;
         }
 
         connector = &intel_output->base;
@@ -1116,7 +1116,7 @@ void intel_sdvo_init(struct drm_device *dev, int output_device)
 
         intel_output->ddc_bus = i2cbus;
 
-        return;
+        return true;
 
 err_i2c:
         intel_i2c_destroy(intel_output->i2c_bus);
@@ -1124,5 +1124,5 @@ err_connector:
         drm_connector_cleanup(connector);
         kfree(intel_output);
 
-        return;
+        return false;
 }