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

 	mode->crtc_hblank_start = width + border;
 	mode->crtc_hblank_end = mode->crtc_hblank_start + blank_width;
 	mode->crtc_hsync_start = mode->crtc_hblank_start + sync_pos;
-	mode->crtc_hsync_end = mode->crtc_hsync_start + sync_width;
-	mode->private_flags |= INTEL_MODE_CRTC_TIMINGS_SET;
+	mode->crtc_hsync_end = mode->crtc_hsync_start + sync_width;
+}
 static void
 	mode->crtc_vblank_start = height + border;
 	mode->crtc_vblank_end = mode->crtc_vblank_start + blank_width;
 	mode->crtc_vsync_start = mode->crtc_vblank_start + sync_pos;
-	mode->crtc_vsync_end = mode->crtc_vsync_start + sync_width;
-	mode->private_flags |= INTEL_MODE_CRTC_TIMINGS_SET;
+	mode->crtc_vsync_end = mode->crtc_vsync_start + sync_width;
+}
 static inline u32 panel_fitter_scaling(u32 source, u32 target)
 #define FACTOR (1 << ACCURACY)
 	u32 ratio = source * FACTOR / target;
 	return (FACTOR * ratio + FACTOR/2) / FACTOR;
+}
-static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
-				  const struct drm_display_mode *mode,
+static bool intel_lvds_compute_config(struct intel_encoder *intel_encoder,
-				  struct drm_display_mode *adjusted_mode)
+				      struct intel_crtc_config *pipe_config)
 {
-	struct drm_device *dev = encoder->dev;
+	struct drm_device *dev = intel_encoder->base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
+	struct intel_lvds_encoder *lvds_encoder =
-	struct intel_lvds_encoder *lvds_encoder = to_lvds_encoder(encoder);
+		to_lvds_encoder(&intel_encoder->base);
 	struct intel_connector *intel_connector =
+		&lvds_encoder->attached_connector->base;
+	struct drm_display_mode *adjusted_mode = &pipe_config->adjusted_mode;
-		&lvds_encoder->attached_connector->base;
+	struct drm_display_mode *mode = &pipe_config->requested_mode;
 	struct intel_crtc *intel_crtc = lvds_encoder->base.new_crtc;
+	u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0;
-	u32 pfit_control = 0, pfit_pgm_ratios = 0, border = 0;
+	unsigned int lvds_bpp;
 	int pipe;
 	/* Should never happen!! */
+	}
 	if (intel_encoder_check_is_cloned(&lvds_encoder->base))
+			return false;
+	if ((I915_READ(lvds_encoder->reg) & LVDS_A3_POWER_MASK) ==
+	    LVDS_A3_POWER_UP)
+		lvds_bpp = 8*3;
+	else
+		lvds_bpp = 6*3;
+	if (lvds_bpp != pipe_config->pipe_bpp) {
+		DRM_DEBUG_KMS("forcing display bpp (was %d) to LVDS (%d)\n",
+			      pipe_config->pipe_bpp, lvds_bpp);
-			return false;
+		pipe_config->pipe_bpp = lvds_bpp;
+	}
 	/*
 	 * We have timings from the BIOS for the panel, put them in
 	 * to the adjusted mode.  The CRTC will be set up for this mode,
 	 * with the panel scaling set up to source from the H/VDisplay
 	 * of the original mode.
 	 */
 	intel_fixed_panel_mode(intel_connector->panel.fixed_mode,
+			       adjusted_mode);
-			       adjusted_mode);
+	if (HAS_PCH_SPLIT(dev)) {
 		pipe_config->has_pch_encoder = true;
 	if (HAS_PCH_SPLIT(dev)) {
 		intel_pch_panel_fitting(dev,
 					intel_connector->panel.fitting_mode,
 	 */
 	for_each_pipe(pipe)
 		I915_WRITE(BCLRPAT(pipe), 0);
+	drm_mode_set_crtcinfo(adjusted_mode, 0);
-	drm_mode_set_crtcinfo(adjusted_mode, 0);
+	pipe_config->timings_set = true;
 	switch (intel_connector->panel.fitting_mode) {
 	case DRM_MODE_SCALE_CENTER:
-	if (!IS_ERR_OR_NULL(lvds_connector->base.edid))
-		kfree(lvds_connector->base.edid);
+	if (!IS_ERR_OR_NULL(lvds_connector->base.edid))
 		kfree(lvds_connector->base.edid);
 	intel_panel_destroy_backlight(connector->dev);
 	intel_panel_fini(&lvds_connector->base.panel);
 	return 0;
+}
 static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = {
-	.mode_fixup = intel_lvds_mode_fixup,
+static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = {
 	.mode_set = intel_lvds_mode_set,
 };
 			DMI_MATCH(DMI_BOARD_NAME, "AT5NM10T-I"),
 		},
 	},
+	{
 		.callback = intel_no_lvds_dmi_callback,
-		.ident = "Hewlett-Packard HP t5740e Thin Client",
+		.ident = "Hewlett-Packard HP t5740",
 		.matches = {
 			DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "HP t5740e Thin Client"),
+			DMI_MATCH(DMI_PRODUCT_NAME, " t5740"),
 		},
 	},
+	{
 		.callback = intel_no_lvds_dmi_callback,
 		.ident = "Hewlett-Packard t5745",
 		.matches = {
 			DMI_MATCH(DMI_SYS_VENDOR, "Supermicro"),
 			DMI_MATCH(DMI_PRODUCT_NAME, "X7SPA-H"),
 		},
 	},
+	{
+		.callback = intel_no_lvds_dmi_callback,
+		.ident = "Fujitsu Esprimo Q900",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "ESPRIMO Q900"),
+		},
+	},
 	{ }	/* terminating entry */
 };
 static bool intel_lvds_supported(struct drm_device *dev)
+{
 	/* With the introduction of the PCH we gained a dedicated
 	 * LVDS presence pin, use it. */
-	if (HAS_PCH_SPLIT(dev))
+	if (HAS_PCH_IBX(dev) || HAS_PCH_CPT(dev))
 		return true;
 	/* Otherwise LVDS was only attached to mobile products,
+	 * except for the inglorious 830gm */
+	if (INTEL_INFO(dev)->gen <= 4 && IS_MOBILE(dev) && !IS_I830(dev))
+		return true;
 	 * except for the inglorious 830gm */
-	return IS_MOBILE(dev) && !IS_I830(dev);
+	return false;
+}
 			 DRM_MODE_ENCODER_LVDS);
 	intel_encoder->enable = intel_enable_lvds;
 	intel_encoder->pre_enable = intel_pre_enable_lvds;
+	intel_encoder->pre_pll_enable = intel_pre_pll_enable_lvds;
-	intel_encoder->pre_pll_enable = intel_pre_pll_enable_lvds;
+	intel_encoder->compute_config = intel_lvds_compute_config;
 	intel_encoder->disable = intel_disable_lvds;
 	intel_encoder->get_hw_state = intel_lvds_get_hw_state;
 	intel_connector->get_hw_state = intel_connector_get_hw_state;

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/i915/intel_lvds.c – Rev 3480 → 3746