From c62515814a2d9f0906b4cfd68a27b704392b3c0a Mon Sep 17 00:00:00 2001 From: "Luis R. Rodriguez" Date: Tue, 2 Oct 2012 13:15:53 -0700 Subject: [PATCH] compat-drivers: fix patches/drm/04-revert-prime-support.patch Required manual intervention due to hunk differences. Signed-off-by: Luis R. Rodriguez --- patches/drm/04-revert-prime-support.patch | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/patches/drm/04-revert-prime-support.patch b/patches/drm/04-revert-prime-support.patch index 256c81e9faee..1b29c2459cde 100644 --- a/patches/drm/04-revert-prime-support.patch +++ b/patches/drm/04-revert-prime-support.patch @@ -326,17 +326,17 @@ not < 3.3.0. static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj); static void i915_gem_object_flush_cpu_write_domain(struct drm_i915_gem_object *obj); -@@ -3701,8 +3703,10 @@ void i915_gem_free_object(struct drm_gem +@@ -3767,8 +3769,10 @@ void i915_gem_free_object(struct drm_gem - trace_i915_gem_object_destroy(obj); + BUG_ON(obj->pages); +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) - if (gem_obj->import_attach) - drm_prime_gem_destroy(gem_obj, obj->sg_table); + if (obj->base.import_attach) + drm_prime_gem_destroy(&obj->base, NULL); +#endif - if (obj->phys_obj) - i915_gem_detach_phys_object(dev, obj); + drm_gem_object_release(&obj->base); + i915_gem_info_remove_obj(dev_priv, obj->base.size); --- a/drivers/gpu/drm/i915/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -23,6 +23,7 @@ -- 2.30.2