Commit 3490bdb5 authored by Christian König's avatar Christian König Committed by Alex Deucher
Browse files

drm/amdgpu: move GART struct and function into amdgpu_gart.h v2 



No functional change, just cleanup.

v2: rebased, keep gart name.

Signed-off-by: default avatarChristian König <christian.koenig@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 70d17a25

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

+1 −47
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 


#include "gpu_scheduler.h"

#include "amdgpu_virt.h"

#include "amdgpu_gart.h"



/*

 * Modules parameters.
@@ -531,53 +532,6 @@ int amdgpu_mode_dumb_mmap(struct drm_file *filp, 
int amdgpu_fence_slab_init(void);

void amdgpu_fence_slab_fini(void);



/*

 * GART structures, functions & helpers

 */

struct amdgpu_mc;



#define AMDGPU_GPU_PAGE_SIZE 4096

#define AMDGPU_GPU_PAGE_MASK (AMDGPU_GPU_PAGE_SIZE - 1)

#define AMDGPU_GPU_PAGE_SHIFT 12

#define AMDGPU_GPU_PAGE_ALIGN(a) (((a) + AMDGPU_GPU_PAGE_MASK) & ~AMDGPU_GPU_PAGE_MASK)



struct amdgpu_gart {

	dma_addr_t			table_addr;

	struct amdgpu_bo		*robj;

	void				*ptr;

	unsigned			num_gpu_pages;

	unsigned			num_cpu_pages;

	unsigned			table_size;

#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS

	struct page			**pages;

#endif

	bool				ready;



	/* Asic default pte flags */

	uint64_t			gart_pte_flags;



	const struct amdgpu_gart_funcs *gart_funcs;

};



void amdgpu_gart_set_defaults(struct amdgpu_device *adev);

int amdgpu_gart_table_ram_alloc(struct amdgpu_device *adev);

void amdgpu_gart_table_ram_free(struct amdgpu_device *adev);

int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev);

void amdgpu_gart_table_vram_free(struct amdgpu_device *adev);

int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev);

void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev);

int amdgpu_gart_init(struct amdgpu_device *adev);

void amdgpu_gart_fini(struct amdgpu_device *adev);

int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,

			int pages);

int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset,

		    int pages, dma_addr_t *dma_addr, uint64_t flags,

		    void *dst);

int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,

		     int pages, struct page **pagelist,

		     dma_addr_t *dma_addr, uint64_t flags);

int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);



/*

 * VMHUB structures, functions & helpers

 */

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

0 → 100644
+77 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2017 Advanced Micro Devices, Inc.

 *

 * Permission is hereby granted, free of charge, to any person obtaining a

 * copy of this software and associated documentation files (the "Software"),

 * to deal in the Software without restriction, including without limitation

 * the rights to use, copy, modify, merge, publish, distribute, sublicense,

 * and/or sell copies of the Software, and to permit persons to whom the

 * Software is furnished to do so, subject to the following conditions:

 *

 * The above copyright notice and this permission notice shall be included in

 * all copies or substantial portions of the Software.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL

 * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

 * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 *

 */



#ifndef __AMDGPU_GART_H__

#define __AMDGPU_GART_H__



#include <linux/types.h>



/*

 * GART structures, functions & helpers

 */

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)

#define AMDGPU_GPU_PAGE_SHIFT 12

#define AMDGPU_GPU_PAGE_ALIGN(a) (((a) + AMDGPU_GPU_PAGE_MASK) & ~AMDGPU_GPU_PAGE_MASK)



struct amdgpu_gart {

	dma_addr_t			table_addr;

	struct amdgpu_bo		*robj;

	void				*ptr;

	unsigned			num_gpu_pages;

	unsigned			num_cpu_pages;

	unsigned			table_size;

#ifdef CONFIG_DRM_AMDGPU_GART_DEBUGFS

	struct page			**pages;

#endif

	bool				ready;



	/* Asic default pte flags */

	uint64_t			gart_pte_flags;



	const struct amdgpu_gart_funcs *gart_funcs;

};



void amdgpu_gart_set_defaults(struct amdgpu_device *adev);

int amdgpu_gart_table_ram_alloc(struct amdgpu_device *adev);

void amdgpu_gart_table_ram_free(struct amdgpu_device *adev);

int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev);

void amdgpu_gart_table_vram_free(struct amdgpu_device *adev);

int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev);

void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev);

int amdgpu_gart_init(struct amdgpu_device *adev);

void amdgpu_gart_fini(struct amdgpu_device *adev);

int amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset,

		       int pages);

int amdgpu_gart_map(struct amdgpu_device *adev, uint64_t offset,

		    int pages, dma_addr_t *dma_addr, uint64_t flags,

		    void *dst);

int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset,

		     int pages, struct page **pagelist,

		     dma_addr_t *dma_addr, uint64_t flags);



#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -80,5 +80,6 @@ int amdgpu_fill_buffer(struct amdgpu_bo *bo, 
int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma);

bool amdgpu_ttm_is_bound(struct ttm_tt *ttm);

int amdgpu_ttm_bind(struct ttm_buffer_object *bo, struct ttm_mem_reg *bo_mem);

int amdgpu_ttm_recover_gart(struct amdgpu_device *adev);



#endif