diff options
author | Dave Airlie | 2014-12-02 01:58:33 +0100 |
---|---|---|
committer | Dave Airlie | 2014-12-02 01:58:33 +0100 |
commit | e8115e79aa62b6ebdb3e8e61ca4092cc32938afc (patch) | |
tree | 42b791ab54ef9d5c73dcd49f907b8b37fa2f7e19 /drivers/gpu/drm/i915/intel_display.c | |
parent | Merge tag 'topic/core-stuff-2014-11-28' of git://anongit.freedesktop.org/drm-... (diff) | |
parent | Linux 3.18-rc7 (diff) | |
download | kernel-qcow2-linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.gz kernel-qcow2-linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.tar.xz kernel-qcow2-linux-e8115e79aa62b6ebdb3e8e61ca4092cc32938afc.zip |
Merge tag 'v3.18-rc7' into drm-next
This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 947144985700..e9a0df8a437b 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -9066,6 +9066,10 @@ static bool page_flip_finished(struct intel_crtc *crtc) struct drm_device *dev = crtc->base.dev; struct drm_i915_private *dev_priv = dev->dev_private; + if (i915_reset_in_progress(&dev_priv->gpu_error) || + crtc->reset_counter != atomic_read(&dev_priv->gpu_error.reset_counter)) + return true; + /* * The relevant registers doen't exist on pre-ctg. * As the flip done interrupt doesn't trigger for mmio |