summaryrefslogtreecommitdiff
path: root/linux-core
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-17 17:30:46 -0700
committerJesse Barnes <jbarnes@hobbes.virtuousgeek.org>2007-04-17 17:30:46 -0700
commit73b031df613b58c4462a65818b88200bed0a97de (patch)
tree5b3d4d0117a769d1d27a45f0cbe5d537517997c9 /linux-core
parenta45fa264f2b60185ae797f85d2084d57de49bbca (diff)
Add framebuffer bo freeing to drm_mode_config_cleanup (seems like the best
place for now).
Diffstat (limited to 'linux-core')
-rw-r--r--linux-core/drm_crtc.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/linux-core/drm_crtc.c b/linux-core/drm_crtc.c
index 1adae0d2..0fb5b9ae 100644
--- a/linux-core/drm_crtc.c
+++ b/linux-core/drm_crtc.c
@@ -614,8 +614,8 @@ bool drm_initial_config(drm_device_t *dev, bool can_grow)
DRM_BO_FLAG_MEM_PRIV0 | DRM_BO_FLAG_NO_MOVE,
0, 0, 0,
&fbo);
- DRM_DEBUG("allocated %dx%d fb: 0x%08lx\n", fb->width, fb->height,
- fbo->offset);
+ DRM_DEBUG("allocated %dx%d fb: 0x%08lx, bo %p\n", fb->width,
+ fb->height, fbo->offset, fbo);
fb->offset = fbo->offset;
fb->bo = fbo;
drmfb_probe(dev, fb);
@@ -639,6 +639,12 @@ void drm_mode_config_cleanup(drm_device_t *dev)
list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) {
drmfb_remove(dev, fb);
+ /* If this FB was the kernel one, free it */
+ if (fb->bo->type == drm_bo_type_kernel) {
+ mutex_lock(&dev->struct_mutex);
+ drm_bo_usage_deref_locked(fb->bo);
+ mutex_unlock(&dev->struct_mutex);
+ }
drm_framebuffer_destroy(fb);
}
}