]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
drm/i915/hsw: Avoid early timeout during LCPLL disable/restore
authorImre Deak <imre.deak@intel.com>
Tue, 28 Jun 2016 10:37:32 +0000 (13:37 +0300)
committerJani Nikula <jani.nikula@intel.com>
Wed, 29 Jun 2016 08:18:04 +0000 (11:18 +0300)
commitfa7c13e5b1e2076b0ec716ed584ab76f9e65b7a6
treec091a063780a5c3ba38505ee36373bca00b2b1e2
parent11f6145791775ce41b8993fd29e19eb53ef0ff14
drm/i915/hsw: Avoid early timeout during LCPLL disable/restore

Since wait_for_atomic doesn't re-check the wait-for condition after
expiry of the timeout it can fail when called from non-atomic context
even if the condition is set correctly before the expiry. Fix this by
using the non-atomic wait_for instead.

Fixes: 0351b93992aa ("drm/i915: Do not lie about atomic timeout granularity")
CC: Chris Wilson <chris@chris-wilson.co.uk>
CC: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
CC: drm-intel-fixes@lists.freedesktop.org
Link: http://patchwork.freedesktop.org/patch/msgid/1467110253-16046-4-git-send-email-imre.deak@intel.com
(cherry picked from commit f53dd63f1119a98a16d1a5a7cb3277a2f1ff483d)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c