drm/ttm: add ttm_bo_io_mem_pfn to check io_mem_pfn

BugLink: https://bugs.launchpad.net/bugs/1738334
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>
(cherry picked from commit c67fa6edc8b11afe22c88a23963170bf5f151acf)
Signed-off-by: Daniel Axtens <daniel.axtens@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/drivers/gpu/drm/ttm/ttm_bo_vm.c b/drivers/gpu/drm/ttm/ttm_bo_vm.c
index b17d0d38f290a645cf4402b60f3c02616c3c8504..d952d999691765cebaeeb430aeb0b6d892f22073 100644 (file)
--- a/drivers/gpu/drm/ttm/ttm_bo_vm.c
+++ b/drivers/gpu/drm/ttm/ttm_bo_vm.c
@@ -92,6 +92,17 @@ out_unlock:
        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)
 {
        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) {
                        /* Iomem should not be marked encrypted */
                        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 {
                        page = ttm->pages[page_offset];
                        if (unlikely(!page && i == 0)) {