diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-07 10:23:19 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2017-02-10 21:43:43 +0000 |
| commit | ae9a043b0c5b0d90dcd9fb8b3a2d27f34f0725fc (patch) | |
| tree | 35f308a8a3c7dac15159cd2779ac7fdcf3cbe23b /drivers/gpu/drm/i915/intel_ringbuffer.c | |
| parent | drm/i915: Move the irq_barrier for reset earlier into reset_prepare (diff) | |
| download | linux-dev-ae9a043b0c5b0d90dcd9fb8b3a2d27f34f0725fc.tar.xz linux-dev-ae9a043b0c5b0d90dcd9fb8b3a2d27f34f0725fc.zip | |
drm/i915: Rename conditional GEM execution macros
After a brief discussion, we settled on a naming convention for the
conditional GEM debugging data that should be clearer to the casual
user: GEM_DEBUG
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Mika Kuoppala <mika.kuoppala@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20170207102319.10910-1-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_ringbuffer.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_ringbuffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c index 8ae78b79178f..9fba5664376e 100644 --- a/drivers/gpu/drm/i915/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/intel_ringbuffer.c @@ -2284,7 +2284,7 @@ int intel_ring_begin(struct drm_i915_gem_request *req, int num_dwords) ring->space -= bytes; GEM_BUG_ON(ring->space < 0); - GEM_BUG_ONLY(ring->advance = ring->tail + bytes); + GEM_DEBUG_EXEC(ring->advance = ring->tail + bytes); return 0; } |