xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge v5.8-rc6 into drm-next

Browse Source 
I've got a silent conflict + two trees based on fixes to merge.

Fixes a silent merge with amdgpu

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie
2020-07-24 08:28:09 +10:00
parent 2067391195 ba47d845d7
commit 41206a073c
1370 changed files with 11800 additions and 6440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/gpu/drm/ttm/ttm_bo.c
View File

@@ -880,8 +880,10 @@ static int ttm_bo_add_move_fence(struct ttm_buffer_object *bo,
if (!fence)
return 0;
if (no_wait_gpu)
if (no_wait_gpu) {
dma_fence_put(fence);
return -EBUSY;
}
dma_resv_add_shared_fence(bo->base.resv, fence);