diff options
| author | Takashi Iwai <[email protected]> | 2020-09-02 13:31:45 +0200 |
|---|---|---|
| committer | Takashi Iwai <[email protected]> | 2020-09-02 13:32:06 +0200 |
| commit | 6bde8ef51c917a657476310728d6cb3de6bac9e4 (patch) | |
| tree | ba8a63abee1fa74d849dc9fc59e0854bc99a8524 /drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | |
| parent | 949a1ebe8cea7b342085cb6a4946b498306b9493 (diff) | |
| parent | 07da90b0e5fc299c0ce4d34d1916d7a79b86848b (diff) | |
Merge branch 'topic/tasklet-convert' into for-linus
Pull tasklet API conversions.
Signed-off-by: Takashi Iwai <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c index 25ddb482466a..db731f573f98 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_fb.c @@ -114,7 +114,7 @@ static void amdgpufb_destroy_pinned_object(struct drm_gem_object *gobj) amdgpu_bo_unpin(abo); amdgpu_bo_unreserve(abo); } - drm_gem_object_put_unlocked(gobj); + drm_gem_object_put(gobj); } static int amdgpufb_create_pinned_object(struct amdgpu_fbdev *rfbdev, @@ -278,7 +278,7 @@ out: } if (fb && ret) { - drm_gem_object_put_unlocked(gobj); + drm_gem_object_put(gobj); drm_framebuffer_unregister_private(fb); drm_framebuffer_cleanup(fb); kfree(fb); |