Attachment 117903 Details for Bug 91749 – possible fix

[patch] possible fix

0001-drm-amdgpu-fix-IH-ring-allocation-for-bus-addresses.patch (text/plain), 2.32 KB, created by Alex Deucher on 2015-08-25 02:53:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Deucher

Created: 2015-08-25 02:53:32 UTC

Size: 2.32 KB

patch

obsolete

>From 422caf640a089117f66cd51fd8b04c3362eac91d Mon Sep 17 00:00:00 2001
>From: Alex Deucher <alexander.deucher@amd.com>
>Date: Mon, 24 Aug 2015 22:46:13 -0400
>Subject: [PATCH] drm/amdgpu: fix IH ring allocation for bus addresses
>
>Use pci_alloc_consistent rather than kzalloc since we
>need 256 byte aligned memory for the ring buffer.
>
>bug:
>https://bugs.freedesktop.org/show_bug.cgi?id=91749
>
>Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>Cc: stable@vger.kernel.org
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 20 +++++++-------------
> 1 file changed, 7 insertions(+), 13 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
>index 90044b2..2b0a34d 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c
>@@ -98,18 +98,12 @@ int amdgpu_ih_ring_init(struct amdgpu_device *adev, unsigned ring_size,
> 			/* add 8 bytes for the rptr/wptr shadows and
> 			 * add them to the end of the ring allocation.
> 			 */
>-			adev->irq.ih.ring = kzalloc(adev->irq.ih.ring_size + 8, GFP_KERNEL);
>+			adev->irq.ih.ring = pci_alloc_consistent(adev->pdev,
>+								 adev->irq.ih.ring_size + 8,
>+								 &adev->irq.ih.rb_dma_addr);
> 			if (adev->irq.ih.ring == NULL)
> 				return -ENOMEM;
>-			adev->irq.ih.rb_dma_addr = pci_map_single(adev->pdev,
>-								  (void *)adev->irq.ih.ring,
>-								  adev->irq.ih.ring_size,
>-								  PCI_DMA_BIDIRECTIONAL);
>-			if (pci_dma_mapping_error(adev->pdev, adev->irq.ih.rb_dma_addr)) {
>-				dev_err(&adev->pdev->dev, "Failed to DMA MAP the IH RB page\n");
>-				kfree((void *)adev->irq.ih.ring);
>-				return -ENOMEM;
>-			}
>+			memset((void *)adev->irq.ih.ring, 0, adev->irq.ih.ring_size + 8);
> 			adev->irq.ih.wptr_offs = (adev->irq.ih.ring_size / 4) + 0;
> 			adev->irq.ih.rptr_offs = (adev->irq.ih.ring_size / 4) + 1;
> 		}
>@@ -149,9 +143,9 @@ void amdgpu_ih_ring_fini(struct amdgpu_device *adev)
> 			/* add 8 bytes for the rptr/wptr shadows and
> 			 * add them to the end of the ring allocation.
> 			 */
>-			pci_unmap_single(adev->pdev, adev->irq.ih.rb_dma_addr,
>-					 adev->irq.ih.ring_size + 8, PCI_DMA_BIDIRECTIONAL);
>-			kfree((void *)adev->irq.ih.ring);
>+			pci_free_consistent(adev->pdev, adev->irq.ih.ring_size + 8,
>+					    (void *)adev->irq.ih.ring,
>+					    adev->gart.table_addr);
> 			adev->irq.ih.ring = NULL;
> 		}
> 	} else {
>-- 
>1.8.3.1
>

Actions: View | Splinter Review

Attachments on bug 91749: 117903

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.