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: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
index 53b3b4cd77d7c23be9154867854abf6322f51163..ad5d993f780529b820fdec6ee037e1f58215ac30 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
@@ -4,7 +4,7 @@
 struct nvbios_init {
        struct nvkm_subdev *subdev;
        struct nvkm_bios *bios;
-       u16 offset;
+       u32 offset;
 
        struct dcb_output *outp;
        union {
@@ -15,8 +15,8 @@ struct nvbios_init {
        /* internal state used during parsing */
        u8 execute;
        u32 nested;
-       u16 repeat;
-       u16 repend;
+       u32 repeat;
+       u32 repend;
        u32 ramcfg;
 };
 

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
index e177457084a75719965f9fbcb5b1e7cef5b896fc..249d018ee32ce469092afc50593a8f8c2abd6b9b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c
@@ -37,7 +37,7 @@
 #include <subdev/vga.h>
 
 #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) ?                            \
                    '0' + (init->nested - 1) : ' ', ##args);                   \
 } while(0)