WebSVN – Kolibri OS – Diff – /drivers/video/drm/i915/intel_crt.c

  *	Eric Anholt
  */
 #include
 #include
-#include "drmP.h"
-#include "drm.h"
+#include
-#include "drm_crtc.h"
+#include
-#include "drm_crtc_helper.h"
+#include
-#include "drm_edid.h"
+#include
 #include "intel_drv.h"
-#include "i915_drm.h"
+#include
 #include "i915_drv.h"
 /* Here's the desired hotplug mode */
 			   ADPA_CRT_HOTPLUG_ENABLE)
 struct intel_crt {
 	struct intel_encoder base;
+	bool force_hotplug_required;
-	bool force_hotplug_required;
+	u32 adpa_reg;
 };
 static struct intel_crt *intel_attached_crt(struct drm_connector *connector)
+{
 	return container_of(intel_attached_encoder(connector),
 			    struct intel_crt, base);
+}
+static struct intel_crt *intel_encoder_to_crt(struct intel_encoder *encoder)
+{
+	return container_of(encoder, struct intel_crt, base);
+}
+static bool intel_crt_get_hw_state(struct intel_encoder *encoder,
-static void intel_crt_dpms(struct drm_encoder *encoder, int mode)
+				   enum pipe *pipe)
+{
-{
+	struct drm_device *dev = encoder->base.dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_crt *crt = intel_encoder_to_crt(encoder);
+	u32 tmp;
+	tmp = I915_READ(crt->adpa_reg);
-	struct drm_device *dev = encoder->dev;
-	struct drm_i915_private *dev_priv = dev->dev_private;
+	if (!(tmp & ADPA_DAC_ENABLE))
-	u32 temp, reg;
+		return false;
+	if (HAS_PCH_CPT(dev))
+		*pipe = PORT_TO_PIPE_CPT(tmp);
+	else
+		*pipe = PORT_TO_PIPE(tmp);
+	return true;
+}
+static void intel_disable_crt(struct intel_encoder *encoder)
+{
+	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+	struct intel_crt *crt = intel_encoder_to_crt(encoder);
+	u32 temp;
+	temp = I915_READ(crt->adpa_reg);
+	temp &= ~(ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE);
+	temp &= ~ADPA_DAC_ENABLE;
+	I915_WRITE(crt->adpa_reg, temp);
+}
+static void intel_enable_crt(struct intel_encoder *encoder)
+{
+	struct drm_i915_private *dev_priv = encoder->base.dev->dev_private;
+	struct intel_crt *crt = intel_encoder_to_crt(encoder);
+	u32 temp;
+	temp = I915_READ(crt->adpa_reg);
+	temp |= ADPA_DAC_ENABLE;
+	I915_WRITE(crt->adpa_reg, temp);
+}
+/* Note: The caller is required to filter out dpms modes not supported by the
+ * platform. */
+static void intel_crt_set_dpms(struct intel_encoder *encoder, int mode)
+{
-	if (HAS_PCH_SPLIT(dev))
+	struct drm_device *dev = encoder->base.dev;
-		reg = PCH_ADPA;
+	struct drm_i915_private *dev_priv = dev->dev_private;
-	else
+	struct intel_crt *crt = intel_encoder_to_crt(encoder);
-		reg = ADPA;
+	u32 temp;
 	case DRM_MODE_DPMS_OFF:
 		temp |= ADPA_HSYNC_CNTL_DISABLE | ADPA_VSYNC_CNTL_DISABLE;
 		break;
+	}
+	I915_WRITE(crt->adpa_reg, temp);
+}
+static void intel_crt_dpms(struct drm_connector *connector, int mode)
+{
+	struct drm_device *dev = connector->dev;
+	struct intel_encoder *encoder = intel_attached_encoder(connector);
+	struct drm_crtc *crtc;
+	int old_dpms;
+	/* PCH platforms and VLV only support on/off. */
+	if (INTEL_INFO(dev)->gen < 5 && mode != DRM_MODE_DPMS_ON)
+		mode = DRM_MODE_DPMS_OFF;
+	if (mode == connector->dpms)
+		return;
+	old_dpms = connector->dpms;
+	connector->dpms = mode;
+	/* Only need to change hw state when actually enabled */
+	crtc = encoder->base.crtc;
+	if (!crtc) {
+		encoder->connectors_active = false;
+		return;
+	}
+	/* We need the pipe to run for anything but OFF. */
+	if (mode == DRM_MODE_DPMS_OFF)
+		encoder->connectors_active = false;
+	else
+		encoder->connectors_active = true;
+	if (mode < old_dpms) {
+		/* From off to on, enable the pipe first. */
+		intel_crtc_update_dpms(crtc);
+		intel_crt_set_dpms(encoder, mode);
+	} else {
+		intel_crt_set_dpms(encoder, mode);
+		intel_crtc_update_dpms(crtc);
+	}
-	I915_WRITE(reg, temp);
+	intel_modeset_check_state(connector->dev);
+}
 static int intel_crt_mode_valid(struct drm_connector *connector,
 	return MODE_OK;
+}
 static bool intel_crt_mode_fixup(struct drm_encoder *encoder,
-				 struct drm_display_mode *mode,
+				 const struct drm_display_mode *mode,
 				 struct drm_display_mode *adjusted_mode)
+{
 			       struct drm_display_mode *adjusted_mode)
+{
 	struct drm_device *dev = encoder->dev;
+	struct drm_crtc *crtc = encoder->crtc;
+	struct intel_crt *crt =
-	struct drm_crtc *crtc = encoder->crtc;
+		intel_encoder_to_crt(to_intel_encoder(encoder));
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
-	struct drm_i915_private *dev_priv = dev->dev_private;
-	int dpll_md_reg;
-	u32 adpa, dpll_md;
+	struct drm_i915_private *dev_priv = dev->dev_private;
-	u32 adpa_reg;
-	dpll_md_reg = DPLL_MD(intel_crtc->pipe);
-	if (HAS_PCH_SPLIT(dev))
-		adpa_reg = PCH_ADPA;
-	else
-		adpa_reg = ADPA;
-	/*
-	 * Disable separate mode multiplier used when cloning SDVO to CRT
-	 * XXX this needs to be adjusted when we really are cloning
-	 */
-	if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev)) {
-		dpll_md = I915_READ(dpll_md_reg);
-		I915_WRITE(dpll_md_reg,
-			   dpll_md & ~DPLL_MD_UDI_MULTIPLIER_MASK);
 	u32 adpa;
 	adpa = ADPA_HOTPLUG_BITS;
 	if (adjusted_mode->flags & DRM_MODE_FLAG_PHSYNC)
 			adpa |= ADPA_PIPE_B_SELECT;
 	if (!HAS_PCH_SPLIT(dev))
 		I915_WRITE(BCLRPAT(intel_crtc->pipe), 0);
-	I915_WRITE(adpa_reg, adpa);
+	I915_WRITE(crt->adpa_reg, adpa);
+}
 	DRM_DEBUG_KMS("ironlake hotplug adpa=0x%x, result %d\n", adpa, ret);
 	return ret;
+}
+static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
+{
+	struct drm_device *dev = connector->dev;
+	struct drm_i915_private *dev_priv = dev->dev_private;
+	u32 adpa;
+	bool ret;
+	u32 save_adpa;
+	save_adpa = adpa = I915_READ(ADPA);
+	DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=0x%x\n", adpa);
+	adpa |= ADPA_CRT_HOTPLUG_FORCE_TRIGGER;
+	I915_WRITE(ADPA, adpa);
+	if (wait_for((I915_READ(ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
+)) {
+		DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
+		I915_WRITE(ADPA, save_adpa);
+	}
+	/* Check the status to see if both blue and green are on now */
+	adpa = I915_READ(ADPA);
+	if ((adpa & ADPA_CRT_HOTPLUG_MONITOR_MASK) != 0)
+		ret = true;
+	else
+		ret = false;
+	DRM_DEBUG_KMS("valleyview hotplug adpa=0x%x, result %d\n", adpa, ret);
+	/* FIXME: debug force function and remove */
+	ret = true;
+	return ret;
+}
 /**
  * Uses CRT_HOTPLUG_EN and CRT_HOTPLUG_STAT to detect CRT presence.
+ *
 	int i, tries = 0;
 	if (HAS_PCH_SPLIT(dev))
+		return intel_ironlake_crt_detect_hotplug(connector);
+	if (IS_VALLEYVIEW(dev))
-		return intel_ironlake_crt_detect_hotplug(connector);
+		return valleyview_crt_detect_hotplug(connector);
 	/*
 	 * On 4 series desktop, CRT detect sequence need to be done twice
 	I915_WRITE(PORT_HOTPLUG_EN, orig);
 	return ret;
+}
+static struct edid *intel_crt_get_edid(struct drm_connector *connector,
+				struct i2c_adapter *i2c)
+{
+	struct edid *edid;
+	edid = drm_get_edid(connector, i2c);
+	if (!edid && !intel_gmbus_is_forced_bit(i2c)) {
+		DRM_DEBUG_KMS("CRT GMBUS EDID read failed, retry using GPIO bit-banging\n");
+		intel_gmbus_force_bit(i2c, true);
+		edid = drm_get_edid(connector, i2c);
+		intel_gmbus_force_bit(i2c, false);
+	}
+	return edid;
+}
+/* local version of intel_ddc_get_modes() to use intel_crt_get_edid() */
+static int intel_crt_ddc_get_modes(struct drm_connector *connector,
+				struct i2c_adapter *adapter)
+{
+	struct edid *edid;
+	edid = intel_crt_get_edid(connector, adapter);
+	if (!edid)
+		return 0;
+	return intel_connector_update_modes(connector, edid);
+}
 static bool intel_crt_detect_ddc(struct drm_connector *connector)
+{
+	struct intel_crt *crt = intel_attached_crt(connector);
+	struct drm_i915_private *dev_priv = crt->base.base.dev->dev_private;
-	struct intel_crt *crt = intel_attached_crt(connector);
-	struct drm_i915_private *dev_priv = crt->base.base.dev->dev_private;
+	struct edid *edid;
-	/* CRT should always be at 0, but check anyway */
+	struct i2c_adapter *i2c;
+	BUG_ON(crt->base.type != INTEL_OUTPUT_ANALOG);
-	if (crt->base.type != INTEL_OUTPUT_ANALOG)
-		return false;
+	i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->crt_ddc_pin);
-	if (intel_ddc_probe(&crt->base, dev_priv->crt_ddc_pin)) {
-		struct edid *edid;
+	edid = intel_crt_get_edid(connector, i2c);
 		bool is_digital = false;
 	if (edid) {
-		edid = drm_get_edid(connector,
+		bool is_digital = edid->input & DRM_EDID_INPUT_DIGITAL;
-			&dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter);
-		/*
 		 * This may be a DVI-I connector with a shared DDC
-		 * link between analog and digital outputs, so we
-		 * have to check the EDID input spec of the attached device.
-		 *
-		 * On the other hand, what should we do if it is a broken EDID?
-		 */
-		if (edid != NULL) {
-			is_digital = edid->input & DRM_EDID_INPUT_DIGITAL;
+		/*
-			connector->display_info.raw_edid = NULL;
+		 * This may be a DVI-I connector with a shared DDC
-			kfree(edid);
+		 * link between analog and digital outputs, so we
-		}
-		if (!is_digital) {
+		 * have to check the EDID input spec of the attached device.
+		 */
+		if (!is_digital) {
+			DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n");
+			return true;
 			DRM_DEBUG_KMS("CRT detected via DDC:0x50 [EDID]\n");
+		DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n");
-			return true;
+		} else {
-		} else {
+		DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [no valid EDID found]\n");
 			DRM_DEBUG_KMS("CRT not detected via DDC:0x50 [EDID reports a digital panel]\n");
 static enum drm_connector_status
 intel_crt_detect(struct drm_connector *connector, bool force)
+{
 	struct drm_device *dev = connector->dev;
 	struct intel_crt *crt = intel_attached_crt(connector);
-	struct drm_crtc *crtc;
 	enum drm_connector_status status;
+	struct intel_load_detect_pipe tmp;
+	if (I915_HAS_HOTPLUG(dev)) {
+		/* We can not rely on the HPD pin always being correctly wired
+		 * up, for example many KVM do not pass it through, and so
+		 * only trust an assertion that the monitor is connected.
-	if (I915_HAS_HOTPLUG(dev)) {
+		 */
 		if (intel_crt_detect_hotplug(connector)) {
 			DRM_DEBUG_KMS("CRT detected via hotplug\n");
 			return connector_status_connected;
-		} else {
+		} else
-			DRM_DEBUG_KMS("CRT not detected via hotplug\n");
-			return connector_status_disconnected;
 			DRM_DEBUG_KMS("CRT not detected via hotplug\n");
+	}
+	if (intel_crt_detect_ddc(connector))
+		return connector_status_connected;
+	/* Load detection is broken on HPD capable machines. Whoever wants a
+	 * broken monitor (without edid) to work behind a broken kvm (that fails
+	 * to have the right resistors for HP detection) needs to fix this up.
+	 * For now just bail out. */
-	if (intel_crt_detect_ddc(connector))
+	if (I915_HAS_HOTPLUG(dev))
-		return connector_status_connected;
+		return connector_status_disconnected;
-	if (!force)
-		return connector->status;
-	/* for pre-945g platforms use load detect */
-	crtc = crt->base.base.crtc;
-	if (crtc && crtc->enabled) {
-		status = intel_crt_load_detect(crt);
+	if (!force)
-	} else {
-		struct intel_load_detect_pipe tmp;
+		return connector->status;
-		if (intel_get_load_detect_pipe(&crt->base, connector, NULL,
+	/* for pre-945g platforms use load detect */
-					       &tmp)) {
+	if (intel_get_load_detect_pipe(connector, NULL, &tmp)) {
 			if (intel_crt_detect_ddc(connector))
-				status = connector_status_connected;
-			else
+				status = connector_status_connected;
-				status = intel_crt_load_detect(crt);
+			else
-			intel_release_load_detect_pipe(&crt->base, connector,
-						       &tmp);
+				status = intel_crt_load_detect(crt);
-		} else
+		intel_release_load_detect_pipe(connector, &tmp);
-			status = connector_status_unknown;
+		} else
 static int intel_crt_get_modes(struct drm_connector *connector)
+{
 	struct drm_device *dev = connector->dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	int ret;
+	struct i2c_adapter *i2c;
-	ret = intel_ddc_get_modes(connector,
+	i2c = intel_gmbus_get_adapter(dev_priv, dev_priv->crt_ddc_pin);
-				 &dev_priv->gmbus[dev_priv->crt_ddc_pin].adapter);
+	ret = intel_crt_ddc_get_modes(connector, i2c);
 	if (ret || !IS_G4X(dev))
 		return ret;
 	/* Try to probe digital port for output in DVI-I -> VGA mode. */
-	return intel_ddc_get_modes(connector,
+	i2c = intel_gmbus_get_adapter(dev_priv, GMBUS_PORT_DPB);
-				   &dev_priv->gmbus[GMBUS_PORT_DPB].adapter);
+	return intel_crt_ddc_get_modes(connector, i2c);
+}
 /*
  * Routines for controlling stuff on the analog port
  */
 static const struct drm_encoder_helper_funcs intel_crt_helper_funcs = {
-	.dpms = intel_crt_dpms,
-	.mode_fixup = intel_crt_mode_fixup,
-	.prepare = intel_encoder_prepare,
+static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
+	.mode_fixup = intel_crt_mode_fixup,
-	.commit = intel_encoder_commit,
+	.mode_set = intel_crt_mode_set,
-	.mode_set = intel_crt_mode_set,
+	.disable = intel_encoder_noop,
 };
 static const struct drm_connector_funcs intel_crt_connector_funcs = {
 	.reset = intel_crt_reset,
-	.dpms = drm_helper_connector_dpms,
+	.dpms = intel_crt_dpms,
 	.detect = intel_crt_detect,
 	.fill_modes = drm_helper_probe_single_connector_modes,
 			 DRM_MODE_ENCODER_DAC);
 	intel_connector_attach_encoder(intel_connector, &crt->base);
 	crt->base.type = INTEL_OUTPUT_ANALOG;
-	crt->base.clone_mask = (1 << INTEL_SDVO_NON_TV_CLONE_BIT |
+	crt->base.cloneable = true;
+	if (IS_HASWELL(dev) || IS_I830(dev))
-<< INTEL_ANALOG_CLONE_BIT |
+		crt->base.crtc_mask = (1 << 0);
+	else
+		crt->base.crtc_mask = (1 << 0) | (1 << 1) | (1 << 2);
+	if (IS_GEN2(dev))
-<< INTEL_SDVO_LVDS_CLONE_BIT);
+		connector->interlace_allowed = 0;
-	crt->base.crtc_mask = (1 << 0) | (1 << 1);
+	else
+	connector->interlace_allowed = 1;
+	connector->doublescan_allowed = 0;
+	if (HAS_PCH_SPLIT(dev))
+		crt->adpa_reg = PCH_ADPA;
+	else if (IS_VALLEYVIEW(dev))
+		crt->adpa_reg = VLV_ADPA;
+	else
+		crt->adpa_reg = ADPA;
+	crt->base.disable = intel_disable_crt;
+	crt->base.enable = intel_enable_crt;
-	connector->interlace_allowed = 1;
+	crt->base.get_hw_state = intel_crt_get_hw_state;
-	connector->doublescan_allowed = 0;
+	intel_connector->get_hw_state = intel_connector_get_hw_state;
-	drm_encoder_helper_add(&crt->base.base, &intel_crt_helper_funcs);
+	drm_encoder_helper_add(&crt->base.base, &crt_encoder_funcs);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_crt.c – Rev 2342 → 3031