From 5ba12bf16614e90031f2cb1678e95596a0ea9511 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Fri, 9 Apr 2010 19:05:08 +0000 Subject: [PATCH] --- yaml --- r: 196467 b: refs/heads/master c: 62b8b21515065235bd363ad07094d301532e14ce h: refs/heads/master i: 196465: 8d85336f3e3b53e18fe2dc8f4c6bb69fdde4a7d8 196463: 738a7aa77f6b2548e577a891d25401bf89e7a745 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/i915_drv.h | 2 +- trunk/drivers/gpu/drm/i915/i915_gem.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb79c39c34f8..aea9e6c6f0a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c397b9084cabdcaae26266bd0bd32ba62e757046 +refs/heads/master: 62b8b21515065235bd363ad07094d301532e14ce diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.h b/trunk/drivers/gpu/drm/i915/i915_drv.h index d1b7dec9add2..354b00f92d45 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.h +++ b/trunk/drivers/gpu/drm/i915/i915_drv.h @@ -747,7 +747,7 @@ struct drm_i915_gem_object { atomic_t pending_flip; }; -#define to_intel_bo(x) ((struct drm_i915_gem_object *) (x)->driver_private) +#define to_intel_bo(x) container_of(x, struct drm_i915_gem_object, base) /** * Request queue structure. diff --git a/trunk/drivers/gpu/drm/i915/i915_gem.c b/trunk/drivers/gpu/drm/i915/i915_gem.c index 23c67e084de7..7c8c01b49d63 100644 --- a/trunk/drivers/gpu/drm/i915/i915_gem.c +++ b/trunk/drivers/gpu/drm/i915/i915_gem.c @@ -4440,7 +4440,7 @@ struct drm_gem_object * i915_gem_alloc_object(struct drm_device *dev, obj->agp_type = AGP_USER_MEMORY; - obj->base.driver_private = obj; + obj->base.driver_private = NULL; obj->obj = &obj->base; obj->fence_reg = I915_FENCE_REG_NONE; INIT_LIST_HEAD(&obj->list);