Skip to content

Commit

Permalink
drm/i915/dp: Trivial code tidy
Browse files Browse the repository at this point in the history
Locally scope the crtc to where it is used.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Chris Wilson committed Dec 5, 2010
1 parent 5aa7d52 commit 160b154
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -1374,7 +1374,6 @@ intel_dp_link_down(struct intel_dp *intel_dp)
{
struct drm_device *dev = intel_dp->base.base.dev;
struct drm_i915_private *dev_priv = dev->dev_private;
struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.base.crtc);
uint32_t DP = intel_dp->DP;

DRM_DEBUG_KMS("\n");
Expand All @@ -1401,6 +1400,8 @@ intel_dp_link_down(struct intel_dp *intel_dp)
DP |= DP_LINK_TRAIN_OFF;

if (!HAS_PCH_CPT(dev) && (DP & DP_PIPEB_SELECT)) {
struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.base.crtc);

/* Hardware workaround: leaving our transcoder select
* set to transcoder B while it's off will prevent the
* corresponding HDMI output on transcoder A.
Expand All @@ -1415,8 +1416,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)
/* Changes to enable or select take place the vblank
* after being written.
*/
intel_wait_for_vblank(intel_dp->base.base.dev,
intel_crtc->pipe);
intel_wait_for_vblank(dev, intel_crtc->pipe);
}

I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN);
Expand Down

0 comments on commit 160b154

Please sign in to comment.