aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_drv.h
diff options
context:
space:
mode:
authorBen Widawsky <ben@bwidawsk.net>2012-02-09 04:15:20 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-02-11 18:21:41 -0500
commit67a3744f7515edda9888df5b226ec3b358908b42 (patch)
treeaa99eaa3436544fbbcc98afba18507707cff1da1 /drivers/gpu/drm/i915/i915_drv.h
parentee64cbdbf617067988168a4a49fcaabdd2743da6 (diff)
drm/i915: check gtfifodbg after possibly failed writes
If we don't have a sufficient number of free entries in the FIFO, we proceed to do a write anyway. With this check we should have a clue if that write actually failed or not. After some discussion with Daniel Vetter regarding his original complaint, we agreed upon this. Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Ben Widawsky <ben@bwidawsk.net> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_drv.h')
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 922aed33035d..000a9ad17ddd 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -1401,7 +1401,7 @@ extern void intel_display_print_error_state(struct seq_file *m,
1401 */ 1401 */
1402void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv); 1402void gen6_gt_force_wake_get(struct drm_i915_private *dev_priv);
1403void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv); 1403void gen6_gt_force_wake_put(struct drm_i915_private *dev_priv);
1404void __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv); 1404int __gen6_gt_wait_for_fifo(struct drm_i915_private *dev_priv);
1405 1405
1406/* We give fast paths for the really cool registers */ 1406/* We give fast paths for the really cool registers */
1407#define NEEDS_FORCE_WAKE(dev_priv, reg) \ 1407#define NEEDS_FORCE_WAKE(dev_priv, reg) \