978474dc82
nouveau_fence_emit() can fail before and after initializing the
dma-fence and hence before and after initializing the dma-fence' kref.
In order to avoid nouveau_fence_emit() potentially failing before
dma-fence initialization pass the channel to nouveau_fence_new() already
and perform the required check before even allocating the fence.
While at it, restore the original behavior of nouveau_fence_new() and
add nouveau_fence_create() for separate (pre-)allocation instead. Always
splitting up allocation end emit wasn't a good idea in the first place.
Hence, limit it to the places where we actually need to pre-allocate.
Fixes: 7f2a0b50b2b2 ("drm/nouveau: fence: separate fence alloc and emit")
Signed-off-by: Danilo Krummrich <dakr@redhat.com>
Reviewed-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230829223847.4406-1-dakr@redhat.com
101 lines
2.8 KiB
C
101 lines
2.8 KiB
C
/* SPDX-License-Identifier: MIT */
|
|
#ifndef __NOUVEAU_FENCE_H__
|
|
#define __NOUVEAU_FENCE_H__
|
|
|
|
#include <linux/dma-fence.h>
|
|
#include <nvif/event.h>
|
|
|
|
struct nouveau_drm;
|
|
struct nouveau_bo;
|
|
|
|
struct nouveau_fence {
|
|
struct dma_fence base;
|
|
|
|
struct list_head head;
|
|
|
|
struct nouveau_channel __rcu *channel;
|
|
unsigned long timeout;
|
|
};
|
|
|
|
int nouveau_fence_create(struct nouveau_fence **, struct nouveau_channel *);
|
|
int nouveau_fence_new(struct nouveau_fence **, struct nouveau_channel *);
|
|
void nouveau_fence_unref(struct nouveau_fence **);
|
|
|
|
int nouveau_fence_emit(struct nouveau_fence *);
|
|
bool nouveau_fence_done(struct nouveau_fence *);
|
|
int nouveau_fence_wait(struct nouveau_fence *, bool lazy, bool intr);
|
|
int nouveau_fence_sync(struct nouveau_bo *, struct nouveau_channel *, bool exclusive, bool intr);
|
|
|
|
struct nouveau_fence_chan {
|
|
spinlock_t lock;
|
|
struct kref fence_ref;
|
|
|
|
struct list_head pending;
|
|
struct list_head flip;
|
|
|
|
int (*emit)(struct nouveau_fence *);
|
|
int (*sync)(struct nouveau_fence *, struct nouveau_channel *,
|
|
struct nouveau_channel *);
|
|
u32 (*read)(struct nouveau_channel *);
|
|
int (*emit32)(struct nouveau_channel *, u64, u32);
|
|
int (*sync32)(struct nouveau_channel *, u64, u32);
|
|
|
|
u32 sequence;
|
|
u32 context;
|
|
char name[32];
|
|
|
|
struct nvif_event event;
|
|
int notify_ref, dead, killed;
|
|
};
|
|
|
|
struct nouveau_fence_priv {
|
|
void (*dtor)(struct nouveau_drm *);
|
|
bool (*suspend)(struct nouveau_drm *);
|
|
void (*resume)(struct nouveau_drm *);
|
|
int (*context_new)(struct nouveau_channel *);
|
|
void (*context_del)(struct nouveau_channel *);
|
|
|
|
bool uevent;
|
|
};
|
|
|
|
#define nouveau_fence(drm) ((struct nouveau_fence_priv *)(drm)->fence)
|
|
|
|
void nouveau_fence_context_new(struct nouveau_channel *, struct nouveau_fence_chan *);
|
|
void nouveau_fence_context_del(struct nouveau_fence_chan *);
|
|
void nouveau_fence_context_free(struct nouveau_fence_chan *);
|
|
void nouveau_fence_context_kill(struct nouveau_fence_chan *, int error);
|
|
|
|
int nv04_fence_create(struct nouveau_drm *);
|
|
int nv04_fence_mthd(struct nouveau_channel *, u32, u32, u32);
|
|
|
|
int nv10_fence_emit(struct nouveau_fence *);
|
|
int nv17_fence_sync(struct nouveau_fence *, struct nouveau_channel *,
|
|
struct nouveau_channel *);
|
|
u32 nv10_fence_read(struct nouveau_channel *);
|
|
void nv10_fence_context_del(struct nouveau_channel *);
|
|
void nv10_fence_destroy(struct nouveau_drm *);
|
|
int nv10_fence_create(struct nouveau_drm *);
|
|
|
|
int nv17_fence_create(struct nouveau_drm *);
|
|
void nv17_fence_resume(struct nouveau_drm *drm);
|
|
|
|
int nv50_fence_create(struct nouveau_drm *);
|
|
int nv84_fence_create(struct nouveau_drm *);
|
|
int nvc0_fence_create(struct nouveau_drm *);
|
|
|
|
struct nv84_fence_chan {
|
|
struct nouveau_fence_chan base;
|
|
struct nouveau_vma *vma;
|
|
};
|
|
|
|
struct nv84_fence_priv {
|
|
struct nouveau_fence_priv base;
|
|
struct nouveau_bo *bo;
|
|
u32 *suspend;
|
|
struct mutex mutex;
|
|
};
|
|
|
|
int nv84_fence_context_new(struct nouveau_channel *);
|
|
|
|
#endif
|