Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux into drm-fixes

Just two small fixes in the ttm_tt_populate error handling; one for radeon,
one for amdgpu.

* 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: use post-decrement in error handling
  drm/amdgpu: use post-decrement in error handling
Dave Airlie 9 years ago
parent
42412b120d bc3f5d8c4c
commit
aaa7dd2ced
2 changed files with 2 additions and 2 deletions
Split View Show Diff Stats
  1. 1 1
      drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
  2. 1 1
      drivers/gpu/drm/radeon/radeon_ttm.c

+ 1 - 1
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c
View File 

@@ -712,7 +712,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm)
 
 						       0, PAGE_SIZE,
 
 						       PCI_DMA_BIDIRECTIONAL);
 
 		if (pci_dma_mapping_error(adev->pdev, gtt->ttm.dma_address[i])) {
 
-			while (--i) {
 
+			while (i--) {
 
 				pci_unmap_page(adev->pdev, gtt->ttm.dma_address[i],
 
 					       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 
 				gtt->ttm.dma_address[i] = 0;

+ 1 - 1
drivers/gpu/drm/radeon/radeon_ttm.c
View File 

@@ -758,7 +758,7 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
 
 						       0, PAGE_SIZE,
 
 						       PCI_DMA_BIDIRECTIONAL);
 
 		if (pci_dma_mapping_error(rdev->pdev, gtt->ttm.dma_address[i])) {
 
-			while (--i) {
 
+			while (i--) {
 
 				pci_unmap_page(rdev->pdev, gtt->ttm.dma_address[i],
 
 					       PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
 
 				gtt->ttm.dma_address[i] = 0;