drm/udl: Use unlocked gem unreferencing
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 30 Mar 2016 09:40:43 +0000 (11:40 +0200)
committerSasha Levin <sasha.levin@oracle.com>
Tue, 12 Jul 2016 12:47:25 +0000 (08:47 -0400)
[ Upstream commit 72b9ff0612ad8fc969b910cd00ac16b57a1a9ba4 ]

For drm_gem_object_unreference callers are required to hold
dev->struct_mutex, which these paths don't. Enforcing this requirement
has become a bit more strict with

commit ef4c6270bf2867e2f8032e9614d1a8cfc6c71663
Author: Daniel Vetter <daniel.vetter@ffwll.ch>
Date:   Thu Oct 15 09:36:25 2015 +0200

    drm/gem: Check locking in drm_gem_object_unreference

Cc: stable@vger.kernel.org
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/gpu/drm/udl/udl_fb.c
drivers/gpu/drm/udl/udl_gem.c

index 5fc16cecd3ba595584f01f5f9a7e0b729f125341..cd8d183dcfe5691cbec8b357b7dba4669c6e51fc 100644 (file)
@@ -546,7 +546,7 @@ static int udlfb_create(struct drm_fb_helper *helper,
 
        return ret;
 out_gfree:
-       drm_gem_object_unreference(&ufbdev->ufb.obj->base);
+       drm_gem_object_unreference_unlocked(&ufbdev->ufb.obj->base);
 out:
        return ret;
 }
index 8044f5fb7c49a1f5709c6e1d62be72a798d465b8..6de963b70eee9596d58b9eb3e82add96e2a028fd 100644 (file)
@@ -51,7 +51,7 @@ udl_gem_create(struct drm_file *file,
                return ret;
        }
 
-       drm_gem_object_unreference(&obj->base);
+       drm_gem_object_unreference_unlocked(&obj->base);
        *handle_p = handle;
        return 0;
 }