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

Commit d9fdaafb authored by Dave Airlie's avatar Dave Airlie
Browse files

drm/radeon/kms: move a bunch of modesetting debug to correct debug usage. 



This migrates a bunch of DRM_DEBUG->DRM_DEBUG_KMS so we can get more modesetting related info without all the other ioctl handling easily.

Also the PM code moves to DRM_DEBUG_DRIVER mostly.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent d6486813

drivers/gpu/drm/radeon/atombios_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -818,7 +818,7 @@ static int evergreen_crtc_set_base(struct drm_crtc *crtc, int x, int y, 


	/* no fb bound */

	if (!crtc->fb) {

		DRM_DEBUG("No FB bound\n");

		DRM_DEBUG_KMS("No FB bound\n");

		return 0;

	}
@@ -957,7 +957,7 @@ static int avivo_crtc_set_base(struct drm_crtc *crtc, int x, int y, 


	/* no fb bound */

	if (!crtc->fb) {

		DRM_DEBUG("No FB bound\n");

		DRM_DEBUG_KMS("No FB bound\n");

		return 0;

	}

drivers/gpu/drm/radeon/atombios_dp.c

+9 −9
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE], 
		u8 this_v = dp_get_adjust_request_voltage(link_status, lane);

		u8 this_p = dp_get_adjust_request_pre_emphasis(link_status, lane);



		DRM_DEBUG("requested signal parameters: lane %d voltage %s pre_emph %s\n",

		DRM_DEBUG_KMS("requested signal parameters: lane %d voltage %s pre_emph %s\n",

			  lane,

			  voltage_names[this_v >> DP_TRAIN_VOLTAGE_SWING_SHIFT],

			  pre_emph_names[this_p >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
@@ -313,7 +313,7 @@ static void dp_get_adjust_train(u8 link_status[DP_LINK_STATUS_SIZE], 
	if (p >= dp_pre_emphasis_max(v))

		p = dp_pre_emphasis_max(v) | DP_TRAIN_MAX_PRE_EMPHASIS_REACHED;



	DRM_DEBUG("using signal parameters: voltage %s pre_emph %s\n",

	DRM_DEBUG_KMS("using signal parameters: voltage %s pre_emph %s\n",

		  voltage_names[(v & DP_TRAIN_VOLTAGE_SWING_MASK) >> DP_TRAIN_VOLTAGE_SWING_SHIFT],

		  pre_emph_names[(p & DP_TRAIN_PRE_EMPHASIS_MASK) >> DP_TRAIN_PRE_EMPHASIS_SHIFT]);
@@ -358,7 +358,7 @@ retry: 
	if (args.v1.ucReplyStatus && !args.v1.ucDataOutLen) {

		if (args.v1.ucReplyStatus == 0x20 && retry_count++ < 10)

			goto retry;

		DRM_DEBUG("failed to get auxch %02x%02x %02x %02x 0x%02x %02x after %d retries\n",

		DRM_DEBUG_KMS("failed to get auxch %02x%02x %02x %02x 0x%02x %02x after %d retries\n",

			  req_bytes[1], req_bytes[0], req_bytes[2], req_bytes[3],

			  chan->rec.i2c_id, args.v1.ucReplyStatus, retry_count);

		return false;
@@ -461,10 +461,10 @@ bool radeon_dp_getdpcd(struct radeon_connector *radeon_connector) 
		memcpy(dig_connector->dpcd, msg, 8);

		{

			int i;

			DRM_DEBUG("DPCD: ");

			DRM_DEBUG_KMS("DPCD: ");

			for (i = 0; i < 8; i++)

				DRM_DEBUG("%02x ", msg[i]);

			DRM_DEBUG("\n");

				DRM_DEBUG_KMS("%02x ", msg[i]);

			DRM_DEBUG_KMS("\n");

		}

		return true;

	}
@@ -512,7 +512,7 @@ static bool atom_dp_get_link_status(struct radeon_connector *radeon_connector, 
		return false;

	}



	DRM_DEBUG("link status %02x %02x %02x %02x %02x %02x\n",

	DRM_DEBUG_KMS("link status %02x %02x %02x %02x %02x %02x\n",

		  link_status[0], link_status[1], link_status[2],

		  link_status[3], link_status[4], link_status[5]);

	return true;
@@ -695,7 +695,7 @@ void dp_link_train(struct drm_encoder *encoder, 
	if (!clock_recovery)

		DRM_ERROR("clock recovery failed\n");

	else

		DRM_DEBUG("clock recovery at voltage %d pre-emphasis %d\n",

		DRM_DEBUG_KMS("clock recovery at voltage %d pre-emphasis %d\n",

			  train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK,

			  (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK) >>

			  DP_TRAIN_PRE_EMPHASIS_SHIFT);
@@ -739,7 +739,7 @@ void dp_link_train(struct drm_encoder *encoder, 
	if (!channel_eq)

		DRM_ERROR("channel eq failed\n");

	else

		DRM_DEBUG("channel eq at voltage %d pre-emphasis %d\n",

		DRM_DEBUG_KMS("channel eq at voltage %d pre-emphasis %d\n",

			  train_set[0] & DP_TRAIN_VOLTAGE_SWING_MASK,

			  (train_set[0] & DP_TRAIN_PRE_EMPHASIS_MASK)

			  >> DP_TRAIN_PRE_EMPHASIS_SHIFT);

drivers/gpu/drm/radeon/r100.c

+6 −6
Original line number Diff line number Diff line
@@ -141,7 +141,7 @@ void r100_pm_get_dynpm_state(struct radeon_device *rdev) 
	/* only one clock mode per power state */

	rdev->pm.requested_clock_mode_index = 0;



	DRM_DEBUG("Requested: e: %d m: %d p: %d\n",

	DRM_DEBUG_DRIVER("Requested: e: %d m: %d p: %d\n",

		  rdev->pm.power_state[rdev->pm.requested_power_state_index].

		  clock_info[rdev->pm.requested_clock_mode_index].sclk,

		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
@@ -276,7 +276,7 @@ void r100_pm_misc(struct radeon_device *rdev) 
	     rdev->pm.power_state[rdev->pm.current_power_state_index].pcie_lanes)) {

		radeon_set_pcie_lanes(rdev,

				      ps->pcie_lanes);

		DRM_DEBUG("Setting: p: %d\n", ps->pcie_lanes);

		DRM_DEBUG_DRIVER("Setting: p: %d\n", ps->pcie_lanes);

	}

}
@@ -849,7 +849,7 @@ static int r100_cp_init_microcode(struct radeon_device *rdev) 
	const char *fw_name = NULL;

	int err;



	DRM_DEBUG("\n");

	DRM_DEBUG_KMS("\n");



	pdev = platform_device_register_simple("radeon_cp", 0, NULL, 0);

	err = IS_ERR(pdev);
@@ -2642,7 +2642,7 @@ int r100_set_surface_reg(struct radeon_device *rdev, int reg, 
		flags |= pitch / 8;





	DRM_DEBUG("writing surface %d %d %x %x\n", reg, flags, offset, offset+obj_size-1);

	DRM_DEBUG_KMS("writing surface %d %d %x %x\n", reg, flags, offset, offset+obj_size-1);

	WREG32(RADEON_SURFACE0_INFO + surf_index, flags);

	WREG32(RADEON_SURFACE0_LOWER_BOUND + surf_index, offset);

	WREG32(RADEON_SURFACE0_UPPER_BOUND + surf_index, offset + obj_size - 1);
@@ -3038,7 +3038,7 @@ void r100_bandwidth_update(struct radeon_device *rdev) 
		}

#endif



		DRM_DEBUG("GRPH_BUFFER_CNTL from to %x\n",

		DRM_DEBUG_KMS("GRPH_BUFFER_CNTL from to %x\n",

			  /* 	  (unsigned int)info->SavedReg->grph_buffer_cntl, */

			  (unsigned int)RREG32(RADEON_GRPH_BUFFER_CNTL));

	}
@@ -3134,7 +3134,7 @@ void r100_bandwidth_update(struct radeon_device *rdev) 
			WREG32(RS400_DISP1_REQ_CNTL1, 0x28FBC3AC);

		}



		DRM_DEBUG("GRPH2_BUFFER_CNTL from to %x\n",

		DRM_DEBUG_KMS("GRPH2_BUFFER_CNTL from to %x\n",

			  (unsigned int)RREG32(RADEON_GRPH2_BUFFER_CNTL));

	}

}

drivers/gpu/drm/radeon/r600.c

+2 −2
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ void r600_pm_get_dynpm_state(struct radeon_device *rdev) 
		}

	}



	DRM_DEBUG("Requested: e: %d m: %d p: %d\n",

	DRM_DEBUG_DRIVER("Requested: e: %d m: %d p: %d\n",

		  rdev->pm.power_state[rdev->pm.requested_power_state_index].

		  clock_info[rdev->pm.requested_clock_mode_index].sclk,

		  rdev->pm.power_state[rdev->pm.requested_power_state_index].
@@ -586,7 +586,7 @@ void r600_pm_misc(struct radeon_device *rdev) 
		if (voltage->voltage != rdev->pm.current_vddc) {

			radeon_atom_set_voltage(rdev, voltage->voltage);

			rdev->pm.current_vddc = voltage->voltage;

			DRM_DEBUG("Setting: v: %d\n", voltage->voltage);

			DRM_DEBUG_DRIVER("Setting: v: %d\n", voltage->voltage);

		}

	}

}

drivers/gpu/drm/radeon/radeon_atombios.c

+22 −22
Original line number Diff line number Diff line
@@ -723,7 +723,7 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct 
		}



		if (i == ATOM_DEVICE_CV_INDEX) {

			DRM_DEBUG("Skipping Component Video\n");

			DRM_DEBUG_KMS("Skipping Component Video\n");

			continue;

		}
@@ -1095,7 +1095,7 @@ bool radeon_atombios_get_tmds_info(struct radeon_encoder *encoder, 
			    (tmds_info->asMiscInfo[i].

			     ucPLL_VoltageSwing & 0xf) << 16;



			DRM_DEBUG("TMDS PLL From ATOMBIOS %u %x\n",

			DRM_DEBUG_KMS("TMDS PLL From ATOMBIOS %u %x\n",

				  tmds->tmds_pll[i].freq,

				  tmds->tmds_pll[i].value);
@@ -2187,11 +2187,11 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_TV1_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_TV1_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("TV1 connected\n");

			DRM_DEBUG_KMS("TV1 connected\n");

			bios_3_scratch |= ATOM_S3_TV1_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_TV1;

		} else {

			DRM_DEBUG("TV1 disconnected\n");

			DRM_DEBUG_KMS("TV1 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_TV1_MASK;

			bios_3_scratch &= ~ATOM_S3_TV1_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_TV1;
@@ -2200,11 +2200,11 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_CV_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_CV_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("CV connected\n");

			DRM_DEBUG_KMS("CV connected\n");

			bios_3_scratch |= ATOM_S3_CV_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_CV;

		} else {

			DRM_DEBUG("CV disconnected\n");

			DRM_DEBUG_KMS("CV disconnected\n");

			bios_0_scratch &= ~ATOM_S0_CV_MASK;

			bios_3_scratch &= ~ATOM_S3_CV_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_CV;
@@ -2213,12 +2213,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_LCD1_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_LCD1_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("LCD1 connected\n");

			DRM_DEBUG_KMS("LCD1 connected\n");

			bios_0_scratch |= ATOM_S0_LCD1;

			bios_3_scratch |= ATOM_S3_LCD1_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_LCD1;

		} else {

			DRM_DEBUG("LCD1 disconnected\n");

			DRM_DEBUG_KMS("LCD1 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_LCD1;

			bios_3_scratch &= ~ATOM_S3_LCD1_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_LCD1;
@@ -2227,12 +2227,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_CRT1_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_CRT1_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("CRT1 connected\n");

			DRM_DEBUG_KMS("CRT1 connected\n");

			bios_0_scratch |= ATOM_S0_CRT1_COLOR;

			bios_3_scratch |= ATOM_S3_CRT1_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_CRT1;

		} else {

			DRM_DEBUG("CRT1 disconnected\n");

			DRM_DEBUG_KMS("CRT1 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_CRT1_MASK;

			bios_3_scratch &= ~ATOM_S3_CRT1_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_CRT1;
@@ -2241,12 +2241,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_CRT2_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_CRT2_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("CRT2 connected\n");

			DRM_DEBUG_KMS("CRT2 connected\n");

			bios_0_scratch |= ATOM_S0_CRT2_COLOR;

			bios_3_scratch |= ATOM_S3_CRT2_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_CRT2;

		} else {

			DRM_DEBUG("CRT2 disconnected\n");

			DRM_DEBUG_KMS("CRT2 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_CRT2_MASK;

			bios_3_scratch &= ~ATOM_S3_CRT2_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_CRT2;
@@ -2255,12 +2255,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_DFP1_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_DFP1_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("DFP1 connected\n");

			DRM_DEBUG_KMS("DFP1 connected\n");

			bios_0_scratch |= ATOM_S0_DFP1;

			bios_3_scratch |= ATOM_S3_DFP1_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_DFP1;

		} else {

			DRM_DEBUG("DFP1 disconnected\n");

			DRM_DEBUG_KMS("DFP1 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_DFP1;

			bios_3_scratch &= ~ATOM_S3_DFP1_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP1;
@@ -2269,12 +2269,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_DFP2_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_DFP2_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("DFP2 connected\n");

			DRM_DEBUG_KMS("DFP2 connected\n");

			bios_0_scratch |= ATOM_S0_DFP2;

			bios_3_scratch |= ATOM_S3_DFP2_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_DFP2;

		} else {

			DRM_DEBUG("DFP2 disconnected\n");

			DRM_DEBUG_KMS("DFP2 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_DFP2;

			bios_3_scratch &= ~ATOM_S3_DFP2_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP2;
@@ -2283,12 +2283,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_DFP3_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_DFP3_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("DFP3 connected\n");

			DRM_DEBUG_KMS("DFP3 connected\n");

			bios_0_scratch |= ATOM_S0_DFP3;

			bios_3_scratch |= ATOM_S3_DFP3_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_DFP3;

		} else {

			DRM_DEBUG("DFP3 disconnected\n");

			DRM_DEBUG_KMS("DFP3 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_DFP3;

			bios_3_scratch &= ~ATOM_S3_DFP3_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP3;
@@ -2297,12 +2297,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_DFP4_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_DFP4_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("DFP4 connected\n");

			DRM_DEBUG_KMS("DFP4 connected\n");

			bios_0_scratch |= ATOM_S0_DFP4;

			bios_3_scratch |= ATOM_S3_DFP4_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_DFP4;

		} else {

			DRM_DEBUG("DFP4 disconnected\n");

			DRM_DEBUG_KMS("DFP4 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_DFP4;

			bios_3_scratch &= ~ATOM_S3_DFP4_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP4;
@@ -2311,12 +2311,12 @@ radeon_atombios_connected_scratch_regs(struct drm_connector *connector, 
	if ((radeon_encoder->devices & ATOM_DEVICE_DFP5_SUPPORT) &&

	    (radeon_connector->devices & ATOM_DEVICE_DFP5_SUPPORT)) {

		if (connected) {

			DRM_DEBUG("DFP5 connected\n");

			DRM_DEBUG_KMS("DFP5 connected\n");

			bios_0_scratch |= ATOM_S0_DFP5;

			bios_3_scratch |= ATOM_S3_DFP5_ACTIVE;

			bios_6_scratch |= ATOM_S6_ACC_REQ_DFP5;

		} else {

			DRM_DEBUG("DFP5 disconnected\n");

			DRM_DEBUG_KMS("DFP5 disconnected\n");

			bios_0_scratch &= ~ATOM_S0_DFP5;

			bios_3_scratch &= ~ATOM_S3_DFP5_ACTIVE;

			bios_6_scratch &= ~ATOM_S6_ACC_REQ_DFP5;