drm/nouveau/nvif: fix a number of notify thinkos
Note to self: more sleep Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
27111a23d0
commit
7caa63c040
|
@ -132,12 +132,12 @@ nvkm_client_notify_new(struct nouveau_client *client,
|
|||
if (ret == 0) {
|
||||
client->notify[index] = notify;
|
||||
notify->client = client;
|
||||
return 0;
|
||||
return index;
|
||||
}
|
||||
}
|
||||
|
||||
kfree(notify);
|
||||
return 0;
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int
|
||||
|
|
|
@ -14,7 +14,7 @@ struct nouveau_client {
|
|||
void *data;
|
||||
|
||||
int (*ntfy)(const void *, u32, const void *, u32);
|
||||
struct nvkm_client_notify *notify[8];
|
||||
struct nvkm_client_notify *notify[16];
|
||||
};
|
||||
|
||||
static inline struct nouveau_client *
|
||||
|
|
|
@ -87,12 +87,25 @@ nvif_notify_get(struct nvif_notify *notify)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static inline int
|
||||
nvif_notify_func(struct nvif_notify *notify, bool keep)
|
||||
{
|
||||
int ret = notify->func(notify);
|
||||
if (ret == NVIF_NOTIFY_KEEP ||
|
||||
!test_and_clear_bit(NVKM_NOTIFY_USER, ¬ify->flags)) {
|
||||
if (!keep)
|
||||
atomic_dec(¬ify->putcnt);
|
||||
else
|
||||
nvif_notify_get_(notify);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
nvif_notify_work(struct work_struct *work)
|
||||
{
|
||||
struct nvif_notify *notify = container_of(work, typeof(*notify), work);
|
||||
if (notify->func(notify) == NVIF_NOTIFY_KEEP)
|
||||
nvif_notify_get_(notify);
|
||||
nvif_notify_func(notify, true);
|
||||
}
|
||||
|
||||
int
|
||||
|
@ -113,19 +126,15 @@ nvif_notify(const void *header, u32 length, const void *data, u32 size)
|
|||
if (!WARN_ON(notify == NULL)) {
|
||||
struct nvif_client *client = nvif_client(notify->object);
|
||||
if (!WARN_ON(notify->size != size)) {
|
||||
atomic_inc(¬ify->putcnt);
|
||||
if (test_bit(NVIF_NOTIFY_WORK, ¬ify->flags)) {
|
||||
atomic_inc(¬ify->putcnt);
|
||||
memcpy((void *)notify->data, data, size);
|
||||
schedule_work(¬ify->work);
|
||||
return NVIF_NOTIFY_DROP;
|
||||
}
|
||||
notify->data = data;
|
||||
ret = notify->func(notify);
|
||||
ret = nvif_notify_func(notify, client->driver->keep);
|
||||
notify->data = NULL;
|
||||
if (ret != NVIF_NOTIFY_DROP && client->driver->keep) {
|
||||
atomic_inc(¬ify->putcnt);
|
||||
nvif_notify_get_(notify);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue