Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 13c7d870 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: track is_dual_link in intel_lvds 



Yeah, all users (both the clock selection special cases and the lvds
pin pair stuff) are still in common code, but this will change.

v2: Rebase on top of Jani Nikula's panel rework.

v3: Incorporate review from Paulo Zanoni:
- s/__is_dual_link_lvds/compute_is_dual_link_lvds
- kill dev_priv->lvds_val
- drop spurious whitespace change

v4: Add a debug printk to display the dual-link status, as suggested
by Paulo Zanoni in review.

Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> (v3)
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 1974cad0

drivers/gpu/drm/i915/i915_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -705,7 +705,6 @@ typedef struct drm_i915_private { 
	unsigned int display_clock_mode:1;

	int lvds_ssc_freq;

	unsigned int bios_lvds_val; /* initial [PCH_]LVDS reg val in VBIOS */

	unsigned int lvds_val; /* used for checking LVDS channel mode */

	struct {

		int rate;

		int lanes;

drivers/gpu/drm/i915/intel_lvds.c

+31 −13
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ struct intel_lvds_encoder { 
	u32 pfit_control;

	u32 pfit_pgm_ratios;

	bool pfit_dirty;

	bool is_dual_link;



	struct intel_lvds_connector *attached_connector;

};
@@ -922,6 +923,23 @@ static const struct dmi_system_id intel_dual_link_lvds[] = { 
};



bool intel_is_dual_link_lvds(struct drm_device *dev)

{

	struct intel_encoder *encoder;

	struct intel_lvds_encoder *lvds_encoder;



	list_for_each_entry(encoder, &dev->mode_config.encoder_list,

			    base.head) {

		if (encoder->type == INTEL_OUTPUT_LVDS) {

			lvds_encoder = to_lvds_encoder(&encoder->base);



			return lvds_encoder->is_dual_link;

		}

	}



	return false;

}



static bool compute_is_dual_link_lvds(struct drm_device *dev)

{

	unsigned int val;

	struct drm_i915_private *dev_priv = dev->dev_private;
@@ -940,9 +958,6 @@ bool intel_is_dual_link_lvds(struct drm_device *dev) 
	if (dmi_check_system(intel_dual_link_lvds))

		return true;



	if (dev_priv->lvds_val)

		val = dev_priv->lvds_val;

	else {

	/* BIOS should set the proper LVDS register value at boot, but

	 * in reality, it doesn't set the value when the lid is closed;

	 * we need to check "the value to be set" in VBT when LVDS
@@ -951,8 +966,7 @@ bool intel_is_dual_link_lvds(struct drm_device *dev) 
	val = I915_READ(lvds_reg);

	if (!(val & ~(LVDS_PIPE_MASK | LVDS_DETECTED)))

		val = dev_priv->bios_lvds_val;

		dev_priv->lvds_val = val;

	}



	return (val & LVDS_CLKB_POWER_MASK) == LVDS_CLKB_POWER_UP;

}
@@ -1162,6 +1176,10 @@ bool intel_lvds_init(struct drm_device *dev) 
		goto failed;



out:

	lvds_encoder->is_dual_link = compute_is_dual_link_lvds(dev);

	DRM_DEBUG_KMS("detected %s-link lvds configuration\n",

		      lvds_encoder->is_dual_link ? "dual" : "single");



	/*

	 * Unlock registers and just

	 * leave them unlocked