1 files changed, 4 insertions, 1 deletions

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);
         }