From: Alex Deucher <alexander.deucher@amd.com>
Date: Fri, 1 Aug 2014 18:05:31 +0000 (+0200)
Subject: drm/radeon: use packet3 for nop on hawaii with new firmware
X-Git-Tag: v3.17-rc1~82^2~6^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=78cd3661fe597dc13b874192994ea6865e7a951c;p=~emulex%2Finfiniband.git

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 <alexander.deucher@amd.com>
Signed-off-by: Andreas Boll <andreas.boll.dev@gmail.com>
---

diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 2cb507ab0b7..2693c57de80 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);
 	}