Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-27 05:11:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs 2014-03-19 00:55:02 +10:00
parent 7730705126
commit 0a8649f1c6
7 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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

2
drivers/gpu/drm/nouveau/core/subdev/bios/init.c
View File

@ -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);
}

9
drivers/gpu/drm/nouveau/core/subdev/bios/ramcfg.c
View File

@ -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;

2
drivers/gpu/drm/nouveau/core/subdev/fb/ramnv50.c
View File

@ -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;

2
drivers/gpu/drm/nouveau/core/subdev/fb/ramnva3.c
View File

@ -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;

2
drivers/gpu/drm/nouveau/core/subdev/fb/ramnvc0.c
View File

@ -152,7 +152,7 @@ nvc0_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;

5
drivers/gpu/drm/nouveau/core/subdev/fb/ramnve0.c
View File

@ -950,10 +950,11 @@ nve0_ram_calc_data(struct nouveau_fb *pfb, u32 freq,
}
/* 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.rammap.version,
ram->base.rammap.size, cnt, len,
nvbios_ramcfg_index(bios),
ram->base.rammap.size,
cnt, len, strap,
&ram->base.ramcfg.version,
&ram->base.ramcfg.size,
&data->bios);