Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ca9c2d5b authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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

drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h

+3 −3
Original line number Diff line number Diff line
@@ -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;

};

drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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)