aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2012-05-14 16:05:47 -0400
committerDave Airlie <airlied@redhat.com>2012-05-22 05:18:47 -0400
commit0d198328538276c4459ef5de081e68ae60e6c4c2 (patch)
treebb29613eb5ba940c7f2fcb837397ab0c026e5ee2 /drivers/gpu/drm
parentde44d97193fc67c1636c614fc302945e2912da1f (diff)
drm/i915/dp: Probe branch/sink OUIs
Signed-off-by: Adam Jackson <ajax@redhat.com> Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/intel_dp.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index a1a5ce71558a..71c7096e3869 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -1961,6 +1961,23 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp)
1961 return false; 1961 return false;
1962} 1962}
1963 1963
1964static void
1965intel_dp_probe_oui(struct intel_dp *intel_dp)
1966{
1967 u8 buf[3];
1968
1969 if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT))
1970 return;
1971
1972 if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3))
1973 DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n",
1974 buf[0], buf[1], buf[2]);
1975
1976 if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3))
1977 DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n",
1978 buf[0], buf[1], buf[2]);
1979}
1980
1964static bool 1981static bool
1965intel_dp_get_sink_irq(struct intel_dp *intel_dp, u8 *sink_irq_vector) 1982intel_dp_get_sink_irq(struct intel_dp *intel_dp, u8 *sink_irq_vector)
1966{ 1983{
@@ -2144,6 +2161,8 @@ intel_dp_detect(struct drm_connector *connector, bool force)
2144 if (status != connector_status_connected) 2161 if (status != connector_status_connected)
2145 return status; 2162 return status;
2146 2163
2164 intel_dp_probe_oui(intel_dp);
2165
2147 if (intel_dp->force_audio != HDMI_AUDIO_AUTO) { 2166 if (intel_dp->force_audio != HDMI_AUDIO_AUTO) {
2148 intel_dp->has_audio = (intel_dp->force_audio == HDMI_AUDIO_ON); 2167 intel_dp->has_audio = (intel_dp->force_audio == HDMI_AUDIO_ON);
2149 } else { 2168 } else {