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/intel_overlay.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/intel_overlay.c')
-rw-r--r-- | drivers/gpu/drm/i915/intel_overlay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c index bc3721af855c..b0e17b06eb6e 100644 --- a/drivers/gpu/drm/i915/intel_overlay.c +++ b/drivers/gpu/drm/i915/intel_overlay.c | |||
@@ -373,7 +373,7 @@ static void intel_overlay_off_tail(struct intel_overlay *overlay) | |||
373 | 373 | ||
374 | /* never have the overlay hw on without showing a frame */ | 374 | /* never have the overlay hw on without showing a frame */ |
375 | BUG_ON(!overlay->vid_bo); | 375 | BUG_ON(!overlay->vid_bo); |
376 | obj = overlay->vid_bo->obj; | 376 | obj = &overlay->vid_bo->base; |
377 | 377 | ||
378 | i915_gem_object_unpin(obj); | 378 | i915_gem_object_unpin(obj); |
379 | drm_gem_object_unreference(obj); | 379 | drm_gem_object_unreference(obj); |
@@ -411,7 +411,7 @@ int intel_overlay_recover_from_interrupt(struct intel_overlay *overlay, | |||
411 | 411 | ||
412 | switch (overlay->hw_wedged) { | 412 | switch (overlay->hw_wedged) { |
413 | case RELEASE_OLD_VID: | 413 | case RELEASE_OLD_VID: |
414 | obj = overlay->old_vid_bo->obj; | 414 | obj = &overlay->old_vid_bo->base; |
415 | i915_gem_object_unpin(obj); | 415 | i915_gem_object_unpin(obj); |
416 | drm_gem_object_unreference(obj); | 416 | drm_gem_object_unreference(obj); |
417 | overlay->old_vid_bo = NULL; | 417 | overlay->old_vid_bo = NULL; |
@@ -467,7 +467,7 @@ static int intel_overlay_release_old_vid(struct intel_overlay *overlay) | |||
467 | if (ret != 0) | 467 | if (ret != 0) |
468 | return ret; | 468 | return ret; |
469 | 469 | ||
470 | obj = overlay->old_vid_bo->obj; | 470 | obj = &overlay->old_vid_bo->base; |
471 | i915_gem_object_unpin(obj); | 471 | i915_gem_object_unpin(obj); |
472 | drm_gem_object_unreference(obj); | 472 | drm_gem_object_unreference(obj); |
473 | overlay->old_vid_bo = NULL; | 473 | overlay->old_vid_bo = NULL; |