]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
drm/radeon/kms: Do not unpin buffer in fb destruction
authorJerome Glisse <jglisse@redhat.com>
Wed, 13 Jan 2010 11:32:36 +0000 (12:32 +0100)
committerDave Airlie <airlied@redhat.com>
Thu, 14 Jan 2010 01:53:21 +0000 (11:53 +1000)
It's not necessary to unpin buffer in fb destruction. pin/unpin
need to be balanced and we don't pin in fb creation. We pin when
an fb is associated to a crtc and unpin when the fb is disassociated
from the crtc.

Note:
Maybe we should take reference on fb in set_base callback so fb
doesn't disappear until it's unbind from ctrc.

Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/radeon/radeon_display.c

index 47ceae9cdc4311865cf40bd641eeb9a69e160e5a..49f3c69cf240a79c95fe5698688471afe4f445f8 100644 (file)
@@ -668,7 +668,6 @@ static void radeon_user_framebuffer_destroy(struct drm_framebuffer *fb)
                radeonfb_remove(dev, fb);
 
        if (radeon_fb->obj) {
-               radeon_gem_object_unpin(radeon_fb->obj);
                mutex_lock(&dev->struct_mutex);
                drm_gem_object_unreference(radeon_fb->obj);
                mutex_unlock(&dev->struct_mutex);