Commit ca9c2d5b authored by Ben Skeggs's avatar Ben Skeggs

drm/nouveau/bios/init: bump script offset to 32-bits

No (known) case yet, but other tables have been moving beyond 16-bits,
so we may as well be prepared.
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 2195a22f
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
struct nvbios_init { struct nvbios_init {
struct nvkm_subdev *subdev; struct nvkm_subdev *subdev;
struct nvkm_bios *bios; struct nvkm_bios *bios;
u16 offset; u32 offset;
struct dcb_output *outp; struct dcb_output *outp;
union { union {
...@@ -15,8 +15,8 @@ struct nvbios_init { ...@@ -15,8 +15,8 @@ struct nvbios_init {
/* internal state used during parsing */ /* internal state used during parsing */
u8 execute; u8 execute;
u32 nested; u32 nested;
u16 repeat; u32 repeat;
u16 repend; u32 repend;
u32 ramcfg; u32 ramcfg;
}; };
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include <subdev/vga.h> #include <subdev/vga.h>
#define bioslog(lvl, fmt, args...) do { \ #define bioslog(lvl, fmt, args...) do { \
nvkm_printk(init->subdev, lvl, info, "0x%04x[%c]: "fmt, \ nvkm_printk(init->subdev, lvl, info, "0x%08x[%c]: "fmt, \
init->offset, init_exec(init) ? \ init->offset, init_exec(init) ? \
'0' + (init->nested - 1) : ' ', ##args); \ '0' + (init->nested - 1) : ' ', ##args); \
} while(0) } while(0)
......
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