Merge remote branch 'airlied/drm-fixes' into drm-intel-fixes
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:33:11 +0000 (06:33 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Mon, 15 Nov 2010 06:33:11 +0000 (06:33 +0000)
1  2 
drivers/gpu/drm/i915/i915_gem.c

@@@ -2907,20 -2907,6 +2907,20 @@@ i915_gem_object_set_to_display_plane(st
        return 0;
  }
  
 +int
 +i915_gem_object_flush_gpu(struct drm_i915_gem_object *obj,
 +                        bool interruptible)
 +{
 +      if (!obj->active)
 +              return 0;
 +
 +      if (obj->base.write_domain & I915_GEM_GPU_DOMAINS)
 +              i915_gem_flush_ring(obj->base.dev, NULL, obj->ring,
 +                                  0, obj->base.write_domain);
 +
 +      return i915_gem_object_wait_rendering(&obj->base, interruptible);
 +}
 +
  /**
   * Moves a single object to the CPU read, and possibly write domain.
   *
@@@ -4079,8 -4065,7 +4079,7 @@@ i915_gem_object_pin(struct drm_gem_obje
                        alignment = i915_gem_get_gtt_alignment(obj);
                if (obj_priv->gtt_offset & (alignment - 1)) {
                        WARN(obj_priv->pin_count,
-                            "bo is already pinned with incorrect alignment:"
-                            " offset=%x, req.alignment=%x\n",
+                            "bo is already pinned with incorrect alignment: offset=%x, req.alignment=%x\n",
                             obj_priv->gtt_offset, alignment);
                        ret = i915_gem_object_unbind(obj);
                        if (ret)