From: Alex Deucher <alexander.deuc...@amd.com>

Older firmware didn't support the new nop packet.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
Signed-off-by: Andreas Boll <andreas.boll.dev at gmail.com>
---
 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 e5985d5..8b580dc 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -8035,7 +8035,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.0.1

Reply via email to