diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-04-13 20:47:58 +0200 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2023-04-13 20:47:58 +0200 |
commit | cab2932213c5cd72a9e04e5e82002e81b946592b (patch) | |
tree | 1d2f684e585f26354bb6c6f7fceab1430d011241 /drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | |
parent | fffb0b52d5258554c645c966c6cbef7de50b851d (diff) | |
parent | 5603effb8295ada8419408d038a34ca89d658229 (diff) |
Merge tag 'drm-misc-fixes-2023-04-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixesdrm-fixes-2023-04-13
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: Daniel Vetter <daniel.vetter@ffwll.ch>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20230413184233.GA8148@linux-uq9g
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c index f73442ccb424..433fa966ba23 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c @@ -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, |