24d9422e26
Not entirely sure why this never came up when I originally tested this
(maybe some BIOSes already have this setup?) but the ->caps_init vfunc
appears to cause the display engine to throw an exception on driver
init, at least on my ThinkPad P72:
nouveau 0000:01:00.0: disp: chid 0 mthd 008c data 00000000 0000508c 0000102b
This is magic nvidia speak for "You need to have the DMA notifier offset
programmed before you can call NV507D_GET_CAPABILITIES." So, let's fix
this by doing that, and also perform an update afterwards to prevent
racing with the GPU when reading capabilities.
v2:
* Don't just program the DMA notifier offset, make sure to actually
perform an update
v3:
* Don't call UPDATE()
* Actually read the correct notifier fields, as apparently the
CAPABILITIES_DONE field lives in a different location than the main
NV_DISP_CORE_NOTIFIER_1 field. As well, 907d+ use a different
CAPABILITIES_DONE field then pre-907d cards.
v4:
* Don't forget to check the return value of core507d_read_caps()
v5:
* Get rid of NV50_DISP_CAPS_NTFY[14], use NV50_DISP_CORE_NTFY
* Disable notifier after calling GetCapabilities()
Signed-off-by: Lyude Paul <lyude@redhat.com>
Fixes: 4a2cb4181b ("drm/nouveau/kms/nv50-: Probe SOR and PIOR caps for DP interlacing support")
Cc: <stable@vger.kernel.org> # v5.8+
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
73 lines
2.5 KiB
C
73 lines
2.5 KiB
C
#ifndef __NV50_KMS_CORE_H__
|
|
#define __NV50_KMS_CORE_H__
|
|
#include "disp.h"
|
|
#include "atom.h"
|
|
#include "crc.h"
|
|
#include <nouveau_encoder.h>
|
|
|
|
struct nv50_core {
|
|
const struct nv50_core_func *func;
|
|
struct nv50_dmac chan;
|
|
bool assign_windows;
|
|
};
|
|
|
|
int nv50_core_new(struct nouveau_drm *, struct nv50_core **);
|
|
void nv50_core_del(struct nv50_core **);
|
|
|
|
struct nv50_core_func {
|
|
int (*init)(struct nv50_core *);
|
|
void (*ntfy_init)(struct nouveau_bo *, u32 offset);
|
|
int (*caps_init)(struct nouveau_drm *, struct nv50_disp *);
|
|
int (*ntfy_wait_done)(struct nouveau_bo *, u32 offset,
|
|
struct nvif_device *);
|
|
int (*update)(struct nv50_core *, u32 *interlock, bool ntfy);
|
|
|
|
struct {
|
|
int (*owner)(struct nv50_core *);
|
|
} wndw;
|
|
|
|
const struct nv50_head_func *head;
|
|
#if IS_ENABLED(CONFIG_DEBUG_FS)
|
|
const struct nv50_crc_func *crc;
|
|
#endif
|
|
const struct nv50_outp_func {
|
|
int (*ctrl)(struct nv50_core *, int or, u32 ctrl,
|
|
struct nv50_head_atom *);
|
|
/* XXX: Only used by SORs and PIORs for now */
|
|
void (*get_caps)(struct nv50_disp *,
|
|
struct nouveau_encoder *, int or);
|
|
} *dac, *pior, *sor;
|
|
};
|
|
|
|
int core507d_new(struct nouveau_drm *, s32, struct nv50_core **);
|
|
int core507d_new_(const struct nv50_core_func *, struct nouveau_drm *, s32,
|
|
struct nv50_core **);
|
|
int core507d_init(struct nv50_core *);
|
|
void core507d_ntfy_init(struct nouveau_bo *, u32);
|
|
int core507d_read_caps(struct nv50_disp *disp);
|
|
int core507d_caps_init(struct nouveau_drm *, struct nv50_disp *);
|
|
int core507d_ntfy_wait_done(struct nouveau_bo *, u32, struct nvif_device *);
|
|
int core507d_update(struct nv50_core *, u32 *, bool);
|
|
|
|
extern const struct nv50_outp_func dac507d;
|
|
extern const struct nv50_outp_func sor507d;
|
|
extern const struct nv50_outp_func pior507d;
|
|
|
|
int core827d_new(struct nouveau_drm *, s32, struct nv50_core **);
|
|
|
|
int core907d_new(struct nouveau_drm *, s32, struct nv50_core **);
|
|
int core907d_caps_init(struct nouveau_drm *drm, struct nv50_disp *disp);
|
|
extern const struct nv50_outp_func dac907d;
|
|
extern const struct nv50_outp_func sor907d;
|
|
|
|
int core917d_new(struct nouveau_drm *, s32, struct nv50_core **);
|
|
|
|
int corec37d_new(struct nouveau_drm *, s32, struct nv50_core **);
|
|
int corec37d_caps_init(struct nouveau_drm *, struct nv50_disp *);
|
|
int corec37d_ntfy_wait_done(struct nouveau_bo *, u32, struct nvif_device *);
|
|
int corec37d_update(struct nv50_core *, u32 *, bool);
|
|
int corec37d_wndw_owner(struct nv50_core *);
|
|
extern const struct nv50_outp_func sorc37d;
|
|
|
|
int corec57d_new(struct nouveau_drm *, s32, struct nv50_core **);
|
|
#endif
|