cik: liverpool doesn't know how to NOP

fail0verflow · Jan 3, 2016 · 8453f71 · 8453f71
1 parent 4423720
commit 8453f71
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
@@ -9257,12 +9257,13 @@ static int cik_startup(struct radeon_device *rdev)
 		return r;
 	}
 	cik_irq_set(rdev);
-
 	if (rdev->family == CHIP_HAWAII) {
 		if (rdev->new_fw)
 			nop = PACKET3(PACKET3_NOP, 0x3FFF);
 		else
 			nop = RADEON_CP_PACKET2;
+	} else if (rdev->family == CHIP_LIVERPOOL) {
+		nop = RADEON_CP_PACKET2;
 	} else {
 		nop = PACKET3(PACKET3_NOP, 0x3FFF);
 	}