diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-12 07:20:47 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-06-16 09:39:02 -0400 |
| commit | 351cfc34db8decb0c5cc1aac7cf1780a0e45c8b1 (patch) | |
| tree | edec05bc1f76cb0076f6396265a814730e10b68e | |
| parent | b708a1d5ea7880b399dbd45cacafff6ae8d73171 (diff) | |
drm/i915: eDP aux needs vdd
The new oui probe has been missing these.
This issue has been introduce in
commit 0d198328538276c4459ef5de081e68ae60e6c4c2
Author: Adam Jackson <ajax@redhat.com>
Date: Mon May 14 16:05:47 2012 -0400
drm/i915/dp: Probe branch/sink OUIs
v2: Do the eDP vdd dance of simply not probing the OUI on eDP panels
as suggested by Chris Wilson.
v3: Fix up the error path fail - I suck.
Cc: Adam Jackson <ajax@redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50808
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Bugreport: http://permalink.gmane.org/gmane.comp.video.dri.devel/69695
Tested-by: Yang Guang <guang.a.yang@intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 296cfc201a81..c574ff0189de 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -1973,6 +1973,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp) | |||
| 1973 | if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT)) | 1973 | if (!(intel_dp->dpcd[DP_DOWN_STREAM_PORT_COUNT] & DP_OUI_SUPPORT)) |
| 1974 | return; | 1974 | return; |
| 1975 | 1975 | ||
| 1976 | ironlake_edp_panel_vdd_on(intel_dp); | ||
| 1977 | |||
| 1976 | if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3)) | 1978 | if (intel_dp_aux_native_read_retry(intel_dp, DP_SINK_OUI, buf, 3)) |
| 1977 | DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n", | 1979 | DRM_DEBUG_KMS("Sink OUI: %02hx%02hx%02hx\n", |
| 1978 | buf[0], buf[1], buf[2]); | 1980 | buf[0], buf[1], buf[2]); |
| @@ -1980,6 +1982,8 @@ intel_dp_probe_oui(struct intel_dp *intel_dp) | |||
| 1980 | if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3)) | 1982 | if (intel_dp_aux_native_read_retry(intel_dp, DP_BRANCH_OUI, buf, 3)) |
| 1981 | DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n", | 1983 | DRM_DEBUG_KMS("Branch OUI: %02hx%02hx%02hx\n", |
| 1982 | buf[0], buf[1], buf[2]); | 1984 | buf[0], buf[1], buf[2]); |
| 1985 | |||
| 1986 | ironlake_edp_panel_vdd_off(intel_dp, false); | ||
| 1983 | } | 1987 | } |
| 1984 | 1988 | ||
| 1985 | static bool | 1989 | static bool |
