Sfoglia il codice sorgente

drm/ttm: add ttm_bo_io_mem_pfn to check io_mem_pfn

The io_mem_pfn field was added in commit ea642c3216cb ("drm/ttm: add
io_mem_pfn callback") and is called unconditionally. However, not all
drivers were updated to set it.

Use the ttm_bo_default_io_mem_pfn function if a driver did not set its
own. And add new function ttm_bo_io_mem_pfn() as wrapper.

Signed-off-by: Michal Srb <msrb@suse.com>
Signed-off-by: Tan Xiaojun <tanxiaojun@huawei.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Tan Xiaojun 7 anni fa
parent
commit
c67fa6edc8
1 ha cambiato i file con 12 aggiunte e 1 eliminazioni
  1. 12 1
      drivers/gpu/drm/ttm/ttm_bo_vm.c

+ 12 - 1
drivers/gpu/drm/ttm/ttm_bo_vm.c

@@ -92,6 +92,17 @@ out_unlock:
 	return ret;
 	return ret;
 }
 }
 
 
+static unsigned long ttm_bo_io_mem_pfn(struct ttm_buffer_object *bo,
+				       unsigned long page_offset)
+{
+	struct ttm_bo_device *bdev = bo->bdev;
+
+	if (bdev->driver->io_mem_pfn)
+		return bdev->driver->io_mem_pfn(bo, page_offset);
+
+	return ttm_bo_default_io_mem_pfn(bo, page_offset);
+}
+
 static int ttm_bo_vm_fault(struct vm_fault *vmf)
 static int ttm_bo_vm_fault(struct vm_fault *vmf)
 {
 {
 	struct vm_area_struct *vma = vmf->vma;
 	struct vm_area_struct *vma = vmf->vma;
@@ -234,7 +245,7 @@ static int ttm_bo_vm_fault(struct vm_fault *vmf)
 		if (bo->mem.bus.is_iomem) {
 		if (bo->mem.bus.is_iomem) {
 			/* Iomem should not be marked encrypted */
 			/* Iomem should not be marked encrypted */
 			cvma.vm_page_prot = pgprot_decrypted(cvma.vm_page_prot);
 			cvma.vm_page_prot = pgprot_decrypted(cvma.vm_page_prot);
-			pfn = bdev->driver->io_mem_pfn(bo, page_offset);
+			pfn = ttm_bo_io_mem_pfn(bo, page_offset);
 		} else {
 		} else {
 			page = ttm->pages[page_offset];
 			page = ttm->pages[page_offset];
 			if (unlikely(!page && i == 0)) {
 			if (unlikely(!page && i == 0)) {