* [PATCH] drm/radeon: use packet2 for nop on hawaii with old firmware
@ 2014-07-25 21:44 Alex Deucher
2014-07-26 9:36 ` Christian König
0 siblings, 1 reply; 2+ messages in thread
From: Alex Deucher @ 2014-07-25 21:44 UTC (permalink / raw
To: dri-devel; +Cc: Alex Deucher
Older firmware didn't support the new nop packet.
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
drivers/gpu/drm/radeon/cik.c | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 44d25da..80a7ce0 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -8259,6 +8259,7 @@ restart_ih:
static int cik_startup(struct radeon_device *rdev)
{
struct radeon_ring *ring;
+ u32 nop;
int r;
/* enable pcie gen2/3 link */
@@ -8392,9 +8393,18 @@ static int cik_startup(struct radeon_device *rdev)
}
cik_irq_set(rdev);
+ if (rdev->family == CHIP_HAWAII) {
+ if (rdev->new_fw)
+ nop = PACKET3(PACKET3_NOP, 0x3FFF);
+ else
+ nop = RADEON_CP_PACKET2;
+ } else {
+ nop = PACKET3(PACKET3_NOP, 0x3FFF);
+ }
+
ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
- PACKET3(PACKET3_NOP, 0x3FFF));
+ nop);
if (r)
return r;
@@ -8402,7 +8412,7 @@ static int cik_startup(struct radeon_device *rdev)
/* type-2 packets are deprecated on MEC, use type-3 instead */
ring = &rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX];
r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP1_RPTR_OFFSET,
- PACKET3(PACKET3_NOP, 0x3FFF));
+ nop);
if (r)
return r;
ring->me = 1; /* first MEC */
@@ -8413,7 +8423,7 @@ static int cik_startup(struct radeon_device *rdev)
/* type-2 packets are deprecated on MEC, use type-3 instead */
ring = &rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX];
r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP2_RPTR_OFFSET,
- PACKET3(PACKET3_NOP, 0x3FFF));
+ nop);
if (r)
return r;
/* dGPU only have 1 MEC */
--
1.8.3.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/radeon: use packet2 for nop on hawaii with old firmware
2014-07-25 21:44 [PATCH] drm/radeon: use packet2 for nop on hawaii with old firmware Alex Deucher
@ 2014-07-26 9:36 ` Christian König
0 siblings, 0 replies; 2+ messages in thread
From: Christian König @ 2014-07-26 9:36 UTC (permalink / raw
To: Alex Deucher, dri-devel; +Cc: Alex Deucher
Am 25.07.2014 um 23:44 schrieb Alex Deucher:
> Older firmware didn't support the new nop packet.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
> ---
> drivers/gpu/drm/radeon/cik.c | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 44d25da..80a7ce0 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -8259,6 +8259,7 @@ restart_ih:
> static int cik_startup(struct radeon_device *rdev)
> {
> struct radeon_ring *ring;
> + u32 nop;
> int r;
>
> /* enable pcie gen2/3 link */
> @@ -8392,9 +8393,18 @@ static int cik_startup(struct radeon_device *rdev)
> }
> cik_irq_set(rdev);
>
> + if (rdev->family == CHIP_HAWAII) {
> + if (rdev->new_fw)
> + nop = PACKET3(PACKET3_NOP, 0x3FFF);
> + else
> + nop = RADEON_CP_PACKET2;
> + } else {
> + nop = PACKET3(PACKET3_NOP, 0x3FFF);
> + }
> +
> ring = &rdev->ring[RADEON_RING_TYPE_GFX_INDEX];
> r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP_RPTR_OFFSET,
> - PACKET3(PACKET3_NOP, 0x3FFF));
> + nop);
> if (r)
> return r;
>
> @@ -8402,7 +8412,7 @@ static int cik_startup(struct radeon_device *rdev)
> /* type-2 packets are deprecated on MEC, use type-3 instead */
> ring = &rdev->ring[CAYMAN_RING_TYPE_CP1_INDEX];
> r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP1_RPTR_OFFSET,
> - PACKET3(PACKET3_NOP, 0x3FFF));
> + nop);
> if (r)
> return r;
> ring->me = 1; /* first MEC */
> @@ -8413,7 +8423,7 @@ static int cik_startup(struct radeon_device *rdev)
> /* type-2 packets are deprecated on MEC, use type-3 instead */
> ring = &rdev->ring[CAYMAN_RING_TYPE_CP2_INDEX];
> r = radeon_ring_init(rdev, ring, ring->ring_size, RADEON_WB_CP2_RPTR_OFFSET,
> - PACKET3(PACKET3_NOP, 0x3FFF));
> + nop);
> if (r)
> return r;
> /* dGPU only have 1 MEC */
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-26 9:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-25 21:44 [PATCH] drm/radeon: use packet2 for nop on hawaii with old firmware Alex Deucher
2014-07-26 9:36 ` Christian König
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.