diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 01:33:11 -0500 |
| commit | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (patch) | |
| tree | 9cf66b22a611bb6bc78778c05dac72263bb45a23 /drivers/gpu/drm/i915 | |
| parent | 85345517fe6d4de27b0d6ca19fef9d28ac947c4a (diff) | |
| parent | a41c73e04673b47730df682446f0d52f95e32a5b (diff) | |
Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 951e3d463113..781c26c37b38 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -4079,8 +4079,7 @@ i915_gem_object_pin(struct drm_gem_object *obj, uint32_t alignment) | |||
| 4079 | alignment = i915_gem_get_gtt_alignment(obj); | 4079 | alignment = i915_gem_get_gtt_alignment(obj); |
| 4080 | if (obj_priv->gtt_offset & (alignment - 1)) { | 4080 | if (obj_priv->gtt_offset & (alignment - 1)) { |
| 4081 | WARN(obj_priv->pin_count, | 4081 | WARN(obj_priv->pin_count, |
| 4082 | "bo is already pinned with incorrect alignment:" | 4082 | "bo is already pinned with incorrect alignment: offset=%x, req.alignment=%x\n", |
| 4083 | " offset=%x, req.alignment=%x\n", | ||
| 4084 | obj_priv->gtt_offset, alignment); | 4083 | obj_priv->gtt_offset, alignment); |
| 4085 | ret = i915_gem_object_unbind(obj); | 4084 | ret = i915_gem_object_unbind(obj); |
| 4086 | if (ret) | 4085 | if (ret) |