diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2011-10-09 21:52:02 +0200 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2011-11-03 09:20:37 -0700 |
| commit | 4b9de737fad5bd8993e6070530802de22f32744d (patch) | |
| tree | 156183628ff3cc2a3887d71660e3c5d506e1e256 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 775d17b6ca4357048f36c22151335addfe15db4b (diff) | |
| download | op-kernel-dev-4b9de737fad5bd8993e6070530802de22f32744d.zip op-kernel-dev-4b9de737fad5bd8993e6070530802de22f32744d.tar.gz | |
drm/i915: add constants to size fence arrays and fields
In preparation of to support 32 fences on Ivybdrigde.
Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index d18b07a..a838597 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1745,7 +1745,7 @@ static void i915_gem_reset_fences(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; int i; - for (i = 0; i < 16; i++) { + for (i = 0; i < dev_priv->num_fence_regs; i++) { struct drm_i915_fence_reg *reg = &dev_priv->fence_regs[i]; struct drm_i915_gem_object *obj = reg->obj; @@ -3877,7 +3877,7 @@ i915_gem_load(struct drm_device *dev) INIT_LIST_HEAD(&dev_priv->mm.gtt_list); for (i = 0; i < I915_NUM_RINGS; i++) init_ring_lists(&dev_priv->ring[i]); - for (i = 0; i < 16; i++) + for (i = 0; i < I915_MAX_NUM_FENCES; i++) INIT_LIST_HEAD(&dev_priv->fence_regs[i].lru_list); INIT_DELAYED_WORK(&dev_priv->mm.retire_work, i915_gem_retire_work_handler); |
