diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-12-02 15:55:41 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-01-20 09:57:21 -0500 |
commit | 7147573a5ce499dec3979e6b524691d47e1288d5 (patch) | |
tree | b3c414243613b8aeee33921602d6b6363d4f2565 /drivers/gpu/drm/drm_crtc.c | |
parent | 80f0b5aff8f49f63eaf08bdae243de3a8ea3f77e (diff) |
drm/gma500: move fbcon restore to lastclose
Doing this within the fb->destroy callback leads to a locking
nightmare. And all other drm drivers that restore the fbcon do
it in lastclose, too.
With this adjustments all fb->destroy callbacks optionally drop
references to any gem objects used as backing storage, call
drm_framebuffer_cleanup and then kfree the struct. Which nicely
simplifies the locking for framebuffer unreferencing and freeing,
since this doesn't require that we hold the mode_config lock. A
slight exception is the vmwgfx surface backed framebuffer, it also
calls drm_master_put and removes the object from a device-private
framebuffer list. Both seem to have solid locking in place already.
Conclusion is that now it is no longer required to hold the
mode_config lock while freeing a framebuffer.
v2: Drop the corresponding mutex_lock WARN check from
drm_framebuffer_unreference.
v3: Use just the mode_config lock not modeset_lock_all, due to patch
reordering.
Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
-rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 81545540b2df..8d665fafc15e 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c | |||
@@ -317,9 +317,7 @@ static void drm_framebuffer_free(struct kref *kref) | |||
317 | */ | 317 | */ |
318 | void drm_framebuffer_unreference(struct drm_framebuffer *fb) | 318 | void drm_framebuffer_unreference(struct drm_framebuffer *fb) |
319 | { | 319 | { |
320 | struct drm_device *dev = fb->dev; | ||
321 | DRM_DEBUG("FB ID: %d\n", fb->base.id); | 320 | DRM_DEBUG("FB ID: %d\n", fb->base.id); |
322 | WARN_ON(!drm_modeset_is_locked(dev)); | ||
323 | kref_put(&fb->refcount, drm_framebuffer_free); | 321 | kref_put(&fb->refcount, drm_framebuffer_free); |
324 | } | 322 | } |
325 | EXPORT_SYMBOL(drm_framebuffer_unreference); | 323 | EXPORT_SYMBOL(drm_framebuffer_unreference); |