summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2015-05-15 12:13:28 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2015-05-19 16:09:00 -0400
commit01f359f3f1bbf95d7ac4453a6c1de811bf0aee11 (patch)
treec35c928fcacaae7be13b4601538032dae9f672c6 /drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
parent7ddd6e261ed620dbb388202be89ca4e6843e3947 (diff)
Revert "Revert "gpu: nvgpu: New allocator for VA space""
This reverts commit 7eb42bc239dbd207208ff491c3fb65c3d83274d8. The original commit was actually fine. Change-Id: I564ce6530ac73fcfad17dcec9c53f0353b4f02d4 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/743300 (cherry picked from commit e99aa2485f8992eabe3556f3ebcb57bdc8ad91ff) Reviewed-on: http://git-master/r/743301 Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.h')
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.h4
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 73530b22..f29c810e 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-2014, NVIDIA CORPORATION. All rights reserved. 6 * Copyright (c) 2011-2015, 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,
@@ -466,7 +466,7 @@ struct pmu_ucode_desc {
466#define PMU_UNIT_ID_IS_VALID(id) \ 466#define PMU_UNIT_ID_IS_VALID(id) \
467 (((id) < PMU_UNIT_END) || ((id) >= PMU_UNIT_TEST_START)) 467 (((id) < PMU_UNIT_END) || ((id) >= PMU_UNIT_TEST_START))
468 468
469#define PMU_DMEM_ALLOC_ALIGNMENT (32) 469#define PMU_DMEM_ALLOC_ALIGNMENT (4)
470#define PMU_DMEM_ALIGNMENT (4) 470#define PMU_DMEM_ALIGNMENT (4)
471 471
472#define PMU_CMD_FLAGS_PMU_MASK (0xF0) 472#define PMU_CMD_FLAGS_PMU_MASK (0xF0)