From 0ed912ec9a7ec4caa5011cde0b20d597ca3706b7 Mon Sep 17 00:00:00 2001 From: Jiri Slaby Date: Apr 20 2023 11:00:31 +0000 Subject: drm/nouveau/fb: add missing sysmen flush callbacks (bsc#1012628). --- diff --git a/patches.kernel.org/6.2.12-060-drm-nouveau-fb-add-missing-sysmen-flush-callba.patch b/patches.kernel.org/6.2.12-060-drm-nouveau-fb-add-missing-sysmen-flush-callba.patch new file mode 100644 index 0000000..d52e882 --- /dev/null +++ b/patches.kernel.org/6.2.12-060-drm-nouveau-fb-add-missing-sysmen-flush-callba.patch @@ -0,0 +1,75 @@ +From: Karol Herbst +Date: Wed, 5 Apr 2023 13:04:55 +0200 +Subject: [PATCH] drm/nouveau/fb: add missing sysmen flush callbacks +References: bsc#1012628 +Patch-mainline: 6.2.12 +Git-commit: 86d8740dae5a397d8344ae75f8758103c1fcba97 + +[ Upstream commit 86d8740dae5a397d8344ae75f8758103c1fcba97 ] + +Closes: https://gitlab.freedesktop.org/drm/nouveau/-/issues/203 +Fixes: 5728d064190e1 ("drm/nouveau/fb: handle sysmem flush page from common code") +Signed-off-by: Karol Herbst +Reviewed-by: Lyude Paul +Reviewed-by: Ben Skeggs +Link: https://patchwork.freedesktop.org/patch/msgid/20230405110455.1368428-1-kherbst@redhat.com +Signed-off-by: Sasha Levin +Signed-off-by: Jiri Slaby +--- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c | 1 + + 4 files changed, 4 insertions(+) + +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c +index 76678dd6..c4c6f67a 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gf108.c +@@ -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, + }; +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk104.c +index f73442cc..433fa966 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, +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c +index 45d6cdff..4dc283de 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gk110.c +@@ -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, +diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c +index de52462a..90bfff61 100644 +--- a/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c ++++ b/drivers/gpu/drm/nouveau/nvkm/subdev/fb/gm107.c +@@ -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, + }; +-- +2.35.3 + diff --git a/series.conf b/series.conf index a3c0a38..e2ccd2d 100644 --- a/series.conf +++ b/series.conf @@ -2287,6 +2287,7 @@ patches.kernel.org/6.2.12-057-Bluetooth-Fix-printing-errors-if-LE-Connection.patch patches.kernel.org/6.2.12-058-Bluetooth-SCO-Fix-possible-circular-locking-de.patch patches.kernel.org/6.2.12-059-Bluetooth-Set-ISO-Data-Path-on-broadcast-sink.patch + patches.kernel.org/6.2.12-060-drm-nouveau-fb-add-missing-sysmen-flush-callba.patch ######################################################## # Build fixes that apply to the vanilla kernel too.