Commit 1b255f1c authored by Ben Skeggs's avatar Ben Skeggs Committed by Dave Airlie
Browse files

drm/nouveau/disp: add output class 



Will be used to more cleanly implement existing method interfaces that
take some confusing (IEDTkey, inherited from VBIOS, which RM no longer
uses on Ampere) match values to determine which display path to operate
on.

Methods will be protected from racing with supervisor, and from being
called where they shouldn't be (ie. without an OR assigned).

v2:
- use ?: (lyude)
v3:
- fix return code if noacquire() method fails

Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent a6fd8f93

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

+15 −3
Original line number Diff line number Diff line
@@ -563,6 +563,10 @@ nv50_dac_help = { 
static void

nv50_dac_destroy(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



	nvif_outp_dtor(&nv_encoder->outp);



	drm_encoder_cleanup(encoder);

	kfree(encoder);

}
@@ -576,6 +580,7 @@ static int 
nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe)

{

	struct nouveau_drm *drm = nouveau_drm(connector->dev);

	struct nv50_disp *disp = nv50_disp(connector->dev);

	struct nvkm_i2c *i2c = nvxx_i2c(&drm->client.device);

	struct nvkm_i2c_bus *bus;

	struct nouveau_encoder *nv_encoder;
@@ -599,7 +604,7 @@ nv50_dac_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	drm_encoder_helper_add(encoder, &nv50_dac_help);



	drm_connector_attach_encoder(connector, encoder);

	return 0;

	return nvif_outp_ctor(disp->disp, nv_encoder->base.base.name, dcbe->id, &nv_encoder->outp);

}



/*
@@ -1822,6 +1827,9 @@ static void 
nv50_sor_destroy(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



	nvif_outp_dtor(&nv_encoder->outp);



	nv50_mstm_del(&nv_encoder->dp.mstm);

	drm_encoder_cleanup(encoder);
@@ -1918,7 +1926,7 @@ nv50_sor_create(struct drm_connector *connector, struct dcb_output *dcbe) 
			nv_encoder->i2c = &bus->i2c;

	}



	return 0;

	return nvif_outp_ctor(disp->disp, nv_encoder->base.base.name, dcbe->id, &nv_encoder->outp);

}



/******************************************************************************
@@ -1999,6 +2007,10 @@ nv50_pior_help = { 
static void

nv50_pior_destroy(struct drm_encoder *encoder)

{

	struct nouveau_encoder *nv_encoder = nouveau_encoder(encoder);



	nvif_outp_dtor(&nv_encoder->outp);



	drm_encoder_cleanup(encoder);

	kfree(encoder);

}
@@ -2056,7 +2068,7 @@ nv50_pior_create(struct drm_connector *connector, struct dcb_output *dcbe) 
	disp->core->func->pior->get_caps(disp, nv_encoder, ffs(dcbe->or) - 1);

	nv50_outp_dump_caps(drm, nv_encoder);



	return 0;

	return nvif_outp_ctor(disp->disp, nv_encoder->base.base.name, dcbe->id, &nv_encoder->outp);

}



/******************************************************************************

drivers/gpu/drm/nouveau/include/nvif/class.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 


#define NVIF_CLASS_DISP                              /* if0010.h */  0x80000010

#define NVIF_CLASS_CONN                              /* if0011.h */  0x80000011

#define NVIF_CLASS_OUTP                              /* if0012.h */  0x80000012

#define NVIF_CLASS_DISP_CHAN                         /* if0014.h */  0x80000014



/* the below match nvidia-assigned (either in hw, or sw) class numbers */

drivers/gpu/drm/nouveau/include/nvif/disp.h

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ struct nvif_device; 
struct nvif_disp {

	struct nvif_object object;

	unsigned long conn_mask;

	unsigned long outp_mask;

};



int nvif_disp_ctor(struct nvif_device *, const char *name, s32 oclass,

drivers/gpu/drm/nouveau/include/nvif/if0010.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ union nvif_disp_args { 
		__u8 version;

		__u8 pad01[3];

		__u32 conn_mask;

		__u32 outp_mask;

	} v0;

};

#endif

drivers/gpu/drm/nouveau/include/nvif/if0012.h

0 → 100644
+12 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

#ifndef __NVIF_IF0012_H__

#define __NVIF_IF0012_H__



union nvif_outp_args {

	struct nvif_outp_v0 {

		__u8 version;

		__u8 id;	/* DCB device index. */

		__u8 pad02[6];

	} v0;

};

#endif