Skip to contentSkip to conversation

drm/radeon: don't use PACKET2 on CIK

PATCH Applied Marek Olšák 3 participants 4 messages Oct 30, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/radeon: don't use PACKET2 on CIK

From: Marek Olšák <[email protected]>

It is said to cause hangs.

---
 drivers/gpu/drm/radeon/cik.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/cik.c +1 -1
index 2cd2ac0..44507a4 100644
@@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev)
 	ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
 	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
 			     CP_RB0_RPTR, CP_RB0_WPTR,
-			     RADEON_CP_PACKET2);
+			     PACKET3(PACKET3_NOP, 0x3FFF));
 	if (r)
 		return r;
 
Signature · 6 lines
1.8.1.2

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

Am 30.10.2013 14:41, schrieb Marek Olšák:

Quoted 5 lines

From: Marek Olšák <[email protected]>

It is said to cause hangs.

We should probably do so for SI as well.

Patch is Reviewed-by: Christian König <[email protected]>

Quoted 9 lines
---
  drivers/gpu/drm/radeon/cik.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/cik.c +0 -0
index 2cd2ac0..44507a4 100644

drivers/gpu/drm/radeon/cik.c static int cik_startup(struct radeon_device *rdev) · line 7140

Quoted 8 lines
drivers/gpu/drm/radeon/cik.c +1 -1
@@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev)
  	ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
  	r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
  			     CP_RB0_RPTR, CP_RB0_WPTR,
-			     RADEON_CP_PACKET2);
+			     PACKET3(PACKET3_NOP, 0x3FFF));
  	if (r)
  		return r;
 

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

#2 lore raw
Quoted 11 lines · Christian König

Am 30.10.2013 14:41, schrieb Marek Olšák:

Quoted 5 lines

From: Marek Olšák <[email protected]>

It is said to cause hangs.

We should probably do so for SI as well.

SI doesn't support single DW type 3 nop packets and AFAIK, there are no bugs with type 2 packet handling on SI.

Alex

Quoted 19 lines

Patch is Reviewed-by: Christian König <[email protected]>

Quoted 16 lines
---
  drivers/gpu/drm/radeon/cik.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/cik.c +1 -1
index 2cd2ac0..44507a4 100644
@@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev)
        ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
        r = radeon_ring_init(rdev, ring, ring->ring_size,
 RADEON_WB_CP_RPTR_OFFSET,
                             CP_RB0_RPTR, CP_RB0_WPTR,
-                            RADEON_CP_PACKET2);
+                            PACKET3(PACKET3_NOP, 0x3FFF));
        if (r)
Quoted 8 lines

drivers/gpu/drm/radeon/cik.c static int cik_startup(struct radeon_device *rdev) · line 7139

Quoted 2 lines
drivers/gpu/drm/radeon/cik.c +0 -0
                return r;

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

Applied
#3 lore raw
In reply to Marek Olšák
Quoted 5 lines · Marek Olšák

From: Marek Olšák <[email protected]>

It is said to cause hangs.

Applied! Thanks.

Quoted 20 lines
---
 drivers/gpu/drm/radeon/cik.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/radeon/cik.c +1 -2
index 2cd2ac0..44507a4 100644
@@ -7134,7 +7134,7 @@ static int cik_startup(struct radeon_device *rdev)
        ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
        r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
                             CP_RB0_RPTR, CP_RB0_WPTR,
-                            RADEON_CP_PACKET2);
+                            PACKET3(PACKET3_NOP, 0x3FFF));
        if (r)
                return r;
 
--

1.8.1.2

Quoted 4 lines

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel

_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel