diff options
author | 2016-02-23 07:36:46 +0100 | |
---|---|---|
committer | 2016-02-23 07:36:46 +0100 | |
commit | fb86780bf7708cd6553f592a6318f10eda766127 (patch) | |
tree | b59737c56a407c9f82166576209ef8e8cd09ecc6 /drivers/gpu/drm/amd/amdgpu | |
parent | x86/platform/intel/mid: Remove dead code (diff) | |
parent | x86/platform/intel/quark: Change the kernel's IMR lock bit to false (diff) | |
download | linux-dev-fb86780bf7708cd6553f592a6318f10eda766127.tar.xz linux-dev-fb86780bf7708cd6553f592a6318f10eda766127.zip |
Merge branch 'x86/urgent' into x86/platform, to queue up dependent patch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index 6442a06d6fdc..1cbb16e15307 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -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; |