1 files changed, 6 insertions, 10 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
index 93000af92283..87da6b1848fd 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -96,8 +96,8 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
 
         if ((amdgpu_runtime_pm != 0) &&
             amdgpu_has_atpx() &&
-            ((flags & AMDGPU_IS_APU) == 0))
-                flags |= AMDGPU_IS_PX;
+            ((flags & AMD_IS_APU) == 0))
+                flags |= AMD_IS_PX;
 
         /* amdgpu_device_init should report only fatal error
          * like memory allocation failure or iomapping failure,
@@ -451,11 +451,11 @@ static int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file
                 dev_info.num_hw_gfx_contexts = adev->gfx.config.max_hw_contexts;
                 dev_info._pad = 0;
                 dev_info.ids_flags = 0;
-                if (adev->flags & AMDGPU_IS_APU)
+                if (adev->flags & AMD_IS_APU)
                         dev_info.ids_flags |= AMDGPU_IDS_FLAGS_FUSION;
                 dev_info.virtual_address_offset = AMDGPU_VA_RESERVED_SIZE;
                 dev_info.virtual_address_max = (uint64_t)adev->vm_manager.max_pfn * AMDGPU_GPU_PAGE_SIZE;
-                dev_info.virtual_address_alignment = max(PAGE_SIZE, 0x10000UL);
+                dev_info.virtual_address_alignment = max((int)PAGE_SIZE, AMDGPU_GPU_PAGE_SIZE);
                 dev_info.pte_fragment_size = (1 << AMDGPU_LOG2_PAGES_PER_FRAG) *
                                              AMDGPU_GPU_PAGE_SIZE;
                 dev_info.gart_page_size = AMDGPU_GPU_PAGE_SIZE;
@@ -527,10 +527,7 @@ int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv)
         mutex_init(&fpriv->bo_list_lock);
         idr_init(&fpriv->bo_list_handles);
 
-        /* init context manager */
-        mutex_init(&fpriv->ctx_mgr.lock);
-        idr_init(&fpriv->ctx_mgr.ctx_handles);
-        fpriv->ctx_mgr.adev = adev;
+        amdgpu_ctx_mgr_init(&fpriv->ctx_mgr);
 
         file_priv->driver_priv = fpriv;
 
@@ -571,8 +568,7 @@ void amdgpu_driver_postclose_kms(struct drm_device *dev,
         idr_destroy(&fpriv->bo_list_handles);
         mutex_destroy(&fpriv->bo_list_lock);
 
-        /* release context */
-        amdgpu_ctx_fini(fpriv);
+        amdgpu_ctx_mgr_fini(&fpriv->ctx_mgr);
 
         kfree(fpriv);
         file_priv->driver_priv = NULL;