tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'drm-fixes-2020-03-27' of git://anongit.freedesktop.org/drm/drm

Pull drm fixes from Dave Airlie:
"Pretty quiet: some minor sg mapping fixes for 3 drivers, and a single
oops fix for the scheduler. I'm hoping nobody tries to send me a fixes
pull today but I'll keep an eye out of the weekend.

radeon/amdgpu/dma-buf:
- sg list fixes

scheduler:
- oops fix"

* tag 'drm-fixes-2020-03-27' of git://anongit.freedesktop.org/drm/drm:
drm/scheduler: fix rare NULL ptr race
drm/radeon: fix scatter-gather mapping with user pages
drm/amdgpu: fix scatter-gather mapping with user pages
drm/prime: use dma length macro when mapping sg

Linus Torvalds 7bf8df68 f3e69428

+5 -3
+1 -1
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
··· 974 974 /* Map SG to device */ 975 975 r = -ENOMEM; 976 976 nents = dma_map_sg(adev->dev, ttm->sg->sgl, ttm->sg->nents, direction); 977 - if (nents != ttm->sg->nents) 977 + if (nents == 0) 978 978 goto release_sg; 979 979 980 980 /* convert SG to linear array of pages and dma addresses */
+1 -1
drivers/gpu/drm/drm_prime.c
··· 967 967 968 968 index = 0; 969 969 for_each_sg(sgt->sgl, sg, sgt->nents, count) { 970 - len = sg->length; 970 + len = sg_dma_len(sg); 971 971 page = sg_page(sg); 972 972 addr = sg_dma_address(sg); 973 973
+1 -1
drivers/gpu/drm/radeon/radeon_ttm.c
··· 528 528 529 529 r = -ENOMEM; 530 530 nents = dma_map_sg(rdev->dev, ttm->sg->sgl, ttm->sg->nents, direction); 531 - if (nents != ttm->sg->nents) 531 + if (nents == 0) 532 532 goto release_sg; 533 533 534 534 drm_prime_sg_to_page_addr_arrays(ttm->sg, ttm->pages,
+2
drivers/gpu/drm/scheduler/sched_main.c
··· 661 661 662 662 trace_drm_sched_process_job(s_fence); 663 663 664 + dma_fence_get(&s_fence->finished); 664 665 drm_sched_fence_finished(s_fence); 666 + dma_fence_put(&s_fence->finished); 665 667 wake_up_interruptible(&sched->wake_up_worker); 666 668 } 667 669