diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2010-04-09 15:05:09 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2010-04-19 23:23:14 -0400 |
commit | a8089e849a32c5b6bfd6c88dbd09c0ea4a779b71 (patch) | |
tree | 50eda22881d24af5668d87e3ee90669c2272082e /drivers/gpu/drm/i915/i915_irq.c | |
parent | 62b8b21515065235bd363ad07094d301532e14ce (diff) |
drm/i915: drop pointer to drm_gem_object
Luckily the change is quite a little bit less invasive than I've
feared.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_irq.c')
-rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e357ccd1ce53..ed26b7b7376a 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c | |||
@@ -613,7 +613,7 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
613 | batchbuffer[1] = NULL; | 613 | batchbuffer[1] = NULL; |
614 | count = 0; | 614 | count = 0; |
615 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { | 615 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { |
616 | struct drm_gem_object *obj = obj_priv->obj; | 616 | struct drm_gem_object *obj = &obj_priv->base; |
617 | 617 | ||
618 | if (batchbuffer[0] == NULL && | 618 | if (batchbuffer[0] == NULL && |
619 | bbaddr >= obj_priv->gtt_offset && | 619 | bbaddr >= obj_priv->gtt_offset && |
@@ -649,7 +649,7 @@ static void i915_capture_error_state(struct drm_device *dev) | |||
649 | if (error->active_bo) { | 649 | if (error->active_bo) { |
650 | int i = 0; | 650 | int i = 0; |
651 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { | 651 | list_for_each_entry(obj_priv, &dev_priv->mm.active_list, list) { |
652 | struct drm_gem_object *obj = obj_priv->obj; | 652 | struct drm_gem_object *obj = &obj_priv->base; |
653 | 653 | ||
654 | error->active_bo[i].size = obj->size; | 654 | error->active_bo[i].size = obj->size; |
655 | error->active_bo[i].name = obj->name; | 655 | error->active_bo[i].name = obj->name; |