drm/nouveau/nvif: modify nvif_unvers/nvif_unpack macros to be more obvious

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

diff --git a/drivers/gpu/drm/nouveau/include/nvif/unpack.h b/drivers/gpu/drm/nouveau/include/nvif/unpack.h
index 5933188b4a77f8a01a5b206dc3dc14c2a75f1321..751bcf4930a7a892e0330599b3269588885eacc0 100644 (file)
--- a/drivers/gpu/drm/nouveau/include/nvif/unpack.h
+++ b/drivers/gpu/drm/nouveau/include/nvif/unpack.h
@@ -1,24 +1,28 @@
 #ifndef __NVIF_UNPACK_H__
 #define __NVIF_UNPACK_H__
 
-#define nvif_unvers(d) ({                                                      \
-       ret = (size == sizeof(d)) ? 0 : -ENOSYS;                               \
-       (ret == 0);                                                            \
+#define nvif_unvers(r,d,s,m) ({                                                \
+       void **_data = (d); __u32 *_size = (s); int _ret = (r);                \
+       if (_ret == -ENOSYS && *_size == sizeof(m)) {                          \
+               *_data = NULL;                                                 \
+               *_size = _ret = 0;                                             \
+       }                                                                      \
+       _ret;                                                                  \
 })
 
-#define nvif_unpack(d,vl,vh,m) ({                                              \
-       if ((vl) == 0 || ret == -ENOSYS) {                                     \
-               int _size = sizeof(d);                                         \
-               if (_size <= size && (d).version >= (vl) &&                    \
-                                    (d).version <= (vh)) {                    \
-                       data = (u8 *)data + _size;                             \
-                       size = size - _size;                                   \
-                       ret = ((m) || !size) ? 0 : -E2BIG;                     \
-               } else {                                                       \
-                       ret = -ENOSYS;                                         \
+#define nvif_unpack(r,d,s,m,vl,vh,x) ({                                        \
+       void **_data = (d); __u32 *_size = (s);                                \
+       int _ret = (r), _vl = (vl), _vh = (vh);                                \
+       if (_ret == -ENOSYS && *_size >= sizeof(m) &&                          \
+           (m).version >= _vl && (m).version <= _vh) {                        \
+               *_data = (__u8 *)*_data + sizeof(m);                           \
+               *_size = *_size - sizeof(m);                                   \
+               if (_ret = 0, !(x)) {                                          \
+                       _ret = *_size ? -E2BIG : 0;                            \
+                       *_data = NULL;                                         \
+                       *_size = 0;                                            \
                }                                                              \
        }                                                                      \
-       (ret == 0);                                                            \
+       _ret;                                                                  \
 })
-
 #endif

diff --git a/drivers/gpu/drm/nouveau/nouveau_abi16.c b/drivers/gpu/drm/nouveau/nouveau_abi16.c
index 054ef97df411ec16e43b0fd253c0974ff8e40849..50f52ffe5b0c740f9aef27b41c7c706393f6f59c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_abi16.c
+++ b/drivers/gpu/drm/nouveau/nouveau_abi16.c
@@ -357,9 +357,9 @@ nouveau_abi16_usif(struct drm_file *file_priv, void *data, u32 size)
        } *args = data;
        struct nouveau_abi16_chan *chan;
        struct nouveau_abi16 *abi16;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                switch (args->v0.type) {
                case NVIF_IOCTL_V0_NEW:
                case NVIF_IOCTL_V0_MTHD:

diff --git a/drivers/gpu/drm/nouveau/nouveau_usif.c b/drivers/gpu/drm/nouveau/nouveau_usif.c
index 6ae1b3494bcd16a8492d65cffa95554d4125bfbc..e9f52ef0be830442e1ea136a4580275d0cb5022c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_usif.c
+++ b/drivers/gpu/drm/nouveau/nouveau_usif.c
@@ -130,20 +130,21 @@ usif_notify_new(struct drm_file *f, void *data, u32 size, void *argv, u32 argc)
                struct nvif_notify_req_v0 v0;
        } *req;
        struct usif_notify *ntfy;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                if (usif_notify_find(f, args->v0.index))
                        return -EEXIST;
        } else
                return ret;
        req = data;
+       ret = -ENOSYS;
 
        if (!(ntfy = kmalloc(sizeof(*ntfy), GFP_KERNEL)))
                return -ENOMEM;
        atomic_set(&ntfy->enabled, 0);
 
-       if (nvif_unpack(req->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, req->v0, 0, 0, true))) {
                ntfy->reply = sizeof(struct nvif_notify_rep_v0) + req->v0.reply;
                ntfy->route = req->v0.route;
                ntfy->token = req->v0.token;
@@ -171,9 +172,9 @@ usif_notify_del(struct drm_file *f, void *data, u32 size, void *argv, u32 argc)
                struct nvif_ioctl_ntfy_del_v0 v0;
        } *args = data;
        struct usif_notify *ntfy;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                if (!(ntfy = usif_notify_find(f, args->v0.index)))
                        return -ENOENT;
        } else
@@ -194,9 +195,9 @@ usif_notify_get(struct drm_file *f, void *data, u32 size, void *argv, u32 argc)
                struct nvif_ioctl_ntfy_del_v0 v0;
        } *args = data;
        struct usif_notify *ntfy;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                if (!(ntfy = usif_notify_find(f, args->v0.index)))
                        return -ENOENT;
        } else
@@ -233,9 +234,9 @@ usif_notify_put(struct drm_file *f, void *data, u32 size, void *argv, u32 argc)
                struct nvif_ioctl_ntfy_put_v0 v0;
        } *args = data;
        struct usif_notify *ntfy;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                if (!(ntfy = usif_notify_find(f, args->v0.index)))
                        return -ENOENT;
        } else
@@ -270,13 +271,13 @@ usif_object_new(struct drm_file *f, void *data, u32 size, void *argv, u32 argc)
                struct nvif_ioctl_new_v0 v0;
        } *args = data;
        struct usif_object *object;
-       int ret;
+       int ret = -ENOSYS;
 
        if (!(object = kmalloc(sizeof(*object), GFP_KERNEL)))
                return -ENOMEM;
        list_add(&object->head, &cli->objects);
 
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                object->route = args->v0.route;
                object->token = args->v0.token;
                args->v0.route = NVDRM_OBJECT_USIF;
@@ -310,7 +311,7 @@ usif_ioctl(struct drm_file *filp, void __user *user, u32 argc)
        if (ret = -EFAULT, copy_from_user(argv, user, size))
                goto done;
 
-       if (nvif_unpack(argv->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(-ENOSYS, &data, &size, argv->v0, 0, 0, true))) {
                /* block access to objects not created via this interface */
                owner = argv->v0.owner;
                if (argv->v0.object == 0ULL)

diff --git a/drivers/gpu/drm/nouveau/nvkm/core/client.c b/drivers/gpu/drm/nouveau/nvkm/core/client.c
index 98e694179acee3287408343b1de3a52d3bcdb7f3..e1943910858e5f9fb46ecb3c6ff2b77bdf80e847 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/core/client.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/client.c
@@ -97,7 +97,7 @@ nvkm_client_notify_new(struct nvkm_object *object,
                struct nvif_notify_req_v0 v0;
        } *req = data;
        u8  index, reply;
-       int ret;
+       int ret = -ENOSYS;
 
        for (index = 0; index < ARRAY_SIZE(client->notify); index++) {
                if (!client->notify[index])
@@ -112,7 +112,7 @@ nvkm_client_notify_new(struct nvkm_object *object,
                return -ENOMEM;
 
        nvif_ioctl(object, "notify new size %d\n", size);
-       if (nvif_unpack(req->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, req->v0, 0, 0, true))) {
                nvif_ioctl(object, "notify new vers %d reply %d route %02x "
                                   "token %llx\n", req->v0.version,
                           req->v0.reply, req->v0.route, req->v0.token);
@@ -144,10 +144,10 @@ nvkm_client_mthd_devlist(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nv_client_devlist_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "client devlist size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "client devlist vers %d count %d\n",
                           args->v0.version, args->v0.count);
                if (size == sizeof(args->v0.device[0]) * args->v0.count) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
index d87d6ab03cc7f1a5a67a854752de132aed64a181..b0db51847c361efabb336e28d21007c1d81dccc8 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
+++ b/drivers/gpu/drm/nouveau/nvkm/core/ioctl.c
@@ -34,10 +34,10 @@ nvkm_ioctl_nop(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_nop_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "nop size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "nop vers %lld\n", args->v0.version);
                args->v0.version = NVIF_VERSION_LATEST;
        }
@@ -52,10 +52,10 @@ nvkm_ioctl_sclass(struct nvkm_object *object, void *data, u32 size)
                struct nvif_ioctl_sclass_v0 v0;
        } *args = data;
        struct nvkm_oclass oclass;
-       int ret, i = 0;
+       int ret = -ENOSYS, i = 0;
 
        nvif_ioctl(object, "sclass size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "sclass vers %d count %d\n",
                           args->v0.version, args->v0.count);
                if (size != args->v0.count * sizeof(args->v0.oclass[0]))
@@ -86,10 +86,10 @@ nvkm_ioctl_new(struct nvkm_object *parent, void *data, u32 size)
        struct nvkm_client *client = parent->client;
        struct nvkm_object *object = NULL;
        struct nvkm_oclass oclass;
-       int ret, i = 0;
+       int ret = -ENOSYS, i = 0;
 
        nvif_ioctl(parent, "new size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(parent, "new vers %d handle %08x class %08x "
                                   "route %02x token %llx object %016llx\n",
                           args->v0.version, args->v0.handle, args->v0.oclass,
@@ -147,10 +147,10 @@ nvkm_ioctl_del(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_del none;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "delete size %d\n", size);
-       if (nvif_unvers(args->none)) {
+       if (!(ret = nvif_unvers(ret, &data, &size, args->none))) {
                nvif_ioctl(object, "delete\n");
                nvkm_object_fini(object, false);
                nvkm_object_del(&object);
@@ -165,10 +165,10 @@ nvkm_ioctl_mthd(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_mthd_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "mthd size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "mthd vers %d mthd %02x\n",
                           args->v0.version, args->v0.method);
                ret = nvkm_object_mthd(object, args->v0.method, data, size);
@@ -189,10 +189,10 @@ nvkm_ioctl_rd(struct nvkm_object *object, void *data, u32 size)
                u16 b16;
                u32 b32;
        } v;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "rd size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "rd vers %d size %d addr %016llx\n",
                           args->v0.version, args->v0.size, args->v0.addr);
                switch (args->v0.size) {
@@ -223,10 +223,10 @@ nvkm_ioctl_wr(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_wr_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "wr size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object,
                           "wr vers %d size %d addr %016llx data %08x\n",
                           args->v0.version, args->v0.size, args->v0.addr,
@@ -251,10 +251,10 @@ nvkm_ioctl_map(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_map_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "map size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "map vers %d\n", args->v0.version);
                ret = nvkm_object_map(object, &args->v0.handle,
                                              &args->v0.length);
@@ -269,10 +269,10 @@ nvkm_ioctl_unmap(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_unmap none;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "unmap size %d\n", size);
-       if (nvif_unvers(args->none)) {
+       if (!(ret = nvif_unvers(ret, &data, &size, args->none))) {
                nvif_ioctl(object, "unmap\n");
        }
 
@@ -286,10 +286,10 @@ nvkm_ioctl_ntfy_new(struct nvkm_object *object, void *data, u32 size)
                struct nvif_ioctl_ntfy_new_v0 v0;
        } *args = data;
        struct nvkm_event *event;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "ntfy new size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "ntfy new vers %d event %02x\n",
                           args->v0.version, args->v0.event);
                ret = nvkm_object_ntfy(object, args->v0.event, &event);
@@ -312,10 +312,10 @@ nvkm_ioctl_ntfy_del(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_ntfy_del_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "ntfy del size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "ntfy del vers %d index %d\n",
                           args->v0.version, args->v0.index);
                ret = nvkm_client_notify_del(client, args->v0.index);
@@ -331,10 +331,10 @@ nvkm_ioctl_ntfy_get(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_ntfy_get_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "ntfy get size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "ntfy get vers %d index %d\n",
                           args->v0.version, args->v0.index);
                ret = nvkm_client_notify_get(client, args->v0.index);
@@ -350,10 +350,10 @@ nvkm_ioctl_ntfy_put(struct nvkm_object *object, void *data, u32 size)
        union {
                struct nvif_ioctl_ntfy_put_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "ntfy put size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "ntfy put vers %d index %d\n",
                           args->v0.version, args->v0.index);
                ret = nvkm_client_notify_put(client, args->v0.index);
@@ -421,12 +421,12 @@ nvkm_ioctl(struct nvkm_client *client, bool supervisor,
        union {
                struct nvif_ioctl_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        client->super = supervisor;
        nvif_ioctl(object, "size %d\n", size);
 
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object,
                           "vers %d type %02x object %016llx owner %02x\n",
                           args->v0.version, args->v0.type, args->v0.object,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
index 5e84b2f9f32aeb79f23e6dbe6c97c0076cc6375b..b0ece71aefdee1b0d8259920532820e1c8adabcc 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/ctrl.c
@@ -38,10 +38,10 @@ nvkm_control_mthd_pstate_info(struct nvkm_control *ctrl, void *data, u32 size)
                struct nvif_control_pstate_info_v0 v0;
        } *args = data;
        struct nvkm_clk *clk = ctrl->device->clk;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(&ctrl->object, "control pstate info size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(&ctrl->object, "control pstate info vers %d\n",
                           args->v0.version);
        } else
@@ -76,10 +76,10 @@ nvkm_control_mthd_pstate_attr(struct nvkm_control *ctrl, void *data, u32 size)
        struct nvkm_cstate *cstate;
        int i = 0, j = -1;
        u32 lo, hi;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(&ctrl->object, "control pstate attr size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(&ctrl->object,
                           "control pstate attr vers %d state %d index %d\n",
                           args->v0.version, args->v0.state, args->v0.index);
@@ -144,10 +144,10 @@ nvkm_control_mthd_pstate_user(struct nvkm_control *ctrl, void *data, u32 size)
                struct nvif_control_pstate_user_v0 v0;
        } *args = data;
        struct nvkm_clk *clk = ctrl->device->clk;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(&ctrl->object, "control pstate user size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(&ctrl->object,
                           "control pstate user vers %d ustate %d pwrsrc %d\n",
                           args->v0.version, args->v0.ustate, args->v0.pwrsrc);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
index 22a2d7632d49fd61573a3d3d637aeda8b7fef3c0..137066426ed7f9cbb37e24650a95e15225e02765 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/device/user.c
@@ -49,10 +49,10 @@ nvkm_udevice_info(struct nvkm_udevice *udev, void *data, u32 size)
        union {
                struct nv_device_info_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "device info size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "device info vers %d\n", args->v0.version);
        } else
                return ret;
@@ -124,13 +124,16 @@ nvkm_udevice_info(struct nvkm_udevice *udev, void *data, u32 size)
 static int
 nvkm_udevice_time(struct nvkm_udevice *udev, void *data, u32 size)
 {
+       struct nvkm_object *object = &udev->object;
        struct nvkm_device *device = udev->device;
        union {
                struct nv_device_time_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       nvif_ioctl(object, "device time size %d\n", size);
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
+               nvif_ioctl(object, "device time vers %d\n", args->v0.version);
                args->v0.time = nvkm_timer_read(device->timer);
        }
 
@@ -141,6 +144,7 @@ static int
 nvkm_udevice_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
 {
        struct nvkm_udevice *udev = nvkm_udevice(object);
+       nvif_ioctl(object, "device mthd %08x\n", mthd);
        switch (mthd) {
        case NV_DEVICE_V0_INFO:
                return nvkm_udevice_info(udev, data, size);
@@ -332,10 +336,10 @@ nvkm_udevice_new(const struct nvkm_oclass *oclass, void *data, u32 size,
        struct nvkm_object *parent = &client->object;
        const struct nvkm_object_func *func;
        struct nvkm_udevice *udev;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create device size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create device v%d device %016llx\n",
                           args->v0.version, args->v0.device);
        } else

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
index 9ac1638ae0cea70a4633aab986ef27db03ba674c..785fa76d0fbf3e8d7a9dbcc0ae790696c6a72e5b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c
@@ -59,9 +59,9 @@ nvkm_disp_vblank_ctor(struct nvkm_object *object, void *data, u32 size,
        union {
                struct nvif_notify_head_req_v0 v0;
        } *req = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(req->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, req->v0, 0, 0, false))) {
                notify->size = sizeof(struct nvif_notify_head_rep_v0);
                if (ret = -ENXIO, req->v0.head <= disp->vblank.index_nr) {
                        notify->types = 1;
@@ -97,9 +97,9 @@ nvkm_disp_hpd_ctor(struct nvkm_object *object, void *data, u32 size,
                struct nvif_notify_conn_req_v0 v0;
        } *req = data;
        struct nvkm_output *outp;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(req->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, req->v0, 0, 0, false))) {
                notify->size = sizeof(struct nvif_notify_conn_rep_v0);
                list_for_each_entry(outp, &disp->outp, head) {
                        if (ret = -ENXIO, outp->conn->index == req->v0.conn) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/basenv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/basenv50.c
index 23e3d43e50a0e765fad4cb741a6e4738bd5dad58..83f152300ec016166e3f6709b9e18ef30212187a 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/basenv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/basenv50.c
@@ -42,11 +42,11 @@ nv50_disp_base_new(const struct nv50_disp_dmac_func *func,
        } *args = data;
        struct nvkm_object *parent = oclass->parent;
        struct nv50_disp *disp = root->disp;
-       int head, ret;
+       int head, ret = -ENOSYS;
        u64 push;
 
        nvif_ioctl(parent, "create disp base channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create disp base channel dma vers %d "
                                   "pushbuf %016llx head %d\n",
                           args->v0.version, args->v0.pushbuf, args->v0.head);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
index 41d0ad2646a41212ad27483703c374e5ee600f31..dd2953bc926463cb1324d75a83d70a17bf1b7f9d 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/channv50.c
@@ -134,9 +134,9 @@ nv50_disp_chan_uevent_ctor(struct nvkm_object *object, void *data, u32 size,
        union {
                struct nvif_notify_uevent_req none;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unvers(args->none)) {
+       if (!(ret = nvif_unvers(ret, &data, &size, args->none))) {
                notify->size  = sizeof(struct nvif_notify_uevent_rep);
                notify->types = 1;
                notify->index = chan->chid;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/corenv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/corenv50.c
index 6901b712da3fb719b516591c5ffe80e590dff043..b547c8b833caba4b134f8e5b886fa3c595ef5919 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/corenv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/corenv50.c
@@ -43,10 +43,10 @@ nv50_disp_core_new(const struct nv50_disp_dmac_func *func,
        } *args = data;
        struct nvkm_object *parent = oclass->parent;
        u64 push;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create disp core channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create disp core channel dma vers %d "
                                   "pushbuf %016llx\n",
                           args->v0.version, args->v0.pushbuf);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c
index 3e9d27ea41a2ad8e80f6bd0ca78979f5ee6c2e6a..8b1320499a0fddfca218b00c77bcd8854aa529db 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/cursnv50.c
@@ -42,10 +42,10 @@ nv50_disp_curs_new(const struct nv50_disp_chan_func *func,
        } *args = data;
        struct nvkm_object *parent = oclass->parent;
        struct nv50_disp *disp = root->disp;
-       int head, ret;
+       int head, ret = -ENOSYS;
 
        nvif_ioctl(parent, "create disp cursor size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create disp cursor vers %d head %d\n",
                           args->v0.version, args->v0.head);
                if (args->v0.head > disp->base.head.nr)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c
index 4a3e0f113ea0066dc2813fe093c4042a257786e2..c9b78b8f9c8765a6a701a068dbcd9d37ae8409d3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/dacnv50.c
@@ -39,10 +39,10 @@ nv50_dac_power(NV50_DISP_MTHD_V1)
                struct nv50_disp_dac_pwr_v0 v0;
        } *args = data;
        u32 stat;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp dac pwr size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp dac pwr vers %d state %d data %d "
                                   "vsync %d hsync %d\n",
                           args->v0.version, args->v0.state, args->v0.data,
@@ -76,10 +76,10 @@ nv50_dac_sense(NV50_DISP_MTHD_V1)
        } *args = data;
        const u32 doff = outp->or * 0x800;
        u32 loadval;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp dac load size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp dac load vers %d data %08x\n",
                           args->v0.version, args->v0.data);
                if (args->v0.data & 0xfff00000)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
index ae7343dda04ec49dfb581e88975457e4738591a0..da6129b2b78f500b440dadbc4202a98aafbb73f4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagf119.c
@@ -41,10 +41,10 @@ gf119_hda_eld(NV50_DISP_MTHD_V1)
        } *args = data;
        const u32 soff = outp->or * 0x030;
        const u32 hoff = head * 0x800;
-       int ret, i;
+       int ret = -ENOSYS, i;
 
        nvif_ioctl(object, "disp sor hda eld size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "disp sor hda eld vers %d\n",
                           args->v0.version);
                if (size > 0x60)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
index e6390e974061f030fd41db4af313d91094caa7f3..6f0436df021953337ba29f0ff9c02c507214b07b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdagt215.c
@@ -38,10 +38,10 @@ gt215_hda_eld(NV50_DISP_MTHD_V1)
                struct nv50_disp_sor_hda_eld_v0 v0;
        } *args = data;
        const u32 soff = outp->or * 0x800;
-       int ret, i;
+       int ret = -ENOSYS, i;
 
        nvif_ioctl(object, "disp sor hda eld size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "disp sor hda eld vers %d\n",
                           args->v0.version);
                if (size > 0x60)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
index 3eca62a299096e11e1bff655083bfbc8cbb03221..1c4256e8cbd64b0329c2709a6ab9f20dbe97bb75 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmig84.c
@@ -37,10 +37,10 @@ g84_hdmi_ctrl(NV50_DISP_MTHD_V1)
                struct nv50_disp_sor_hdmi_pwr_v0 v0;
        } *args = data;
        u32 ctrl;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp sor hdmi ctrl vers %d state %d "
                                   "max_ac_packet %d rekey %d\n",
                           args->v0.version, args->v0.state,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
index 62ca1feaff666be43ab0480570f0eafe2af72c0c..632f02da13825e3c42da50d866b4da4060bda83e 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigf119.c
@@ -37,10 +37,10 @@ gf119_hdmi_ctrl(NV50_DISP_MTHD_V1)
                struct nv50_disp_sor_hdmi_pwr_v0 v0;
        } *args = data;
        u32 ctrl;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp sor hdmi ctrl vers %d state %d "
                                   "max_ac_packet %d rekey %d\n",
                           args->v0.version, args->v0.state,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
index efba0e12ff1c4a03cbef831a8240016d3103cd2d..4e8067d511d77675f7362bdf36d44f3b718efcda 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigk104.c
@@ -38,10 +38,10 @@ gk104_hdmi_ctrl(NV50_DISP_MTHD_V1)
                struct nv50_disp_sor_hdmi_pwr_v0 v0;
        } *args = data;
        u32 ctrl;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp sor hdmi ctrl vers %d state %d "
                                   "max_ac_packet %d rekey %d\n",
                           args->v0.version, args->v0.state,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
index 472444c837bf92e203feacb211fb2e3fda9a486c..f1afc16494b692e0575477f122d5fc0aad5aee85 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/hdmigt215.c
@@ -38,10 +38,10 @@ gt215_hdmi_ctrl(NV50_DISP_MTHD_V1)
                struct nv50_disp_sor_hdmi_pwr_v0 v0;
        } *args = data;
        u32 ctrl;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp sor hdmi ctrl size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp sor hdmi ctrl vers %d state %d "
                                   "max_ac_packet %d rekey %d\n",
                           args->v0.version, args->v0.state,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c
index 8e9a06487d14f5a6f1dd21f1642f92582b3c5c9e..3940b9c966ec9c2c9473db6804460b006dae1b65 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/oimmnv50.c
@@ -42,10 +42,10 @@ nv50_disp_oimm_new(const struct nv50_disp_chan_func *func,
        } *args = data;
        struct nvkm_object *parent = oclass->parent;
        struct nv50_disp *disp = root->disp;
-       int head, ret;
+       int head, ret = -ENOSYS;
 
        nvif_ioctl(parent, "create disp overlay size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create disp overlay vers %d head %d\n",
                           args->v0.version, args->v0.head);
                if (args->v0.head > disp->base.head.nr)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c
index 503e9b5761c1aac3dcbf83300d6bf1eb7d9f9945..2a49c46425cd0bba3b476203ee398b53f172677c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/ovlynv50.c
@@ -42,11 +42,11 @@ nv50_disp_ovly_new(const struct nv50_disp_dmac_func *func,
        } *args = data;
        struct nvkm_object *parent = oclass->parent;
        struct nv50_disp *disp = root->disp;
-       int head, ret;
+       int head, ret = -ENOSYS;
        u64 push;
 
        nvif_ioctl(parent, "create disp overlay channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create disp overlay channel dma vers %d "
                                   "pushbuf %016llx head %d\n",
                           args->v0.version, args->v0.pushbuf, args->v0.head);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
index dcd1836800bff58b19f061da8b0eda535d533fd4..6c532eadba17b997bd3082f9dbae1c836c8928cf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/piornv50.c
@@ -40,10 +40,10 @@ nv50_pior_power(NV50_DISP_MTHD_V1)
                struct nv50_disp_pior_pwr_v0 v0;
        } *args = data;
        u32 ctrl, type;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp pior pwr size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp pior pwr vers %d state %d type %x\n",
                           args->v0.version, args->v0.state, args->v0.type);
                if (args->v0.type > 0x0f)

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c
index 09d12067b1bb94f76950ec434b5826da7947ffc1..335d88823c22d12d7aef3cfb26e48a6a96f5b0eb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootgf119.c
@@ -42,10 +42,10 @@ gf119_disp_root_scanoutpos(NV50_DISP_MTHD_V0)
        union {
                struct nv50_disp_scanoutpos_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp scanoutpos size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp scanoutpos vers %d\n",
                           args->v0.version);
                args->v0.vblanke = (blanke & 0xffff0000) >> 16;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c
index d73f1c6e325465792328303b599ca005c72b5d13..f535f43231e2ac9815d89f95ca2c5681ee053ecb 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv04.c
@@ -46,10 +46,10 @@ nv04_disp_scanoutpos(struct nv04_disp_root *root,
                struct nv04_disp_scanoutpos_v0 v0;
        } *args = data;
        u32 line;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp scanoutpos size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp scanoutpos vers %d\n",
                           args->v0.version);
                args->v0.vblanks = nvkm_rd32(device, 0x680800 + hoff) & 0xffff;
@@ -86,10 +86,10 @@ nv04_disp_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
        union {
                struct nv04_disp_mthd_v0 v0;
        } *args = data;
-       int head, ret;
+       int head, ret = -ENOSYS;
 
        nvif_ioctl(object, "disp mthd size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "disp mthd vers %d mthd %02x head %d\n",
                           args->v0.version, args->v0.method, args->v0.head);
                mthd = args->v0.method;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
index 2aba84d51b1e4e1fba38dda2f3e5e050434291ec..2f9cecd81d04886e3699d3ecd4bab84a7fbd1f63 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/rootnv50.c
@@ -42,10 +42,10 @@ nv50_disp_root_scanoutpos(NV50_DISP_MTHD_V0)
        union {
                struct nv50_disp_scanoutpos_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp scanoutpos size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp scanoutpos vers %d\n",
                           args->v0.version);
                args->v0.vblanke = (blanke & 0xffff0000) >> 16;
@@ -79,19 +79,19 @@ nv50_disp_root_mthd_(struct nvkm_object *object, u32 mthd, void *data, u32 size)
        struct nvkm_output *outp = NULL;
        struct nvkm_output *temp;
        u16 type, mask = 0;
-       int head, ret;
+       int head, ret = -ENOSYS;
 
        if (mthd != NV50_DISP_MTHD)
                return -EINVAL;
 
        nvif_ioctl(object, "disp mthd size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(object, "disp mthd vers %d mthd %02x head %d\n",
                           args->v0.version, args->v0.method, args->v0.head);
                mthd = args->v0.method;
                head = args->v0.head;
        } else
-       if (nvif_unpack(args->v1, 1, 1, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v1, 1, 1, true))) {
                nvif_ioctl(object, "disp mthd vers %d mthd %02x "
                                   "type %04x mask %04x\n",
                           args->v1.version, args->v1.method,
@@ -144,8 +144,9 @@ nv50_disp_root_mthd_(struct nvkm_object *object, u32 mthd, void *data, u32 size)
                union {
                        struct nv50_disp_sor_lvds_script_v0 v0;
                } *args = data;
+               int ret = -ENOSYS;
                nvif_ioctl(object, "disp sor lvds script size %d\n", size);
-               if (nvif_unpack(args->v0, 0, 0, false)) {
+               if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                        nvif_ioctl(object, "disp sor lvds script "
                                           "vers %d name %04x\n",
                                   args->v0.version, args->v0.script);
@@ -160,8 +161,9 @@ nv50_disp_root_mthd_(struct nvkm_object *object, u32 mthd, void *data, u32 size)
                union {
                        struct nv50_disp_sor_dp_pwr_v0 v0;
                } *args = data;
+               int ret = -ENOSYS;
                nvif_ioctl(object, "disp sor dp pwr size %d\n", size);
-               if (nvif_unpack(args->v0, 0, 0, false)) {
+               if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                        nvif_ioctl(object, "disp sor dp pwr vers %d state %d\n",
                                   args->v0.version, args->v0.state);
                        if (args->v0.state == 0) {

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
index 6e8c954518d8e0de87ddfa16f5ae1651477a947d..53596bed3c3622d586dca8ac182a17b189ddb85f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/sornv50.c
@@ -39,10 +39,10 @@ nv50_sor_power(NV50_DISP_MTHD_V1)
        } *args = data;
        const u32 soff = outp->or * 0x800;
        u32 stat;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "disp sor pwr size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "disp sor pwr vers %d state %d\n",
                           args->v0.version, args->v0.state);
                stat = !!args->v0.state;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c
index 4a4e3b13d6b17524a9612cca98c6fb73d7d85f0d..13c661b1ef14e13e3123addb65b0d6a99be9211c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/user.c
@@ -69,7 +69,7 @@ nvkm_dmaobj_ctor(const struct nvkm_dmaobj_func *func, struct nvkm_dma *dma,
        struct nvkm_fb *fb = device->fb;
        void *data = *pdata;
        u32 size = *psize;
-       int ret;
+       int ret = -ENOSYS;
 
        nvkm_object_ctor(&nvkm_dmaobj_func, oclass, &dmaobj->object);
        dmaobj->func = func;
@@ -77,7 +77,7 @@ nvkm_dmaobj_ctor(const struct nvkm_dmaobj_func *func, struct nvkm_dma *dma,
        RB_CLEAR_NODE(&dmaobj->rb);
 
        nvif_ioctl(parent, "create dma size %d\n", *psize);
-       if (nvif_unpack(args->v0, 0, 0, true)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, true))) {
                nvif_ioctl(parent, "create dma vers %d target %d access %d "
                                   "start %016llx limit %016llx\n",
                           args->v0.version, args->v0.target, args->v0.access,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c
index 93435a4a6df9154c0333eaec98e41ab5d696a190..ef7ac360101ecd2028c5993c8cfd150eaa1ac2b6 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf100.c
@@ -87,10 +87,11 @@ gf100_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
        if (ret)
                return ret;
 
+       ret  = -ENOSYS;
        args = data;
 
        nvif_ioctl(parent, "create gf100 dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent,
                           "create gf100 dma vers %d priv %d kind %02x\n",
                           args->v0.version, args->v0.priv, args->v0.kind);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
index fc7c97eaf970870b67b2ee5bd1b8dfc0e0ca0235..c068cee345885e94c3a7de97b65545bee03eda79 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usergf119.c
@@ -85,10 +85,11 @@ gf119_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
        if (ret)
                return ret;
 
+       ret  = -ENOSYS;
        args = data;
 
        nvif_ioctl(parent, "create gf119 dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent,
                           "create gf100 dma vers %d page %d kind %02x\n",
                           args->v0.version, args->v0.page, args->v0.kind);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c
index f3ec8df1dd8c88456a27538d83e3ed3f1b0aaf67..6a85b5dea6430f354ea5be16bff2951707a455fe 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/dma/usernv50.c
@@ -87,10 +87,11 @@ nv50_dmaobj_new(struct nvkm_dma *dma, const struct nvkm_oclass *oclass,
        if (ret)
                return ret;
 
+       ret  = -ENOSYS;
        args = data;
 
        nvif_ioctl(parent, "create nv50 dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create nv50 dma vers %d priv %d part %d "
                                   "comp %d kind %02x\n", args->v0.version,
                           args->v0.priv, args->v0.part, args->v0.comp,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
index 1fbbfbe6ca9cf477c68dbc00c5ca94ba166a6705..cfc7d5725a61faa25bd268e4aee7f18803fceaa7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/base.c
@@ -129,9 +129,9 @@ nvkm_fifo_uevent_ctor(struct nvkm_object *object, void *data, u32 size,
        union {
                struct nvif_notify_uevent_req none;
        } *req = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unvers(req->none)) {
+       if (!(ret = nvif_unvers(ret, &data, &size, req->none))) {
                notify->size  = sizeof(struct nvif_notify_uevent_rep);
                notify->types = 1;
                notify->index = 0;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmag84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmag84.c
index 4091727d07edb1e30a789c1a4b0499a449158673..caa91407475258451b0da09de9fdb5cdc54f49d3 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmag84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmag84.c
@@ -40,10 +40,10 @@ g84_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        } *args = data;
        struct nv50_fifo *fifo = nv50_fifo(base);
        struct nv50_fifo_chan *chan;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel dma vers %d vm %llx "
                                   "pushbuf %llx offset %016llx\n",
                           args->v0.version, args->v0.vm, args->v0.pushbuf,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c
index 51af281a0b14c755b262b2a81dfa940a02ab35e7..edec30fd3ecd682174acab05f15f0cd18db68331 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv04.c
@@ -168,10 +168,10 @@ nv04_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct nv04_fifo_chan *chan = NULL;
        struct nvkm_device *device = fifo->base.engine.subdev.device;
        struct nvkm_instmem *imem = device->imem;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                   "offset %08x\n", args->v0.version,
                           args->v0.pushbuf, args->v0.offset);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c
index e676af4504c2dec945c2e58e3e3d3be0ab5d6e71..f5f355ff005da617a9ed7f83dfae06f3bb4c15cf 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv10.c
@@ -44,10 +44,10 @@ nv10_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct nv04_fifo_chan *chan = NULL;
        struct nvkm_device *device = fifo->base.engine.subdev.device;
        struct nvkm_instmem *imem = device->imem;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                   "offset %08x\n", args->v0.version,
                           args->v0.pushbuf, args->v0.offset);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c
index ee364e287d0a1fd160a91452224a57a3df394171..7edc6a564b5da60504e933e77f0ddf8781c9c640 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv17.c
@@ -44,10 +44,10 @@ nv17_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct nv04_fifo_chan *chan = NULL;
        struct nvkm_device *device = fifo->base.engine.subdev.device;
        struct nvkm_instmem *imem = device->imem;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                   "offset %08x\n", args->v0.version,
                           args->v0.pushbuf, args->v0.offset);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c
index c75a41eaaa24436f4a7aaa8d9dd1b14ec7a787a1..0ec179fc40a1f366ac2891aa306d7d1c6107af44 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv40.c
@@ -189,10 +189,10 @@ nv40_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct nv04_fifo_chan *chan = NULL;
        struct nvkm_device *device = fifo->base.engine.subdev.device;
        struct nvkm_instmem *imem = device->imem;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel dma vers %d pushbuf %llx "
                                   "offset %08x\n", args->v0.version,
                           args->v0.pushbuf, args->v0.offset);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv50.c
index 982bed04c6a4f317cc1de6f5e45f0fb80fa324b1..480bc3777be59d76e2eac937f804be997c5ebd49 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/dmanv50.c
@@ -40,10 +40,10 @@ nv50_fifo_dma_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        } *args = data;
        struct nv50_fifo *fifo = nv50_fifo(base);
        struct nv50_fifo_chan *chan;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel dma size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel dma vers %d vm %llx "
                                   "pushbuf %llx offset %016llx\n",
                           args->v0.version, args->v0.vm, args->v0.pushbuf,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifog84.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifog84.c
index e463100f74da559ad36dea9989d107cdd5581cb6..77c2f2a28bf3b41f44ec94eceab9c99b2238e32c 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifog84.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifog84.c
@@ -41,10 +41,10 @@ g84_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct nv50_fifo *fifo = nv50_fifo(base);
        struct nv50_fifo_chan *chan;
        u64 ioffset, ilength;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel gpfifo vers %d vm %llx "
                                   "pushbuf %llx ioffset %016llx "
                                   "ilength %08x\n",

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c
index 8db9cf018c890b63ed4b3a9545be88ebf5dd6a2a..cbc67f2623223177d084395294facda07375e694 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogf100.c
@@ -200,10 +200,10 @@ gf100_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct nvkm_object *parent = oclass->parent;
        struct gf100_fifo_chan *chan;
        u64 usermem, ioffset, ilength;
-       int ret, i;
+       int ret = -ENOSYS, i;
 
        nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel gpfifo vers %d vm %llx "
                                   "ioffset %016llx ilength %08x\n",
                           args->v0.version, args->v0.vm, args->v0.ioffset,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
index ba2bfe59c041a61d67e763235c00b4a3ca7bfa86..2e1df01bd9284d1d577ebcba567a2e4a074d4d42 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifogk104.c
@@ -214,10 +214,10 @@ gk104_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct gk104_fifo_chan *chan;
        u64 usermem, ioffset, ilength;
        u32 engines;
-       int ret, i;
+       int ret = -ENOSYS, i;
 
        nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel gpfifo vers %d vm %llx "
                                   "ioffset %016llx ilength %08x engine %08x\n",
                           args->v0.version, args->v0.vm, args->v0.ioffset,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c
index 94456cad3ef0dd65bed9da63f6145f49568f210d..c5a7de9db2596279f608d7a5907896f11494504b 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/fifo/gpfifonv50.c
@@ -41,10 +41,10 @@ nv50_fifo_gpfifo_new(struct nvkm_fifo *base, const struct nvkm_oclass *oclass,
        struct nv50_fifo *fifo = nv50_fifo(base);
        struct nv50_fifo_chan *chan;
        u64 ioffset, ilength;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create channel gpfifo size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create channel gpfifo vers %d vm %llx "
                                   "pushbuf %llx ioffset %016llx "
                                   "ilength %08x\n",

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
index d423a0686a31a516de34fa4367e1b5aa4e315b16..3c6effbf19d630f4bf38508fb6a617899db93a84 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c
@@ -148,9 +148,9 @@ gf100_fermi_mthd_zbc_color(struct nvkm_object *object, void *data, u32 size)
        union {
                struct fermi_a_zbc_color_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                switch (args->v0.format) {
                case FERMI_A_ZBC_COLOR_V0_FMT_ZERO:
                case FERMI_A_ZBC_COLOR_V0_FMT_UNORM_ONE:
@@ -194,9 +194,9 @@ gf100_fermi_mthd_zbc_depth(struct nvkm_object *object, void *data, u32 size)
        union {
                struct fermi_a_zbc_depth_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                switch (args->v0.format) {
                case FERMI_A_ZBC_DEPTH_V0_FMT_FP32:
                        ret = gf100_gr_zbc_depth_get(gr, args->v0.format,
@@ -214,6 +214,7 @@ gf100_fermi_mthd_zbc_depth(struct nvkm_object *object, void *data, u32 size)
 static int
 gf100_fermi_mthd(struct nvkm_object *object, u32 mthd, void *data, u32 size)
 {
+       nvif_ioctl(object, "fermi mthd %08x\n", mthd);
        switch (mthd) {
        case FERMI_A_ZBC_COLOR:
                return gf100_fermi_mthd_zbc_color(object, data, size);

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
index 344b1e5d7f85e2968cde40b18eb61f853bfd202e..f19fabef8d73ce1a64206e3bca70519a53d3a3d9 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c
@@ -212,10 +212,10 @@ nvkm_perfdom_init(struct nvkm_perfdom *dom, void *data, u32 size)
        } *args = data;
        struct nvkm_object *object = &dom->object;
        struct nvkm_pm *pm = dom->perfmon->pm;
-       int ret, i;
+       int ret = -ENOSYS, i;
 
        nvif_ioctl(object, "perfdom init size %d\n", size);
-       if (nvif_unvers(args->none)) {
+       if (!(ret = nvif_unvers(ret, &data, &size, args->none))) {
                nvif_ioctl(object, "perfdom init\n");
        } else
                return ret;
@@ -242,10 +242,10 @@ nvkm_perfdom_sample(struct nvkm_perfdom *dom, void *data, u32 size)
        } *args = data;
        struct nvkm_object *object = &dom->object;
        struct nvkm_pm *pm = dom->perfmon->pm;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(object, "perfdom sample size %d\n", size);
-       if (nvif_unvers(args->none)) {
+       if (!(ret = nvif_unvers(ret, &data, &size, args->none))) {
                nvif_ioctl(object, "perfdom sample\n");
        } else
                return ret;
@@ -266,10 +266,10 @@ nvkm_perfdom_read(struct nvkm_perfdom *dom, void *data, u32 size)
        } *args = data;
        struct nvkm_object *object = &dom->object;
        struct nvkm_pm *pm = dom->perfmon->pm;
-       int ret, i;
+       int ret = -ENOSYS, i;
 
        nvif_ioctl(object, "perfdom read size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "perfdom read vers %d\n", args->v0.version);
        } else
                return ret;
@@ -376,10 +376,10 @@ nvkm_perfdom_new_(struct nvkm_perfmon *perfmon,
        struct nvkm_perfctr *ctr[4] = {};
        struct nvkm_perfdom *dom;
        int c, s, m;
-       int ret;
+       int ret = -ENOSYS;
 
        nvif_ioctl(parent, "create perfdom size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(parent, "create perfdom vers %d dom %d mode %02x\n",
                           args->v0.version, args->v0.domain, args->v0.mode);
        } else
@@ -441,10 +441,10 @@ nvkm_perfmon_mthd_query_domain(struct nvkm_perfmon *perfmon,
        struct nvkm_pm *pm = perfmon->pm;
        struct nvkm_perfdom *dom;
        u8 domain_nr;
-       int di, ret;
+       int di, ret = -ENOSYS;
 
        nvif_ioctl(object, "perfmon query domain size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object, "perfmon domain vers %d iter %02x\n",
                           args->v0.version, args->v0.iter);
                di = (args->v0.iter & 0xff) - 1;
@@ -492,10 +492,10 @@ nvkm_perfmon_mthd_query_signal(struct nvkm_perfmon *perfmon,
        struct nvkm_perfsig *sig;
        const bool all = nvkm_boolopt(device->cfgopt, "NvPmShowAll", false);
        const bool raw = nvkm_boolopt(device->cfgopt, "NvPmUnnamed", all);
-       int ret, si;
+       int ret = -ENOSYS, si;
 
        nvif_ioctl(object, "perfmon query signal size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object,
                           "perfmon query signal vers %d dom %d iter %04x\n",
                           args->v0.version, args->v0.domain, args->v0.iter);
@@ -545,10 +545,10 @@ nvkm_perfmon_mthd_query_source(struct nvkm_perfmon *perfmon,
        struct nvkm_perfsig *sig;
        struct nvkm_perfsrc *src;
        u8 source_nr = 0;
-       int si, ret;
+       int si, ret = -ENOSYS;
 
        nvif_ioctl(object, "perfmon query source size %d\n", size);
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                nvif_ioctl(object,
                           "perfmon source vers %d dom %d sig %02x iter %02x\n",
                           args->v0.version, args->v0.domain, args->v0.signal,

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c
index d082f4f73a80ce8a298524390dc387c422c380cc..f28967065639e1f5c4d6c01d44b5b5fca665e248 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/chan.c
@@ -53,9 +53,9 @@ nvkm_sw_chan_event_ctor(struct nvkm_object *object, void *data, u32 size,
        union {
                struct nvif_notify_uevent_req none;
        } *req = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unvers(req->none)) {
+       if (!(ret = nvif_unvers(ret, &data, &size, req->none))) {
                notify->size  = sizeof(struct nvif_notify_uevent_rep);
                notify->types = 1;
                notify->index = 0;

diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
index 648caac3841ac8554fe304cd9604e51d68e84fb2..b6675fe1b0ce97876e567595c312a9f1aff032a4 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
+++ b/drivers/gpu/drm/nouveau/nvkm/engine/sw/nv04.c
@@ -47,9 +47,9 @@ nv04_nvsw_mthd_get_ref(struct nvkm_nvsw *nvsw, void *data, u32 size)
        union {
                struct nv04_nvsw_get_ref_v0 v0;
        } *args = data;
-       int ret;
+       int ret = -ENOSYS;
 
-       if (nvif_unpack(args->v0, 0, 0, false)) {
+       if (!(ret = nvif_unpack(ret, &data, &size, args->v0, 0, 0, false))) {
                args->v0.ref = atomic_read(&chan->ref);
        }