diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2007-10-25 11:00:45 +0200 |
| commit | 9adf8c02563b1e6110e46dabd733e2dc440b4200 (patch) | |
| tree | 7a0e360dc9663b3e269a5d5e164672bf8885a5e4 /shared-core/i915_init.c | |
| parent | d5f2b4b411c5ca95d6f66a33d213ece387ac4fc5 (diff) | |
| parent | b9d9c30474238ac8ba4899a19fe4a97e9376f6c4 (diff) | |
Merge branch 'master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
linux-core/drm_bo.c
linux-core/drm_objects.h
Diffstat (limited to 'shared-core/i915_init.c')
| -rw-r--r-- | shared-core/i915_init.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/shared-core/i915_init.c b/shared-core/i915_init.c index 8e419b8a..3b43c722 100644 --- a/shared-core/i915_init.c +++ b/shared-core/i915_init.c @@ -188,16 +188,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) ret = drm_buffer_object_create(dev, size, drm_bo_type_kernel, DRM_BO_FLAG_READ | DRM_BO_FLAG_WRITE | DRM_BO_FLAG_MEM_VRAM | + DRM_BO_FLAG_NO_EVICT | DRM_BO_HINT_DONT_FENCE, 0, 0x1, 0, &dev_priv->ring_buffer); if (ret < 0) { - DRM_ERROR("Unable to allocate ring buffer\n"); - return -EINVAL; - } - - ret = drm_bo_set_pin(dev, dev_priv->ring_buffer, 1); - if (ret < 0) { - DRM_ERROR("Unable to pin ring buffer\n"); + DRM_ERROR("Unable to allocate or pin ring buffer\n"); return -EINVAL; } |