Skip to content

Commit

Permalink
drm/i915: don't change VDD AUX status in panel power functions
Browse files Browse the repository at this point in the history
Mode set sequence outlines when the AUX VDD bit should be set and
cleared, and it's separate from the panel power sequence.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
  • Loading branch information
Jesse Barnes authored and Chris Wilson committed Sep 8, 2010
1 parent 33a34e4 commit 3969c9c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -783,7 +783,7 @@ static bool ironlake_edp_panel_on (struct drm_device *dev)
DRM_ERROR("panel on wait timed out: 0x%08x\n",
I915_READ(PCH_PP_STATUS));

pp &= ~(PANEL_UNLOCK_REGS | EDP_FORCE_VDD);
pp &= ~(PANEL_UNLOCK_REGS);
pp |= PANEL_POWER_RESET; /* restore panel reset bit */
I915_WRITE(PCH_PP_CONTROL, pp);
POSTING_READ(PCH_PP_CONTROL);
Expand Down Expand Up @@ -811,7 +811,7 @@ static void ironlake_edp_panel_off (struct drm_device *dev)
I915_READ(PCH_PP_STATUS));

/* Make sure VDD is enabled so DP AUX will work */
pp |= EDP_FORCE_VDD | PANEL_POWER_RESET; /* restore panel reset bit */
pp |= PANEL_POWER_RESET; /* restore panel reset bit */
I915_WRITE(PCH_PP_CONTROL, pp);
POSTING_READ(PCH_PP_CONTROL);
}
Expand Down

0 comments on commit 3969c9c

Please sign in to comment.