From 9d3f11214be4975ef75788903950b1dd715d4d22 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 26 Jul 2011 15:39:45 -0400 Subject: [PATCH] --- yaml --- r: 293533 b: refs/heads/master c: 092945e11c5b84f66dd08f0b87fb729715d377bc h: refs/heads/master i: 293531: e2a828ad12901d01e7ef363faf7647674dcded4c v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 1168d449e040..cdd873f81af6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6919132e7a307b1f181d7655b3ef64cc7581a5ef +refs/heads/master: 092945e11c5b84f66dd08f0b87fb729715d377bc diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c index add871911a63..2f4766385797 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dp.c +++ b/trunk/drivers/gpu/drm/i915/intel_dp.c @@ -362,7 +362,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, int recv_bytes; uint32_t status; uint32_t aux_clock_divider; - int try, precharge; + int try, precharge = 5; intel_dp_check_edp(intel_dp); /* The clock divider is based off the hrawclk, @@ -382,11 +382,6 @@ intel_dp_aux_ch(struct intel_dp *intel_dp, else aux_clock_divider = intel_hrawclk(dev) / 2; - if (IS_GEN6(dev)) - precharge = 3; - else - precharge = 5; - /* Try to wait for any previous AUX channel activity */ for (try = 0; try < 3; try++) { status = I915_READ(ch_ctl);