diff options
| author |   Eric Anholt <eric@anholt.net> | 2008-12-19 14:47:48 -0800 |
|---|---|---|
| committer |   Dave Airlie <airlied@linux.ie> | 2008-12-29 17:47:27 +1000 |
| commit | f1acec933848219c402c165686677b1c307407f8 (patch) | |
| tree | 960df89074b8788421fa2bf0f9ab8e4410182e0d /drivers/gpu | |
| parent | drm: pin new and unpin old buffer when setting a mode. (diff) | |
| download | linux-dev-f1acec933848219c402c165686677b1c307407f8.tar.xz linux-dev-f1acec933848219c402c165686677b1c307407f8.zip | |
drm/i915: Don't print to dmesg when taking signal during object_pin.
This showed up in logs where people had a hung chip, so pinning was blocked
on the chip unpinning other buffers, and the X Server took its scheduler
signal during that time.
Signed-off-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 6a288a758385..630eec21b373 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -2491,7 +2491,8 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, /* error other than GTT full, or we've already tried again */ if (ret != -ENOMEM || pin_tries >= 1) { - DRM_ERROR("Failed to pin buffers %d\n", ret); + if (ret != -ERESTARTSYS) + DRM_ERROR("Failed to pin buffers %d\n", ret); goto err; } @@ -2641,7 +2642,8 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment) if (obj_priv->gtt_space == NULL) { ret = i915_gem_object_bind_to_gtt(obj, alignment); if (ret != 0) { - DRM_ERROR("Failure to bind: %d", ret); + if (ret != -ERESTARTSYS) + DRM_ERROR("Failure to bind: %d", ret); return ret; } } |