summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/si.c
diff options
context:
space:
mode:
authorChristian König2014-05-10 12:17:56 +0200
committerAlex Deucher2014-06-02 16:25:03 +0200
commit1c89d27fb9f169003c5a82561ffeb8adb980ebfb (patch)
tree5d5541d1c768e6dd7ce4ce16e33109860fb734b7 /drivers/gpu/drm/radeon/si.c
parentdrm/radeon: add large PTE support for NI, SI and CIK v5 (diff)
downloadkernel-qcow2-linux-1c89d27fb9f169003c5a82561ffeb8adb980ebfb.tar.gz
kernel-qcow2-linux-1c89d27fb9f169003c5a82561ffeb8adb980ebfb.tar.xz
kernel-qcow2-linux-1c89d27fb9f169003c5a82561ffeb8adb980ebfb.zip
drm/radeon: add proper support for RADEON_VM_BLOCK_SIZE v2
This patch makes it possible to decide how many address bits are spend on the page directory vs the page tables. v2: remove unintended change Signed-off-by: Christian König <christian.koenig@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/si.c')
-rw-r--r--drivers/gpu/drm/radeon/si.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/si.c b/drivers/gpu/drm/radeon/si.c
index 22ecbc07e9a6..9739d71cd0a2 100644
--- a/drivers/gpu/drm/radeon/si.c
+++ b/drivers/gpu/drm/radeon/si.c
@@ -4095,6 +4095,7 @@ static int si_pcie_gart_enable(struct radeon_device *rdev)
(u32)(rdev->dummy_page.addr >> 12));
WREG32(VM_CONTEXT1_CNTL2, 4);
WREG32(VM_CONTEXT1_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(1) |
+ PAGE_TABLE_BLOCK_SIZE(RADEON_VM_BLOCK_SIZE - 9) |
RANGE_PROTECTION_FAULT_ENABLE_INTERRUPT |
RANGE_PROTECTION_FAULT_ENABLE_DEFAULT |
DUMMY_PAGE_PROTECTION_FAULT_ENABLE_INTERRUPT |