Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90f256b5 authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Daniel Vetter
Browse files

drm/i915: Report all GTFIFODBG errors 



On VLV GTFIFODBG has more bits. Just report them all.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 43709ba0

drivers/gpu/drm/i915/i915_reg.h

+4 −1
Original line number Diff line number Diff line
@@ -4857,7 +4857,10 @@ 
#define    FORCEWAKE_MT_ENABLE			(1<<5)



#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_IAWRERR			(1<<1)

#define    GT_FIFO_IARDERR			(1<<0)

drivers/gpu/drm/i915/intel_uncore.c

+2 −3
Original line number Diff line number Diff line
@@ -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,