drm/nouveau/sw: turn flip completion into an event

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/include/nvif/class.h b/drivers/gpu/drm/nouveau/include/nvif/class.h
index 4dd2c6e..d8bad60 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/class.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/class.h
@@ -584,6 +584,8 @@ struct nv50_disp_overlay_v0 {
  * software
  ******************************************************************************/
 
+#define NVSW_NTFY_UEVENT                                                   0x00
+
 #define NV04_NVSW_GET_REF                                                  0x00
 
 struct nv04_nvsw_get_ref_v0 {

diff --git a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
index 8dae958..b06140a 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/engine/sw.h
@@ -1,27 +1,5 @@
 #ifndef __NVKM_SW_H__
 #define __NVKM_SW_H__
-#include <core/engctx.h>
-
-struct nvkm_sw_chan {
-       struct nvkm_engctx base;
-
-       int (*flip)(void *);
-       void *flip_data;
-};
-
-#define nvkm_sw_context_create(p,e,c,d)                               \
-       nvkm_engctx_create((p), (e), (c), (p), 0, 0, 0, (d))
-#define nvkm_sw_context_destroy(d)                                    \
-       nvkm_engctx_destroy(&(d)->base)
-#define nvkm_sw_context_init(d)                                       \
-       nvkm_engctx_init(&(d)->base)
-#define nvkm_sw_context_fini(d,s)                                     \
-       nvkm_engctx_fini(&(d)->base, (s))
-
-#define _nvkm_sw_context_dtor _nvkm_engctx_dtor
-#define _nvkm_sw_context_init _nvkm_engctx_init
-#define _nvkm_sw_context_fini _nvkm_engctx_fini
-
 #include <core/engine.h>
 
 struct nvkm_sw {

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index 7f3e821..4a13bda 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/drm/nouveau/nouveau_chan.c
@@ -293,7 +293,6 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
        struct nvif_device *device = chan->device;
        struct nouveau_cli *cli = (void *)chan->user.client;
        struct nvkm_mmu *mmu = nvxx_mmu(device);
-       struct nvkm_sw_chan *swch;
        struct nv_dma_v0 args = {};
        int ret, i;
 
@@ -382,10 +381,6 @@ nouveau_channel_init(struct nouveau_channel *chan, u32 vram, u32 gart)
                if (ret)
                        return ret;
 
-               swch = (void *)nvxx_object(&chan->nvsw)->parent;
-               swch->flip = nouveau_flip_complete;
-               swch->flip_data = chan;
-
                ret = RING_SPACE(chan, 2);
                if (ret)
                        return ret;

diff --cc drivers/gpu/drm/nouveau/nouveau_display.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_drm.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nouveau_fence.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/Kbuild
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/gf100.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/nv10.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/nv50.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.c
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/nvsw.h
Simple merge

diff --cc drivers/gpu/drm/nouveau/nvkm/engine/sw/priv.h
Simple merge