Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ef2bb506 authored by Maarten Maathuis's avatar Maarten Maathuis Committed by Ben Skeggs
Browse files

drm/nouveau: use drm debug levels 



- Use driver level (0x2) for NV_DEBUG instead of all levels
- Create a NV_DEBUG_KMS for KMS level (0x4) and use them in modesetting code
- Remove a few odd NV_TRACE calls and replace some of them with NV_DEBUG_KMS or
NV_INFO

Signed-off-by: default avatarMaarten Maathuis <madman2003@gmail.com>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent dc4a684a

drivers/gpu/drm/nouveau/nouveau_bios.c

+6 −6
Original line number Diff line number Diff line
@@ -3854,7 +3854,7 @@ nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent, 
	 * script tables is a pointer to the script to execute.

	 */



	NV_DEBUG(dev, "Searching for output entry for %d %d %d\n",

	NV_DEBUG_KMS(dev, "Searching for output entry for %d %d %d\n",

			dcbent->type, dcbent->location, dcbent->or);

	otable = bios_output_config_match(dev, dcbent, table[1] +

					  bios->display.script_table_ptr,
@@ -3884,7 +3884,7 @@ nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent, 
	if (pxclk == 0) {

		script = ROM16(otable[6]);

		if (!script) {

			NV_DEBUG(dev, "output script 0 not found\n");

			NV_DEBUG_KMS(dev, "output script 0 not found\n");

			return 1;

		}
@@ -3894,7 +3894,7 @@ nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent, 
	if (pxclk == -1) {

		script = ROM16(otable[8]);

		if (!script) {

			NV_DEBUG(dev, "output script 1 not found\n");

			NV_DEBUG_KMS(dev, "output script 1 not found\n");

			return 1;

		}
@@ -3907,7 +3907,7 @@ nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent, 
		else

			script = 0;

		if (!script) {

			NV_DEBUG(dev, "output script 2 not found\n");

			NV_DEBUG_KMS(dev, "output script 2 not found\n");

			return 1;

		}
@@ -3931,7 +3931,7 @@ nouveau_bios_run_display_table(struct drm_device *dev, struct dcb_entry *dcbent, 
		if (script)

			script = clkcmptable(bios, script, -pxclk);

		if (!script) {

			NV_DEBUG(dev, "clock script 1 not found\n");

			NV_DEBUG_KMS(dev, "clock script 1 not found\n");

			return 1;

		}
@@ -5234,7 +5234,7 @@ parse_dcb_connector_table(struct nvbios *bios) 
	int i;



	if (!bios->bdcb.connector_table_ptr) {

		NV_DEBUG(dev, "No DCB connector table present\n");

		NV_DEBUG_KMS(dev, "No DCB connector table present\n");

		return;

	}

drivers/gpu/drm/nouveau/nouveau_connector.c

+4 −4
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ nouveau_connector_destroy(struct drm_connector *drm_connector) 
	struct nouveau_connector *connector = nouveau_connector(drm_connector);

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



	NV_DEBUG(dev, "\n");

	NV_DEBUG_KMS(dev, "\n");



	if (!connector)

		return;
@@ -420,7 +420,7 @@ nouveau_connector_native_mode(struct nouveau_connector *connector) 
	/* Use preferred mode if there is one.. */

	list_for_each_entry(mode, &connector->base.probed_modes, head) {

		if (mode->type & DRM_MODE_TYPE_PREFERRED) {

			NV_DEBUG(dev, "native mode from preferred\n");

			NV_DEBUG_KMS(dev, "native mode from preferred\n");

			return drm_mode_duplicate(dev, mode);

		}

	}
@@ -445,7 +445,7 @@ nouveau_connector_native_mode(struct nouveau_connector *connector) 
		largest = mode;

	}



	NV_DEBUG(dev, "native mode from largest: %dx%d@%d\n",

	NV_DEBUG_KMS(dev, "native mode from largest: %dx%d@%d\n",

		      high_w, high_h, high_v);

	return largest ? drm_mode_duplicate(dev, largest) : NULL;

}
@@ -725,7 +725,7 @@ nouveau_connector_create(struct drm_device *dev, int index, int type) 
	struct drm_encoder *encoder;

	int ret;



	NV_DEBUG(dev, "\n");

	NV_DEBUG_KMS(dev, "\n");



	nv_connector = kzalloc(sizeof(*nv_connector), GFP_KERNEL);

	if (!nv_connector)

drivers/gpu/drm/nouveau/nouveau_dp.c

+14 −14
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ nouveau_dp_link_train_adjust(struct drm_encoder *encoder, uint8_t *config) 
	if (ret)

		return false;



	NV_DEBUG(dev, "\t\tadjust 0x%02x 0x%02x\n", request[0], request[1]);

	NV_DEBUG_KMS(dev, "\t\tadjust 0x%02x 0x%02x\n", request[0], request[1]);



	/* Keep all lanes at the same level.. */

	for (i = 0; i < nv_encoder->dp.link_nr; i++) {
@@ -228,7 +228,7 @@ nouveau_dp_link_train_commit(struct drm_encoder *encoder, uint8_t *config) 
	int or = nv_encoder->or, link = !(nv_encoder->dcb->sorconf.link & 1);

	int dpe_headerlen, ret, i;



	NV_DEBUG(dev, "\t\tconfig 0x%02x 0x%02x 0x%02x 0x%02x\n",

	NV_DEBUG_KMS(dev, "\t\tconfig 0x%02x 0x%02x 0x%02x 0x%02x\n",

		 config[0], config[1], config[2], config[3]);



	dpe = nouveau_bios_dp_table(dev, nv_encoder->dcb, &dpe_headerlen);
@@ -276,12 +276,12 @@ nouveau_dp_link_train(struct drm_encoder *encoder) 
	bool cr_done, cr_max_vs, eq_done;

	int ret = 0, i, tries, voltage;



	NV_DEBUG(dev, "link training!!\n");

	NV_DEBUG_KMS(dev, "link training!!\n");

train:

	cr_done = eq_done = false;



	/* set link configuration */

	NV_DEBUG(dev, "\tbegin train: bw %d, lanes %d\n",

	NV_DEBUG_KMS(dev, "\tbegin train: bw %d, lanes %d\n",

		 nv_encoder->dp.link_bw, nv_encoder->dp.link_nr);



	ret = nouveau_dp_link_bw_set(encoder, nv_encoder->dp.link_bw);
@@ -297,7 +297,7 @@ train: 
		return false;



	/* clock recovery */

	NV_DEBUG(dev, "\tbegin cr\n");

	NV_DEBUG_KMS(dev, "\tbegin cr\n");

	ret = nouveau_dp_link_train_set(encoder, DP_TRAINING_PATTERN_1);

	if (ret)

		goto stop;
@@ -314,7 +314,7 @@ train: 
		ret = auxch_rd(encoder, DP_LANE0_1_STATUS, status, 2);

		if (ret)

			break;

		NV_DEBUG(dev, "\t\tstatus: 0x%02x 0x%02x\n",

		NV_DEBUG_KMS(dev, "\t\tstatus: 0x%02x 0x%02x\n",

			 status[0], status[1]);



		cr_done = true;
@@ -346,7 +346,7 @@ train: 
		goto stop;



	/* channel equalisation */

	NV_DEBUG(dev, "\tbegin eq\n");

	NV_DEBUG_KMS(dev, "\tbegin eq\n");

	ret = nouveau_dp_link_train_set(encoder, DP_TRAINING_PATTERN_2);

	if (ret)

		goto stop;
@@ -357,7 +357,7 @@ train: 
		ret = auxch_rd(encoder, DP_LANE0_1_STATUS, status, 3);

		if (ret)

			break;

		NV_DEBUG(dev, "\t\tstatus: 0x%02x 0x%02x\n",

		NV_DEBUG_KMS(dev, "\t\tstatus: 0x%02x 0x%02x\n",

			 status[0], status[1]);



		eq_done = true;
@@ -395,9 +395,9 @@ stop: 


	/* retry at a lower setting, if possible */

	if (!ret && !(eq_done && cr_done)) {

		NV_DEBUG(dev, "\twe failed\n");

		NV_DEBUG_KMS(dev, "\twe failed\n");

		if (nv_encoder->dp.link_bw != DP_LINK_BW_1_62) {

			NV_DEBUG(dev, "retry link training at low rate\n");

			NV_DEBUG_KMS(dev, "retry link training at low rate\n");

			nv_encoder->dp.link_bw = DP_LINK_BW_1_62;

			goto train;

		}
@@ -418,7 +418,7 @@ nouveau_dp_detect(struct drm_encoder *encoder) 
	if (ret)

		return false;



	NV_DEBUG(dev, "encoder: link_bw %d, link_nr %d\n"

	NV_DEBUG_KMS(dev, "encoder: link_bw %d, link_nr %d\n"

		      "display: link_bw %d, link_nr %d version 0x%02x\n",

		 nv_encoder->dcb->dpconf.link_bw,

		 nv_encoder->dcb->dpconf.link_nr,
@@ -446,7 +446,7 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr, 
	uint32_t tmp, ctrl, stat = 0, data32[4] = {};

	int ret = 0, i, index = auxch->rd;



	NV_DEBUG(dev, "ch %d cmd %d addr 0x%x len %d\n", index, cmd, addr, data_nr);

	NV_DEBUG_KMS(dev, "ch %d cmd %d addr 0x%x len %d\n", index, cmd, addr, data_nr);



	tmp = nv_rd32(dev, NV50_AUXCH_CTRL(auxch->rd));

	nv_wr32(dev, NV50_AUXCH_CTRL(auxch->rd), tmp | 0x00100000);
@@ -472,7 +472,7 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr, 
	if (!(cmd & 1)) {

		memcpy(data32, data, data_nr);

		for (i = 0; i < 4; i++) {

			NV_DEBUG(dev, "wr %d: 0x%08x\n", i, data32[i]);

			NV_DEBUG_KMS(dev, "wr %d: 0x%08x\n", i, data32[i]);

			nv_wr32(dev, NV50_AUXCH_DATA_OUT(index, i), data32[i]);

		}

	}
@@ -504,7 +504,7 @@ nouveau_dp_auxch(struct nouveau_i2c_chan *auxch, int cmd, int addr, 
	if (cmd & 1) {

		for (i = 0; i < 4; i++) {

			data32[i] = nv_rd32(dev, NV50_AUXCH_DATA_IN(index, i));

			NV_DEBUG(dev, "rd %d: 0x%08x\n", i, data32[i]);

			NV_DEBUG_KMS(dev, "rd %d: 0x%08x\n", i, data32[i]);

		}

		memcpy(data, data32, data_nr);

	}

drivers/gpu/drm/nouveau/nouveau_drv.h

+12 −2
Original line number Diff line number Diff line
@@ -1207,14 +1207,24 @@ static inline void nv_wo32(struct drm_device *dev, struct nouveau_gpuobj *obj, 
					pci_name(d->pdev), ##arg)

#ifndef NV_DEBUG_NOTRACE

#define NV_DEBUG(d, fmt, arg...) do {                                          \

	if (drm_debug) {                                                       \

	if (drm_debug & DRM_UT_DRIVER) {                                       \

		NV_PRINTK(KERN_DEBUG, d, "%s:%d - " fmt, __func__,             \

			  __LINE__, ##arg);                                    \

	}                                                                      \

} while (0)

#define NV_DEBUG_KMS(d, fmt, arg...) do {                                      \

	if (drm_debug & DRM_UT_KMS) {                                          \

		NV_PRINTK(KERN_DEBUG, d, "%s:%d - " fmt, __func__,             \

			  __LINE__, ##arg);                                    \

	}                                                                      \

} while (0)

#else

#define NV_DEBUG(d, fmt, arg...) do {                                          \

	if (drm_debug)                                                         \

	if (drm_debug & DRM_UT_DRIVER)                                         \

		NV_PRINTK(KERN_DEBUG, d, fmt, ##arg);                          \

} while (0)

#define NV_DEBUG_KMS(d, fmt, arg...) do {                                      \

	if (drm_debug & DRM_UT_KMS)                                            \

		NV_PRINTK(KERN_DEBUG, d, fmt, ##arg);                          \

} while (0)

#endif

drivers/gpu/drm/nouveau/nouveau_fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -347,7 +347,7 @@ out: 
int

nouveau_fbcon_probe(struct drm_device *dev)

{

	NV_DEBUG(dev, "\n");

	NV_DEBUG_KMS(dev, "\n");



	return drm_fb_helper_single_fb_probe(dev, 32, nouveau_fbcon_create);

}