diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-02-04 14:56:52 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-02-04 14:57:34 +1000 |
| commit | 148fb2e2e38769d99e3dfafdc03d06eeedcf7ad3 (patch) | |
| tree | 8f2bba99e26341ba20534a69951a9e9792952806 /drivers/gpu/drm/ast | |
| parent | 37fdaa3390cf3e0fde96941799543e85ea58f6ae (diff) | |
| parent | 47dd8048a1bf5b2fb96e5abe99b4f1dcd208ea4d (diff) | |
Merge branch 'drm-next-5.1' of git://people.freedesktop.org/~agd5f/linux into drm-next
ttm:
- Replace ref/unref naming with get/put
amdgpu:
- Revert DC clang fix, causes a segfault with some compiler versions
- SR-IOV fix
- PCIE fix for vega20
- Misc DC fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190201062345.7304-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/ast')
| -rw-r--r-- | drivers/gpu/drm/ast/ast_main.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/ast/ast_main.c b/drivers/gpu/drm/ast/ast_main.c index 373700c05a00..2854399856ba 100644 --- a/drivers/gpu/drm/ast/ast_main.c +++ b/drivers/gpu/drm/ast/ast_main.c @@ -639,13 +639,9 @@ int ast_dumb_create(struct drm_file *file, static void ast_bo_unref(struct ast_bo **bo) { - struct ttm_buffer_object *tbo; - if ((*bo) == NULL) return; - - tbo = &((*bo)->bo); - ttm_bo_unref(&tbo); + ttm_bo_put(&((*bo)->bo)); *bo = NULL; } |