diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2013-11-14 01:59:59 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-11-28 08:31:46 +0100 |
| commit | 90f256b5bbdd5c69e5a7bbaec690bc4821bb2272 (patch) | |
| tree | b5b9b95a686e578f2bb4153fd0e70fe3057b2d3d /drivers/gpu/drm/i915/intel_uncore.c | |
| parent | 43709ba0d828b3706ace6980d875b762f90ce472 (diff) | |
| download | blackbird-op-linux-90f256b5bbdd5c69e5a7bbaec690bc4821bb2272.tar.gz blackbird-op-linux-90f256b5bbdd5c69e5a7bbaec690bc4821bb2272.zip | |
drm/i915: Report all GTFIFODBG errors
On VLV GTFIFODBG has more bits. Just report them all.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_uncore.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_uncore.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c index d002e30aaae0..cff6610601f6 100644 --- a/drivers/gpu/drm/i915/intel_uncore.c +++ b/drivers/gpu/drm/i915/intel_uncore.c @@ -123,9 +123,8 @@ static void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv) u32 gtfifodbg; gtfifodbg = __raw_i915_read32(dev_priv, GTFIFODBG); - if (WARN(gtfifodbg & GT_FIFO_CPU_ERROR_MASK, - "MMIO read or write has been dropped %x\n", gtfifodbg)) - __raw_i915_write32(dev_priv, GTFIFODBG, GT_FIFO_CPU_ERROR_MASK); + if (WARN(gtfifodbg, "GT wake FIFO error 0x%x\n", gtfifodbg)) + __raw_i915_write32(dev_priv, GTFIFODBG, gtfifodbg); } static void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, |
