diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:52:07 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-29 12:52:07 +0200 |
| commit | d8dfacf8b50c260d79864933ac82a8198a0908a9 (patch) | |
| tree | b172eb8643de7bd9f9439c58031b06c98116d86a /drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | |
| parent | e87359efcaf45efc41dbaa6ec25eb26705300cee (diff) | |
| parent | df075feefbd347f13fba5198294cda619532c237 (diff) | |
| download | talos-obmc-linux-d8dfacf8b50c260d79864933ac82a8198a0908a9.tar.gz talos-obmc-linux-d8dfacf8b50c260d79864933ac82a8198a0908a9.zip | |
Merge branch 'topic/firewire-update' into for-next
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c index 496ed2192eba..84d68d658f8a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c @@ -183,7 +183,7 @@ int alloc_gtt_mem(struct kgd_dev *kgd, size_t size, return -ENOMEM; r = amdgpu_bo_create(rdev, size, PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_GTT, - AMDGPU_GEM_CREATE_CPU_GTT_USWC, NULL, &(*mem)->bo); + AMDGPU_GEM_CREATE_CPU_GTT_USWC, NULL, NULL, &(*mem)->bo); if (r) { dev_err(rdev->dev, "failed to allocate BO for amdkfd (%d)\n", r); |
