diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-04-09 19:05:08 +0000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-20 13:22:56 +1000 |
| commit | 62b8b21515065235bd363ad07094d301532e14ce (patch) | |
| tree | 39a669cf4c9a26ff1aed46b9ed306d92903abb45 | |
| parent | c397b9084cabdcaae26266bd0bd32ba62e757046 (diff) | |
| download | linux-62b8b21515065235bd363ad07094d301532e14ce.tar.bz2 | |
drm/i915: don't use ->driver_private anymore
Thanks to the to_intel_bo helper, this change is rather trivial.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 2 | ||||
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index d1b7dec9add2..354b00f92d45 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/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/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 23c67e084de7..7c8c01b49d63 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/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); |