diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-08-08 16:16:26 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-08-08 16:16:26 +1000 |
| commit | e8285cec4e6d6500d1ac25ec81ced56deffdb1fb (patch) | |
| tree | 71a4c84232d4b0c16a74c939f975ff30016d4e18 /drivers/gpu/drm/i915/intel_display.c | |
| parent | 5c6c201ccbaf9d3901f829441d457293f7ca8ef4 (diff) | |
| parent | c45eb4fed12d278d3619f1904885bd0d7bcbf036 (diff) | |
| download | linux-e8285cec4e6d6500d1ac25ec81ced56deffdb1fb.tar.gz | |
Merge tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm-intel into drm-next
3 intel fixes.
* tag 'drm-intel-next-fixes-2016-08-05' of git://anongit.freedesktop.org/drm-intel:
drm/i915/fbdev: Check for the framebuffer before use
drm/i915: Never fully mask the the EI up rps interrupt on SNB/IVB
drm/i915: Wait up to 3ms for the pcu to ack the cdclk change request on SKL
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c457eed76f1f..baeb75388dbe 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5691,15 +5691,7 @@ static bool skl_cdclk_pcu_ready(struct drm_i915_private *dev_priv) static bool skl_cdclk_wait_for_pcu_ready(struct drm_i915_private *dev_priv) { - unsigned int i; - - for (i = 0; i < 15; i++) { - if (skl_cdclk_pcu_ready(dev_priv)) - return true; - udelay(10); - } - - return false; + return _wait_for(skl_cdclk_pcu_ready(dev_priv), 3000, 10) == 0; } static void skl_set_cdclk(struct drm_i915_private *dev_priv, int cdclk, int vco) |