Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 218102
b: refs/heads/master
c: 27d6433
h: refs/heads/master
v: v3
  • Loading branch information
Hette Visser authored and Chris Wilson committed Sep 24, 2010
1 parent 6ff62fa commit 0943613
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e61cb0d5fd172ab95a4501917526382f25158e83
refs/heads/master: 27d64339a8d8465484286a2da93f5f6c36be5c3d
10 changes: 10 additions & 0 deletions trunk/drivers/gpu/drm/i915/intel_dp.c
Original file line number Diff line number Diff line change
Expand Up @@ -784,6 +784,11 @@ static bool ironlake_edp_panel_on (struct drm_device *dev)
pp |= POWER_TARGET_ON;
I915_WRITE(PCH_PP_CONTROL, pp);

/* Ouch. We need to wait here for some panels, like Dell e6510
* https://bugs.freedesktop.org/show_bug.cgi?id=29278i
*/
msleep(300);

if (wait_for(I915_READ(PCH_PP_STATUS) & PP_ON, 5000))
DRM_ERROR("panel on wait timed out: 0x%08x\n",
I915_READ(PCH_PP_STATUS));
Expand Down Expand Up @@ -819,6 +824,11 @@ static void ironlake_edp_panel_off (struct drm_device *dev)
pp |= PANEL_POWER_RESET; /* restore panel reset bit */
I915_WRITE(PCH_PP_CONTROL, pp);
POSTING_READ(PCH_PP_CONTROL);

/* Ouch. We need to wait here for some panels, like Dell e6510
* https://bugs.freedesktop.org/show_bug.cgi?id=29278i
*/
msleep(300);
}

static void ironlake_edp_panel_vdd_on(struct drm_device *dev)
Expand Down

0 comments on commit 0943613

Please sign in to comment.