drm/i915: move wedged to the other gpu error handling stuff

[deliverable/linux.git] / drivers / gpu / drm / i915 / i915_drv.h

diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index dfe0e747c4f79747266f5f17987a1e179ef0dc6f..62da6c7a4884e5e3c4fdaea36804891b967ab110 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -744,15 +744,6 @@ struct i915_gem_mm {
         */
        int suspended;
 
-       /**
-        * Flag if the hardware appears to be wedged.
-        *
-        * This is set when attempts to idle the device timeout.
-        * It prevents command submission from occurring and makes
-        * every pending request fail
-        */
-       atomic_t wedged;
-
        /** Bit 6 swizzling required for X tiling */
        uint32_t bit_6_swizzle_x;
        /** Bit 6 swizzling required for Y tiling */
@@ -784,6 +775,8 @@ struct i915_gpu_error {
 
        unsigned long last_reset;
 
+       atomic_t wedged;
+
        /* For gpu hang simulation. */
        unsigned int stop_rings;
 };
@@ -1548,7 +1541,7 @@ i915_gem_object_unpin_fence(struct drm_i915_gem_object *obj)
 
 void i915_gem_retire_requests(struct drm_device *dev);
 void i915_gem_retire_requests_ring(struct intel_ring_buffer *ring);
-int __must_check i915_gem_check_wedge(struct drm_i915_private *dev_priv,
+int __must_check i915_gem_check_wedge(struct i915_gpu_error *error,
                                      bool interruptible);
 
 void i915_gem_reset(struct drm_device *dev);