Commit 132f34e4 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: move struct gart_funcs into amdgpu_gmc.h 



And rename it to struct gmc_funcs.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarSamuel Li <Samuel.Li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 770d13b1

drivers/gpu/drm/amd/amdgpu/amdgpu.h

+4 −26
Original line number Diff line number Diff line
@@ -333,28 +333,6 @@ struct amdgpu_vm_pte_funcs { 
			    uint32_t incr, uint64_t flags);

};



/* provided by the gmc block */

struct amdgpu_gart_funcs {

	/* flush the vm tlb via mmio */

	void (*flush_gpu_tlb)(struct amdgpu_device *adev,

			      uint32_t vmid);

	/* write pte/pde updates using the cpu */

	int (*set_pte_pde)(struct amdgpu_device *adev,

			   void *cpu_pt_addr, /* cpu addr of page table */

			   uint32_t gpu_page_idx, /* pte/pde to update */

			   uint64_t addr, /* addr to write into pte/pde */

			   uint64_t flags); /* access flags */

	/* enable/disable PRT support */

	void (*set_prt)(struct amdgpu_device *adev, bool enable);

	/* set pte flags based per asic */

	uint64_t (*get_vm_pte_flags)(struct amdgpu_device *adev,

				     uint32_t flags);

	/* get the pde for a given mc addr */

	void (*get_vm_pde)(struct amdgpu_device *adev, int level,

			   u64 *dst, u64 *flags);

	uint32_t (*get_invalidate_req)(unsigned int vmid);

};



/* provided by the ih block */

struct amdgpu_ih_funcs {

	/* ring read/write ptr handling, called from interrupt context */
@@ -1797,13 +1775,13 @@ amdgpu_get_sdma_instance(struct amdgpu_ring *ring) 
#define amdgpu_asic_get_config_memsize(adev) (adev)->asic_funcs->get_config_memsize((adev))

#define amdgpu_asic_flush_hdp(adev) (adev)->asic_funcs->flush_hdp((adev))

#define amdgpu_asic_invalidate_hdp(adev) (adev)->asic_funcs->invalidate_hdp((adev))

#define amdgpu_gart_flush_gpu_tlb(adev, vmid) (adev)->gart.gart_funcs->flush_gpu_tlb((adev), (vmid))

#define amdgpu_gart_set_pte_pde(adev, pt, idx, addr, flags) (adev)->gart.gart_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))

#define amdgpu_gart_get_vm_pde(adev, level, dst, flags) (adev)->gart.gart_funcs->get_vm_pde((adev), (level), (dst), (flags))

#define amdgpu_gmc_flush_gpu_tlb(adev, vmid) (adev)->gmc.gmc_funcs->flush_gpu_tlb((adev), (vmid))

#define amdgpu_gmc_set_pte_pde(adev, pt, idx, addr, flags) (adev)->gmc.gmc_funcs->set_pte_pde((adev), (pt), (idx), (addr), (flags))

#define amdgpu_gmc_get_vm_pde(adev, level, dst, flags) (adev)->gmc.gmc_funcs->get_vm_pde((adev), (level), (dst), (flags))

#define amdgpu_gmc_get_pte_flags(adev, flags) (adev)->gmc.gmc_funcs->get_vm_pte_flags((adev),(flags))

#define amdgpu_vm_copy_pte(adev, ib, pe, src, count) ((adev)->vm_manager.vm_pte_funcs->copy_pte((ib), (pe), (src), (count)))

#define amdgpu_vm_write_pte(adev, ib, pe, value, count, incr) ((adev)->vm_manager.vm_pte_funcs->write_pte((ib), (pe), (value), (count), (incr)))

#define amdgpu_vm_set_pte_pde(adev, ib, pe, addr, count, incr, flags) ((adev)->vm_manager.vm_pte_funcs->set_pte_pde((ib), (pe), (addr), (count), (incr), (flags)))

#define amdgpu_vm_get_pte_flags(adev, flags) (adev)->gart.gart_funcs->get_vm_pte_flags((adev),(flags))

#define amdgpu_ring_parse_cs(r, p, ib) ((r)->funcs->parse_cs((p), (ib)))

#define amdgpu_ring_test_ring(r) (r)->funcs->test_ring((r))

#define amdgpu_ring_test_ib(r, t) (r)->funcs->test_ib((r), (t))

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

+1 −1
Original line number Diff line number Diff line
@@ -1775,7 +1775,7 @@ int amdgpu_device_init(struct amdgpu_device *adev, 
	adev->mman.buffer_funcs_ring = NULL;

	adev->vm_manager.vm_pte_funcs = NULL;

	adev->vm_manager.vm_pte_num_rings = 0;

	adev->gart.gart_funcs = NULL;

	adev->gmc.gmc_funcs = NULL;

	adev->fence_context = dma_fence_context_alloc(AMDGPU_MAX_RINGS);

	bitmap_zero(adev->gfx.pipe_reserve_bitmap, AMDGPU_MAX_COMPUTE_QUEUES);

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

+5 −5
Original line number Diff line number Diff line
@@ -241,14 +241,14 @@ int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, 
			continue;



		for (j = 0; j < (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); j++, t++) {

			amdgpu_gart_set_pte_pde(adev, adev->gart.ptr,

			amdgpu_gmc_set_pte_pde(adev, adev->gart.ptr,

					       t, page_base, flags);

			page_base += AMDGPU_GPU_PAGE_SIZE;

		}

	}

	mb();

	amdgpu_asic_flush_hdp(adev);

	amdgpu_gart_flush_gpu_tlb(adev, 0);

	amdgpu_gmc_flush_gpu_tlb(adev, 0);

	return 0;

}
@@ -280,7 +280,7 @@ int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset, 
	for (i = 0; i < pages; i++) {

		page_base = dma_addr[i];

		for (j = 0; j < (PAGE_SIZE / AMDGPU_GPU_PAGE_SIZE); j++, t++) {

			amdgpu_gart_set_pte_pde(adev, dst, t, page_base, flags);

			amdgpu_gmc_set_pte_pde(adev, dst, t, page_base, flags);

			page_base += AMDGPU_GPU_PAGE_SIZE;

		}

	}
@@ -331,7 +331,7 @@ int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, 


	mb();

	amdgpu_asic_flush_hdp(adev);

	amdgpu_gart_flush_gpu_tlb(adev, 0);

	amdgpu_gmc_flush_gpu_tlb(adev, 0);

	return 0;

}

drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h

+0 −3
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
 */

struct amdgpu_device;

struct amdgpu_bo;

struct amdgpu_gart_funcs;



#define AMDGPU_GPU_PAGE_SIZE 4096

#define AMDGPU_GPU_PAGE_MASK (AMDGPU_GPU_PAGE_SIZE - 1)
@@ -52,8 +51,6 @@ struct amdgpu_gart { 


	/* Asic default pte flags */

	uint64_t			gart_pte_flags;



	const struct amdgpu_gart_funcs *gart_funcs;

};



int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev);

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

+2 −2
Original line number Diff line number Diff line
@@ -634,7 +634,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
		if (r)

			goto error_backoff;



		va_flags = amdgpu_vm_get_pte_flags(adev, args->flags);

		va_flags = amdgpu_gmc_get_pte_flags(adev, args->flags);

		r = amdgpu_vm_bo_map(adev, bo_va, args->va_address,

				     args->offset_in_bo, args->map_size,

				     va_flags);
@@ -654,7 +654,7 @@ int amdgpu_gem_va_ioctl(struct drm_device *dev, void *data, 
		if (r)

			goto error_backoff;



		va_flags = amdgpu_vm_get_pte_flags(adev, args->flags);

		va_flags = amdgpu_gmc_get_pte_flags(adev, args->flags);

		r = amdgpu_vm_bo_replace_map(adev, bo_va, args->va_address,

					     args->offset_in_bo, args->map_size,

					     va_flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE