]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amdgpu: skip reservation of discovery tmr region in pre-Navi
authorHawking Zhang <Hawking.Zhang@amd.com>
Thu, 16 Jan 2020 17:10:52 +0000 (01:10 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 1 May 2020 19:19:07 +0000 (15:19 -0400)
IP discovery is only supported in Navi series and onwards.
There is no need to reserve a portion of vram as discovery
tmr region for pre-Navi adapters.

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: Likun Gao <Likun.Gao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

index 085d7c238163580f7c79e3bf8d07745cbfba3f6e..93d057f92dcd66eea2770cc08fd1410faac5a9b2 100644 (file)
@@ -1961,14 +1961,16 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
         * reserve TMR memory at the top of VRAM which holds
         * IP Discovery data and is protected by PSP.
         */
-       r = amdgpu_bo_create_kernel_at(adev,
+       if (adev->discovery_tmr_size > 0) {
+               r = amdgpu_bo_create_kernel_at(adev,
                        adev->gmc.real_vram_size - adev->discovery_tmr_size,
                        adev->discovery_tmr_size,
                        AMDGPU_GEM_DOMAIN_VRAM,
                        &adev->discovery_memory,
                        NULL);
-       if (r)
-               return r;
+               if (r)
+                       return r;
+       }
 
        DRM_INFO("amdgpu: %uM of VRAM memory ready\n",
                 (unsigned) (adev->gmc.real_vram_size / (1024 * 1024)));