diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-06-04 09:23:51 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-06-04 09:23:51 +1000 |
| commit | a8a50fce60e86f82e442bf84b8af20750b3d6105 (patch) | |
| tree | 974c04f9f4f10275a8a9435113ea5b307d172bb6 /drivers/gpu/drm/radeon/r600.c | |
| parent | 9b5edbf7a462b7c846e9d4675b9b72b7a4e84de9 (diff) | |
| parent | c65b99f046843d2455aa231747b5a07a999a9f3d (diff) | |
| download | talos-obmc-linux-a8a50fce60e86f82e442bf84b8af20750b3d6105.tar.gz talos-obmc-linux-a8a50fce60e86f82e442bf84b8af20750b3d6105.zip | |
Merge tag 'v4.1-rc6' into drm-next
Linux 4.1-rc6
backmerge 4.1-rc6 as some of the later pull reqs are based on newer bases
and I'd prefer to do the fixup myself.
Diffstat (limited to 'drivers/gpu/drm/radeon/r600.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r600.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index d0ff93256bb0..35dafd77a639 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1159,7 +1159,7 @@ static int r600_pcie_gart_enable(struct radeon_device *rdev) WREG32(MC_VM_L1_TLB_MCB_RD_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE); WREG32(MC_VM_L1_TLB_MCB_WR_SEM_CNTL, tmp | ENABLE_SEMAPHORE_MODE); WREG32(VM_CONTEXT0_PAGE_TABLE_START_ADDR, rdev->mc.gtt_start >> 12); - WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, (rdev->mc.gtt_end >> 12) - 1); + WREG32(VM_CONTEXT0_PAGE_TABLE_END_ADDR, rdev->mc.gtt_end >> 12); WREG32(VM_CONTEXT0_PAGE_TABLE_BASE_ADDR, rdev->gart.table_addr >> 12); WREG32(VM_CONTEXT0_CNTL, ENABLE_CONTEXT | PAGE_TABLE_DEPTH(0) | RANGE_PROTECTION_FAULT_ENABLE_DEFAULT); |
