Revert "drm/amdgpu: use the kernel zone memory size as the max remote memory in amdgpu"
Subsystems (2)
PATCH 1/1 Revert "drm/amdgpu: use the kernel zone memory size as the max remote memory in amdgpu"
This reverts commit a693e050edfe794fea81d7cfe72429a406aa380b.
This breaks on systems with huge amounts of system memory as we do not have enough vram to store the page tables. Additionally, this is less of an issue with the recent gtt manager changes.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 -- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 12 +++++------- drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 7 +------ 5 files changed, 8 insertions(+), 27 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0 -2
@@ -2434,8 +2434,6 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm,void amdgpu_vram_location (struct amdgpu_device *adev,struct amdgpu_mc *mc,u64 base);void amdgpu_gtt_location (struct amdgpu_device *adev,struct amdgpu_mc *mc);void amdgpu_ttm_set_active_vram_size (struct amdgpu_device *adev,u64 size); -u64 amdgpu_ttm_get_gtt_mem_size (struct amdgpu_device *adev); -int amdgpu_ttm_global_init (struct amdgpu_device *adev);int amdgpu_ttm_init (struct amdgpu_device *adev);void amdgpu_ttm_fini (struct amdgpu_device *adev); void amdgpu_program_register_sequence(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +5 -7
@@ -34,7 +34,6 @@#include <ttm/ttm_placement.h> #include <ttm/ttm_module.h> #include <ttm/ttm_page_alloc.h> -#include <ttm/ttm_memory.h> #include <drm/drmP.h> #include <drm/amdgpu_drm.h> #include <linux/seq_file.h>
@@ -75,7 +74,7 @@ static void amdgpu_ttm_mem_global_release(struct drm_global_reference *ref)ttm_mem_global_release (ref->object); } -int amdgpu_ttm_global_init (struct amdgpu_device *adev) +static int amdgpu_ttm_global_init (struct amdgpu_device *adev) {struct drm_global_reference *global_ref;struct amdgpu_ring *ring;
@@ -1083,6 +1082,10 @@ int amdgpu_ttm_init(struct amdgpu_device *adev)unsigned i, j;int r; + r =amdgpu_ttm_global_init (adev); +if (r) { +return r; + }/* No others user of address space so set it to 0 */ r = ttm_bo_device_init(&adev->mman.bdev, adev->mman.bo_global_ref.ref.object,
@@ -1554,8 +1557,3 @@ static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev)#endif } - -u64 amdgpu_ttm_get_gtt_mem_size (struct amdgpu_device *adev) -{ -return ttm_get_kernel_zone_memory_size (adev->mman.mem_global_ref.object); -}
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1 -6
@@ -317,7 +317,7 @@ static int gmc_v6_0_mc_init(struct amdgpu_device *adev)* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size ==-1 ) - adev->mc.gtt_size =amdgpu_ttm_get_gtt_mem_size (adev); + adev->mc.gtt_size =max ((1024ULL <<20 ), adev->mc.mc_vram_size);else adev->mc.gtt_size = (uint64_t )amdgpu_gart_size <<20 ;
@@ -766,11 +766,6 @@ static int gmc_v6_0_sw_init(void *handle)return r; } - r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } - r =gmc_v6_0_mc_init (adev);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1 -6
@@ -385,7 +385,7 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev)* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size ==-1 ) - adev->mc.gtt_size =amdgpu_ttm_get_gtt_mem_size (adev); + adev->mc.gtt_size =max ((1024ULL <<20 ), adev->mc.mc_vram_size);else adev->mc.gtt_size = (uint64_t )amdgpu_gart_size <<20 ;
@@ -945,11 +945,6 @@ static int gmc_v7_0_sw_init(void *handle)return r; } - r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } - r =gmc_v7_0_mc_init (adev);if (r)return r;
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1 -6
@@ -472,7 +472,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size ==-1 ) - adev->mc.gtt_size =amdgpu_ttm_get_gtt_mem_size (adev); + adev->mc.gtt_size =max ((1024ULL <<20 ), adev->mc.mc_vram_size);else adev->mc.gtt_size = (uint64_t )amdgpu_gart_size <<20 ;
@@ -952,11 +952,6 @@ static int gmc_v8_0_sw_init(void *handle)return r; } - r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } - r =gmc_v8_0_mc_init (adev);if (r)return r;
Signature · 6 lines
2.5.5 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1479247509-6807-1-git-send-email-alexander.deucher-5C7GfCeVMHo@public.gmane.org
Quoted 5 lines · Alex Deucher
This reverts commit
a693e050edfe794fea81d7cfe72429a406aa380b.This breaks on systems with huge amounts of system memory as we do not have enough vram to store the page tables. Additionally, this is less of an issue with the recent gtt manager changes.
Why revert it instead of limit the amount of vram it can use (as per the patch I sent the other day)?
If there's no benefit to scaling the GTT size why was the change made in the first place?
- Russell
Quoted 149 lines
Signed-off-by Alex Deucher <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 --drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c| 12 +++++-------drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 7 +------ 5 files changed, 8 insertions(+), 27 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-2@@ -2434,8 +2434,6 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct amdgpu_device *adev, struct ttm_tt *ttm, void amdgpu_vram_location(struct amdgpu_device *adev, struct amdgpu_mc *mc,u64 base); void amdgpu_gtt_location(struct amdgpu_device *adev, struct amdgpu_mc *mc); void amdgpu_ttm_set_active_vram_size(struct amdgpu_device *adev, u64 size); -u64 amdgpu_ttm_get_gtt_mem_size (struct amdgpu_device *adev); -int amdgpu_ttm_global_init (struct amdgpu_device *adev); int amdgpu_ttm_init(struct amdgpu_device *adev);void
amdgpu_ttm_fini(struct amdgpu_device *adev);
void amdgpu_program_register_sequence(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-1@@ -34,7 +34,6 @@ #include <ttm/ttm_placement.h> #include <ttm/ttm_module.h> #include <ttm/ttm_page_alloc.h> -#include <ttm/ttm_memory.h> #include <drm/drmP.h> #include <drm/amdgpu_drm.h> #include <linux/seq_file.h>@@ -75,7 +74,7 @@ static void amdgpu_ttm_mem_global_release(struct drm_global_reference *ref) ttm_mem_global_release(ref->object); }drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-1-int amdgpu_ttm_global_init (struct amdgpu_device *adev) +static int amdgpu_ttm_global_init (struct amdgpu_device *adev){
structdrm_global_reference*global_ref;
structamdgpu_ring*ring;drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0@@ -1083,6 +1082,10 @@ int amdgpu_ttm_init(struct amdgpu_device *adev) unsigned i, j; int r;drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4
-0+ r =amdgpu_ttm_global_init (adev); +if (r) { +return r; + }/* No others user of address space so set it to 0 */ r = ttm_bo_device_init(&adev->mman.bdev,
adev->mman.bo_global_ref.ref.object,drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0@@ -1554,8 +1557,3 @@ static void amdgpu_ttm_debugfs_fini(struct amdgpu_device *adev)
#endif
}drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-4- -u64 amdgpu_ttm_get_gtt_mem_size (struct amdgpu_device *adev) -{ - return ttm_get_kernel_zone_memory_size(adev-Quoted 1 line
mman.mem_global_ref.object);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-1-}drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1
-1@@ -317,7 +317,7 @@ static int gmc_v6_0_mc_init(struct amdgpu_device *adev)* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size == -1) - adev->mc.gtt_size =amdgpu_ttm_get_gtt_mem_size (adev); + adev->mc.gtt_size =max ((1024ULL <<20 ), adev- >mc.mc_vram_size);else
adev->mc.gtt_size= (uint64_t)amdgpu_gart_size << 20;drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +0
-0@@ -766,11 +766,6 @@ static int gmc_v6_0_sw_init(void *handle) return r; }drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +0
-5- r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } -r =
gmc_v6_0_mc_init(adev);
if (r)
return r;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-1@@ -385,7 +385,7 @@ static int gmc_v7_0_mc_init(struct amdgpu_device *adev)* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size == -1) - adev->mc.gtt_size =amdgpu_ttm_get_gtt_mem_size (adev); + adev->mc.gtt_size =max ((1024ULL <<20 ), adev- >mc.mc_vram_size);else
adev->mc.gtt_size= (uint64_t)amdgpu_gart_size << 20;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-0@@ -945,11 +945,6 @@ static int gmc_v7_0_sw_init(void *handle) return r; }drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-5- r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } -r =
gmc_v7_0_mc_init(adev);
if (r)
return r;drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1
-1@@ -472,7 +472,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device *adev)* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size == -1) - adev->mc.gtt_size =amdgpu_ttm_get_gtt_mem_size (adev); + adev->mc.gtt_size =max ((1024ULL <<20 ), adev- >mc.mc_vram_size);else
adev->mc.gtt_size= (uint64_t)amdgpu_gart_size << 20;drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-0@@ -952,11 +952,6 @@ static int gmc_v8_0_sw_init(void *handle) return r; }drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-5- r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } -
Quoted 3 lines
r =
gmc_v8_0_mc_init(adev);
if (r)
return r;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1479264461.6000.4.camel-3Su/[email protected]
Quoted 16 lines
-----Original Message-----
From: Russell Currey [mailto:[email protected]]
Sent: Tuesday, November 15, 2016 9:48 PM
To: Alex Deucher; [email protected]
Cc: Deucher, Alexander
Subject: Re: [PATCH] Revert "drm/amdgpu: use the kernel zone memory size as the max remote memory in amdgpu"Quoted 3 lines · Alex Deucher
This reverts commit
a693e050edfe794fea81d7cfe72429a406aa380b.This breaks on systems with huge amounts of system memory as we do
not have
Quoted 2 lines
enough vram to store the page tables. Additionally, this is less of an issue with the recent gtt manager changes.
Quoted 6 lines
Why revert it instead of limit the amount of vram it can use (as per the patch I
sent the other day)?If there's no benefit to scaling the GTT size why was the change made in the first place?
It doesn't make a whole lot of sense to waste large amounts of fast vram for page tables to access slower system memory. The original patch was basically a workaround to enable some larger workloads by default t until we reworked the gtt and vram managers in the driver. Now that that is largely complete, we don't really need as large a gart anymore.
Alex
Quoted 159 lines
- Russell
drivers/gpu/drm/amd/amdgpu/amdgpu.h uint32_t amdgpu_ttm_tt_pte_flags(struct
Quoted 16 lines
Signed-off-by Alex Deucher <[email protected]>---
drivers/gpu/drm/amd/amdgpu/amdgpu.h | 2 --drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c| 12 +++++-------drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +------ drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 7 +------ 5 files changed, 8 insertions(+), 27 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-0@@ -2434,8 +2434,6 @@ uint32_t amdgpu_ttm_tt_pte_flags(struct
amdgpu_deviceQuoted 2 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-0*adev, struct ttm_tt *ttm,void amdgpu_vram_location(struct
amdgpu_device*adev, struct
amdgpu_mc*mc,Quoted 2 lines
u64 base);
void amdgpu_gtt_location(structamdgpu_device*adev, struct
amdgpu_mc*mc);Quoted 1 line
void amdgpu_ttm_set_active_vram_size(struct
amdgpu_device*adev,u64 size);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c int amdgpu_ttm_init(struct amdgpu_device
Quoted 29 lines
drivers/gpu/drm/amd/amdgpu/amdgpu.h +0
-2-u64 amdgpu_ttm_get_gtt_mem_size (struct amdgpu_device *adev); -int amdgpu_ttm_global_init (struct amdgpu_device *adev);int
amdgpu_ttm_init(struct amdgpu_device *adev);
voidamdgpu_ttm_fini(struct amdgpu_device *adev);
void amdgpu_program_register_sequence(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1
-2@@ -34,7 +34,6 @@ #include <ttm/ttm_placement.h> #include <ttm/ttm_module.h> #include <ttm/ttm_page_alloc.h> -#include <ttm/ttm_memory.h> #include <drm/drmP.h> #include <drm/amdgpu_drm.h> #include <linux/seq_file.h>@@ -75,7 +74,7 @@ static void amdgpu_ttm_mem_global_release(struct drm_global_reference *ref) ttm_mem_global_release(ref->object); } -int amdgpu_ttm_global_init (struct amdgpu_device *adev) +static int amdgpu_ttm_global_init (struct amdgpu_device *adev) { struct drm_global_reference *global_ref;struct
amdgpu_ring*ring;drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0@@ -1083,6 +1082,10 @@ int amdgpu_ttm_init(struct amdgpu_device*adev)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c static void amdgpu_ttm_debugfs_fini(struct
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +4
-0unsigned i, j; int r; + r =amdgpu_ttm_global_init (adev); +if (r) { +return r; + } /* No others user of address space so set it to 0 */ r = ttm_bo_device_init(&adev->mman.bdev, adev->mman.bo_global_ref.ref.object,@@ -1554,8 +1557,3 @@ static void amdgpu_ttm_debugfs_fini(struct
amdgpu_devicedrivers/gpu/drm/amd/amdgpu/gmc_v6_0.c static int gmc_v6_0_mc_init(struct amdgpu_device
Quoted 16 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-0*adev) #endif}
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-4- -u64 amdgpu_ttm_get_gtt_mem_size (struct amdgpu_device *adev) -{ - return ttm_get_kernel_zone_memory_size(adev-Quoted 1 line
mman.mem_global_ref.object);
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-1-}drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +0
-0@@ -317,7 +317,7 @@ static int gmc_v6_0_mc_init(struct amdgpu_device*adev)
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c static int gmc_v6_0_mc_init(struct amdgpu_device *adev)
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +0
-1* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size == -1) - adev->mc.gtt_size =
amdgpu_ttm_get_gtt_mem_size(adev);drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static int gmc_v7_0_mc_init(struct amdgpu_device
Quoted 23 lines
drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +1
-0+ adev->mc.gtt_size =max ((1024ULL <<20 ), adev- >mc.mc_vram_size);else
adev->mc.gtt_size= (uint64_t)amdgpu_gart_size << 20;drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +0
-5@@ -766,11 +766,6 @@ static int gmc_v6_0_sw_init(void *handle) return r; } - r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } - r = gmc_v6_0_mc_init(adev); if (r) return r;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-0@@ -385,7 +385,7 @@ static int gmc_v7_0_mc_init(struct amdgpu_device*adev)
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c static int gmc_v7_0_mc_init(struct amdgpu_device · line 388
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-1* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size == -1) - adev->mc.gtt_size =
amdgpu_ttm_get_gtt_mem_size(adev);drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static int gmc_v8_0_mc_init(struct amdgpu_device
Quoted 23 lines
drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +1
-0+ adev->mc.gtt_size =max ((1024ULL <<20 ), adev- >mc.mc_vram_size);else
adev->mc.gtt_size= (uint64_t)amdgpu_gart_size << 20;drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +0
-5@@ -945,11 +945,6 @@ static int gmc_v7_0_sw_init(void *handle) return r; } - r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } - r = gmc_v7_0_mc_init(adev); if (r) return r;drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-0@@ -472,7 +472,7 @@ static int gmc_v8_0_mc_init(struct amdgpu_device*adev)
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static int gmc_v8_0_mc_init(struct amdgpu_device · line 475
Quoted 4 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-1* size equal to the 1024 or vram, whichever is larger. */ if (amdgpu_gart_size == -1) - adev->mc.gtt_size =
amdgpu_ttm_get_gtt_mem_size(adev);Quoted 9 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +1
-0+ adev->mc.gtt_size =max ((1024ULL <<20 ), adev- >mc.mc_vram_size);else
adev->mc.gtt_size= (uint64_t)amdgpu_gart_size << 20;drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-0@@ -952,11 +952,6 @@ static int gmc_v8_0_sw_init(void *handle) return r; }
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c static int gmc_v8_0_sw_init(void *handle) · line 957
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +0
-5- r =amdgpu_ttm_global_init (adev); -if (r) { -return r; - } - r = gmc_v8_0_mc_init(adev); if (r) return r;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx