From 78cd3661fe597dc13b874192994ea6865e7a951c Mon Sep 17 00:00:00 2001 From: Alex Deucher Date: Fri, 1 Aug 2014 20:05:31 +0200 Subject: [PATCH] drm/radeon: use packet3 for nop on hawaii with new firmware Older firmware didn't support the new nop packet. Signed-off-by: Alex Deucher Signed-off-by: Andreas Boll --- drivers/gpu/drm/radeon/cik.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c index 2cb507ab0b7c..2693c57de80c 100644 --- a/drivers/gpu/drm/radeon/cik.c +++ b/drivers/gpu/drm/radeon/cik.c @@ -8394,7 +8394,10 @@ static int cik_startup(struct radeon_device *rdev) cik_irq_set(rdev); if (rdev->family == CHIP_HAWAII) { - nop = RADEON_CP_PACKET2; + if (rdev->new_fw) + nop = PACKET3(PACKET3_NOP, 0x3FFF); + else + nop = RADEON_CP_PACKET2; } else { nop = PACKET3(PACKET3_NOP, 0x3FFF); } -- 2.20.1