mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-04-23 05:56:14 -04:00
drm/amd/display: use drm_info instead of DRM_INFO
drm_info prints the drm device instance which is helpful when debugging multi gpu issues Reviewed-by: Alex Hung <alex.hung@amd.com> Signed-off-by: Aurabindo Pillai <aurabindo.pillai@amd.com> Signed-off-by: Fangzhi Zuo <jerry.zuo@amd.com> Tested-by: Daniel Wheeler <daniel.wheeler@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
committed by
Alex Deucher
parent
3b258b6f52
commit
50d6714b24
@@ -783,7 +783,7 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,
|
||||
|
||||
/* Skip DMUB HPD IRQ in suspend/resume. We will probe them later. */
|
||||
if (notify->type == DMUB_NOTIFICATION_HPD && adev->in_suspend) {
|
||||
DRM_INFO("Skip DMUB HPD IRQ callback in suspend/resume\n");
|
||||
drm_info(adev_to_drm(adev), "Skip DMUB HPD IRQ callback in suspend/resume\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -800,9 +800,9 @@ static void dmub_hpd_callback(struct amdgpu_device *adev,
|
||||
aconnector = to_amdgpu_dm_connector(connector);
|
||||
if (link && aconnector->dc_link == link) {
|
||||
if (notify->type == DMUB_NOTIFICATION_HPD)
|
||||
DRM_INFO("DMUB HPD IRQ callback: link_index=%u\n", link_index);
|
||||
drm_info(adev_to_drm(adev), "DMUB HPD IRQ callback: link_index=%u\n", link_index);
|
||||
else if (notify->type == DMUB_NOTIFICATION_HPD_IRQ)
|
||||
DRM_INFO("DMUB HPD RX IRQ callback: link_index=%u\n", link_index);
|
||||
drm_info(adev_to_drm(adev), "DMUB HPD RX IRQ callback: link_index=%u\n", link_index);
|
||||
else
|
||||
DRM_WARN("DMUB Unknown HPD callback type %d, link_index=%u\n",
|
||||
notify->type, link_index);
|
||||
@@ -1014,7 +1014,7 @@ static void amdgpu_dm_fbc_init(struct drm_connector *connector)
|
||||
drm_err(adev_to_drm(adev), "DM: Failed to initialize FBC\n");
|
||||
else {
|
||||
adev->dm.dc->ctx->fbc_gpu_addr = compressor->gpu_addr;
|
||||
DRM_INFO("DM: FBC alloc %lu\n", max_size*4);
|
||||
drm_info(adev_to_drm(adev), "DM: FBC alloc %lu\n", max_size*4);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1200,7 +1200,7 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
|
||||
}
|
||||
|
||||
if (!has_hw_support) {
|
||||
DRM_INFO("DMUB unsupported on ASIC\n");
|
||||
drm_info(adev_to_drm(adev), "DMUB unsupported on ASIC\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -1319,7 +1319,7 @@ static int dm_dmub_hw_init(struct amdgpu_device *adev)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
DRM_INFO("DMUB hardware initialized: version=0x%08X\n",
|
||||
drm_info(adev_to_drm(adev), "DMUB hardware initialized: version=0x%08X\n",
|
||||
adev->dm.dmcub_fw_version);
|
||||
|
||||
/* Keeping sanity checks off if
|
||||
@@ -2094,10 +2094,10 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
adev->dm.dc = dc_create(&init_data);
|
||||
|
||||
if (adev->dm.dc) {
|
||||
DRM_INFO("Display Core v%s initialized on %s\n", DC_VER,
|
||||
drm_info(adev_to_drm(adev), "Display Core v%s initialized on %s\n", DC_VER,
|
||||
dce_version_to_string(adev->dm.dc->ctx->dce_version));
|
||||
} else {
|
||||
DRM_INFO("Display Core failed to initialize with v%s!\n", DC_VER);
|
||||
drm_info(adev_to_drm(adev), "Display Core failed to initialize with v%s!\n", DC_VER);
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -2137,7 +2137,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
adev->dm.dc->debug.ignore_cable_id = true;
|
||||
|
||||
if (adev->dm.dc->caps.dp_hdmi21_pcon_support)
|
||||
DRM_INFO("DP-HDMI FRL PCON supported\n");
|
||||
drm_info(adev_to_drm(adev), "DP-HDMI FRL PCON supported\n");
|
||||
|
||||
r = dm_dmub_hw_init(adev);
|
||||
if (r) {
|
||||
@@ -2197,7 +2197,7 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
|
||||
init_completion(&adev->dm.dmub_aux_transfer_done);
|
||||
adev->dm.dmub_notify = kzalloc(sizeof(struct dmub_notification), GFP_KERNEL);
|
||||
if (!adev->dm.dmub_notify) {
|
||||
DRM_INFO("amdgpu: fail to allocate adev->dm.dmub_notify");
|
||||
drm_info(adev_to_drm(adev), "amdgpu: fail to allocate adev->dm.dmub_notify");
|
||||
goto error;
|
||||
}
|
||||
|
||||
@@ -2573,7 +2573,7 @@ static int dm_dmub_sw_init(struct amdgpu_device *adev)
|
||||
adev->firmware.fw_size +=
|
||||
ALIGN(le32_to_cpu(hdr->inst_const_bytes), PAGE_SIZE);
|
||||
|
||||
DRM_INFO("Loading DMUB firmware via PSP: version=0x%08X\n",
|
||||
drm_info(adev_to_drm(adev), "Loading DMUB firmware via PSP: version=0x%08X\n",
|
||||
adev->dm.dmcub_fw_version);
|
||||
}
|
||||
|
||||
@@ -10237,7 +10237,7 @@ static void amdgpu_dm_atomic_commit_tail(struct drm_atomic_state *state)
|
||||
new_con_state->content_protection >= DRM_MODE_CONTENT_PROTECTION_DESIRED)
|
||||
enable_encryption = true;
|
||||
|
||||
DRM_INFO("[HDCP_DM] hdcp_update_display enable_encryption = %x\n", enable_encryption);
|
||||
drm_info(adev_to_drm(adev), "[HDCP_DM] hdcp_update_display enable_encryption = %x\n", enable_encryption);
|
||||
|
||||
if (aconnector->dc_link)
|
||||
hdcp_update_display(
|
||||
|
||||
Reference in New Issue
Block a user