Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aaa7dd2c authored Feb 19, 2016 by Dave Airlie

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

parents 42412b12 bc3f5d8c

drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -712,7 +712,7 @@ static int amdgpu_ttm_tt_populate(struct ttm_tt *ttm)
	0, PAGE_SIZE,		0, PAGE_SIZE,
	PCI_DMA_BIDIRECTIONAL);		PCI_DMA_BIDIRECTIONAL);
	if (pci_dma_mapping_error(adev->pdev, gtt->ttm.dma_address[i])) {		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],		pci_unmap_page(adev->pdev, gtt->ttm.dma_address[i],
	PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);		PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
	gtt->ttm.dma_address[i] = 0;		gtt->ttm.dma_address[i] = 0;

drivers/gpu/drm/radeon/radeon_ttm.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -758,7 +758,7 @@ static int radeon_ttm_tt_populate(struct ttm_tt *ttm)
	0, PAGE_SIZE,		0, PAGE_SIZE,
	PCI_DMA_BIDIRECTIONAL);		PCI_DMA_BIDIRECTIONAL);
	if (pci_dma_mapping_error(rdev->pdev, gtt->ttm.dma_address[i])) {		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],		pci_unmap_page(rdev->pdev, gtt->ttm.dma_address[i],
	PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);		PAGE_SIZE, PCI_DMA_BIDIRECTIONAL);
	gtt->ttm.dma_address[i] = 0;		gtt->ttm.dma_address[i] = 0;