Commit 26d61aad authored by Keith Packard's avatar Keith Packard

drm/i915: Rename i915_dp_detect_common to intel_dp_get_dpcd

This describes the function better, allowing it to be used where the
DPCD value is relevant.
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarAdam Jackson <ajax@redhat.com>
parent 92fd8fd1
...@@ -1567,18 +1567,16 @@ intel_dp_link_down(struct intel_dp *intel_dp) ...@@ -1567,18 +1567,16 @@ intel_dp_link_down(struct intel_dp *intel_dp)
POSTING_READ(intel_dp->output_reg); POSTING_READ(intel_dp->output_reg);
} }
static enum drm_connector_status static bool
i915_dp_detect_common(struct intel_dp *intel_dp) intel_dp_get_dpcd(struct intel_dp *intel_dp)
{ {
enum drm_connector_status status = connector_status_disconnected;
if (intel_dp_aux_native_read_retry(intel_dp, 0x000, intel_dp->dpcd, if (intel_dp_aux_native_read_retry(intel_dp, 0x000, intel_dp->dpcd,
sizeof (intel_dp->dpcd)) && sizeof (intel_dp->dpcd)) &&
(intel_dp->dpcd[DP_DPCD_REV] != 0)) { (intel_dp->dpcd[DP_DPCD_REV] != 0)) {
status = connector_status_connected; return true;
} }
return status; return false;
} }
/* /*
...@@ -1603,7 +1601,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) ...@@ -1603,7 +1601,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
} }
/* Now read the DPCD to see if it's actually running */ /* Now read the DPCD to see if it's actually running */
if (i915_dp_detect_common(intel_dp) != connector_status_connected) { if (!intel_dp_get_dpcd(intel_dp)) {
intel_dp_link_down(intel_dp); intel_dp_link_down(intel_dp);
return; return;
} }
...@@ -1616,6 +1614,14 @@ intel_dp_check_link_status(struct intel_dp *intel_dp) ...@@ -1616,6 +1614,14 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
} }
} }
static enum drm_connector_status
intel_dp_detect_dpcd(struct intel_dp *intel_dp)
{
if (intel_dp_get_dpcd(intel_dp))
return connector_status_connected;
return connector_status_disconnected;
}
static enum drm_connector_status static enum drm_connector_status
ironlake_dp_detect(struct intel_dp *intel_dp) ironlake_dp_detect(struct intel_dp *intel_dp)
{ {
...@@ -1629,7 +1635,7 @@ ironlake_dp_detect(struct intel_dp *intel_dp) ...@@ -1629,7 +1635,7 @@ ironlake_dp_detect(struct intel_dp *intel_dp)
return status; return status;
} }
return i915_dp_detect_common(intel_dp); return intel_dp_detect_dpcd(intel_dp);
} }
static enum drm_connector_status static enum drm_connector_status
...@@ -1658,7 +1664,7 @@ g4x_dp_detect(struct intel_dp *intel_dp) ...@@ -1658,7 +1664,7 @@ g4x_dp_detect(struct intel_dp *intel_dp)
if ((temp & bit) == 0) if ((temp & bit) == 0)
return connector_status_disconnected; return connector_status_disconnected;
return i915_dp_detect_common(intel_dp); return intel_dp_detect_dpcd(intel_dp);
} }
/** /**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment