Commit 4711c033 authored by Luben Tuikov's avatar Luben Tuikov Committed by Alex Deucher
Browse files

drm/amd/display: Use appropriate DRM_DEBUG_... level 



Convert IRQ-based prints from DRM_DEBUG_DRIVER to
the appropriate DRM log type, since IRQ-based
prints drown out the rest of the driver's
DRM_DEBUG_DRIVER messages.

v2: Update as per feedback to fine-tune for each
type of DRM log level.

Cc: Harry Wentland <Harry.Wentland@amd.com>
Cc: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarLuben Tuikov <luben.tuikov@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9b7f1e04

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c

+28 −29
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static void dm_pflip_high_irq(void *interrupt_params) 
	amdgpu_crtc->pflip_status = AMDGPU_FLIP_NONE;

	spin_unlock_irqrestore(&adev_to_drm(adev)->event_lock, flags);



	DRM_DEBUG_DRIVER("crtc:%d[%p], pflip_stat:AMDGPU_FLIP_NONE, vrr[%d]-fp %d\n",

	DRM_DEBUG_KMS("crtc:%d[%p], pflip_stat:AMDGPU_FLIP_NONE, vrr[%d]-fp %d\n",

		      amdgpu_crtc->crtc_id, amdgpu_crtc,

		      vrr_active, (int) !e);

}
@@ -1018,8 +1018,7 @@ static void event_mall_stutter(struct work_struct *work) 


	dc_allow_idle_optimizations(dm->dc, dm->active_vblank_irq_count == 0);



	DRM_DEBUG_DRIVER("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0);



	DRM_DEBUG_KMS("Allow idle optimizations (MALL): %d\n", dm->active_vblank_irq_count == 0);



	mutex_unlock(&dm->dc_lock);

}
@@ -1835,7 +1834,7 @@ static void dm_gpureset_toggle_interrupts(struct amdgpu_device *adev, 
		if (acrtc && state->stream_status[i].plane_count != 0) {

			irq_source = IRQ_TYPE_PFLIP + acrtc->otg_inst;

			rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;

			DRM_DEBUG("crtc %d - vupdate irq %sabling: r=%d\n",

			DRM_DEBUG_VBL("crtc %d - vupdate irq %sabling: r=%d\n",

				      acrtc->crtc_id, enable ? "en" : "dis", rc);

			if (rc)

				DRM_WARN("Failed to %s pflip interrupts\n",
@@ -4940,7 +4939,7 @@ static void update_stream_scaling_settings(const struct drm_display_mode *mode, 
	stream->src = src;

	stream->dst = dst;



	DRM_DEBUG_DRIVER("Destination Rectangle x:%d  y:%d  width:%d  height:%d\n",

	DRM_DEBUG_KMS("Destination Rectangle x:%d  y:%d  width:%d  height:%d\n",

		      dst.x, dst.y, dst.width, dst.height);



}
@@ -5684,7 +5683,7 @@ static inline int dm_set_vupdate_irq(struct drm_crtc *crtc, bool enable) 


	rc = dc_interrupt_set(adev->dm.dc, irq_source, enable) ? 0 : -EBUSY;



	DRM_DEBUG_DRIVER("crtc %d - vupdate irq %sabling: r=%d\n",

	DRM_DEBUG_VBL("crtc %d - vupdate irq %sabling: r=%d\n",

		      acrtc->crtc_id, enable ? "en" : "dis", rc);

	return rc;

}
@@ -6625,7 +6624,7 @@ static int dm_plane_helper_prepare_fb(struct drm_plane *plane, 
	int r;



	if (!new_state->fb) {

		DRM_DEBUG_DRIVER("No FB bound\n");

		DRM_DEBUG_KMS("No FB bound\n");

		return 0;

	}
@@ -7858,7 +7857,7 @@ static void handle_cursor_update(struct drm_plane *plane, 
	if (!plane->state->fb && !old_plane_state->fb)

		return;



	DRM_DEBUG_DRIVER("%s: crtc_id=%d with size %d to %d\n",

	DRM_DEBUG_KMS("%s: crtc_id=%d with size %d to %d\n",

		      __func__,

		      amdgpu_crtc->crtc_id,

		      plane->state->crtc_w,
@@ -7920,7 +7919,7 @@ static void prepare_flip_isr(struct amdgpu_crtc *acrtc) 
	/* Mark this event as consumed */

	acrtc->base.state->event = NULL;



	DRM_DEBUG_DRIVER("crtc:%d, pflip_stat:AMDGPU_FLIP_SUBMITTED\n",

	DRM_DEBUG_KMS("crtc:%d, pflip_stat:AMDGPU_FLIP_SUBMITTED\n",

		      acrtc->crtc_id);

}
@@ -8227,7 +8226,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
			&bundle->flip_addrs[planes_count].address,

			afb->tmz_surface, false);



		DRM_DEBUG_DRIVER("plane: id=%d dcc_en=%d\n",

		DRM_DEBUG_ATOMIC("plane: id=%d dcc_en=%d\n",

				 new_plane_state->plane->index,

				 bundle->plane_infos[planes_count].dcc.enable);
@@ -8261,7 +8260,7 @@ static void amdgpu_dm_commit_planes(struct drm_atomic_state *state, 
				dc_plane,

				bundle->flip_addrs[planes_count].flip_timestamp_in_us);



		DRM_DEBUG_DRIVER("%s Flipping to hi: 0x%x, low: 0x%x\n",

		DRM_DEBUG_ATOMIC("%s Flipping to hi: 0x%x, low: 0x%x\n",

				 __func__,

				 bundle->flip_addrs[planes_count].address.grph.addr.high_part,

				 bundle->flip_addrs[planes_count].address.grph.addr.low_part);
@@ -8583,7 +8582,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
		dm_new_crtc_state = to_dm_crtc_state(new_crtc_state);

		dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);



		DRM_DEBUG_DRIVER(

		DRM_DEBUG_ATOMIC(

			"amdgpu_crtc id:%d crtc_state_flags: enable:%d, active:%d, "

			"planes_changed:%d, mode_changed:%d,active_changed:%d,"

			"connectors_changed:%d\n",
@@ -8617,7 +8616,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 


		if (modeset_required(new_crtc_state, dm_new_crtc_state->stream, dm_old_crtc_state->stream)) {



			DRM_DEBUG_DRIVER("Atomic commit: SET crtc id %d: [%p]\n", acrtc->crtc_id, acrtc);

			DRM_DEBUG_ATOMIC("Atomic commit: SET crtc id %d: [%p]\n", acrtc->crtc_id, acrtc);



			if (!dm_new_crtc_state->stream) {

				/*
@@ -8650,7 +8649,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state) 
			crtc->hwmode = new_crtc_state->mode;

			mode_set_reset_required = true;

		} else if (modereset_required(new_crtc_state)) {

			DRM_DEBUG_DRIVER("Atomic commit: RESET. crtc id %d:[%p]\n", acrtc->crtc_id, acrtc);

			DRM_DEBUG_ATOMIC("Atomic commit: RESET. crtc id %d:[%p]\n", acrtc->crtc_id, acrtc);

			/* i.e. reset mode */

			if (dm_old_crtc_state->stream)

				remove_stream(adev, acrtc, dm_old_crtc_state->stream);
@@ -9255,7 +9254,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, 
	if (!drm_atomic_crtc_needs_modeset(new_crtc_state))

		goto skip_modeset;



	DRM_DEBUG_DRIVER(

	DRM_DEBUG_ATOMIC(

		"amdgpu_crtc id:%d crtc_state_flags: enable:%d, active:%d, "

		"planes_changed:%d, mode_changed:%d,active_changed:%d,"

		"connectors_changed:%d\n",
@@ -9339,7 +9338,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, 


			dc_stream_retain(new_stream);



			DRM_DEBUG_DRIVER("Enabling DRM crtc: %d\n",

			DRM_DEBUG_ATOMIC("Enabling DRM crtc: %d\n",

					 crtc->base.id);



			if (dc_add_stream_to_ctx(
@@ -9685,7 +9684,7 @@ static int dm_update_plane_state(struct dc *dc, 
		if (!dc_new_plane_state)

			return -ENOMEM;



		DRM_DEBUG_DRIVER("Enabling DRM plane: %d on DRM crtc %d\n",

		DRM_DEBUG_ATOMIC("Enabling DRM plane: %d on DRM crtc %d\n",

				 plane->base.id, new_plane_crtc->base.id);



		ret = fill_dc_plane_attributes(