diff options
| author | Ville Syrjälä | 2013-11-14 01:00:00 +0100 |
|---|---|---|
| committer | Daniel Vetter | 2013-11-28 08:31:47 +0100 |
| commit | 46520e2baa861a02c14d3d590d5897092950c62a (patch) | |
| tree | a75c613630c1cc67484a91d40923cf1134aebcfb /drivers/gpu/drm/i915/i915_reg.h | |
| parent | drm/i915: Report all GTFIFODBG errors (diff) | |
| download | kernel-qcow2-linux-46520e2baa861a02c14d3d590d5897092950c62a.tar.gz kernel-qcow2-linux-46520e2baa861a02c14d3d590d5897092950c62a.tar.xz kernel-qcow2-linux-46520e2baa861a02c14d3d590d5897092950c62a.zip | |
drm/i915: Fix GT wake FIFO free entries for VLV
On VLV the GTFIFOCTL register has other bits besides the number of free
entries in the GT wake FIFO. Apply a mask when we read th register to
make sure we don't misinterpret the number of free FIFO entries.
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
[danvet: There's some unclarity about hsw, but brushed off as todays'
Bspec just acting up a bit.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_reg.h')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_reg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h index 4f84573c5ad6..2658d975279b 100644 --- a/drivers/gpu/drm/i915/i915_reg.h +++ b/drivers/gpu/drm/i915/i915_reg.h @@ -4865,7 +4865,8 @@ #define GT_FIFO_IAWRERR (1<<1) #define GT_FIFO_IARDERR (1<<0) -#define GT_FIFO_FREE_ENTRIES 0x120008 +#define GTFIFOCTL 0x120008 +#define GT_FIFO_FREE_ENTRIES_MASK 0x7f #define GT_FIFO_NUM_RESERVED_ENTRIES 20 #define HSW_IDICR 0x9008 |