Commit 57cbdbe6 authored by Lyude Paul's avatar Lyude Paul Committed by Karol Herbst
Browse files

drm/nouveau/kms/nv140-: Use hard-coded wndws or core channel for CRC channel 



Originally it was assumed based on Nvidia's open-gpu-docs and testing that
NVDisplay required that at least one wndw which belongs to a given head to
be used as the controlling channel
(NVC37D_HEAD_SET_CRC_CONTROL_CONTROLLING_CHANNEL) in order for CRC capture
to function. While this is the case on Volta, Turing actually adds the
ability to instead use the core channel as the controlling channel. For
Turing this is quite useful, as it means that we can always default to the
core channel as the controlling channel and we don't need to be concerned
about ensuring we have at least one wndw channel owned by a head with CRC
output enabled. While Volta lacks this ability, Volta conveniently also
lacks flexible wndw mapping - meaning that we can always rely on each head
having four wndw channels mapped to it regardless of the atomic state.

So, simply use the hard-coded wndw mappings we're guaranteed to have on
Volta as the controlling channel, and use the core channel as the
controlling channel for Turing+. As a result this also renders the plane
ownership logic in nv50_crc_atomic_check() unnessecary, which gives us one
less thing to implement when we get support for flexible wndw mapping. We
also can entirely drop the wndw parameter from our set_src callbacks, and
the atomic state.

v2 (Karol): put prackets around complex macro definition
            removed spaces before :32 in structs

Cc: Martin Peres <martin.peres@free.fr>
Cc: Jeremy Cline <jcline@redhat.com>
Cc: Simon Ser <contact@emersion.fr>
Signed-off-by: default avatarLyude Paul <lyude@redhat.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarKarol Herbst <kherbst@redhat.com>
Signed-off-by: default avatarKarol Herbst <kherbst@redhat.com>
Link: https://gitlab.freedesktop.org/drm/nouveau/-/merge_requests/10
parent 4f232990

drivers/gpu/drm/nouveau/dispnv50/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ nouveau-y += dispnv50/corec57d.o 
nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crc.o

nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crc907d.o

nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crcc37d.o

nouveau-$(CONFIG_DEBUG_FS) += dispnv50/crcc57d.o



nouveau-y += dispnv50/dac507d.o

nouveau-y += dispnv50/dac907d.o

drivers/gpu/drm/nouveau/dispnv50/corec57d.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ corec57d = { 
	.head = &headc57d,

	.sor = &sorc37d,

#if IS_ENABLED(CONFIG_DEBUG_FS)

	.crc = &crcc37d,

	.crc = &crcc57d,

#endif

};

drivers/gpu/drm/nouveau/dispnv50/crc.c

+4 −30
Original line number Diff line number Diff line
@@ -351,8 +351,6 @@ int nv50_crc_atomic_check_head(struct nv50_head *head, 
			       struct nv50_head_atom *armh)

{

	struct nv50_atom *atom = nv50_atom(asyh->state.state);

	struct drm_device *dev = head->base.base.dev;

	struct nv50_disp *disp = nv50_disp(dev);

	bool changed = armh->crc.src != asyh->crc.src;



	if (!armh->crc.src && !asyh->crc.src) {
@@ -361,30 +359,7 @@ int nv50_crc_atomic_check_head(struct nv50_head *head, 
		return 0;

	}



	/* While we don't care about entry tags, Volta+ hw always needs the

	 * controlling wndw channel programmed to a wndw that's owned by our

	 * head

	 */

	if (asyh->crc.src && disp->disp->object.oclass >= GV100_DISP &&

	    !(BIT(asyh->crc.wndw) & asyh->wndw.owned)) {

		if (!asyh->wndw.owned) {

			/* TODO: once we support flexible channel ownership,

			 * we should write some code here to handle attempting

			 * to "steal" a plane: e.g. take a plane that is

			 * currently not-visible and owned by another head,

			 * and reassign it to this head. If we fail to do so,

			 * we shuld reject the mode outright as CRC capture

			 * then becomes impossible.

			 */

			NV_ATOMIC(nouveau_drm(dev),

				  "No available wndws for CRC readback\n");

			return -EINVAL;

		}

		asyh->crc.wndw = ffs(asyh->wndw.owned) - 1;

	}



	if (drm_atomic_crtc_needs_modeset(&asyh->state) || changed ||

	    armh->crc.wndw != asyh->crc.wndw) {

	if (drm_atomic_crtc_needs_modeset(&asyh->state) || changed) {

		asyh->clr.crc = armh->crc.src && armh->state.active;

		asyh->set.crc = asyh->crc.src && asyh->state.active;

		if (changed)
@@ -471,9 +446,8 @@ void nv50_crc_atomic_set(struct nv50_head *head, 
	struct nouveau_encoder *outp =

		nv50_real_outp(nv50_head_atom_get_encoder(asyh));



	func->set_src(head, outp->or,

		      nv50_crc_source_type(outp, asyh->crc.src),

		      &crc->ctx[crc->ctx_idx], asyh->crc.wndw);

	func->set_src(head, outp->or, nv50_crc_source_type(outp, asyh->crc.src),

		      &crc->ctx[crc->ctx_idx]);

}



void nv50_crc_atomic_clr(struct nv50_head *head)
@@ -481,7 +455,7 @@ void nv50_crc_atomic_clr(struct nv50_head *head) 
	const struct nv50_crc_func *func =

		nv50_disp(head->base.base.dev)->core->func->crc;



	func->set_src(head, 0, NV50_CRC_SOURCE_TYPE_NONE, NULL, 0);

	func->set_src(head, 0, NV50_CRC_SOURCE_TYPE_NONE, NULL);

}



static inline int

drivers/gpu/drm/nouveau/dispnv50/crc.h

+3 −4
Original line number Diff line number Diff line
@@ -45,13 +45,11 @@ struct nv50_crc_notifier_ctx { 


struct nv50_crc_atom {

	enum nv50_crc_source src;

	/* Only used for gv100+ */

	u8 wndw : 4;

};



struct nv50_crc_func {

	int (*set_src)(struct nv50_head *, int or, enum nv50_crc_source_type,

		       struct nv50_crc_notifier_ctx *, u32 wndw);

	int (*set_src)(struct nv50_head *, int or, enum nv50_crc_source_type type,

		       struct nv50_crc_notifier_ctx *ctx);

	int (*set_ctx)(struct nv50_head *, struct nv50_crc_notifier_ctx *);

	u32 (*get_entry)(struct nv50_head *, struct nv50_crc_notifier_ctx *,

			 enum nv50_crc_source, int idx);
@@ -95,6 +93,7 @@ void nv50_crc_atomic_clr(struct nv50_head *); 


extern const struct nv50_crc_func crc907d;

extern const struct nv50_crc_func crcc37d;

extern const struct nv50_crc_func crcc57d;



#else /* IS_ENABLED(CONFIG_DEBUG_FS) */

struct nv50_crc {};

drivers/gpu/drm/nouveau/dispnv50/crc907d.c

+2 −3
Original line number Diff line number Diff line
@@ -23,9 +23,8 @@ struct crc907d_notifier { 
} __packed;



static int

crc907d_set_src(struct nv50_head *head, int or,

		enum nv50_crc_source_type source,

		struct nv50_crc_notifier_ctx *ctx, u32 wndw)

crc907d_set_src(struct nv50_head *head, int or, enum nv50_crc_source_type source,

		struct nv50_crc_notifier_ctx *ctx)

{

	struct nvif_push *push = nv50_disp(head->base.base.dev)->core->chan.push;

	const int i = head->base.index;