From c3e17d991b2a77d240dcff1538da3662b13391b4 Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Fri, 10 Sep 2010 10:46:45 -0700 Subject: [PATCH] --- yaml --- r: 217988 b: refs/heads/master c: 4d12fe0b4864682d3562021cde0f32961c655d75 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 04fffead0d10..edfe71f85e3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b8765c6e7fb6e0aaa9b9081454fb0f202852523 +refs/heads/master: 4d12fe0b4864682d3562021cde0f32961c655d75 diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c index b9efeaf5d5b4..103a60b3cad4 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dp.c +++ b/trunk/drivers/gpu/drm/i915/intel_dp.c @@ -781,7 +781,7 @@ static bool ironlake_edp_panel_on (struct drm_device *dev) I915_WRITE(PCH_PP_CONTROL, pp); POSTING_READ(PCH_PP_CONTROL); - pp |= PANEL_UNLOCK_REGS | POWER_TARGET_ON; + pp |= POWER_TARGET_ON; I915_WRITE(PCH_PP_CONTROL, pp); if (wait_for(I915_READ(PCH_PP_STATUS) & PP_ON, 5000))