drm/i915: Polish intel_get_lvds_encoder() (17be4942) · Commits · 戴 / test

drivers/gpu/drm/i915/intel_dp.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -7073,7 +7073,7 @@ static bool intel_edp_init_connector(struct intel_dp *intel_dp,
	* eDP and LVDS bail out early in this case to prevent interfering		* eDP and LVDS bail out early in this case to prevent interfering
	* with an already powered-on LVDS power sequencer.		* with an already powered-on LVDS power sequencer.
	*/		*/
	if (intel_get_lvds_encoder(&dev_priv->drm)) {		if (intel_get_lvds_encoder(dev_priv)) {
	WARN_ON(!(HAS_PCH_IBX(dev_priv) \|\| HAS_PCH_CPT(dev_priv)));		WARN_ON(!(HAS_PCH_IBX(dev_priv) \|\| HAS_PCH_CPT(dev_priv)));
	DRM_INFO("LVDS was detected, not registering eDP\n");		DRM_INFO("LVDS was detected, not registering eDP\n");

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -2116,7 +2116,7 @@ void intel_read_infoframe(struct intel_encoder *encoder,
	bool intel_lvds_port_enabled(struct drm_i915_private *dev_priv,		bool intel_lvds_port_enabled(struct drm_i915_private *dev_priv,
	i915_reg_t lvds_reg, enum pipe *pipe);		i915_reg_t lvds_reg, enum pipe *pipe);
	void intel_lvds_init(struct drm_i915_private *dev_priv);		void intel_lvds_init(struct drm_i915_private *dev_priv);
	struct intel_encoder intel_get_lvds_encoder(struct drm_device dev);		struct intel_encoder intel_get_lvds_encoder(struct drm_i915_private dev_priv);
	bool intel_is_dual_link_lvds(struct drm_device *dev);		bool intel_is_dual_link_lvds(struct drm_device *dev);

	/* intel_overlay.c */		/* intel_overlay.c */

+7 −6

Original line number	Original line	Diff line number	Diff line
	@@ -742,20 +742,21 @@ static const struct dmi_system_id intel_dual_link_lvds[] = {
	{ } /* terminating entry */		{ } /* terminating entry */
	};		};

	struct intel_encoder intel_get_lvds_encoder(struct drm_device dev)		struct intel_encoder intel_get_lvds_encoder(struct drm_i915_private dev_priv)
	{		{
	struct intel_encoder *intel_encoder;		struct intel_encoder *encoder;

	for_each_intel_encoder(dev, intel_encoder)		for_each_intel_encoder(&dev_priv->drm, encoder) {
	if (intel_encoder->type == INTEL_OUTPUT_LVDS)		if (encoder->type == INTEL_OUTPUT_LVDS)
	return intel_encoder;		return encoder;
			}

	return NULL;		return NULL;
	}		}

	bool intel_is_dual_link_lvds(struct drm_device *dev)		bool intel_is_dual_link_lvds(struct drm_device *dev)
	{		{
	struct intel_encoder *encoder = intel_get_lvds_encoder(dev);		struct intel_encoder *encoder = intel_get_lvds_encoder(to_i915(dev));

	return encoder && to_lvds_encoder(&encoder->base)->is_dual_link;		return encoder && to_lvds_encoder(&encoder->base)->is_dual_link;
	}		}