geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some buffer teardown problems.

main
Alan Hourihane 2007-10-15 11:51:19 +01:00
parent d69721a14a
commit cc9be8ac32
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
linux-core/drm_crtc.c
View File

@ -951,14 +951,10 @@ void drm_mode_config_cleanup(struct drm_device *dev)
} }
list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) { list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) {
dev->driver->fb_remove(dev, drm_crtc_from_fb(dev, fb)); if (fb->bo->type != drm_bo_type_kernel)
/* 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); drm_framebuffer_destroy(fb);
else
dev->driver->fb_remove(dev, drm_crtc_from_fb(dev, fb));
} }
list_for_each_entry_safe(crtc, ct, &dev->mode_config.crtc_list, head) { list_for_each_entry_safe(crtc, ct, &dev->mode_config.crtc_list, head) {
@ -1585,14 +1581,15 @@ int drm_mode_rmfb(struct drm_device *dev,
goto out; goto out;
} }
dev->driver->fb_remove(dev, drm_crtc_from_fb(dev, fb));
/* TODO check if we own the buffer */ /* TODO check if we own the buffer */
/* TODO release all crtc connected to the framebuffer */ /* TODO release all crtc connected to the framebuffer */
/* bind the fb to the crtc for now */ /* bind the fb to the crtc for now */
/* TODO unhock the destructor from the buffer object */ /* TODO unhock the destructor from the buffer object */
if (fb->bo->type != drm_bo_type_kernel)
drm_framebuffer_destroy(fb); drm_framebuffer_destroy(fb);
else
dev->driver->fb_remove(dev, drm_crtc_from_fb(dev, fb));
out: out:
mutex_unlock(&dev->mode_config.mutex); mutex_unlock(&dev->mode_config.mutex);
@ -1666,8 +1663,10 @@ void drm_fb_release(struct file *filp)
mutex_lock(&dev->mode_config.mutex); mutex_lock(&dev->mode_config.mutex);
list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) { list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) {
list_del(&fb->filp_head); list_del(&fb->filp_head);
dev->driver->fb_remove(dev, drm_crtc_from_fb(dev, fb)); if (fb->bo->type != drm_bo_type_kernel)
drm_framebuffer_destroy(fb); drm_framebuffer_destroy(fb);
else
dev->driver->fb_remove(dev, drm_crtc_from_fb(dev, fb));
} }
mutex_unlock(&dev->mode_config.mutex); mutex_unlock(&dev->mode_config.mutex);
} }

1
linux-core/intel_fb.c
View File

@ -657,6 +657,7 @@ int intelfb_remove(struct drm_device *dev, struct drm_crtc *crtc)
unregister_framebuffer(info); unregister_framebuffer(info);
framebuffer_release(info); framebuffer_release(info);
drm_mem_reg_iounmap(dev, &fb->bo->mem, fb->virtual_base); drm_mem_reg_iounmap(dev, &fb->bo->mem, fb->virtual_base);
drm_bo_usage_deref_locked(&fb->bo);
drm_framebuffer_destroy(fb); drm_framebuffer_destroy(fb);
} }
return 0; return 0;