Commit 34ce62a5 authored by Dave Airlie's avatar Dave Airlie Committed by Dave Airlie
Browse files

nouveau/gsp: drop some acpi related debug 



These were leftover debug, if we need to bring them back do so
for debugging later.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20231222043308.3090089-3-airlied@gmail.com
parent 24ab185d

drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c

+0 −7
Original line number Diff line number Diff line
@@ -1465,8 +1465,6 @@ r535_disp_oneinit(struct nvkm_disp *disp) 
				bool nvhg = acpi_check_dsm(handle, &NVHG_DSM_GUID, NVHG_DSM_REV,

						           1ULL << 0x00000014);



				printk(KERN_ERR "bl: nbci:%d nvhg:%d\n", nbci, nvhg);



				if (nbci || nvhg) {

					union acpi_object argv4 = {

						.buffer.type    = ACPI_TYPE_BUFFER,
@@ -1479,9 +1477,6 @@ r535_disp_oneinit(struct nvkm_disp *disp) 
					if (!obj) {

						acpi_handle_info(handle, "failed to evaluate _DSM\n");

					} else {

						printk(KERN_ERR "bl: obj type %d\n", obj->type);

						printk(KERN_ERR "bl: obj len %d\n", obj->package.count);



						for (int i = 0; i < obj->package.count; i++) {

							union acpi_object *elt = &obj->package.elements[i];

							u32 size;
@@ -1491,12 +1486,10 @@ r535_disp_oneinit(struct nvkm_disp *disp) 
							else

								size = 4;



							printk(KERN_ERR "elt %03d: type %d size %d\n", i, elt->type, size);

							memcpy(&ctrl->backLightData[ctrl->backLightDataSize], &elt->integer.value, size);

							ctrl->backLightDataSize += size;

						}



						printk(KERN_ERR "bl: data size %d\n", ctrl->backLightDataSize);

						ctrl->status = 0;

						ACPI_FREE(obj);

					}

drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c

+0 −9
Original line number Diff line number Diff line
@@ -1100,16 +1100,12 @@ r535_gsp_acpi_caps(acpi_handle handle, CAPS_METHOD_DATA *caps) 
	if (!obj)

		return;



	printk(KERN_ERR "nvop: obj type %d\n", obj->type);

	printk(KERN_ERR "nvop: obj len %d\n", obj->buffer.length);



	if (WARN_ON(obj->type != ACPI_TYPE_BUFFER) ||

	    WARN_ON(obj->buffer.length != 4))

		return;



	caps->status = 0;

	caps->optimusCaps = *(u32 *)obj->buffer.pointer;

	printk(KERN_ERR "nvop: caps %08x\n", caps->optimusCaps);



	ACPI_FREE(obj);
@@ -1136,9 +1132,6 @@ r535_gsp_acpi_jt(acpi_handle handle, JT_METHOD_DATA *jt) 
	if (!obj)

		return;



	printk(KERN_ERR "jt: obj type %d\n", obj->type);

	printk(KERN_ERR "jt: obj len %d\n", obj->buffer.length);



	if (WARN_ON(obj->type != ACPI_TYPE_BUFFER) ||

	    WARN_ON(obj->buffer.length != 4))

		return;
@@ -1147,7 +1140,6 @@ r535_gsp_acpi_jt(acpi_handle handle, JT_METHOD_DATA *jt) 
	jt->jtCaps = *(u32 *)obj->buffer.pointer;

	jt->jtRevId = (jt->jtCaps & 0xfff00000) >> 20;

	jt->bSBIOSCaps = 0;

	printk(KERN_ERR "jt: caps %08x rev:%04x\n", jt->jtCaps, jt->jtRevId);



	ACPI_FREE(obj);
@@ -1233,7 +1225,6 @@ r535_gsp_acpi_dod(acpi_handle handle, DOD_METHOD_DATA *dod) 
		dod->acpiIdListLen += sizeof(dod->acpiIdList[0]);

	}



	printk(KERN_ERR "_DOD: ok! len:%d\n", dod->acpiIdListLen);

	dod->status = 0;

}

#endif