diff options
| author | Mark Brown <broonie@kernel.org> | 2015-10-12 13:09:27 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-10-12 13:09:27 -0400 |
| commit | 79828b4fa835f73cdaf4bffa48696abdcbea9d02 (patch) | |
| tree | 5e0fa7156acb75ba603022bc807df8f2fedb97a8 /drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | |
| parent | 721b51fcf91898299d96f4b72cb9434cda29dce6 (diff) | |
| parent | 8c1a9d6323abf0fb1e5dad96cf3f1c783505ea5a (diff) | |
Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-fix-rt5645
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c index e02db0b2e839..cbd3a486c5c2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | |||
| @@ -125,7 +125,8 @@ int amdgpu_gart_table_vram_alloc(struct amdgpu_device *adev) | |||
| 125 | 125 | ||
| 126 | if (adev->gart.robj == NULL) { | 126 | if (adev->gart.robj == NULL) { |
| 127 | r = amdgpu_bo_create(adev, adev->gart.table_size, | 127 | r = amdgpu_bo_create(adev, adev->gart.table_size, |
| 128 | PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, 0, | 128 | PAGE_SIZE, true, AMDGPU_GEM_DOMAIN_VRAM, |
| 129 | AMDGPU_GEM_CREATE_CPU_ACCESS_REQUIRED, | ||
| 129 | NULL, &adev->gart.robj); | 130 | NULL, &adev->gart.robj); |
| 130 | if (r) { | 131 | if (r) { |
| 131 | return r; | 132 | return r; |