Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae55321c authored by Francisco Jerez's avatar Francisco Jerez Committed by Ben Skeggs
Browse files

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: default avatarFrancisco Jerez <currojerez@riseup.net>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 6e86e041

drivers/gpu/drm/nouveau/nouveau_bios.c

+3 −3
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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);