* [PATCH] drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts.
@ 2013-01-24 17:42 Michel Dänzer
2013-01-24 18:02 ` [PATCH v2] " Michel Dänzer
0 siblings, 1 reply; 3+ messages in thread
From: Michel Dänzer @ 2013-01-24 17:42 UTC (permalink / raw)
To: Alex Deucher; +Cc: dri-devel
From: Michel Dänzer <michel.daenzer@amd.com>
Fixes spurious GPU lockup during DMA ring IB test.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59672
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
drivers/gpu/drm/radeon/ni.c | 8 ++++++--
drivers/gpu/drm/radeon/r600.c | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 39e8be1..c6ace17 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,7 +1265,11 @@ 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;
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 2aaf147..cf1b853 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,7 +2296,11 @@ 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;
--
1.7.10.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH v2] drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts.
2013-01-24 17:42 [PATCH] drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts Michel Dänzer
@ 2013-01-24 18:02 ` Michel Dänzer
2013-01-24 19:00 ` Alex Deucher
0 siblings, 1 reply; 3+ messages in thread
From: Michel Dänzer @ 2013-01-24 18:02 UTC (permalink / raw)
To: Alex Deucher; +Cc: dri-devel
From: Michel Dänzer <michel.daenzer@amd.com>
Fixes GPU hang during DMA ring IB test.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59672
Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
---
v2: The patch fixes real GPU hangs, not just spurious ones. Change the commit
log accordingly.
drivers/gpu/drm/radeon/ni.c | 8 ++++++--
drivers/gpu/drm/radeon/r600.c | 8 ++++++--
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
index 39e8be1..c6ace17 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,7 +1265,11 @@ 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;
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 2aaf147..cf1b853 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,7 +2296,11 @@ 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;
--
1.7.10.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts.
2013-01-24 18:02 ` [PATCH v2] " Michel Dänzer
@ 2013-01-24 19:00 ` Alex Deucher
0 siblings, 0 replies; 3+ messages in thread
From: Alex Deucher @ 2013-01-24 19:00 UTC (permalink / raw)
To: Michel Dänzer; +Cc: dri-devel
On Thu, Jan 24, 2013 at 1:02 PM, Michel Dänzer <michel@daenzer.net> wrote:
> From: Michel Dänzer <michel.daenzer@amd.com>
>
> Fixes GPU hang during DMA ring IB test.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59672
>
> Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
> ---
>
> v2: The patch fixes real GPU hangs, not just spurious ones. Change the commit
> log accordingly.
Thanks. Added to my fixes queue.
Alex
>
> drivers/gpu/drm/radeon/ni.c | 8 ++++++--
> drivers/gpu/drm/radeon/r600.c | 8 ++++++--
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c
> index 39e8be1..c6ace17 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,7 +1265,11 @@ 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;
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 2aaf147..cf1b853 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,7 +2296,11 @@ 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;
> --
> 1.7.10.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-01-24 19:00 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-01-24 17:42 [PATCH] drm/radeon: Enable DMA_IB_SWAP_ENABLE on big endian hosts Michel Dänzer
2013-01-24 18:02 ` [PATCH v2] " Michel Dänzer
2013-01-24 19:00 ` Alex Deucher
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.