Merge branch 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux into drm-next

A few more things for 4.12:
- ttm and amdgpu support for non-contiguous vram CPU mappings
- lots of bug fixes and cleanups for vega10
- misc bug fixes and code cleanups

[airlied: fix do_div error on 32-bit arm, not sure it's 100% correct]

* 'drm-next-4.12' of git://people.freedesktop.org/~agd5f/linux: (58 commits)
  drm/amdgpu: use uintptr_t instead of unsigned long to store pointer
  drm/amdgpu: Avoid using signed integer to store pointer value
  drm/amdgpu:invoke new implemented AI MB func
  drm/amdgpu/vega10:timeout set to equal with VI
  drm/amdgpu:implement the reset MB func for vega10
  drm/amdgpu:fix typo for mxgpu_ai
  drm/amdgpu:no need to involv HDP in KIQ
  drm/amdgpu:add PSP block only load_type=PSP (v2)
  drm/amdgpu/smu9: update to latest driver interface
  drm/amd/amdgpu: cleanup gfx_v9_0_gpu_init()
  drm/amd/amdgpu: cleanup gfx_v9_0_rlc_reset()
  drm/amd/amdgpu: cleanup gfx_v9_0_rlc_start()
  drm/amd/amdgpu: simplify gfx_v9_0_cp_gfx_enable()
  drm/amd/amdgpu: cleanup gfx_v9_0_kiq_init_register()
  drm/amd/amdgpu: Drop gfx_v9_0_print_status()
  drm/amd/amdgpu: cleanup gfx_v9_0_set_gfx_eop_interrupt_state()
  drm/amd/amdgpu: cleanup gfx_v9_0_set_priv_reg_fault_state()
  drm/amd/amdgpu: cleanup gfx_v9_0_set_priv_inst_fault_state()
  drm/amd/amdgpu: cleanup gfx_v9_0_init_queue()
  drm/amdgpu: Move function amdgpu_has_atpx near other similar functions
  ...

1 files changed, 12 insertions, 28 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
index 244bb9aacf86..7e993259c2e9 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
@@ -529,40 +529,12 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_
         case TTM_PL_TT:
                 break;
         case TTM_PL_VRAM:
-                if (mem->start == AMDGPU_BO_INVALID_OFFSET)
-                        return -EINVAL;
-
                 mem->bus.offset = mem->start << PAGE_SHIFT;
                 /* check if it's visible */
                 if ((mem->bus.offset + mem->bus.size) > adev->mc.visible_vram_size)
                         return -EINVAL;
                 mem->bus.base = adev->mc.aper_base;
                 mem->bus.is_iomem = true;
-#ifdef __alpha__
-                /*
-                 * Alpha: use bus.addr to hold the ioremap() return,
-                 * so we can modify bus.base below.
-                 */
-                if (mem->placement & TTM_PL_FLAG_WC)
-                        mem->bus.addr =
-                                ioremap_wc(mem->bus.base + mem->bus.offset,
-                                           mem->bus.size);
-                else
-                        mem->bus.addr =
-                                ioremap_nocache(mem->bus.base + mem->bus.offset,
-                                                mem->bus.size);
-                if (!mem->bus.addr)
-                        return -ENOMEM;
-
-                /*
-                 * Alpha: Use just the bus offset plus
-                 * the hose/domain memory base for bus.base.
-                 * It then can be used to build PTEs for VRAM
-                 * access, as done in ttm_bo_vm_fault().
-                 */
-                mem->bus.base = (mem->bus.base & 0x0ffffffffUL) +
-                        adev->ddev->hose->dense_mem_base;
-#endif
                 break;
         default:
                 return -EINVAL;
@@ -574,6 +546,17 @@ static void amdgpu_ttm_io_mem_free(struct ttm_bo_device *bdev, struct ttm_mem_re
 {
 }
 
+static unsigned long amdgpu_ttm_io_mem_pfn(struct ttm_buffer_object *bo,
+                                           unsigned long page_offset)
+{
+        struct drm_mm_node *mm = bo->mem.mm_node;
+        uint64_t size = mm->size;
+        uint64_t offset = page_offset;
+
+        page_offset = do_div(offset, size);
+        return (bo->mem.bus.base >> PAGE_SHIFT) + mm->start + page_offset;
+}
+
 /*
  * TTM backend functions.
  */
@@ -1089,6 +1072,7 @@ static struct ttm_bo_driver amdgpu_bo_driver = {
         .fault_reserve_notify = &amdgpu_bo_fault_reserve_notify,
         .io_mem_reserve = &amdgpu_ttm_io_mem_reserve,
         .io_mem_free = &amdgpu_ttm_io_mem_free,
+        .io_mem_pfn = amdgpu_ttm_io_mem_pfn,
 };
 
 int amdgpu_ttm_init(struct amdgpu_device *adev)