diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-01-16 01:52:59 +0300 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2021-01-16 01:52:59 +0300 |
| commit | ba217b77772a16ad93c8534121b4859e731db384 (patch) | |
| tree | ed45091c22d72284e3cebdc3124e2991e18db566 /drivers/gpu/drm/i915/intel_memory_region.c | |
| parent | 777e687a0c6512179d7e333a633d4c6fa5046233 (diff) | |
| parent | fb5cfcaa2efbb4c71abb1dfbc8f4da727e0bfd89 (diff) | |
| download | linux-ba217b77772a16ad93c8534121b4859e731db384.tar.xz | |
Merge drm/drm-next into drm-intel-next
Syncing drm-intel-next and drm-intel-gt-next to unblock ADL enabling.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_memory_region.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_memory_region.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c index b326993a1026..1bfcdd89b241 100644 --- a/drivers/gpu/drm/i915/intel_memory_region.c +++ b/drivers/gpu/drm/i915/intel_memory_region.c @@ -10,7 +10,7 @@ #define REGION_MAP(type, inst) \ BIT((type) + INTEL_MEMORY_TYPE_SHIFT) | BIT(inst) -const u32 intel_region_map[] = { +static const u32 intel_region_map[] = { [INTEL_REGION_SMEM] = REGION_MAP(INTEL_MEMORY_SYSTEM, 0), [INTEL_REGION_LMEM] = REGION_MAP(INTEL_MEMORY_LOCAL, 0), [INTEL_REGION_STOLEN] = REGION_MAP(INTEL_MEMORY_STOLEN, 0), |