Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 205057
b: refs/heads/master
c: ae55321
h: refs/heads/master
i:
  205055: 2780ae2
v: v3
  • Loading branch information
Francisco Jerez authored and Ben Skeggs committed Jul 13, 2010
1 parent d550811 commit 4ce47a3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6e86e0419471d11ed3d4d46039ee90e8cb85806c
refs/heads/master: ae55321c50434a57fca62aa9b243d575f0de8e6b
6 changes: 3 additions & 3 deletions trunk/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 4ce47a3

Please sign in to comment.