Commit 4fb5076bf3be220b86b9971e92b68657a6eb9080

Authored by Alex Deucher
Committed by Greg Kroah-Hartman
1 parent 83108f2238

drm/radeon: properly set vm fragment size for TN/RL

commit a124d068bf5be6be2ff4b9fab77b1b7509107e68 upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

drivers/gpu/drm/radeon/radeon_vm.c
... ... @@ -753,9 +753,11 @@
753 753 */
754 754  
755 755 /* NI is optimized for 256KB fragments, SI and newer for 64KB */
756   - uint64_t frag_flags = rdev->family == CHIP_CAYMAN ?
  756 + uint64_t frag_flags = ((rdev->family == CHIP_CAYMAN) ||
  757 + (rdev->family == CHIP_ARUBA)) ?
757 758 R600_PTE_FRAG_256KB : R600_PTE_FRAG_64KB;
758   - uint64_t frag_align = rdev->family == CHIP_CAYMAN ? 0x200 : 0x80;
  759 + uint64_t frag_align = ((rdev->family == CHIP_CAYMAN) ||
  760 + (rdev->family == CHIP_ARUBA)) ? 0x200 : 0x80;
759 761  
760 762 uint64_t frag_start = ALIGN(pe_start, frag_align);
761 763 uint64_t frag_end = pe_end & ~(frag_align - 1);