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 branch 'drm-next-4.18' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
amd
/
amdgpu
/
amdgpu_cs.c
diff --git
a/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
index e1756b68a17beda71956555e07b5b8595f786e27..9c1d491d742e095c24b9cff843cb9830c3d67753 100644
(file)
--- a/
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
+++ b/
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c
@@
-530,7
+530,7
@@
static int amdgpu_cs_parser_bos(struct amdgpu_cs_parser *p,
if (p->bo_list) {
amdgpu_bo_list_get_list(p->bo_list, &p->validated);
if (p->bo_list->first_userptr != p->bo_list->num_entries)
- p->mn = amdgpu_mn_get(p->adev);
+ p->mn = amdgpu_mn_get(p->adev
, AMDGPU_MN_TYPE_GFX
);
}
INIT_LIST_HEAD(&duplicates);