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>
This commit is contained in:
Alex Deucher 2014-08-01 20:05:31 +02:00
parent 3c64bd26f7
commit 78cd3661fe

View File

@ -8394,7 +8394,10 @@ static int cik_startup(struct radeon_device *rdev)
cik_irq_set(rdev); cik_irq_set(rdev);
if (rdev->family == CHIP_HAWAII) { if (rdev->family == CHIP_HAWAII) {
nop = RADEON_CP_PACKET2; if (rdev->new_fw)
nop = PACKET3(PACKET3_NOP, 0x3FFF);
else
nop = RADEON_CP_PACKET2;
} else { } else {
nop = PACKET3(PACKET3_NOP, 0x3FFF); nop = PACKET3(PACKET3_NOP, 0x3FFF);
} }