Commit 54d44bfc authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/nvif: give every disp object a human-readable identifier 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
parent 64a0f59a

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

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ struct nvif_disp { 
	struct nvif_object object;

};



int nvif_disp_ctor(struct nvif_device *, s32 oclass, struct nvif_disp *);

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

		   struct nvif_disp *);

void nvif_disp_dtor(struct nvif_disp *);

#endif

drivers/gpu/drm/nouveau/nouveau_display.c

+2 −1
Original line number Diff line number Diff line
@@ -635,7 +635,8 @@ nouveau_display_create(struct drm_device *dev) 
	drm_kms_helper_poll_disable(dev);



	if (nouveau_modeset != 2 && drm->vbios.dcb.entries) {

		ret = nvif_disp_ctor(&drm->client.device, 0, &disp->disp);

		ret = nvif_disp_ctor(&drm->client.device, "kmsDisp", 0,

				     &disp->disp);

		if (ret == 0) {

			nouveau_display_create_properties(dev);

			if (disp->disp.object.oclass < NV50_DISP)

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

+3 −2
Original line number Diff line number Diff line
@@ -31,7 +31,8 @@ nvif_disp_dtor(struct nvif_disp *disp) 
}



int

nvif_disp_ctor(struct nvif_device *device, s32 oclass, struct nvif_disp *disp)

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

	       struct nvif_disp *disp)

{

	static const struct nvif_mclass disps[] = {

		{ TU102_DISP, -1 },
@@ -56,6 +57,6 @@ nvif_disp_ctor(struct nvif_device *device, s32 oclass, struct nvif_disp *disp) 
	if (cid < 0)

		return cid;



	return nvif_object_ctor(&device->object, "nvifDisp", 0,

	return nvif_object_ctor(&device->object, name ? name : "nvifDisp", 0,

				disps[cid].oclass, NULL, 0, &disp->object);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE