Attachment 73440 Details for Bug 59672 – Enable more DMA byte swapping bits on big endian hosts

[patch] Enable more DMA byte swapping bits on big endian hosts

fdo59672.diff (text/plain), 1.93 KB, created by Michel Dänzer on 2013-01-22 10:26:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2013-01-22 10:26:38 UTC

Size: 1.93 KB

patch

obsolete

>diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
>index 39e8be1..234773e 100644
>--- a/drivers/gpu/drm/radeon/ni.c
>+++ b/drivers/gpu/drm/radeon/ni.c
>@@ -1216,7 +1216,7 @@ void cayman_dma_stop(struct radeon_device *rdev)
> int cayman_dma_resume(struct radeon_device *rdev)
> {
> 	struct radeon_ring *ring;
>-	u32 rb_cntl, dma_cntl;
>+	u32 rb_cntl, dma_cntl, ib_cntl;
> 	u32 rb_bufsz;
> 	u32 reg_offset, wb_offset;
> 	int i, r;
>@@ -1265,10 +1265,17 @@ int cayman_dma_resume(struct radeon_device *rdev)
> 		WREG32(DMA_RB_BASE + reg_offset, ring->gpu_addr >> 8);
> 
> 		/* enable DMA IBs */
>-		WREG32(DMA_IB_CNTL + reg_offset, DMA_IB_ENABLE | CMD_VMID_FORCE);
>+		ib_cntl = DMA_IB_ENABLE | CMD_VMID_FORCE;
>+#ifdef __BIG_ENDIAN
>+		ib_cntl |= DMA_IB_SWAP_ENABLE;
>+#endif
>+		WREG32(DMA_IB_CNTL + reg_offset, ib_cntl);
> 
> 		dma_cntl = RREG32(DMA_CNTL + reg_offset);
> 		dma_cntl &= ~CTXEMPTY_INT_ENABLE;
>+#ifdef __BIG_ENDIAN
>+		dma_cntl |= FENCE_SWAP_ENABLE;
>+#endif
> 		WREG32(DMA_CNTL + reg_offset, dma_cntl);
> 
> 		ring->wptr = 0;
>diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
>index 2aaf147..57ea391 100644
>--- a/drivers/gpu/drm/radeon/r600.c
>+++ b/drivers/gpu/drm/radeon/r600.c
>@@ -2256,7 +2256,7 @@ void r600_dma_stop(struct radeon_device *rdev)
> int r600_dma_resume(struct radeon_device *rdev)
> {
> 	struct radeon_ring *ring = &rdev->ring[R600_RING_TYPE_DMA_INDEX];
>-	u32 rb_cntl, dma_cntl;
>+	u32 rb_cntl, dma_cntl, ib_cntl;
> 	u32 rb_bufsz;
> 	int r;
> 
>@@ -2296,10 +2296,17 @@ int r600_dma_resume(struct radeon_device *rdev)
> 	WREG32(DMA_RB_BASE, ring->gpu_addr >> 8);
> 
> 	/* enable DMA IBs */
>-	WREG32(DMA_IB_CNTL, DMA_IB_ENABLE);
>+	ib_cntl = DMA_IB_ENABLE;
>+#ifdef __BIG_ENDIAN
>+	ib_cntl |= DMA_IB_SWAP_ENABLE;
>+#endif
>+	WREG32(DMA_IB_CNTL, ib_cntl);
> 
> 	dma_cntl = RREG32(DMA_CNTL);
> 	dma_cntl &= ~CTXEMPTY_INT_ENABLE;
>+#ifdef __BIG_ENDIAN
>+	dma_cntl |= FENCE_SWAP_ENABLE;
>+#endif
> 	WREG32(DMA_CNTL, dma_cntl);
> 
> 	if (rdev->family >= CHIP_RV770)

Actions: View | Splinter Review

Attachments on bug 59672: 73396 | 73398 | 73440 | 73455

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.