forked from Minki/linux
f20ebd034e
Since commit5e120f6e4b"drm/nouveau/fence: convert to exec engine, and improve channel sync" nouveau fence sync implementation for nv17-50 and nvc0+ started to rely on state of fence buffer left by previous sync operation. But as pinned bo's (where fence state is stored) are not saved+restored across suspend/resume, we need to do it manually. nvc0+ was fixed by commitd6ba6d215a"drm/nvc0/fence: restore pre-suspend fence buffer context on resume". Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=50121 Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Signed-off-by: Ben Skeggs <bskeggs@redhat.com> Cc: stable@vger.kernel.org
73 lines
2.2 KiB
C
73 lines
2.2 KiB
C
#ifndef __NOUVEAU_FENCE_H__
|
|
#define __NOUVEAU_FENCE_H__
|
|
|
|
struct nouveau_drm;
|
|
|
|
struct nouveau_fence {
|
|
struct list_head head;
|
|
struct kref kref;
|
|
|
|
struct nouveau_channel *channel;
|
|
unsigned long timeout;
|
|
u32 sequence;
|
|
|
|
void (*work)(void *priv, bool signalled);
|
|
void *priv;
|
|
};
|
|
|
|
int nouveau_fence_new(struct nouveau_channel *, struct nouveau_fence **);
|
|
struct nouveau_fence *
|
|
nouveau_fence_ref(struct nouveau_fence *);
|
|
void nouveau_fence_unref(struct nouveau_fence **);
|
|
|
|
int nouveau_fence_emit(struct nouveau_fence *, struct nouveau_channel *);
|
|
bool nouveau_fence_done(struct nouveau_fence *);
|
|
int nouveau_fence_wait(struct nouveau_fence *, bool lazy, bool intr);
|
|
int nouveau_fence_sync(struct nouveau_fence *, struct nouveau_channel *);
|
|
|
|
struct nouveau_fence_chan {
|
|
struct list_head pending;
|
|
struct list_head flip;
|
|
|
|
spinlock_t lock;
|
|
u32 sequence;
|
|
};
|
|
|
|
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 *);
|
|
int (*emit)(struct nouveau_fence *);
|
|
int (*sync)(struct nouveau_fence *, struct nouveau_channel *,
|
|
struct nouveau_channel *);
|
|
u32 (*read)(struct nouveau_channel *);
|
|
};
|
|
|
|
#define nouveau_fence(drm) ((struct nouveau_fence_priv *)(drm)->fence)
|
|
|
|
void nouveau_fence_context_new(struct nouveau_fence_chan *);
|
|
void nouveau_fence_context_del(struct nouveau_fence_chan *);
|
|
|
|
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 *);
|
|
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 *);
|
|
u64 nvc0_fence_crtc(struct nouveau_channel *, int crtc);
|
|
|
|
int nouveau_flip_complete(void *chan);
|
|
|
|
#endif
|