git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'amd-drm-next-5.11-2020-11-05' of git://people.freedesktop.org/~agd5f/linux...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_gtt_mgr.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
index 1721739def84a3a265a5e53b1d260f825142283d..8980329cded0298d42529ac0520a5f9442c97f96 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c
@@
-81,8
+81,8
@@
static const struct ttm_resource_manager_func amdgpu_gtt_mgr_func;
/**
* amdgpu_gtt_mgr_init - init GTT manager and DRM MM
*
/**
* amdgpu_gtt_mgr_init - init GTT manager and DRM MM
*
- * @
man: TTM memory type manag
er
- * @
p
_size: maximum size of GTT
+ * @
adev: amdgpu_device point
er
+ * @
gtt
_size: maximum size of GTT
*
* Allocate and initialize the GTT manager.
*/
*
* Allocate and initialize the GTT manager.
*/
@@
-123,7
+123,7
@@
int amdgpu_gtt_mgr_init(struct amdgpu_device *adev, uint64_t gtt_size)
/**
* amdgpu_gtt_mgr_fini - free and destroy GTT manager
*
/**
* amdgpu_gtt_mgr_fini - free and destroy GTT manager
*
- * @
man: TTM memory type manag
er
+ * @
adev: amdgpu_device point
er
*
* Destroy and free the GTT manager, returns -EBUSY if ranges are still
* allocated inside it.
*
* Destroy and free the GTT manager, returns -EBUSY if ranges are still
* allocated inside it.