diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2013-08-11 12:44:01 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-08-22 13:31:37 +0200 |
| commit | f2f4d82faf85d2e53a2ba00a831a9f7f80b7e6e7 (patch) | |
| tree | 713b6905bdcdc6fd1fed0356ab74e9bdf54d88a4 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | c8b5018b22bc03941fbc6dcf7bea5e8344a8f3da (diff) | |
| download | blackbird-op-linux-f2f4d82faf85d2e53a2ba00a831a9f7f80b7e6e7.tar.gz blackbird-op-linux-f2f4d82faf85d2e53a2ba00a831a9f7f80b7e6e7.zip | |
drm/i915: give more distinctive names to ring hangcheck action enums
The short lowercase names are bound to collide. The default warnings
don't even warn about shadowing.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index e414adaaf11d..474748ffa7b6 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2214,7 +2214,7 @@ static void i915_set_reset_status(struct intel_ring_buffer *ring, offset = i915_gem_obj_offset(request->batch_obj, request_to_vm(request)); - if (ring->hangcheck.action != wait && + if (ring->hangcheck.action != HANGCHECK_WAIT && i915_request_guilty(request, acthd, &inside)) { DRM_ERROR("%s hung %s bo (0x%lx ctx %d) at 0x%x\n", ring->name, |
