Commit c8f6364f authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch '04.00-ampere-lite-fixes' of git://github.com/skeggsb/linux into drm-fixes 



As requested, here's a tree with the non-Ampere-specific fixes split
out, as most of them are potentially relevant to already-supported
GPUs.

- irq handling fix
- expansion ROM fix
- hw init dpcd disable
- aux semaphore owner field fix
- vram heap sizing fix
- notifier at 0 is valid fix

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv4P90mcF_ByAh+ghz+ZVD2N2bPbD7xHYYArE1kYrvsGcQ@mail.gmail.com
parents 8e109590 caeb6ab8

drivers/gpu/drm/nouveau/dispnv50/disp.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ nv50_dmac_wait(struct nvif_push *push, u32 size) 


int

nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,

		 const s32 *oclass, u8 head, void *data, u32 size, u64 syncbuf,

		 const s32 *oclass, u8 head, void *data, u32 size, s64 syncbuf,

		 struct nv50_dmac *dmac)

{

	struct nouveau_cli *cli = (void *)device->object.client;
@@ -271,7 +271,7 @@ nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp, 
	if (ret)

		return ret;



	if (!syncbuf)

	if (syncbuf < 0)

		return 0;



	ret = nvif_object_ctor(&dmac->base.user, "kmsSyncCtxDma", NV50_DISP_HANDLE_SYNCBUF,

drivers/gpu/drm/nouveau/dispnv50/disp.h

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ struct nv50_outp_atom { 


int nv50_dmac_create(struct nvif_device *device, struct nvif_object *disp,

		     const s32 *oclass, u8 head, void *data, u32 size,

		     u64 syncbuf, struct nv50_dmac *dmac);

		     s64 syncbuf, struct nv50_dmac *dmac);

void nv50_dmac_destroy(struct nv50_dmac *);



/*

drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ wimmc37b_init_(const struct nv50_wimm_func *func, struct nouveau_drm *drm, 
	int ret;



	ret = nv50_dmac_create(&drm->client.device, &disp->disp->object,

			       &oclass, 0, &args, sizeof(args), 0,

			       &oclass, 0, &args, sizeof(args), -1,

			       &wndw->wimm);

	if (ret) {

		NV_ERROR(drm, "wimm%04x allocation failed: %d\n", oclass, ret);

drivers/gpu/drm/nouveau/include/nvkm/subdev/i2c.h

+1 −0
Original line number Diff line number Diff line
@@ -92,6 +92,7 @@ int g94_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **); 
int gf117_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gf119_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gk104_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gk110_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);

int gm200_i2c_new(struct nvkm_device *, int, struct nvkm_i2c **);



static inline int

drivers/gpu/drm/nouveau/nvkm/engine/device/base.c

+6 −6
Original line number Diff line number Diff line
@@ -1815,7 +1815,7 @@ nvf0_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1853,7 +1853,7 @@ nvf1_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1891,7 +1891,7 @@ nv106_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1929,7 +1929,7 @@ nv108_chipset = { 
	.fb = gk110_fb_new,

	.fuse = gf100_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -1967,7 +1967,7 @@ nv117_chipset = { 
	.fb = gm107_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,
@@ -2003,7 +2003,7 @@ nv118_chipset = { 
	.fb = gm107_fb_new,

	.fuse = gm107_fuse_new,

	.gpio = gk104_gpio_new,

	.i2c = gk104_i2c_new,

	.i2c = gk110_i2c_new,

	.ibus = gk104_ibus_new,

	.iccsense = gf100_iccsense_new,

	.imem = nv50_instmem_new,