diff options
author | Francisco Jerez <currojerez@riseup.net> | 2010-07-03 14:47:44 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2010-07-12 20:13:24 -0400 |
commit | ae55321c50434a57fca62aa9b243d575f0de8e6b (patch) | |
tree | 4e031a4c3a1fda2dd9f930865691840fe1abe96a /drivers/gpu/drm | |
parent | 6e86e0419471d11ed3d4d46039ee90e8cb85806c (diff) |
drm/nouveau: INIT_CONFIGURE_PREINIT/CLK/MEM on newer BIOSes is not an error.
No need to spam the logs when they're found, they're equivalent to
INIT_DONE.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_bios.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_bios.c b/drivers/gpu/drm/nouveau/nouveau_bios.c index 3e274d57d9bb..e05f1292b9fd 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bios.c +++ b/drivers/gpu/drm/nouveau/nouveau_bios.c | |||
@@ -2211,7 +2211,7 @@ init_configure_mem(struct nvbios *bios, uint16_t offset, | |||
2211 | uint32_t reg, data; | 2211 | uint32_t reg, data; |
2212 | 2212 | ||
2213 | if (bios->major_version > 2) | 2213 | if (bios->major_version > 2) |
2214 | return -ENODEV; | 2214 | return 0; |
2215 | 2215 | ||
2216 | bios_idxprt_wr(bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX, bios_idxprt_rd( | 2216 | bios_idxprt_wr(bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX, bios_idxprt_rd( |
2217 | bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX) | 0x20); | 2217 | bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX) | 0x20); |
@@ -2266,7 +2266,7 @@ init_configure_clk(struct nvbios *bios, uint16_t offset, | |||
2266 | int clock; | 2266 | int clock; |
2267 | 2267 | ||
2268 | if (bios->major_version > 2) | 2268 | if (bios->major_version > 2) |
2269 | return -ENODEV; | 2269 | return 0; |
2270 | 2270 | ||
2271 | clock = ROM16(bios->data[meminitoffs + 4]) * 10; | 2271 | clock = ROM16(bios->data[meminitoffs + 4]) * 10; |
2272 | setPLL(bios, NV_PRAMDAC_NVPLL_COEFF, clock); | 2272 | setPLL(bios, NV_PRAMDAC_NVPLL_COEFF, clock); |
@@ -2299,7 +2299,7 @@ init_configure_preinit(struct nvbios *bios, uint16_t offset, | |||
2299 | uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & (1 << 6)); | 2299 | uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & (1 << 6)); |
2300 | 2300 | ||
2301 | if (bios->major_version > 2) | 2301 | if (bios->major_version > 2) |
2302 | return -ENODEV; | 2302 | return 0; |
2303 | 2303 | ||
2304 | bios_idxprt_wr(bios, NV_CIO_CRX__COLOR, | 2304 | bios_idxprt_wr(bios, NV_CIO_CRX__COLOR, |
2305 | NV_CIO_CRE_SCRATCH4__INDEX, cr3c); | 2305 | NV_CIO_CRE_SCRATCH4__INDEX, cr3c); |