瀏覽代碼

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>
Francisco Jerez 15 年之前
父節點
當前提交
ae55321c50
共有 1 個文件被更改,包括 3 次插入3 次删除
  1. 3 3
      drivers/gpu/drm/nouveau/nouveau_bios.c

+ 3 - 3
drivers/gpu/drm/nouveau/nouveau_bios.c

@@ -2211,7 +2211,7 @@ init_configure_mem(struct nvbios *bios, uint16_t offset,
 	uint32_t reg, data;
 	uint32_t reg, data;
 
 
 	if (bios->major_version > 2)
 	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_idxprt_wr(bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX, bios_idxprt_rd(
 		       bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX) | 0x20);
 		       bios, NV_VIO_SRX, NV_VIO_SR_CLOCK_INDEX) | 0x20);
@@ -2266,7 +2266,7 @@ init_configure_clk(struct nvbios *bios, uint16_t offset,
 	int clock;
 	int clock;
 
 
 	if (bios->major_version > 2)
 	if (bios->major_version > 2)
-		return -ENODEV;
+		return 0;
 
 
 	clock = ROM16(bios->data[meminitoffs + 4]) * 10;
 	clock = ROM16(bios->data[meminitoffs + 4]) * 10;
 	setPLL(bios, NV_PRAMDAC_NVPLL_COEFF, clock);
 	setPLL(bios, NV_PRAMDAC_NVPLL_COEFF, clock);
@@ -2299,7 +2299,7 @@ init_configure_preinit(struct nvbios *bios, uint16_t offset,
 	uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & (1 << 6));
 	uint8_t cr3c = ((straps << 2) & 0xf0) | (straps & (1 << 6));
 
 
 	if (bios->major_version > 2)
 	if (bios->major_version > 2)
-		return -ENODEV;
+		return 0;
 
 
 	bios_idxprt_wr(bios, NV_CIO_CRX__COLOR,
 	bios_idxprt_wr(bios, NV_CIO_CRX__COLOR,
 			     NV_CIO_CRE_SCRATCH4__INDEX, cr3c);
 			     NV_CIO_CRE_SCRATCH4__INDEX, cr3c);