drm/amdgpu: keep the stolen memory in visible vram region (994dcfaa) · Commits · 戴 / test

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -1738,6 +1738,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
		uint64_t gtt_size;
		int r;
		u64 vis_vram_limit;
		void *stolen_vga_buf;

		mutex_init(&adev->mman.gtt_window_lock);

		@@ -1792,7 +1793,7 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
		r = amdgpu_bo_create_kernel(adev, adev->gmc.stolen_size, PAGE_SIZE,
		AMDGPU_GEM_DOMAIN_VRAM,
		&adev->stolen_vga_memory,
		NULL, NULL);
		NULL, &stolen_vga_buf);
		if (r)
		return r;
		DRM_INFO("amdgpu: %uM of VRAM memory ready\n",
		@@ -1856,8 +1857,9 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)
		*/
		void amdgpu_ttm_late_init(struct amdgpu_device *adev)
		{
		void *stolen_vga_buf;
		/* return the VGA stolen memory (if any) back to VRAM */
		amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, NULL);
		amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);
		}

		/**

+2 −1

Original line number	Diff line number	Diff line
		@@ -1238,6 +1238,7 @@ static int gmc_v9_0_sw_init(void *handle)
		static int gmc_v9_0_sw_fini(void *handle)
		{
		struct amdgpu_device adev = (struct amdgpu_device )handle;
		void *stolen_vga_buf;

		if (amdgpu_ras_is_supported(adev, AMDGPU_RAS_BLOCK__UMC) &&
		adev->gmc.umc_ras_if) {
		@@ -1270,7 +1271,7 @@ static int gmc_v9_0_sw_fini(void *handle)
		amdgpu_vm_manager_fini(adev);

		if (gmc_v9_0_keep_stolen_memory(adev))
		amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, NULL);
		amdgpu_bo_free_kernel(&adev->stolen_vga_memory, NULL, &stolen_vga_buf);

		amdgpu_gart_table_vram_free(adev);
		amdgpu_bo_fini(adev);