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

Merge tag 'drm-misc-fixes-2023-02-02' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



A fix for a non-unique CEC adapter name registration in vc4, a
regression breaking the display in ssd130x, a signaling bit issue in
dma-fence, a couple of fixes in nouveau for Turing and Ampere, and a
disable fix for the boe-tv101wum-nl6 panel.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20230202085724.pz22m7bmei3wyuzp@houat
parents 6d796c50 a3ee9e0b

drivers/dma-buf/dma-fence.c

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ struct dma_fence *dma_fence_allocate_private_stub(void) 
		       0, 0);



	set_bit(DMA_FENCE_FLAG_ENABLE_SIGNAL_BIT,

		&dma_fence_stub.flags);

		&fence->flags);



	dma_fence_signal(fence);

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

+1 −0
Original line number Diff line number Diff line
@@ -97,6 +97,7 @@ int gp100_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct n 
int gp102_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gp10b_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int gv100_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int tu102_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int ga100_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

int ga102_fb_new(struct nvkm_device *, enum nvkm_subdev_type, int inst, struct nvkm_fb **);

drivers/gpu/drm/nouveau/nvkm/core/firmware.c

+3 −0
Original line number Diff line number Diff line
@@ -151,6 +151,9 @@ nvkm_firmware_mem_page(struct nvkm_memory *memory) 
static enum nvkm_memory_target

nvkm_firmware_mem_target(struct nvkm_memory *memory)

{

	if (nvkm_firmware_mem(memory)->device->func->tegra)

		return NVKM_MEM_TARGET_NCOH;



	return NVKM_MEM_TARGET_HOST;

}

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

+5 −5
Original line number Diff line number Diff line
@@ -2405,7 +2405,7 @@ nv162_chipset = { 
	.bus      = { 0x00000001, gf100_bus_new },

	.devinit  = { 0x00000001, tu102_devinit_new },

	.fault    = { 0x00000001, tu102_fault_new },

	.fb       = { 0x00000001, gv100_fb_new },

	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },
@@ -2440,7 +2440,7 @@ nv164_chipset = { 
	.bus      = { 0x00000001, gf100_bus_new },

	.devinit  = { 0x00000001, tu102_devinit_new },

	.fault    = { 0x00000001, tu102_fault_new },

	.fb       = { 0x00000001, gv100_fb_new },

	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },
@@ -2475,7 +2475,7 @@ nv166_chipset = { 
	.bus      = { 0x00000001, gf100_bus_new },

	.devinit  = { 0x00000001, tu102_devinit_new },

	.fault    = { 0x00000001, tu102_fault_new },

	.fb       = { 0x00000001, gv100_fb_new },

	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },
@@ -2510,7 +2510,7 @@ nv167_chipset = { 
	.bus      = { 0x00000001, gf100_bus_new },

	.devinit  = { 0x00000001, tu102_devinit_new },

	.fault    = { 0x00000001, tu102_fault_new },

	.fb       = { 0x00000001, gv100_fb_new },

	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },
@@ -2545,7 +2545,7 @@ nv168_chipset = { 
	.bus      = { 0x00000001, gf100_bus_new },

	.devinit  = { 0x00000001, tu102_devinit_new },

	.fault    = { 0x00000001, tu102_fault_new },

	.fb       = { 0x00000001, gv100_fb_new },

	.fb       = { 0x00000001, tu102_fb_new },

	.fuse     = { 0x00000001, gm107_fuse_new },

	.gpio     = { 0x00000001, gk104_gpio_new },

	.gsp      = { 0x00000001, gv100_gsp_new },

drivers/gpu/drm/nouveau/nvkm/falcon/gm200.c

+13 −1
Original line number Diff line number Diff line
@@ -48,6 +48,16 @@ gm200_flcn_pio_dmem_rd(struct nvkm_falcon *falcon, u8 port, const u8 *img, int l 
		img += 4;

		len -= 4;

	}



	/* Sigh.  Tegra PMU FW's init message... */

	if (len) {

		u32 data = nvkm_falcon_rd32(falcon, 0x1c4 + (port * 8));



		while (len--) {

			*(u8 *)img++ = data & 0xff;

			data >>= 8;

		}

	}

}



static void
@@ -64,6 +74,8 @@ gm200_flcn_pio_dmem_wr(struct nvkm_falcon *falcon, u8 port, const u8 *img, int l 
		img += 4;

		len -= 4;

	}



	WARN_ON(len);

}



static void
@@ -74,7 +86,7 @@ gm200_flcn_pio_dmem_wr_init(struct nvkm_falcon *falcon, u8 port, bool sec, u32 d 


const struct nvkm_falcon_func_pio

gm200_flcn_dmem_pio = {

	.min = 4,

	.min = 1,

	.max = 0x100,

	.wr_init = gm200_flcn_pio_dmem_wr_init,

	.wr = gm200_flcn_pio_dmem_wr,