Skip to content

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

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

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 77307051
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
drivers/gpu/drm/nouveau/core/include/subdev/bios/ramcfg.h
View file @ 0a8649f1
...@@ -61,6 +61,6 @@ struct nvbios_ramcfg { ...@@ -61,6 +61,6 @@ struct nvbios_ramcfg {
}; };
u8 nvbios_ramcfg_count(struct nouveau_bios *); u8 nvbios_ramcfg_count(struct nouveau_bios *);
u8 nvbios_ramcfg_index(struct nouveau_bios *); u8 nvbios_ramcfg_index(struct nouveau_subdev *);
#endif #endif
drivers/gpu/drm/nouveau/core/subdev/bios/init.c
View file @ 0a8649f1
...@@ -410,7 +410,7 @@ init_ram_restrict(struct nvbios_init *init) ...@@ -410,7 +410,7 @@ init_ram_restrict(struct nvbios_init *init)
* in case *not* re-reading the strap causes similar breakage. * in case *not* re-reading the strap causes similar breakage.
*/ */
if (!init->ramcfg || init->bios->version.major < 0x70) 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); return (init->ramcfg & 0x7fffffff);
} }
......
drivers/gpu/drm/nouveau/core/subdev/bios/ramcfg.c
View file @ 0a8649f1
...@@ -27,9 +27,9 @@ ...@@ -27,9 +27,9 @@
#include <subdev/bios/ramcfg.h> #include <subdev/bios/ramcfg.h>
static u8 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 u8
...@@ -48,9 +48,10 @@ nvbios_ramcfg_count(struct nouveau_bios *bios) ...@@ -48,9 +48,10 @@ nvbios_ramcfg_count(struct nouveau_bios *bios)
} }
u8 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; u32 xlat = 0x00000000;
struct bit_entry bit_M; struct bit_entry bit_M;
......
drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c
View file @ 0a8649f1
...@@ -91,7 +91,7 @@ nv50_ram_calc(struct nouveau_fb *pfb, u32 freq) ...@@ -91,7 +91,7 @@ nv50_ram_calc(struct nouveau_fb *pfb, u32 freq)
} while (perfE.memory < freq); } while (perfE.memory < freq);
/* locate specific data set for the attached memory */ /* locate specific data set for the attached memory */
strap = nvbios_ramcfg_index(bios); strap = nvbios_ramcfg_index(nv_subdev(pfb));
if (strap >= cnt) { if (strap >= cnt) {
nv_error(pfb, "invalid ramcfg strap\n"); nv_error(pfb, "invalid ramcfg strap\n");
return -EINVAL; return -EINVAL;
......
drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c
View file @ 0a8649f1
...@@ -98,7 +98,7 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq) ...@@ -98,7 +98,7 @@ nva3_ram_calc(struct nouveau_fb *pfb, u32 freq)
} }
/* locate specific data set for the attached memory */ /* locate specific data set for the attached memory */
strap = nvbios_ramcfg_index(bios); strap = nvbios_ramcfg_index(nv_subdev(pfb));
if (strap >= cnt) { if (strap >= cnt) {
nv_error(pfb, "invalid ramcfg strap\n"); nv_error(pfb, "invalid ramcfg strap\n");
return -EINVAL; return -EINVAL;
......
drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c
View file @ 0a8649f1
...@@ -152,7 +152,7 @@ nvc0_ram_calc(struct nouveau_fb *pfb, u32 freq) ...@@ -152,7 +152,7 @@ nvc0_ram_calc(struct nouveau_fb *pfb, u32 freq)
} }
/* locate specific data set for the attached memory */ /* locate specific data set for the attached memory */
strap = nvbios_ramcfg_index(bios); strap = nvbios_ramcfg_index(nv_subdev(pfb));
if (strap >= cnt) { if (strap >= cnt) {
nv_error(pfb, "invalid ramcfg strap\n"); nv_error(pfb, "invalid ramcfg strap\n");
return -EINVAL; return -EINVAL;
......
drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
View file @ 0a8649f1
...@@ -950,10 +950,11 @@ nve0_ram_calc_data(struct nouveau_fb *pfb, u32 freq, ...@@ -950,10 +950,11 @@ nve0_ram_calc_data(struct nouveau_fb *pfb, u32 freq,
} }
/* locate specific data set for the attached memory */ /* locate specific data set for the attached memory */
strap = nvbios_ramcfg_index(nv_subdev(pfb));
ram->base.ramcfg.data = nvbios_rammapSp(bios, ram->base.rammap.data, ram->base.ramcfg.data = nvbios_rammapSp(bios, ram->base.rammap.data,
ram->base.rammap.version, ram->base.rammap.version,
ram->base.rammap.size, cnt, len, ram->base.rammap.size,
nvbios_ramcfg_index(bios), cnt, len, strap,
&ram->base.ramcfg.version, &ram->base.ramcfg.version,
&ram->base.ramcfg.size, &ram->base.ramcfg.size,
&data->bios); &data->bios);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7