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

Commit 0df53b77 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: split ibx_digital_port_connected to ibx and cpt variants 



Choose the right function at the intel_digital_port_connected level.

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarDurgadoss R <durgadoss.r@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 7e66bcf2

drivers/gpu/drm/i915/intel_dp.c

+43 −35
Original line number Diff line number Diff line
@@ -4485,7 +4485,6 @@ static bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, 
{

	u32 bit;



	if (HAS_PCH_IBX(dev_priv->dev)) {

	switch (port->port) {

	case PORT_A:

		return true;
@@ -4502,7 +4501,15 @@ static bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, 
		MISSING_CASE(port->port);

		return false;

	}

	} else {



	return I915_READ(SDEISR) & bit;

}



static bool cpt_digital_port_connected(struct drm_i915_private *dev_priv,

				       struct intel_digital_port *port)

{

	u32 bit;



	switch (port->port) {

	case PORT_A:

		return true;
@@ -4519,7 +4526,6 @@ static bool ibx_digital_port_connected(struct drm_i915_private *dev_priv, 
		MISSING_CASE(port->port);

		return false;

	}

	}



	return I915_READ(SDEISR) & bit;

}
@@ -4574,8 +4580,10 @@ static bool g4x_digital_port_connected(struct drm_i915_private *dev_priv, 
static bool intel_digital_port_connected(struct drm_i915_private *dev_priv,

					 struct intel_digital_port *port)

{

	if (HAS_PCH_SPLIT(dev_priv))

	if (HAS_PCH_IBX(dev_priv))

		return ibx_digital_port_connected(dev_priv, port);

	if (HAS_PCH_SPLIT(dev_priv))

		return cpt_digital_port_connected(dev_priv, port);

	else

		return g4x_digital_port_connected(dev_priv, port);

}