drm/radeon: properly set vm fragment size for TN/RL
authorAlex Deucher <alexander.deucher@amd.com>
Fri, 30 Jan 2015 14:52:24 +0000 (09:52 -0500)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 2 Feb 2015 16:39:34 +0000 (11:39 -0500)
Should be the same as cayman.  We don't use VM by default
on NI parts so this isn't critical.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
drivers/gpu/drm/radeon/radeon_vm.c

index 06d2246d07f19a086cddced0d1c9ffd32a2f86fd..2a5a4a9e772d6668ee844b94c61219a0c3100340 100644 (file)
@@ -743,9 +743,11 @@ static void radeon_vm_frag_ptes(struct radeon_device *rdev,
         */
 
        /* NI is optimized for 256KB fragments, SI and newer for 64KB */
-       uint64_t frag_flags = rdev->family == CHIP_CAYMAN ?
+       uint64_t frag_flags = ((rdev->family == CHIP_CAYMAN) ||
+                              (rdev->family == CHIP_ARUBA)) ?
                        R600_PTE_FRAG_256KB : R600_PTE_FRAG_64KB;
-       uint64_t frag_align = rdev->family == CHIP_CAYMAN ? 0x200 : 0x80;
+       uint64_t frag_align = ((rdev->family == CHIP_CAYMAN) ||
+                              (rdev->family == CHIP_ARUBA)) ? 0x200 : 0x80;
 
        uint64_t frag_start = ALIGN(pe_start, frag_align);
        uint64_t frag_end = pe_end & ~(frag_align - 1);