diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2010-02-11 00:09:44 +0100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-11 02:34:46 +0100 |
| commit | 75dfca80a610e4e87d3b9ccfb3f520692808697d (patch) | |
| tree | f36aec97c8e6a6ff7c8c169a2ab5fc078074593c /drivers/gpu/drm | |
| parent | drm/i915: Fix crash while aborting hibernation (diff) | |
| download | linux-75dfca80a610e4e87d3b9ccfb3f520692808697d.tar.xz linux-75dfca80a610e4e87d3b9ccfb3f520692808697d.zip | |
drm/i915: hold ref on flip object until it completes
This will prevent things from falling over if the user frees the flip
buffer before we complete the flip, since we'll hold an internal
reference.
Reported-by: Kristian Høgsberg <krh@bitplanet.net>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c161ace7132d..b27202d23ebc 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -4094,6 +4094,7 @@ static void intel_unpin_work_fn(struct work_struct *__work) mutex_lock(&work->dev->struct_mutex); i915_gem_object_unpin(work->old_fb_obj); + drm_gem_object_unreference(work->pending_flip_obj); drm_gem_object_unreference(work->old_fb_obj); mutex_unlock(&work->dev->struct_mutex); kfree(work); @@ -4221,8 +4222,9 @@ static int intel_crtc_page_flip(struct drm_crtc *crtc, return ret; } - /* Reference the old fb object for the scheduled work. */ + /* Reference the objects for the scheduled work. */ drm_gem_object_reference(work->old_fb_obj); + drm_gem_object_reference(obj); crtc->fb = fb; i915_gem_object_flush_write_domain(obj); |