drm/nouveau/kms/nv50-: convert wndw ntfy_set() to new push macros

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Reviewed-by: Lyude Paul <lyude@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base.h b/drivers/gpu/drm/nouveau/dispnv50/base.h
index c59fd620f3922d894a2b5abfb351c039489b8a5f..a93e2e31464079a13b40a9f3832a692e2ecad850 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/base.h
@@ -13,7 +13,6 @@ void base507c_release(struct nv50_wndw *, struct nv50_wndw_atom *,
                      struct nv50_head_atom *);
 int base507c_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 int base507c_sema_clr(struct nv50_wndw *);
-void base507c_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 void base507c_ntfy_clr(struct nv50_wndw *);
 void base507c_xlut_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 void base507c_xlut_clr(struct nv50_wndw *);

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
index c9c920358d95c8083f31f8dcce914c4ca6a6cdf7..d0d6a5056171e605192ce52106dc8f8768c9d6a9 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
@@ -135,16 +135,19 @@ base507c_ntfy_clr(struct nv50_wndw *wndw)
        }
 }
 
-void
+int
 base507c_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 3))) {
-               evo_mthd(push, 0x00a0, 2);
-               evo_data(push, asyw->ntfy.awaken << 30 | asyw->ntfy.offset);
-               evo_data(push, asyw->ntfy.handle);
-               evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 3)))
+               return ret;
+
+       PUSH_NVSQ(push, NV507C, 0x00a0, asyw->ntfy.awaken << 30 |
+                                       asyw->ntfy.offset,
+                               0x00a4, asyw->ntfy.handle);
+       return 0;
 }
 
 void

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly.h b/drivers/gpu/drm/nouveau/dispnv50/ovly.h
index 4869d52d17860f4e3b5af1d4f8f44be46f9bac0b..dee606213d275019825afc45188cd9179dabf1a4 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly.h
@@ -10,7 +10,6 @@ int ovly507e_acquire(struct nv50_wndw *, struct nv50_wndw_atom *,
                     struct nv50_head_atom *);
 void ovly507e_release(struct nv50_wndw *, struct nv50_wndw_atom *,
                      struct nv50_head_atom *);
-void ovly507e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 void ovly507e_ntfy_clr(struct nv50_wndw *);
 void ovly507e_image_clr(struct nv50_wndw *);
 void ovly507e_scale_set(struct nv50_wndw *, struct nv50_wndw_atom *);

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
index 1371225996e9979d10eb62c8ed86d9a90138fb8e..91ea3ea3e7fa948ef3229e9d57085e300b0f8b53 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
@@ -103,18 +103,6 @@ ovly507e_ntfy_clr(struct nv50_wndw *wndw)
        }
 }
 
-void
-ovly507e_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
-{
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 3))) {
-               evo_mthd(push, 0x00a0, 2);
-               evo_data(push, asyw->ntfy.awaken << 30 | asyw->ntfy.offset);
-               evo_data(push, asyw->ntfy.handle);
-               evo_kick(push, &wndw->wndw);
-       }
-}
-
 void
 ovly507e_release(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
                 struct nv50_head_atom *asyh)
@@ -146,7 +134,7 @@ static const struct nv50_wndw_func
 ovly507e = {
        .acquire = ovly507e_acquire,
        .release = ovly507e_release,
-       .ntfy_set = ovly507e_ntfy_set,
+       .ntfy_set = base507c_ntfy_set,
        .ntfy_clr = ovly507e_ntfy_clr,
        .ntfy_reset = base507c_ntfy_reset,
        .ntfy_wait_begun = base507c_ntfy_wait_begun,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
index 4f7ce57f2036ba54e6963d897bd76a69d6b0481d..72a4117529e59a55862b64a1db6eceb506c065a0 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
@@ -77,7 +77,7 @@ static const struct nv50_wndw_func
 ovly827e = {
        .acquire = ovly507e_acquire,
        .release = ovly507e_release,
-       .ntfy_set = ovly507e_ntfy_set,
+       .ntfy_set = base507c_ntfy_set,
        .ntfy_clr = ovly507e_ntfy_clr,
        .ntfy_reset = ovly827e_ntfy_reset,
        .ntfy_wait_begun = ovly827e_ntfy_wait_begun,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
index 9efe5e9d5ce48c0b7402feb318833dee66dacda2..255a8415eb451182e98a10d0ad701368cc7d37b9 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
@@ -51,7 +51,7 @@ const struct nv50_wndw_func
 ovly907e = {
        .acquire = ovly507e_acquire,
        .release = ovly507e_release,
-       .ntfy_set = ovly507e_ntfy_set,
+       .ntfy_set = base507c_ntfy_set,
        .ntfy_clr = ovly507e_ntfy_clr,
        .ntfy_reset = ovly827e_ntfy_reset,
        .ntfy_wait_begun = ovly827e_ntfy_wait_begun,

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndw.h b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
index 84bd402f935c2378bf66f925c33d26817cc075f2..6c994461ea63f83e4d8de26f361f5fdb2689d647 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndw.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndw.h
@@ -60,7 +60,7 @@ struct nv50_wndw_func {
        int (*sema_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
        int (*sema_clr)(struct nv50_wndw *);
        void (*ntfy_reset)(struct nouveau_bo *, u32 offset);
-       void (*ntfy_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
+       int (*ntfy_set)(struct nv50_wndw *, struct nv50_wndw_atom *);
        void (*ntfy_clr)(struct nv50_wndw *);
        int (*ntfy_wait_begun)(struct nouveau_bo *, u32 offset,
                               struct nvif_device *);
@@ -85,6 +85,7 @@ struct nv50_wndw_func {
 extern const struct drm_plane_funcs nv50_wndw;
 
 void base507c_ntfy_reset(struct nouveau_bo *, u32);
+int base507c_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 int base507c_ntfy_wait_begun(struct nouveau_bo *, u32, struct nvif_device *);
 
 void base907c_csc(struct nv50_wndw *, struct nv50_wndw_atom *,
@@ -117,7 +118,7 @@ void wndwc37e_release(struct nv50_wndw *, struct nv50_wndw_atom *,
                      struct nv50_head_atom *);
 int wndwc37e_sema_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 int wndwc37e_sema_clr(struct nv50_wndw *);
-void wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);
+int wndwc37e_ntfy_set(struct nv50_wndw *, struct nv50_wndw_atom *);
 void wndwc37e_ntfy_clr(struct nv50_wndw *);
 void wndwc37e_image_clr(struct nv50_wndw *);
 void wndwc37e_blend_set(struct nv50_wndw *, struct nv50_wndw_atom *);

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
index 965807f8b635316900ade5d3d1cb8ffbcb4bdab3..9738205949bf843275c28d0c69703e35c7060b0b 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
@@ -163,16 +163,19 @@ wndwc37e_ntfy_clr(struct nv50_wndw *wndw)
        }
 }
 
-void
+int
 wndwc37e_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       u32 *push;
-       if ((push = evo_wait(&wndw->wndw, 3))) {
-               evo_mthd(push, 0x021c, 2);
-               evo_data(push, asyw->ntfy.handle);
-               evo_data(push, asyw->ntfy.offset | asyw->ntfy.awaken);
-               evo_kick(push, &wndw->wndw);
-       }
+       struct nvif_push *push = wndw->wndw.push;
+       int ret;
+
+       if ((ret = PUSH_WAIT(push, 3)))
+               return ret;
+
+       PUSH_NVSQ(push, NVC37E, 0x021c, asyw->ntfy.handle,
+                               0x0220, asyw->ntfy.offset |
+                                       asyw->ntfy.awaken);
+       return 0;
 }
 
 int