leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/i915: Report all GTFIFODBG errors

Browse Source 
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>
This commit is contained in:
Ville Syrjälä 2013-11-14 01:59:59 +02:00 committed by Daniel Vetter
parent 43709ba0d8
commit 90f256b5bb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/i915/i915_reg.h
View File

@ -4857,7 +4857,10 @@
#define FORCEWAKE_MT_ENABLE (1<<5) #define FORCEWAKE_MT_ENABLE (1<<5)
#define GTFIFODBG 0x120000 #define GTFIFODBG 0x120000
#define GT_FIFO_CPU_ERROR_MASK 7 #define GT_FIFO_SBDROPERR (1<<6)
#define GT_FIFO_BLOBDROPERR (1<<5)
#define GT_FIFO_SB_READ_ABORTERR (1<<4)
#define GT_FIFO_DROPERR (1<<3)
#define GT_FIFO_OVFERR (1<<2) #define GT_FIFO_OVFERR (1<<2)
#define GT_FIFO_IAWRERR (1<<1) #define GT_FIFO_IAWRERR (1<<1)
#define GT_FIFO_IARDERR (1<<0) #define GT_FIFO_IARDERR (1<<0)

5
drivers/gpu/drm/i915/intel_uncore.c
View File

@ -123,9 +123,8 @@ static void gen6_gt_check_fifodbg(struct drm_i915_private *dev_priv)
u32 gtfifodbg; u32 gtfifodbg;
gtfifodbg = __raw_i915_read32(dev_priv, GTFIFODBG); gtfifodbg = __raw_i915_read32(dev_priv, GTFIFODBG);
if (WARN(gtfifodbg & GT_FIFO_CPU_ERROR_MASK, if (WARN(gtfifodbg, "GT wake FIFO error 0x%x\n", gtfifodbg))
"MMIO read or write has been dropped %x\n", gtfifodbg)) __raw_i915_write32(dev_priv, GTFIFODBG, gtfifodbg);
__raw_i915_write32(dev_priv, GTFIFODBG, GT_FIFO_CPU_ERROR_MASK);
} }
static void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv, static void __gen6_gt_force_wake_put(struct drm_i915_private *dev_priv,