diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-14 12:03:28 (GMT) |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-14 20:08:36 (GMT) |
| commit | 2cf34d7b7ee99c27c1a6bdd2f91344cbfa5fef5c (patch) | |
| tree | 86e52ca489247cddc28950e86cc8a01e5433ae4b /drivers/gpu/drm/i915/intel_display.c | |
| parent | 48b956c5a89c7b100ef3b818b6ccf759ab695383 (diff) | |
| download | linux-fsl-qoriq-2cf34d7b7ee99c27c1a6bdd2f91344cbfa5fef5c.tar.xz | |
drm/i915: Allow get_fence_reg() to be uninterruptible
As we currently may need to acquire a fence register during a modeset,
we need to be able to do so in an uninterruptible manner. So expose that
parameter to the callers of the fence management code.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index a7628fd..11d643a 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -1461,7 +1461,7 @@ intel_pin_and_fence_fb_obj(struct drm_device *dev, */ if (obj_priv->fence_reg == I915_FENCE_REG_NONE && obj_priv->tiling_mode != I915_TILING_NONE) { - ret = i915_gem_object_get_fence_reg(obj); + ret = i915_gem_object_get_fence_reg(obj, false); if (ret) goto err_unpin; } |