Skip to content

Commit

Permalink
drm/nouveau: INIT_CONFIGURE_PREINIT/CLK/MEM on newer BIOSes is not an…
Browse files Browse the repository at this point in the history
… 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>
  • Loading branch information
Francisco Jerez authored and Ben Skeggs committed Jul 13, 2010
1 parent 6e86e04 commit ae55321
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions drivers/gpu/drm/nouveau/nouveau_bios.c
Original file line number Diff line number Diff line change
Expand Up @@ -2211,7 +2211,7 @@ init_configure_mem(struct nvbios *bios, uint16_t offset,
uint32_t reg, data;

if (bios->major_version > 2)
return -ENODEV;
return 0;

bios_idxprt_wr(bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX, bios_idxprt_rd(
bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX) | 0x20);
Expand Down Expand Up @@ -2266,7 +2266,7 @@ init_configure_clk(struct nvbios *bios, uint16_t offset,
int clock;

if (bios->major_version > 2)
return -ENODEV;
return 0;

clock = ROM16(bios->data[meminitoffs + 4]) * 10;
setPLL(bios, NV_PRAMDAC_NVPLL_COEFF, clock);
Expand Down Expand Up @@ -2299,7 +2299,7 @@ init_configure_preinit(struct nvbios *bios, uint16_t offset,
uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & (1 << 6));

if (bios->major_version > 2)
return -ENODEV;
return 0;

bios_idxprt_wr(bios, NV_CIO_CRX__COLOR,
NV_CIO_CRE_SCRATCH4__INDEX, cr3c);
Expand Down

0 comments on commit ae55321

Please sign in to comment.