Commit 869e3869 authored by Aurabindo Pillai's avatar Aurabindo Pillai Committed by Alex Deucher
Browse files

drm/amd/display: switch to drm_dbg_kms() from DRM_DEBUG_KMS 



DRM_DEBUG_ class of macros are depricated. Recommended drm_dbg_kms() has
the advantage of being able to distinguish the logs from devices in a
multi-gpu environment.

Where a pointer to struct amdgpu_device is available, use that to get
the drm device.

Reviewed-by: default avatarSun peng (Leo) Li <sunpeng.li@amd.com>
Signed-off-by: default avatarAurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarMatthew Stewart <matthew.stewart2@amd.com>
Tested-by: default avatarDan Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent e9306b69

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

+15 −15
Original line number Diff line number Diff line
@@ -1137,7 +1137,7 @@ static int amdgpu_dm_audio_component_get_eld(struct device *kdev, int port, 


	mutex_unlock(&adev->dm.audio_lock);



	DRM_DEBUG_KMS("Get ELD : idx=%d ret=%d en=%d\n", port, ret, *enabled);

	drm_dbg_kms(adev_to_drm(adev), "Get ELD : idx=%d ret=%d en=%d\n", port, ret, *enabled);



	return ret;

}
@@ -1231,7 +1231,7 @@ static void amdgpu_dm_audio_eld_notify(struct amdgpu_device *adev, int pin) 
	struct drm_audio_component *acomp = adev->dm.audio_component;



	if (acomp && acomp->audio_ops && acomp->audio_ops->pin_eld_notify) {

		DRM_DEBUG_KMS("Notify ELD: %d\n", pin);

		drm_dbg_kms(adev_to_drm(adev), "Notify ELD: %d\n", pin);



		acomp->audio_ops->pin_eld_notify(acomp->audio_ops->audio_ptr,

						 pin, -1);
@@ -2377,7 +2377,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) 
	}



	if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP) {

		DRM_DEBUG_KMS("dm: DMCU firmware not supported on direct or SMU loading\n");

		drm_dbg_kms(adev_to_drm(adev), "dm: DMCU firmware not supported on direct or SMU loading\n");

		return 0;

	}
@@ -2385,7 +2385,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) 
				 "%s", fw_name_dmcu);

	if (r == -ENODEV) {

		/* DMCU firmware is not necessary, so don't raise a fuss if it's missing */

		DRM_DEBUG_KMS("dm: DMCU firmware not found\n");

		drm_dbg_kms(adev_to_drm(adev), "dm: DMCU firmware not found\n");

		adev->dm.fw_dmcu = NULL;

		return 0;

	}
@@ -2409,7 +2409,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev) 


	adev->dm.dmcu_fw_version = le32_to_cpu(hdr->header.ucode_version);



	DRM_DEBUG_KMS("PSP loading DMCU firmware\n");

	drm_dbg_kms(adev_to_drm(adev), "PSP loading DMCU firmware\n");



	return 0;

}
@@ -4157,7 +4157,7 @@ static void schedule_hpd_rx_offload_work(struct amdgpu_device *adev, struct hpd_ 
	offload_work->adev = adev;



	queue_work(offload_wq->wq, &offload_work->work);

	DRM_DEBUG_KMS("queue work to handle hpd_rx offload work");

	drm_dbg_kms(adev_to_drm(adev), "queue work to handle hpd_rx offload work");

}



static void handle_hpd_rx_irq(void *param)
@@ -4986,7 +4986,7 @@ static void amdgpu_dm_update_backlight_caps(struct amdgpu_display_manager *dm, 
		    caps->min_input_signal < 0 ||

		    spread > AMDGPU_DM_DEFAULT_MAX_BACKLIGHT ||

		    spread < AMDGPU_DM_MIN_SPREAD) {

			DRM_DEBUG_KMS("DM: Invalid backlight caps: min=%d, max=%d\n",

			drm_dbg_kms(adev_to_drm(dm->adev), "DM: Invalid backlight caps: min=%d, max=%d\n",

				      caps->min_input_signal, caps->max_input_signal);

			caps->caps_valid = false;

		}
@@ -5515,7 +5515,7 @@ static int amdgpu_dm_initialize_drm_device(struct amdgpu_device *adev) 
		}

		break;

	default:

		DRM_DEBUG_KMS("Unsupported DCN IP version for outbox: 0x%X\n",

		drm_dbg_kms(adev_to_drm(adev), "Unsupported DCN IP version for outbox: 0x%X\n",

			      amdgpu_ip_version(adev, DCE_HWIP, 0));

	}
@@ -9628,7 +9628,7 @@ static void update_freesync_state_on_stream( 
	new_stream->allow_freesync = mod_freesync_get_freesync_enabled(&vrr_params);



	if (new_crtc_state->freesync_vrr_info_changed)

		DRM_DEBUG_KMS("VRR packet update: crtc=%u enabled=%d state=%d",

		drm_dbg_kms(adev_to_drm(adev), "VRR packet update: crtc=%u enabled=%d state=%d",

			      new_crtc_state->base.crtc->base.id,

			      (int)new_crtc_state->base.vrr_enabled,

			      (int)vrr_params.state);
@@ -11574,7 +11574,7 @@ static int dm_update_crtc_state(struct amdgpu_display_manager *dm, 


			dc_stream_retain(new_stream);



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

			drm_dbg_atomic(adev_to_drm(adev), "Enabling DRM crtc: %d\n",

					 crtc->base.id);



			if (dc_state_add_stream(
@@ -11804,14 +11804,14 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc, 


	if (fb->width > new_acrtc->max_cursor_width ||

	    fb->height > new_acrtc->max_cursor_height) {

		DRM_DEBUG_ATOMIC("Bad cursor FB size %dx%d\n",

		drm_dbg_atomic(adev_to_drm(adev), "Bad cursor FB size %dx%d\n",

				 new_plane_state->fb->width,

				 new_plane_state->fb->height);

		return -EINVAL;

	}

	if (new_plane_state->src_w != fb->width << 16 ||

	    new_plane_state->src_h != fb->height << 16) {

		DRM_DEBUG_ATOMIC("Cropping not supported for cursor plane\n");

		drm_dbg_atomic(adev_to_drm(adev), "Cropping not supported for cursor plane\n");

		return -EINVAL;

	}
@@ -11819,7 +11819,7 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc, 
	pitch = fb->pitches[0] / fb->format->cpp[0];



	if (fb->width != pitch) {

		DRM_DEBUG_ATOMIC("Cursor FB width %d doesn't match pitch %d",

		drm_dbg_atomic(adev_to_drm(adev), "Cursor FB width %d doesn't match pitch %d",

				 fb->width, pitch);

		return -EINVAL;

	}
@@ -11831,7 +11831,7 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc, 
		/* FB pitch is supported by cursor plane */

		break;

	default:

		DRM_DEBUG_ATOMIC("Bad cursor FB pitch %d px\n", pitch);

		drm_dbg_atomic(adev_to_drm(adev), "Bad cursor FB pitch %d px\n", pitch);

		return -EINVAL;

	}
@@ -11849,7 +11849,7 @@ static int dm_check_cursor_fb(struct amdgpu_crtc *new_acrtc, 
				 AMDGPU_TILING_GET(afb->tiling_flags, MICRO_TILE_MODE) == 0;

		}

		if (!linear) {

			DRM_DEBUG_ATOMIC("Cursor FB not linear");

			drm_dbg_atomic(adev_to_drm(adev), "Cursor FB not linear");

			return -EINVAL;

		}

	}