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

Commit 0a8649f1 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/bios: have strap reads show on devinit spam debug level 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 77307051

drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h

+1 −1
Original line number Diff line number Diff line
@@ -61,6 +61,6 @@ struct nvbios_ramcfg { 
};



u8 nvbios_ramcfg_count(struct nouveau_bios *);

u8 nvbios_ramcfg_index(struct nouveau_bios *);

u8 nvbios_ramcfg_index(struct nouveau_subdev *);



#endif

drivers/gpu/drm/nouveau/core/subdev/bios/init.c

+1 −1
Original line number Diff line number Diff line
@@ -410,7 +410,7 @@ init_ram_restrict(struct nvbios_init *init) 
	 * in case *not* re-reading the strap causes similar breakage.

	 */

	if (!init->ramcfg || init->bios->version.major < 0x70)

		init->ramcfg = 0x80000000 | nvbios_ramcfg_index(init->bios);

		init->ramcfg = 0x80000000 | nvbios_ramcfg_index(init->subdev);

	return (init->ramcfg & 0x7fffffff);

}

drivers/gpu/drm/nouveau/core/subdev/bios/ramcfg.c

+5 −4
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
#include <subdev/bios/ramcfg.h>



static u8

nvbios_ramcfg_strap(struct nouveau_bios *bios)

nvbios_ramcfg_strap(struct nouveau_subdev *subdev)

{

	return (nv_rd32(bios, 0x101000) & 0x0000003c) >> 2;

	return (nv_rd32(subdev, 0x101000) & 0x0000003c) >> 2;

}



u8
@@ -48,9 +48,10 @@ nvbios_ramcfg_count(struct nouveau_bios *bios) 
}



u8

nvbios_ramcfg_index(struct nouveau_bios *bios)

nvbios_ramcfg_index(struct nouveau_subdev *subdev)

{

	u8 strap = nvbios_ramcfg_strap(bios);

	struct nouveau_bios *bios = nouveau_bios(subdev);

	u8 strap = nvbios_ramcfg_strap(subdev);

	u32 xlat = 0x00000000;

	struct bit_entry bit_M;

drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ nv50_ram_calc(struct nouveau_fb *pfb, u32 freq) 
	} while (perfE.memory < freq);



	/* locate specific data set for the attached memory */

	strap = nvbios_ramcfg_index(bios);

	strap = nvbios_ramcfg_index(nv_subdev(pfb));

	if (strap >= cnt) {

		nv_error(pfb, "invalid ramcfg strap\n");

		return -EINVAL;

drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq) 
	}



	/* locate specific data set for the attached memory */

	strap = nvbios_ramcfg_index(bios);

	strap = nvbios_ramcfg_index(nv_subdev(pfb));

	if (strap >= cnt) {

		nv_error(pfb, "invalid ramcfg strap\n");

		return -EINVAL;