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: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
f7d24902e1
commit
68b4d82470
drivers/gpu/drm/i915
|
@ -65,6 +65,13 @@ static bool is_pch_edp(struct intel_dp *intel_dp)
|
||||||
return intel_dp->is_pch_edp;
|
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?
|
* is_cpu_edp - is the port on the CPU and attached to an eDP panel?
|
||||||
* @intel_dp: DP struct
|
* @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)
|
static bool is_cpu_edp(struct intel_dp *intel_dp)
|
||||||
{
|
{
|
||||||
return is_edp(intel_dp) && !is_pch_edp(intel_dp);
|
struct drm_device *dev = intel_dp_to_dev(intel_dp);
|
||||||
}
|
|
||||||
|
|
||||||
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);
|
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)
|
static struct intel_dp *intel_attached_dp(struct drm_connector *connector)
|
||||||
|
|
Loading…
Reference in New Issue