diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:37:42 -0500 |
| commit | 83eb95b852902f952ba594447a796ad8146b9462 (patch) | |
| tree | 33c199aeeae58b69ad8d6d2a33c2d96ba2b98ddf /drivers/gpu/drm/i915/intel_dp.c | |
| parent | efb3e34b6176d30c4fe8635fa8e1beb6280cc2cd (diff) | |
| parent | 9bbe7b984096ac45586da2adf26c14069ecb79b2 (diff) | |
Merge branch 'sh/sdio' into sh-latest
Diffstat (limited to 'drivers/gpu/drm/i915/intel_dp.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_dp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index 864417cffe9a..1dc60408d5b8 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c | |||
| @@ -1442,8 +1442,7 @@ intel_dp_link_down(struct intel_dp *intel_dp) | |||
| 1442 | /* Changes to enable or select take place the vblank | 1442 | /* Changes to enable or select take place the vblank |
| 1443 | * after being written. | 1443 | * after being written. |
| 1444 | */ | 1444 | */ |
| 1445 | intel_wait_for_vblank(intel_dp->base.base.dev, | 1445 | intel_wait_for_vblank(dev, intel_crtc->pipe); |
| 1446 | intel_crtc->pipe); | ||
| 1447 | } | 1446 | } |
| 1448 | 1447 | ||
| 1449 | I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN); | 1448 | I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN); |