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

 			   ADPA_CRT_HOTPLUG_VOLREF_325MV |		\
 			   ADPA_CRT_HOTPLUG_ENABLE)
 struct intel_crt {
+	struct intel_encoder base;
+	/* DPMS state is stored in the connector, which we need in the
+	 * encoder's enable/disable callbacks */
-	struct intel_encoder base;
+	struct intel_connector *connector;
 	bool force_hotplug_required;
 	u32 adpa_reg;
 };
 		*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)
+	}
 	I915_WRITE(crt->adpa_reg, temp);
+}
+static void intel_disable_crt(struct intel_encoder *encoder)
+{
+	intel_crt_set_dpms(encoder, DRM_MODE_DPMS_OFF);
+}
+static void intel_enable_crt(struct intel_encoder *encoder)
+{
+	struct intel_crt *crt = intel_encoder_to_crt(encoder);
+	intel_crt_set_dpms(encoder, crt->connector->base.dpms);
+}
 static void intel_crt_dpms(struct drm_connector *connector, int mode)
+{
 	struct drm_device *dev = connector->dev;
 	struct intel_crt *crt = intel_attached_crt(connector);
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32 adpa;
 	bool ret;
+    ENTER();
 	/* The first time through, trigger an explicit detection cycle */
 	if (crt->force_hotplug_required) {
 		bool turn_off_dac = HAS_PCH_SPLIT(dev);
 		u32 save_adpa;
 		crt->force_hotplug_required = 0;
-		save_adpa = adpa = I915_READ(PCH_ADPA);
+		save_adpa = adpa = I915_READ(crt->adpa_reg);
 		DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=0x%x\n", adpa);
 		adpa |= ADPA_CRT_HOTPLUG_FORCE_TRIGGER;
 		if (turn_off_dac)
 			adpa &= ~ADPA_DAC_ENABLE;
-		I915_WRITE(PCH_ADPA, adpa);
+		I915_WRITE(crt->adpa_reg, adpa);
-		if (wait_for((I915_READ(PCH_ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
+		if (wait_for((I915_READ(crt->adpa_reg) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
 ))
 			DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
 		if (turn_off_dac) {
-			I915_WRITE(PCH_ADPA, save_adpa);
+			I915_WRITE(crt->adpa_reg, save_adpa);
-			POSTING_READ(PCH_ADPA);
+			POSTING_READ(crt->adpa_reg);
+		}
+	}
+	/* Check the status to see if both blue and green are on now */
 	adpa = I915_READ(crt->adpa_reg);
-	/* Check the status to see if both blue and green are on now */
+	if ((adpa & ADPA_CRT_HOTPLUG_MONITOR_MASK) != 0)
-	adpa = I915_READ(PCH_ADPA);
+		ret = true;
-	if ((adpa & ADPA_CRT_HOTPLUG_MONITOR_MASK) != 0)
+	else
-		ret = true;
+		ret = false;
+	DRM_DEBUG_KMS("ironlake hotplug adpa=0x%x, result %d\n", adpa, ret);
 	else
-		ret = false;
+    LEAVE();
 	DRM_DEBUG_KMS("ironlake hotplug adpa=0x%x, result %d\n", adpa, ret);
 	return ret;
+}
-	return ret;
+static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
+{
 	struct drm_device *dev = connector->dev;
-static bool valleyview_crt_detect_hotplug(struct drm_connector *connector)
+	struct intel_crt *crt = intel_attached_crt(connector);
-{
+	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct drm_device *dev = connector->dev;
+	u32 adpa;
-	struct drm_i915_private *dev_priv = dev->dev_private;
+	bool ret;
-	u32 adpa;
+	u32 save_adpa;
 	bool ret;
-	u32 save_adpa;
+    ENTER();
-	save_adpa = adpa = I915_READ(ADPA);
+	save_adpa = adpa = I915_READ(crt->adpa_reg);
 	DRM_DEBUG_KMS("trigger hotplug detect cycle: adpa=0x%x\n", adpa);
 	adpa |= ADPA_CRT_HOTPLUG_FORCE_TRIGGER;
-	I915_WRITE(ADPA, adpa);
+	I915_WRITE(crt->adpa_reg, adpa);
+	if (wait_for((I915_READ(crt->adpa_reg) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
+)) {
-	if (wait_for((I915_READ(ADPA) & ADPA_CRT_HOTPLUG_FORCE_TRIGGER) == 0,
+		DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
-)) {
+		I915_WRITE(crt->adpa_reg, save_adpa);
 		DRM_DEBUG_KMS("timed out waiting for FORCE_TRIGGER");
 		I915_WRITE(ADPA, save_adpa);
 	struct drm_i915_private *dev_priv = dev->dev_private;
 	u32 hotplug_en, orig, stat;
 	bool ret = false;
 	int i, tries = 0;
+    ENTER();
 	if (HAS_PCH_SPLIT(dev))
 		return intel_ironlake_crt_detect_hotplug(connector);
 	I915_WRITE(PORT_HOTPLUG_STAT, CRT_HOTPLUG_INT_STATUS);
 	/* and put the bits back */
+	I915_WRITE(PORT_HOTPLUG_EN, orig);
-	I915_WRITE(PORT_HOTPLUG_EN, orig);
+    LEAVE();
 	return ret;
+}
 static struct edid *intel_crt_get_edid(struct drm_connector *connector,
+				struct i2c_adapter *i2c)
+{
-				struct i2c_adapter *i2c)
+	struct edid *edid;
-	struct edid *edid;
+    ENTER();
 	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);
-		DRM_DEBUG_KMS("CRT GMBUS EDID read failed, retry using GPIO bit-banging\n");
+		edid = drm_get_edid(connector, i2c);
-		intel_gmbus_force_bit(i2c, true);
+		intel_gmbus_force_bit(i2c, false);
 		edid = drm_get_edid(connector, i2c);
 		intel_gmbus_force_bit(i2c, false);
 	struct intel_crt *crt = intel_attached_crt(connector);
 	if (HAS_PCH_SPLIT(dev)) {
 		u32 adpa;
-		adpa = I915_READ(PCH_ADPA);
+		adpa = I915_READ(crt->adpa_reg);
 		adpa &= ~ADPA_CRT_HOTPLUG_MASK;
 		adpa |= ADPA_HOTPLUG_BITS;
-		I915_WRITE(PCH_ADPA, adpa);
+		I915_WRITE(crt->adpa_reg, adpa);
-		POSTING_READ(PCH_ADPA);
+		POSTING_READ(crt->adpa_reg);
  */
 static const struct drm_encoder_helper_funcs crt_encoder_funcs = {
 	.mode_fixup = intel_crt_mode_fixup,
-	.mode_set = intel_crt_mode_set,
-	.disable = intel_encoder_noop,
+	.mode_set = intel_crt_mode_set,
 };
 static const struct drm_connector_funcs intel_crt_connector_funcs = {
 		kfree(crt);
 		return;
+	}
+	connector = &intel_connector->base;
-	connector = &intel_connector->base;
+	crt->connector = intel_connector;
 	drm_connector_init(dev, &intel_connector->base,
 			   &intel_crt_connector_funcs, DRM_MODE_CONNECTOR_VGA);
 	else
 		crt->adpa_reg = ADPA;
 	crt->base.disable = intel_disable_crt;
 	crt->base.enable = intel_enable_crt;
-	if (IS_HASWELL(dev))
+	if (HAS_DDI(dev))
 		crt->base.get_hw_state = intel_ddi_get_hw_state;
 	else
 	crt->base.get_hw_state = intel_crt_get_hw_state;
 	crt->force_hotplug_required = 0;
 	dev_priv->hotplug_supported_mask |= CRT_HOTPLUG_INT_STATUS;
 	/*
+	 * TODO: find a proper way to discover whether we need to set the the
-	 * TODO: find a proper way to discover whether we need to set the
+	 * polarity and link reversal bits or not, instead of relying on the
-	 * polarity reversal bit or not, instead of relying on the BIOS.
+	 * BIOS.
+	 */
-	 */
+	if (HAS_PCH_LPT(dev)) {
+		u32 fdi_config = FDI_RX_POLARITY_REVERSED_LPT |
-	if (HAS_PCH_LPT(dev))
+				 FDI_RX_LINK_REVERSAL_OVERRIDE;
-		dev_priv->fdi_rx_polarity_reversed =
+		dev_priv->fdi_rx_config = I915_READ(_FDI_RXA_CTL) & fdi_config;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_crt.c – Rev 3243 → 3480