diff options
author | Christian König <christian.koenig@amd.com> | 2017-09-18 08:32:38 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2017-09-26 15:14:20 -0400 |
commit | a8ffeac96daa66132d44a624c1cf3cbcc2598a34 (patch) | |
tree | a0dfb8d4a1346af28aed606f1e5437e177b959eb | |
parent | fd4495e57cd2594098493a0e5b6beccae8cbf47b (diff) |
drm/amdgpu: use 2MB fragment size for GFX6,7 and 8
Use 2MB fragment size by default for older hardware generations as well.
Signed-off-by: Christian König <christian.koenig@amd.com>
Acked-by: John Bridgman <john.bridgman@amd.com>
Reviewed-by: Roger He <Hongbo.He@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c index 5be9c83dfcf7..2d1f3f651e1f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | |||
@@ -831,7 +831,7 @@ static int gmc_v6_0_sw_init(void *handle) | |||
831 | if (r) | 831 | if (r) |
832 | return r; | 832 | return r; |
833 | 833 | ||
834 | amdgpu_vm_adjust_size(adev, 64, 4); | 834 | amdgpu_vm_adjust_size(adev, 64, 9); |
835 | adev->vm_manager.max_pfn = adev->vm_manager.vm_size << 18; | 835 | adev->vm_manager.max_pfn = adev->vm_manager.vm_size << 18; |
836 | 836 | ||
837 | adev->mc.mc_mask = 0xffffffffffULL; | 837 | adev->mc.mc_mask = 0xffffffffffULL; |
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index eace9e7182c8..2256277d102f 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | |||
@@ -970,7 +970,7 @@ static int gmc_v7_0_sw_init(void *handle) | |||
970 | * Currently set to 4GB ((1 << 20) 4k pages). | 970 | * Currently set to 4GB ((1 << 20) 4k pages). |
971 | * Max GPUVM size for cayman and SI is 40 bits. | 971 | * Max GPUVM size for cayman and SI is 40 bits. |
972 | */ | 972 | */ |
973 | amdgpu_vm_adjust_size(adev, 64, 4); | 973 | amdgpu_vm_adjust_size(adev, 64, 9); |
974 | adev->vm_manager.max_pfn = adev->vm_manager.vm_size << 18; | 974 | adev->vm_manager.max_pfn = adev->vm_manager.vm_size << 18; |
975 | 975 | ||
976 | /* Set the internal MC address mask | 976 | /* Set the internal MC address mask |
diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c index 3b3326daf32b..114671b57004 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | |||
@@ -1067,7 +1067,7 @@ static int gmc_v8_0_sw_init(void *handle) | |||
1067 | * Currently set to 4GB ((1 << 20) 4k pages). | 1067 | * Currently set to 4GB ((1 << 20) 4k pages). |
1068 | * Max GPUVM size for cayman and SI is 40 bits. | 1068 | * Max GPUVM size for cayman and SI is 40 bits. |
1069 | */ | 1069 | */ |
1070 | amdgpu_vm_adjust_size(adev, 64, 4); | 1070 | amdgpu_vm_adjust_size(adev, 64, 9); |
1071 | adev->vm_manager.max_pfn = adev->vm_manager.vm_size << 18; | 1071 | adev->vm_manager.max_pfn = adev->vm_manager.vm_size << 18; |
1072 | 1072 | ||
1073 | /* Set the internal MC address mask | 1073 | /* Set the internal MC address mask |