drm/nouveau/kms: remove push pointer from nv50_dmac

The struct itself lives in nv50_dmac already, just use that.

Signed-off-by: Ben Skeggs <[email protected]>
Signed-off-by: Danilo Krummrich <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base507c.c b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
index e36a473f2075762d14d997decb4810b1bb4f3d42..a431f6c5f6fa95cda10680188dfdc40096098fdd 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base507c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base507c.c
@@ -35,7 +35,7 @@
 int
 base507c_update(struct nv50_wndw *wndw, u32 *interlock)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -48,7 +48,7 @@ base507c_update(struct nv50_wndw *wndw, u32 *interlock)
 int
 base507c_image_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 4)))
@@ -65,7 +65,7 @@ base507c_image_clr(struct nv50_wndw *wndw)
 static int
 base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 13)))
@@ -118,7 +118,7 @@ base507c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 int
 base507c_xlut_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -132,7 +132,7 @@ base507c_xlut_clr(struct nv50_wndw *wndw)
 int
 base507c_xlut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -158,7 +158,7 @@ base507c_ntfy_wait_begun(struct nouveau_bo *bo, u32 offset,
 int
 base507c_ntfy_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -171,7 +171,7 @@ base507c_ntfy_clr(struct nv50_wndw *wndw)
 int
 base507c_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 3)))
@@ -195,7 +195,7 @@ base507c_ntfy_reset(struct nouveau_bo *bo, u32 offset)
 int
 base507c_sema_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -208,7 +208,7 @@ base507c_sema_clr(struct nv50_wndw *wndw)
 int
 base507c_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 5)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base827c.c b/drivers/gpu/drm/nouveau/dispnv50/base827c.c
index 093d4ba6910ec40ec556eeea003e5d83261d6b52..4545cc5f3a14b0234c03011157475e5db31d4c29 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base827c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base827c.c
@@ -28,7 +28,7 @@
 static int
 base827c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 13)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/base907c.c b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
index e6b0417c325baaf57f261b62d717ee55cebcf486..4a2d5a259e15b0083fd7e6b38ef624098f06baf6 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/base907c.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/base907c.c
@@ -28,7 +28,7 @@
 static int
 base907c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 10)))
@@ -65,7 +65,7 @@ base907c_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 static int
 base907c_xlut_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 6)))
@@ -84,7 +84,7 @@ base907c_xlut_clr(struct nv50_wndw *wndw)
 static int
 base907c_xlut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 6)))
@@ -156,7 +156,7 @@ base907c_csc(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw,
 static int
 base907c_csc_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -170,7 +170,7 @@ base907c_csc_clr(struct nv50_wndw *wndw)
 static int
 base907c_csc_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 13)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/core507d.c b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
index 85845e3dc7ba0c1121f746c96bfb3c4e42ce347e..ce2cb78bbdd30f91cb111fbcb59ae3f27a293a52 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/core507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/core507d.c
@@ -33,7 +33,7 @@
 int
 core507d_update(struct nv50_core *core, u32 *interlock, bool ntfy)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, (ntfy ? 2 : 0) + 3)))
@@ -80,7 +80,7 @@ core507d_ntfy_init(struct nouveau_bo *bo, u32 offset)
 int
 core507d_read_caps(struct nv50_disp *disp)
 {
-       struct nvif_push *push = disp->core->chan.push;
+       struct nvif_push *push = &disp->core->chan.push;
        int ret;
 
        ret = PUSH_WAIT(push, 6);
@@ -130,7 +130,7 @@ core507d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)
 int
 core507d_init(struct nv50_core *core)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
index 42f877f2ced2770812bf7b051086d5b04d3917ed..7f637b8830befb9435cb08c694c0a55b241be8f4 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/corec37d.c
@@ -33,7 +33,7 @@
 int
 corec37d_wndw_owner(struct nv50_core *core)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        const u32 windows = 8; /*XXX*/
        int ret, i;
 
@@ -51,7 +51,7 @@ corec37d_wndw_owner(struct nv50_core *core)
 int
 corec37d_update(struct nv50_core *core, u32 *interlock, bool ntfy)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, (ntfy ? 2 * 2 : 0) + 5)))
@@ -127,7 +127,7 @@ int corec37d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp)
 static int
 corec37d_init(struct nv50_core *core)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        const u32 windows = 8; /*XXX*/
        int ret, i;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/corec57d.c b/drivers/gpu/drm/nouveau/dispnv50/corec57d.c
index 53b1e2a569c1b9155a5d696274087f5e8bbad1a1..421d0d57e1d88c6399dc1bb303a14c0e4dd2d675 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/corec57d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/corec57d.c
@@ -29,7 +29,7 @@
 static int
 corec57d_init(struct nv50_core *core)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        const u32 windows = 8; /*XXX*/
        int ret, i;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/crc907d.c b/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
index f9ad641555b7c175de37935769c9decb876d7727..a674ba435b05a708111aed74e06b45c209654209 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crc907d.c
@@ -26,7 +26,7 @@ static int
 crc907d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type source,
                struct nv50_crc_notifier_ctx *ctx)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 crc_args = NVDEF(NV907D, HEAD_SET_CRC_CONTROL, CONTROLLING_CHANNEL, CORE) |
                       NVDEF(NV907D, HEAD_SET_CRC_CONTROL, EXPECT_BUFFER_COLLAPSE, FALSE) |
@@ -74,7 +74,7 @@ crc907d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type source
 static int
 crc907d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c b/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
index f10f6c48440831fda14aed05afccc6e2a1f36a5a..4821ce32f9edd789bd64fc73e6f0f92755eb372e 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crcc37d.c
@@ -15,7 +15,7 @@ static int
 crcc37d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type source,
                struct nv50_crc_notifier_ctx *ctx)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 crc_args = NVVAL(NVC37D, HEAD_SET_CRC_CONTROL, CONTROLLING_CHANNEL, i * 4) |
                       NVDEF(NVC37D, HEAD_SET_CRC_CONTROL, EXPECT_BUFFER_COLLAPSE, FALSE) |
@@ -53,7 +53,7 @@ crcc37d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type source
 
 int crcc37d_set_ctx(struct nv50_head *head, struct nv50_crc_notifier_ctx *ctx)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c b/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
index cc0130e3d496d113463574d5ce804166419bfbd9..ad591dcb0bc9573a6c993b77738c3731560b8ffd 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/crcc57d.c
@@ -13,7 +13,7 @@
 static int crcc57d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type source,
                           struct nv50_crc_notifier_ctx *ctx)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 crc_args = NVDEF(NVC57D, HEAD_SET_CRC_CONTROL, CONTROLLING_CHANNEL, CORE) |
                       NVDEF(NVC57D, HEAD_SET_CRC_CONTROL, EXPECT_BUFFER_COLLAPSE, FALSE) |

diff --git a/drivers/gpu/drm/nouveau/dispnv50/dac507d.c b/drivers/gpu/drm/nouveau/dispnv50/dac507d.c
index 09de78d9667953d6778ef485ba8ee92938c0befa..99ae692f219e4c39e0204592e6a0669bd63f90ea 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/dac507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/dac507d.c
@@ -29,7 +29,7 @@ static int
 dac507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        u32 sync = 0;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/dac907d.c b/drivers/gpu/drm/nouveau/dispnv50/dac907d.c
index 95efa625b69189b02d78fe9ec88c81096b65e76e..74bc9f81e3f14c3f64efb58922dc5efd8735b62d 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/dac907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/dac907d.c
@@ -29,7 +29,7 @@ static int
 dac907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c b/drivers/gpu/drm/nouveau/dispnv50/disp.c
index 22ecda545550c849eead36526c73ee4f86d5714e..d4b62461e37905ed3df80f815e204143423d48e1 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c
@@ -127,20 +127,20 @@ nv50_dmac_destroy(struct nv50_dmac *dmac)
 
        nv50_chan_destroy(&dmac->base);
 
-       nvif_mem_dtor(&dmac->_push.mem);
+       nvif_mem_dtor(&dmac->push.mem);
 }
 
 static void
 nv50_dmac_kick(struct nvif_push *push)
 {
-       struct nv50_dmac *dmac = container_of(push, typeof(*dmac), _push);
+       struct nv50_dmac *dmac = container_of(push, typeof(*dmac), push);
 
-       dmac->cur = push->cur - (u32 __iomem *)dmac->_push.mem.object.map.ptr;
+       dmac->cur = push->cur - (u32 __iomem *)dmac->push.mem.object.map.ptr;
        if (dmac->put != dmac->cur) {
                /* Push buffer fetches are not coherent with BAR1, we need to ensure
                 * writes have been flushed right through to VRAM before writing PUT.
                 */
-               if (dmac->push->mem.type & NVIF_MEM_VRAM) {
+               if (dmac->push.mem.type & NVIF_MEM_VRAM) {
                        struct nvif_device *device = dmac->base.device;
                        nvif_wr32(&device->object, 0x070000, 0x00000001);
                        nvif_msec(device, 2000,
@@ -175,7 +175,7 @@ nv50_dmac_wind(struct nv50_dmac *dmac)
        if (get == 0) {
                /* Corner-case, HW idle, but non-committed work pending. */
                if (dmac->put == 0)
-                       nv50_dmac_kick(dmac->push);
+                       nv50_dmac_kick(&dmac->push);
 
                if (nvif_msec(dmac->base.device, 2000,
                        if (NVIF_TV32(&dmac->base.user, NV507C, GET, PTR, >, 0))
@@ -184,7 +184,7 @@ nv50_dmac_wind(struct nv50_dmac *dmac)
                        return -ETIMEDOUT;
        }
 
-       PUSH_RSVD(dmac->push, PUSH_JUMP(dmac->push, 0));
+       PUSH_RSVD(&dmac->push, PUSH_JUMP(&dmac->push, 0));
        dmac->cur = 0;
        return 0;
 }
@@ -192,19 +192,19 @@ nv50_dmac_wind(struct nv50_dmac *dmac)
 static int
 nv50_dmac_wait(struct nvif_push *push, u32 size)
 {
-       struct nv50_dmac *dmac = container_of(push, typeof(*dmac), _push);
+       struct nv50_dmac *dmac = container_of(push, typeof(*dmac), push);
        int free;
 
        if (WARN_ON(size > dmac->max))
                return -EINVAL;
 
-       dmac->cur = push->cur - (u32 __iomem *)dmac->_push.mem.object.map.ptr;
+       dmac->cur = push->cur - (u32 __iomem *)dmac->push.mem.object.map.ptr;
        if (dmac->cur + size >= dmac->max) {
                int ret = nv50_dmac_wind(dmac);
                if (ret)
                        return ret;
 
-               push->cur = dmac->_push.mem.object.map.ptr;
+               push->cur = dmac->push.mem.object.map.ptr;
                push->cur = push->cur + dmac->cur;
                nv50_dmac_kick(push);
        }
@@ -217,7 +217,7 @@ nv50_dmac_wait(struct nvif_push *push, u32 size)
                return -ETIMEDOUT;
        }
 
-       push->bgn = dmac->_push.mem.object.map.ptr;
+       push->bgn = dmac->push.mem.object.map.ptr;
        push->bgn = push->bgn + dmac->cur;
        push->cur = push->bgn;
        push->end = push->cur + free;
@@ -252,16 +252,15 @@ nv50_dmac_create(struct nouveau_drm *drm,
            (nv50_dmac_vram_pushbuf < 0 && device->info.family == NV_DEVICE_INFO_V0_PASCAL))
                type |= NVIF_MEM_VRAM;
 
-       ret = nvif_mem_ctor_map(&drm->mmu, "kmsChanPush", type, 0x1000, &dmac->_push.mem);
+       ret = nvif_mem_ctor_map(&drm->mmu, "kmsChanPush", type, 0x1000, &dmac->push.mem);
        if (ret)
                return ret;
 
-       dmac->_push.wait = nv50_dmac_wait;
-       dmac->_push.kick = nv50_dmac_kick;
-       dmac->push = &dmac->_push;
-       dmac->push->bgn = dmac->_push.mem.object.map.ptr;
-       dmac->push->cur = dmac->push->bgn;
-       dmac->push->end = dmac->push->bgn;
+       dmac->push.wait = nv50_dmac_wait;
+       dmac->push.kick = nv50_dmac_kick;
+       dmac->push.bgn = dmac->push.mem.object.map.ptr;
+       dmac->push.cur = dmac->push.bgn;
+       dmac->push.end = dmac->push.bgn;
        dmac->max = 0x1000/4 - 1;
 
        /* EVO channels are affected by a HW bug where the last 12 DWORDs
@@ -270,7 +269,7 @@ nv50_dmac_create(struct nouveau_drm *drm,
        if (disp->oclass < GV100_DISP)
                dmac->max -= 12;
 
-       args->pushbuf = nvif_handle(&dmac->_push.mem.object);
+       args->pushbuf = nvif_handle(&dmac->push.mem.object);
 
        ret = nv50_chan_create(device, disp, oclass, head, data, size,
                               &dmac->base);

diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.h b/drivers/gpu/drm/nouveau/dispnv50/disp.h
index b66a30915af26392e34e55093ab1ed26f286c65e..15f9242b72ac71d1e777f1279a64246d3e367e49 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/disp.h
+++ b/drivers/gpu/drm/nouveau/dispnv50/disp.h
@@ -62,8 +62,7 @@ struct nv50_chan {
 struct nv50_dmac {
        struct nv50_chan base;
 
-       struct nvif_push _push;
-       struct nvif_push *push;
+       struct nvif_push push;
 
        struct nvif_object sync;
        struct nvif_object vram;

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head507d.c b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
index 0edd4e520c8e35134e47d37f60e35966a80d73bb..7fa1e0279d7df3d2ff8c336afdf681e4e2dfdfbf 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head507d.c
@@ -29,7 +29,7 @@
 int
 head507d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -48,7 +48,7 @@ head507d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head507d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -66,7 +66,7 @@ head507d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head507d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 bounds = 0;
        int ret;
@@ -94,7 +94,7 @@ head507d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head507d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 bounds = 0;
        int ret;
@@ -122,7 +122,7 @@ head507d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head507d_curs_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -139,7 +139,7 @@ head507d_curs_clr(struct nv50_head *head)
 static int
 head507d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -188,7 +188,7 @@ head507d_curs_layout(struct nv50_head *head, struct nv50_wndw_atom *asyw,
 int
 head507d_core_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -202,7 +202,7 @@ head507d_core_clr(struct nv50_head *head)
 static int
 head507d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -278,7 +278,7 @@ head507d_core_calc(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head507d_olut_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -293,7 +293,7 @@ head507d_olut_clr(struct nv50_head *head)
 static int
 head507d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -345,7 +345,7 @@ head507d_olut(struct nv50_head *head, struct nv50_head_atom *asyh, int size)
 int
 head507d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        struct nv50_head_mode *m = &asyh->mode;
        const int i = head->base.index;
        int ret;
@@ -400,7 +400,7 @@ head507d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head507d_view(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head827d.c b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
index 194d1771c481b3a56ec2a72add4d178b556bb85c..1545d576fe9c69fb144fb4acb5d11960978d2c48 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head827d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head827d.c
@@ -29,7 +29,7 @@
 static int
 head827d_curs_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -48,7 +48,7 @@ head827d_curs_clr(struct nv50_head *head)
 static int
 head827d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -73,7 +73,7 @@ head827d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head827d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -110,7 +110,7 @@ head827d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head827d_olut_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -127,7 +127,7 @@ head827d_olut_clr(struct nv50_head *head)
 static int
 head827d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head907d.c b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
index 18fe4c1e2d6a6cfbbe785f629a2b1818a1432540..6c9e0438e55c35cd63847f33447a79d25c1dd27c 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head907d.c
@@ -36,7 +36,7 @@
 int
 head907d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -57,7 +57,7 @@ head907d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head907d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -77,7 +77,7 @@ head907d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head907d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -95,7 +95,7 @@ head907d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head907d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 bounds = 0;
        int ret;
@@ -124,7 +124,7 @@ head907d_ovly(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head907d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 bounds = 0;
        int ret;
@@ -152,7 +152,7 @@ head907d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head907d_curs_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -171,7 +171,7 @@ head907d_curs_clr(struct nv50_head *head)
 int
 head907d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -195,7 +195,7 @@ head907d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head907d_core_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -209,7 +209,7 @@ head907d_core_clr(struct nv50_head *head)
 int
 head907d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -246,7 +246,7 @@ head907d_core_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head907d_olut_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -263,7 +263,7 @@ head907d_olut_clr(struct nv50_head *head)
 int
 head907d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -322,7 +322,7 @@ bool head907d_ilut_check(int size)
 int
 head907d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        struct nv50_head_mode *m = &asyh->mode;
        const int i = head->base.index;
        int ret;
@@ -378,7 +378,7 @@ head907d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 head907d_view(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/head917d.c b/drivers/gpu/drm/nouveau/dispnv50/head917d.c
index 4ce47b55f72c40cb943f60021b0f8083c61f5c0d..2d9aee0505100d6ead9a36087ceed55517ecb493 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/head917d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/head917d.c
@@ -30,7 +30,7 @@
 static int
 head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -48,7 +48,7 @@ head917d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head917d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u32 bounds = 0;
        int ret;
@@ -77,7 +77,7 @@ head917d_base(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 head917d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
index a4a3b78ea42ca4ac65f8839e7cd05cc0e3eed847..2bcb3790fc10b0e734d8a50c0749ff02367394bf 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/headc37d.c
@@ -30,7 +30,7 @@
 static int
 headc37d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u8 depth;
        int ret;
@@ -64,7 +64,7 @@ headc37d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 headc37d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -85,7 +85,7 @@ headc37d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 headc37d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -104,7 +104,7 @@ headc37d_dither(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 headc37d_curs_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -122,7 +122,7 @@ headc37d_curs_clr(struct nv50_head *head)
 int
 headc37d_curs_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -161,7 +161,7 @@ headc37d_curs_format(struct nv50_head *head, struct nv50_wndw_atom *asyw,
 static int
 headc37d_olut_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -175,7 +175,7 @@ headc37d_olut_clr(struct nv50_head *head)
 static int
 headc37d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -209,7 +209,7 @@ headc37d_olut(struct nv50_head *head, struct nv50_head_atom *asyh, int size)
 static int
 headc37d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        struct nv50_head_mode *m = &asyh->mode;
        const int i = head->base.index;
        int ret;
@@ -254,7 +254,7 @@ headc37d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 int
 headc37d_view(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 

diff --git a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
index 53b1248c40ec838445f65ed831e275ad2883730f..fde4087e76910c1ddd690153a0bbb3915f4630cc 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/headc57d.c
@@ -30,7 +30,7 @@
 static int
 headc57d_display_id(struct nv50_head *head, u32 display_id)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -43,7 +43,7 @@ headc57d_display_id(struct nv50_head *head, u32 display_id)
 static int
 headc57d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        u8 depth;
        int ret;
@@ -78,7 +78,7 @@ headc57d_or(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 headc57d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -96,7 +96,7 @@ headc57d_procamp(struct nv50_head *head, struct nv50_head_atom *asyh)
 static int
 headc57d_olut_clr(struct nv50_head *head)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -110,7 +110,7 @@ headc57d_olut_clr(struct nv50_head *head)
 static int
 headc57d_olut_set(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        const int i = head->base.index;
        int ret;
 
@@ -201,7 +201,7 @@ headc57d_olut(struct nv50_head *head, struct nv50_head_atom *asyh, int size)
 static int
 headc57d_mode(struct nv50_head *head, struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;
+       struct nvif_push *push = &nv50_disp(head->base.base.dev)->core->chan.push;
        struct nv50_head_mode *m = &asyh->mode;
        const int i = head->base.index;
        int ret;

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
index 73fcfb27c32cf125b124b9b24e52b96ef64f8c6a..654e506f8431d00abbb49d4367f63c640292b4dd 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly507e.c
@@ -33,7 +33,7 @@
 int
 ovly507e_scale_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 4)))
@@ -55,7 +55,7 @@ ovly507e_scale_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 static int
 ovly507e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 12)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
index 02dc02d9260f8aacf16bff557bbee6a0ba6fd9b3..a5ae22ed663d7d0ef58dab87034497d5a942db48 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly827e.c
@@ -32,7 +32,7 @@
 static int
 ovly827e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 12)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c b/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
index 645130d18a99194ccdf80ab83cdc133bc7f521a5..8cf0e18fa596963ef6ad16d4d836224a578c9a9c 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/ovly907e.c
@@ -29,7 +29,7 @@
 static int
 ovly907e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 12)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
index 17d230256bddc2af412a4ba22dc29782deb6c1b8..79507d169778736dd58bfac604afdfc9f4a9a287 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/pior507d.c
@@ -30,7 +30,7 @@ static int
 pior507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
              struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if (asyh) {

diff --git a/drivers/gpu/drm/nouveau/dispnv50/sor507d.c b/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
index ca73d7710885cc4090c374a807136ecf3eff3c3a..08cc9845322e84b276ca109a8aa55157f0c78af6 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/sor507d.c
@@ -30,7 +30,7 @@ static int
 sor507d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if (asyh) {

diff --git a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
index c86cd8fa61d6b82fb40abf3a1e7cf2146d5e5392..23957cc8f3263a970a76c9345206950274879a50 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/sor907d.c
@@ -32,7 +32,7 @@ static int
 sor907d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c b/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
index 9eaef34816da3860c0aac509b6da7e9956030393..da05d4614e0044f6b6986a479fcfb8159dd3b0d5 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/sorc37d.c
@@ -29,7 +29,7 @@ static int
 sorc37d_ctrl(struct nv50_core *core, int or, u32 ctrl,
             struct nv50_head_atom *asyh)
 {
-       struct nvif_push *push = core->chan.push;
+       struct nvif_push *push = &core->chan.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
index 8cb5b79bacbfc2c16d96909b6d3104a1ffc495a9..7985da61aaac4717e8b12453a0e2ab0d1312d190 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c
@@ -31,7 +31,7 @@
 static int
 wimmc37b_update(struct nv50_wndw *wndw, u32 *interlock)
 {
-       struct nvif_push *push = wndw->wimm.push;
+       struct nvif_push *push = &wndw->wimm.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -46,7 +46,7 @@ wimmc37b_update(struct nv50_wndw *wndw, u32 *interlock)
 static int
 wimmc37b_point(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wimm.push;
+       struct nvif_push *push = &wndw->wimm.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
index caf40977f455896bba289d99e7e5b10f4f1650a3..50a7b97d37a28c6221ca33fa1b19b4f06707966a 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c
@@ -39,7 +39,7 @@ wndwc37e_csc_clr(struct nv50_wndw *wndw)
 static int
 wndwc37e_csc_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 13)))
@@ -52,7 +52,7 @@ wndwc37e_csc_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 static int
 wndwc37e_ilut_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -65,7 +65,7 @@ wndwc37e_ilut_clr(struct nv50_wndw *wndw)
 static int
 wndwc37e_ilut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 4)))
@@ -94,7 +94,7 @@ wndwc37e_ilut(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw, int size)
 int
 wndwc37e_blend_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 8)))
@@ -139,7 +139,7 @@ wndwc37e_blend_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 int
 wndwc37e_image_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 4)))
@@ -156,7 +156,7 @@ wndwc37e_image_clr(struct nv50_wndw *wndw)
 static int
 wndwc37e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 17)))
@@ -209,7 +209,7 @@ wndwc37e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 int
 wndwc37e_ntfy_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -222,7 +222,7 @@ wndwc37e_ntfy_clr(struct nv50_wndw *wndw)
 int
 wndwc37e_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 3)))
@@ -239,7 +239,7 @@ wndwc37e_ntfy_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 int
 wndwc37e_sema_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -252,7 +252,7 @@ wndwc37e_sema_clr(struct nv50_wndw *wndw)
 int
 wndwc37e_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 5)))
@@ -268,7 +268,7 @@ wndwc37e_sema_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 int
 wndwc37e_update(struct nv50_wndw *wndw, u32 *interlock)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 5)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
index 1d214a4b960ab9021a1be543d6c36b36e3db22c9..d1ca51aae58cd9fe0de2521b6c3f53a6bc562b4d 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c
@@ -32,7 +32,7 @@
 static int
 wndwc57e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 17)))
@@ -81,7 +81,7 @@ wndwc57e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 int
 wndwc57e_csc_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        const u32 identity[12] = {
                0x00010000, 0x00000000, 0x00000000, 0x00000000,
                0x00000000, 0x00010000, 0x00000000, 0x00000000,
@@ -99,7 +99,7 @@ wndwc57e_csc_clr(struct nv50_wndw *wndw)
 int
 wndwc57e_csc_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 13)))
@@ -112,7 +112,7 @@ wndwc57e_csc_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 int
 wndwc57e_ilut_clr(struct nv50_wndw *wndw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 2)))
@@ -125,7 +125,7 @@ wndwc57e_ilut_clr(struct nv50_wndw *wndw)
 int
 wndwc57e_ilut_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 4)))

diff --git a/drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c b/drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c
index 7a370fa1df20c85a7d64393e9acaaf122da717ae..52af293c98f4a19ef1daa19c23a1591ac9548e53 100644 (file)
--- a/drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c
+++ b/drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c
@@ -29,7 +29,7 @@
 static int
 wndwc67e_image_set(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw)
 {
-       struct nvif_push *push = wndw->wndw.push;
+       struct nvif_push *push = &wndw->wndw.push;
        int ret;
 
        if ((ret = PUSH_WAIT(push, 17)))