diff options
author | Adam Jackson <ajax@redhat.com> | 2011-07-12 17:38:01 -0400 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2011-07-25 13:34:49 -0400 |
commit | 1b9be9d09d85b3697418dc444db30d069203ff7d (patch) | |
tree | 396e509a8e1f6aeaa9c65625ad5de6c9d495fee5 | |
parent | 97cdd7101079adc3c626d159c62d43de949516c8 (diff) |
drm/i915/dp: Move DPCD dump to common code instead of PCH-only
No reason not to see this on g4x, after all.
Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index de24f314eda9..0be85a00bb52 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
@@ -1615,8 +1615,6 @@ ironlake_dp_detect(struct intel_dp *intel_dp) | |||
1615 | sizeof (intel_dp->dpcd)); | 1615 | sizeof (intel_dp->dpcd)); |
1616 | if (ret && intel_dp->dpcd[DP_DPCD_REV] != 0) | 1616 | if (ret && intel_dp->dpcd[DP_DPCD_REV] != 0) |
1617 | status = connector_status_connected; | 1617 | status = connector_status_connected; |
1618 | DRM_DEBUG_KMS("DPCD: %hx%hx%hx%hx\n", intel_dp->dpcd[0], | ||
1619 | intel_dp->dpcd[1], intel_dp->dpcd[2], intel_dp->dpcd[3]); | ||
1620 | return status; | 1618 | return status; |
1621 | } | 1619 | } |
1622 | 1620 | ||
@@ -1679,6 +1677,10 @@ intel_dp_detect(struct drm_connector *connector, bool force) | |||
1679 | status = ironlake_dp_detect(intel_dp); | 1677 | status = ironlake_dp_detect(intel_dp); |
1680 | else | 1678 | else |
1681 | status = g4x_dp_detect(intel_dp); | 1679 | status = g4x_dp_detect(intel_dp); |
1680 | |||
1681 | DRM_DEBUG_KMS("DPCD: %hx%hx%hx%hx\n", intel_dp->dpcd[0], | ||
1682 | intel_dp->dpcd[1], intel_dp->dpcd[2], intel_dp->dpcd[3]); | ||
1683 | |||
1682 | if (status != connector_status_connected) | 1684 | if (status != connector_status_connected) |
1683 | return status; | 1685 | return status; |
1684 | 1686 | ||