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_gart.c | |
| parent | e87359efcaf45efc41dbaa6ec25eb26705300cee (diff) | |
| parent | df075feefbd347f13fba5198294cda619532c237 (diff) | |
Merge branch 'topic/firewire-update' into for-next
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c index cbd3a486c5c2..7312d729d300 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c @@ -127,7 +127,7 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) r = amdgpu_bo_create(adev, adev->gart.table_size, PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED, - NULL, &adev->gart.robj); + NULL, NULL, &adev->gart.robj); if (r) { return r; } |