From 2641d86306d126b3f2a3b0d6d508b58821bed2b1 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Mon, 9 Aug 2010 17:21:44 +0100 Subject: [PATCH] --- yaml --- r: 210187 b: refs/heads/master c: 0ad6ef2c587dea59212c4e2ab3ec3b0067500a2a h: refs/heads/master i: 210185: 68ed5065e27c6b9dc92dd3aea89536d0d414ae40 210183: 2071d79ae2e914ed2ff4b9758e25581661febc73 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_display.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 1c7abeceb60c..fd201fc906fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e6cfefc729be2aa20647415317577ed98d4f7bf +refs/heads/master: 0ad6ef2c587dea59212c4e2ab3ec3b0067500a2a diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c index cbb509383089..83c85450608e 100644 --- a/trunk/drivers/gpu/drm/i915/intel_display.c +++ b/trunk/drivers/gpu/drm/i915/intel_display.c @@ -2069,7 +2069,7 @@ static void ironlake_crtc_dpms(struct drm_crtc *crtc, int mode) I915_WRITE(transconf_reg, temp | TRANS_ENABLE); I915_READ(transconf_reg); - if (wait_for(I915_READ(transconf_reg) & TRANS_STATE_ENABLE, 10, 0)) + if (wait_for(I915_READ(transconf_reg) & TRANS_STATE_ENABLE, 100, 1)) DRM_ERROR("failed to enable transcoder\n"); }