diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2015-05-11 22:28:11 -0400 |
---|---|---|
committer | Hiroshi Doyu <hdoyu@nvidia.com> | 2015-05-12 05:46:39 -0400 |
commit | aa25a952ea2b19a081fa746f043228c270f43f94 (patch) | |
tree | e640f945d82c598645b0b2c5cbc6eb194444026d /drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |
parent | a2e852364582e9c337f52bc53ccc33877c8f3b47 (diff) |
Revert "gpu: nvgpu: New allocator for VA space"
This reverts commit 2e235ac150fa4af8632c9abf0f109a10973a0bf5.
Change-Id: I3aa745152124c2bc09c6c6dc5aeb1084ae7e08a4
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/741469
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Hiroshi Doyu <hdoyu@nvidia.com>
Tested-by: Hiroshi Doyu <hdoyu@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h index e54805a6..6cd173e8 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * GK20A PMU (aka. gPMU outside gk20a context) | 4 | * GK20A PMU (aka. gPMU outside gk20a context) |
5 | * | 5 | * |
6 | * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved. | 6 | * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved. |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify it | 8 | * This program is free software; you can redistribute it and/or modify it |
9 | * under the terms and conditions of the GNU General Public License, | 9 | * under the terms and conditions of the GNU General Public License, |
@@ -437,7 +437,7 @@ struct pmu_ucode_desc { | |||
437 | #define PMU_UNIT_ID_IS_VALID(id) \ | 437 | #define PMU_UNIT_ID_IS_VALID(id) \ |
438 | (((id) < PMU_UNIT_END) || ((id) >= PMU_UNIT_TEST_START)) | 438 | (((id) < PMU_UNIT_END) || ((id) >= PMU_UNIT_TEST_START)) |
439 | 439 | ||
440 | #define PMU_DMEM_ALLOC_ALIGNMENT (4) | 440 | #define PMU_DMEM_ALLOC_ALIGNMENT (32) |
441 | #define PMU_DMEM_ALIGNMENT (4) | 441 | #define PMU_DMEM_ALIGNMENT (4) |
442 | 442 | ||
443 | #define PMU_CMD_FLAGS_PMU_MASK (0xF0) | 443 | #define PMU_CMD_FLAGS_PMU_MASK (0xF0) |