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

Commit 68b4d824 authored by Imre Deak's avatar Imre Deak Committed by Daniel Vetter
Browse files

drm/i915: stop using is_pch_edp() in is_cpu_edp() 



is_pch_edp() will be removed by the next patch, so replace it by a check
for the port and device type.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f7d24902

drivers/gpu/drm/i915/intel_dp.c

+11 −6
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ static bool is_pch_edp(struct intel_dp *intel_dp) 
	return intel_dp->is_pch_edp;

}



static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp)

{

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);



	return intel_dig_port->base.base.dev;

}



/**

 * is_cpu_edp - is the port on the CPU and attached to an eDP panel?

 * @intel_dp: DP struct
@@ -73,14 +80,12 @@ static bool is_pch_edp(struct intel_dp *intel_dp) 
 */

static bool is_cpu_edp(struct intel_dp *intel_dp)

{

	return is_edp(intel_dp) && !is_pch_edp(intel_dp);

}



static struct drm_device *intel_dp_to_dev(struct intel_dp *intel_dp)

{

	struct drm_device *dev = intel_dp_to_dev(intel_dp);

	struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp);

	enum port port = intel_dig_port->port;



	return intel_dig_port->base.base.dev;

	return is_edp(intel_dp) &&

		(port == PORT_A || (port == PORT_C && IS_VALLEYVIEW(dev)));

}



static struct intel_dp *intel_attached_dp(struct drm_connector *connector)