Sorry, I just remembered that...

> I'm running upstream 3.2.32-rc1 + c07496fa61f4c5cb2addd1c57f6b.

...this is not entirely true.

I tweaked c07496fa61f4c5cb2addd1c57f6b because the condition on
i915_gem_pwrite_ioctl is again slightly different on 3.2 and 3.5.

This is the actual diff I used:

$ diff -puN drivers/gpu/drm/i915/i915_gem.c{.orig,}
--- drivers/gpu/drm/i915/i915_gem.c.orig        2012-10-16 09:26:24.630824273 
+0100
+++ drivers/gpu/drm/i915/i915_gem.c     2012-10-16 09:27:34.638822368 +0100
@@ -999,6 +999,7 @@ i915_gem_pwrite_ioctl(struct drm_device
        if (obj->phys_obj)
                ret = i915_gem_phys_pwrite(dev, obj, args, file);
        else if (obj->gtt_space &&
+                obj->tiling_mode == I915_TILING_NONE &&
                 obj->base.write_domain != I915_GEM_DOMAIN_CPU) {
                ret = i915_gem_object_pin(obj, 0, true);
                if (ret)


Regards,
Luís Picciochi
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to