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

  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ *
  * Authors:
  *    Eric Anholt
+ *    Thomas Richter
+ *
+ * Minor modifications (Dithering enable):
+ *    Thomas Richter
+ *
  */
 # define VR01_LCD_ENABLE		(1 << 2)
 /** Enables the DVO repeater. */
 # define VR01_DVO_BYPASS_ENABLE		(1 << 1)
 /** Enables the DVO clock */
 # define VR01_DVO_ENABLE		(1 << 0)
+/** Enable dithering for 18bpp panels. Not documented. */
+# define VR01_DITHER_ENABLE             (1 << 4)
 /*
  * LCD Interface Format
  */
 # define VR10_INTERFACE_1X24		(1 << 2)
 /** Enables 2x18-bit LVDS or CMOS output. */
 # define VR10_INTERFACE_2X18		(2 << 2)
 /** Enables 2x24-bit LVDS output */
 # define VR10_INTERFACE_2X24		(3 << 2)
+/** Mask that defines the depth of the pipeline */
+# define VR10_INTERFACE_DEPTH_MASK      (3 << 2)
 /*
  * VR20 LCD Horizontal Display Size
  */
 #define VR20	0x20
 /*
  * LCD Vertical Display Size
  */
-#define VR21	0x20
+#define VR21	0x21
 /*
 # define VR8F_VCH_PRESENT		(1 << 0)
 # define VR8F_DISPLAY_CONN		(1 << 1)
 # define VR8F_POWER_MASK		(0x3c)
 # define VR8F_POWER_POS			(2)
+/* Some Bios implementations do not restore the DVO state upon
+ * resume from standby. Thus, this driver has to handle it
+ * instead. The following list contains all registers that
+ * require saving.
+ */
+static const uint16_t backup_addresses[] = {
+x11, 0x12,
+x18, 0x19, 0x1a, 0x1f,
+x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
+x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
+x8e, 0x8f,
+x10		/* this must come last */
+};
 struct ivch_priv {
+	bool quiet;
+	uint16_t width, height;
-	bool quiet;
+	/* Register backup */
-	uint16_t width, height;
-};
+	uint16_t reg_backup[ARRAY_SIZE(backup_addresses)];
 };
 static void ivch_dump_regs(struct intel_dvo_device *dvo);
 static void ivch_dump_regs(struct intel_dvo_device *dvo);
 static bool ivch_init(struct intel_dvo_device *dvo,
 		      struct i2c_adapter *adapter)
+{
 	struct ivch_priv *priv;
 	uint16_t temp;
+	int i;
 	priv = kzalloc(sizeof(struct ivch_priv), GFP_KERNEL);
 	if (priv == NULL)
+	}
 	ivch_read(dvo, VR20, &priv->width);
+	ivch_read(dvo, VR21, &priv->height);
+	/* Make a backup of the registers to be able to restore them
+	 * upon suspend.
+	 */
+	for (i = 0; i < ARRAY_SIZE(backup_addresses); i++)
+		ivch_read(dvo, backup_addresses[i], priv->reg_backup + i);
-	ivch_read(dvo, VR21, &priv->height);
+	ivch_dump_regs(dvo);
 	return true;
 		return MODE_CLOCK_HIGH;
 	return MODE_OK;
+}
+/* Restore the DVO registers after a resume
+ * from RAM. Registers have been saved during
+ * the initialization.
+ */
+static void ivch_reset(struct intel_dvo_device *dvo)
+{
+	struct ivch_priv *priv = dvo->dev_priv;
+	int i;
+	DRM_DEBUG_KMS("Resetting the IVCH registers\n");
+	ivch_write(dvo, VR10, 0x0000);
+	for (i = 0; i < ARRAY_SIZE(backup_addresses); i++)
+		ivch_write(dvo, backup_addresses[i], priv->reg_backup[i]);
+}
 /** Sets the power state of the panel connected to the ivch */
 static void ivch_dpms(struct intel_dvo_device *dvo, bool enable)
+{
+	int i;
+	uint16_t vr01, vr30, backlight;
 	int i;
-	uint16_t vr01, vr30, backlight;
+	ivch_reset(dvo);
 	/* Set the new power state of the panel. */
 	if (!ivch_read(dvo, VR01, &vr01))
 		return;
+	if (enable)
-	if (enable)
+		backlight = 1;
-		backlight = 1;
+	else
-	else
+		backlight = 0;
 		backlight = 0;
 static bool ivch_get_hw_state(struct intel_dvo_device *dvo)
+{
+	uint16_t vr01;
-	uint16_t vr01;
+	ivch_reset(dvo);
 	/* Set the new power state of the panel. */
 	if (!ivch_read(dvo, VR01, &vr01))
 	else
 		return false;
+}
 static void ivch_mode_set(struct intel_dvo_device *dvo,
-			  struct drm_display_mode *mode,
+			  const struct drm_display_mode *mode,
-			  struct drm_display_mode *adjusted_mode)
+			  const struct drm_display_mode *adjusted_mode)
+{
 	struct ivch_priv *priv = dvo->dev_priv;
+	uint16_t vr40 = 0;
-	uint16_t vr40 = 0;
+	uint16_t vr01 = 0;
+	uint16_t vr10;
+	ivch_reset(dvo);
+	vr10 = priv->reg_backup[ARRAY_SIZE(backup_addresses) - 1];
+	/* Enable dithering for 18 bpp pipelines */
+	vr10 &= VR10_INTERFACE_DEPTH_MASK;
+	if (vr10 == VR10_INTERFACE_2X18 || vr10 == VR10_INTERFACE_1X18)
-	uint16_t vr01;
 		vr01 = VR01_DITHER_ENABLE;
 	vr01 = 0;
 	vr40 = (VR40_STALL_ENABLE | VR40_VERTICAL_INTERP_ENABLE |
 		VR40_HORIZONTAL_INTERP_ENABLE);
-	if (mode->hdisplay != adjusted_mode->hdisplay ||
+	if (mode->hdisplay != adjusted_mode->crtc_hdisplay ||
-	    mode->vdisplay != adjusted_mode->vdisplay) {
+	    mode->vdisplay != adjusted_mode->crtc_vdisplay) {
 		uint16_t x_ratio, y_ratio;
 		vr01 |= VR01_PANEL_FIT_ENABLE;
 		vr40 |= VR40_CLOCK_GATING_ENABLE;
 		x_ratio = (((mode->hdisplay - 1) << 16) /
-			   (adjusted_mode->hdisplay - 1)) >> 2;
+			   (adjusted_mode->crtc_hdisplay - 1)) >> 2;
 		y_ratio = (((mode->vdisplay - 1) << 16) /
-			   (adjusted_mode->vdisplay - 1)) >> 2;
+			   (adjusted_mode->crtc_vdisplay - 1)) >> 2;
 		ivch_write(dvo, VR42, x_ratio);
 		ivch_write(dvo, VR41, y_ratio);
 	} else {
 		vr01 &= ~VR01_PANEL_FIT_ENABLE;
 		vr40 &= ~VR40_CLOCK_GATING_ENABLE;
-	}
-	vr40 &= ~VR40_AUTO_RATIO_ENABLE;
+	}
-	ivch_write(dvo, VR01, vr01);
+	vr40 &= ~VR40_AUTO_RATIO_ENABLE;
 	ivch_write(dvo, VR40, vr40);
 	ivch_write(dvo, VR01, vr01);
-	ivch_dump_regs(dvo);
+	ivch_write(dvo, VR40, vr40);
+}
 static void ivch_dump_regs(struct intel_dvo_device *dvo)
+{
+	uint16_t val;
-	uint16_t val;
+	ivch_read(dvo, VR00, &val);
 	DRM_DEBUG_KMS("VR00: 0x%04x\n", val);
-	ivch_read(dvo, VR00, &val);
+	ivch_read(dvo, VR01, &val);

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/dvo_ivch.c – Rev 5060 → 6084