summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/cik.c
diff options
context:
space:
mode:
authorAlex Deucher <alexander.deucher@amd.com>2014-08-01 20:05:31 +0200
committerAlex Deucher <alexander.deucher@amd.com>2014-08-05 08:53:58 -0400
commit78cd3661fe597dc13b874192994ea6865e7a951c (patch)
tree4fa18ac63c045956c9c0fa8f75e8df60762a012d /drivers/gpu/drm/radeon/cik.c
parent3c64bd26f7e9bd589ebe0d1ebec69ef2f784c12d (diff)
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>
Diffstat (limited to 'drivers/gpu/drm/radeon/cik.c')
-rw-r--r--drivers/gpu/drm/radeon/cik.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 2cb507ab0b7..2693c57de80 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);
}