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

Backmerge remote-tracking branch 'drm/drm-next' into drm-misc-next

Browse Source 
Some conflicts with ttm_bo->offset removal, but drm-misc-next needs updating to v5.8.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
This commit is contained in:
Maarten Lankhorst
2020-06-29 12:15:51 +02:00
parent 84e543bc9d 0a19b068ac
commit 60e9eabf41
15144 changed files with 872568 additions and 325352 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/drm/ttm/ttm_bo_api.h
View File

@@ -666,10 +666,6 @@ int ttm_bo_mmap_obj(struct vm_area_struct *vma, struct ttm_buffer_object *bo);
int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
struct ttm_bo_device *bdev);
void *ttm_kmap_atomic_prot(struct page *page, pgprot_t prot);
void ttm_kunmap_atomic_prot(void *addr, pgprot_t prot);
/**
* ttm_bo_io
*