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 2cb507ab0b7cf51eee7d9ec839844f590010b923..2693c57de80cc55739db516b1294d4bea7df6d3e 100644 (file)
--- 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);
        }