Commit cab29322 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

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



Short summary of fixes pull:

 * armada: Fix double free
 * fb: Clear FB_ACTIVATE_KD_TEXT in ioctl
 * nouveau: Add missing callbacks
 * scheduler: Fix use-after-free error

Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230413184233.GA8148@linux-uq9g
parents fffb0b52 5603effb

drivers/gpu/drm/armada/armada_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -99,7 +99,6 @@ static int armada_drm_bind(struct device *dev) 
	if (ret) {

		dev_err(dev, "[" DRM_NAME ":%s] can't kick out simple-fb: %d\n",

			__func__, ret);

		kfree(priv);

		return ret;

	}

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ gf108_fb = { 
	.init = gf100_fb_init,

	.init_page = gf100_fb_init_page,

	.intr = gf100_fb_intr,

	.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,

	.ram_new = gf108_ram_new,

	.default_bigpage = 17,

};

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ gk104_fb = { 
	.init = gf100_fb_init,

	.init_page = gf100_fb_init_page,

	.intr = gf100_fb_intr,

	.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,

	.ram_new = gk104_ram_new,

	.default_bigpage = 17,

	.clkgate_pack = gk104_fb_clkgate_pack,

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ gk110_fb = { 
	.init = gf100_fb_init,

	.init_page = gf100_fb_init_page,

	.intr = gf100_fb_intr,

	.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,

	.ram_new = gk104_ram_new,

	.default_bigpage = 17,

	.clkgate_pack = gk110_fb_clkgate_pack,

drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ gm107_fb = { 
	.init = gf100_fb_init,

	.init_page = gf100_fb_init_page,

	.intr = gf100_fb_intr,

	.sysmem.flush_page_init = gf100_fb_sysmem_flush_page_init,

	.ram_new = gm107_ram_new,

	.default_bigpage = 17,

};