drm/amdgpu: rename page_directory_fence to last_dir_update (a24960f3) · Commits · 戴 / test

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -781,7 +781,7 @@ static int amdgpu_bo_vm_update_pte(struct amdgpu_cs_parser *p)
		if (r)
		return r;

		r = amdgpu_sync_fence(adev, &p->job->sync, vm->page_directory_fence);
		r = amdgpu_sync_fence(adev, &p->job->sync, vm->last_dir_update);
		if (r)
		return r;

+4 −4

Original line number	Diff line number	Diff line
		@@ -780,8 +780,8 @@ int amdgpu_vm_update_page_directory(struct amdgpu_device *adev,
		goto error_free;

		amdgpu_bo_fence(vm->page_directory, fence, true);
		dma_fence_put(vm->page_directory_fence);
		vm->page_directory_fence = dma_fence_get(fence);
		dma_fence_put(vm->last_dir_update);
		vm->last_dir_update = dma_fence_get(fence);
		dma_fence_put(fence);

		return 0;
		@@ -1913,7 +1913,7 @@ int amdgpu_vm_init(struct amdgpu_device adev, struct amdgpu_vm vm)
		if (r)
		goto err;

		vm->page_directory_fence = NULL;
		vm->last_dir_update = NULL;

		r = amdgpu_bo_create(adev, pd_size, align, true,
		AMDGPU_GEM_DOMAIN_VRAM,
		@@ -1996,7 +1996,7 @@ void amdgpu_vm_fini(struct amdgpu_device adev, struct amdgpu_vm vm)

		amdgpu_bo_unref(&vm->page_directory->shadow);
		amdgpu_bo_unref(&vm->page_directory);
		dma_fence_put(vm->page_directory_fence);
		dma_fence_put(vm->last_dir_update);
		}

		/**

+1 −1

Original line number	Diff line number	Diff line
		@@ -100,7 +100,7 @@ struct amdgpu_vm {
		/* contains the page directory */
		struct amdgpu_bo *page_directory;
		unsigned max_pde_used;
		struct dma_fence *page_directory_fence;
		struct dma_fence *last_dir_update;
		uint64_t last_eviction_counter;

		/* array of page tables, one for each page directory entry */