diff options
Diffstat (limited to 'sys/dev/pci/drm/radeon/ni.c')
| -rw-r--r-- | sys/dev/pci/drm/radeon/ni.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/pci/drm/radeon/ni.c b/sys/dev/pci/drm/radeon/ni.c index 9c39811ef04..57e8e75ba7b 100644 --- a/sys/dev/pci/drm/radeon/ni.c +++ b/sys/dev/pci/drm/radeon/ni.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ni.c,v 1.1 2013/08/12 04:11:53 jsg Exp $ */ +/* $OpenBSD: ni.c,v 1.2 2013/08/18 10:45:32 jsg Exp $ */ /* * Copyright 2010 Advanced Micro Devices, Inc. * @@ -1515,12 +1515,13 @@ static int cayman_startup(struct radeon_device *rdev) /* enable pcie gen2 link */ evergreen_pcie_gen2_enable(rdev); + evergreen_mc_program(rdev); + if (rdev->flags & RADEON_IS_IGP) { if (!rdev->me_fw || !rdev->pfp_fw || !rdev->rlc_fw) { r = ni_init_microcode(rdev); if (r) { DRM_ERROR("Failed to load firmware!\n"); - evergreen_mc_program(rdev); return r; } } @@ -1544,7 +1545,6 @@ static int cayman_startup(struct radeon_device *rdev) if (r) return r; - evergreen_mc_program(rdev); r = cayman_pcie_gart_enable(rdev); if (r) return r; |