From ca9c2d5b28b4d5aa1d229950b88f7c559eee4164 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 19 May 2017 23:59:34 +1000 Subject: [PATCH] drm/nouveau/bios/init: bump script offset to 32-bits Git-commit: ca9c2d5b28b4d5aa1d229950b88f7c559eee4164 Patch-mainline: v4.13-rc1 References: bsc#1095094 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 Acked-by: Takashi Iwai --- drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h | 6 +++--- drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) --- 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; }; --- 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 #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)