> -----Original Message----- > From: gregkh@xxxxxxxxxxxxxxxxxxx [mailto:gregkh@xxxxxxxxxxxxxxxxxxx] > Sent: Wednesday, July 31, 2013 11:44 PM > To: Deucher, Alexander; gregkh@xxxxxxxxxxxxxxxxxxx > Cc: stable@xxxxxxxxxxxxxxx; stable-commits@xxxxxxxxxxxxxxx > Subject: Patch "drm/radeon/vm: only align the pt base to 32k" has been > added to the 3.10-stable tree > > > This is a note to let you know that I've just added the patch titled > > drm/radeon/vm: only align the pt base to 32k > > to the 3.10-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable- > queue.git;a=summary > > The filename of the patch is: > drm-radeon-vm-only-align-the-pt-base-to-32k.patch > and it can be found in the queue-3.10 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. Please drop this patch. It's the second part of an initial incomplete fix that I already previously dropped from the stable series. I'll send a separate patch for stable. Thanks! Alex > > > From 3e3e53f86bee87bb14474213c879595605e35112 Mon Sep 17 00:00:00 > 2001 > From: Alex Deucher <alexander.deucher@xxxxxxx> > Date: Thu, 18 Jul 2013 13:11:56 -0400 > Subject: drm/radeon/vm: only align the pt base to 32k > > From: Alex Deucher <alexander.deucher@xxxxxxx> > > commit 3e3e53f86bee87bb14474213c879595605e35112 upstream. > > fixes: > https://bugs.freedesktop.org/show_bug.cgi?id=67016 > > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > drivers/gpu/drm/radeon/radeon_gart.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- a/drivers/gpu/drm/radeon/radeon_gart.c > +++ b/drivers/gpu/drm/radeon/radeon_gart.c > @@ -466,7 +466,7 @@ int radeon_vm_manager_init(struct radeon > size += rdev->vm_manager.max_pfn * 8; > size *= 2; > r = radeon_sa_bo_manager_init(rdev, &rdev- > >vm_manager.sa_manager, > - RADEON_VM_PTB_ALIGN(size), > + > RADEON_GPU_PAGE_ALIGN(size), > RADEON_VM_PTB_ALIGN_SIZE, > RADEON_GEM_DOMAIN_VRAM); > if (r) { > @@ -621,7 +621,7 @@ int radeon_vm_alloc_pt(struct radeon_dev > } > > retry: > - pd_size = > RADEON_VM_PTB_ALIGN(radeon_vm_directory_size(rdev)); > + pd_size = radeon_vm_directory_size(rdev); > r = radeon_sa_bo_new(rdev, &rdev->vm_manager.sa_manager, > &vm->page_directory, pd_size, > RADEON_VM_PTB_ALIGN_SIZE, false); > @@ -953,8 +953,8 @@ static int radeon_vm_update_pdes(struct > retry: > r = radeon_sa_bo_new(rdev, &rdev- > >vm_manager.sa_manager, > &vm->page_tables[pt_idx], > - > RADEON_VM_PTB_ALIGN(RADEON_VM_PTE_COUNT * 8), > - RADEON_VM_PTB_ALIGN_SIZE, false); > + RADEON_VM_PTE_COUNT * 8, > + RADEON_GPU_PAGE_SIZE, false); > > if (r == -ENOMEM) { > r = radeon_vm_evict(rdev, vm); > > > Patches currently in stable-queue which might be from > alexander.deucher@xxxxxxx are > > queue-3.10/drm-radeon-fix-combios-tables-on-older-cards.patch > queue-3.10/drm-radeon-align-vm-ptbs-page-table-blocks-to-32k.patch > queue-3.10/drm-radeon-fix-uvd-fence-emit.patch > queue-3.10/drm-radeon-fix-endian-issues-with-dp-handling-v3.patch > queue-3.10/drm-radeon-another-card-with-wrong-primary-dac-adj.patch > queue-3.10/drm-radeon-improve-dac-adjust-heuristics-for-legacy- > pdac.patch > queue-3.10/drm-radeon-allow-selection-of-alignment-in-the-sub- > allocator.patch > queue-3.10/drm-radeon-vm-only-align-the-pt-base-to-32k.patch > queue-3.10/drm-radeon-hdmi-make-sure-we-have-an-afmt-block- > assigned.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html