drm/amd/display: Adjust all dev_*() messages to drm_*()

[Why]
dev_*() messages don't show that they are from a driver in drm
subsystem.

[How]
Change all dev_*() messages to drm_*() messages.

Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Roman Li <roman.li@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
index 40915767265d048079d1e8ea3b95cff069910b86..b920760108d2c40aac4ed14b86acc898685a3af2 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -2503,7 +2503,7 @@ static int load_dmcu_fw(struct amdgpu_device *adev)
                return 0;
        }
        if (r) {
-               dev_err(adev->dev, "amdgpu_dm: Can't validate firmware \"%s\"\n",
+               drm_err(adev_to_drm(adev), "amdgpu_dm: Can't validate firmware \"%s\"\n",
                        fw_name_dmcu);
                amdgpu_ucode_release(&adev->dm.fw_dmcu);
                return r;
@@ -3052,13 +3052,13 @@ static int dm_oem_i2c_hw_init(struct amdgpu_device *adev)
        if (oem_ddc_service) {
                oem_i2c = create_i2c(oem_ddc_service, true);
                if (!oem_i2c) {
-                       dev_info(adev->dev, "Failed to create oem i2c adapter data\n");
+                       drm_info(adev_to_drm(adev), "Failed to create oem i2c adapter data\n");
                        return -ENOMEM;
                }
 
                r = i2c_add_adapter(&oem_i2c->base);
                if (r) {
-                       dev_info(adev->dev, "Failed to register oem i2c\n");
+                       drm_info(adev_to_drm(adev), "Failed to register oem i2c\n");
                        kfree(oem_i2c);
                        return r;
                }
@@ -3101,7 +3101,7 @@ static int dm_hw_init(struct amdgpu_ip_block *ip_block)
 
        r = dm_oem_i2c_hw_init(adev);
        if (r)
-               dev_info(adev->dev, "Failed to add OEM i2c bus\n");
+               drm_info(adev_to_drm(adev), "Failed to add OEM i2c bus\n");
 
        return 0;
 }
@@ -5648,7 +5648,7 @@ static int dm_early_init(struct amdgpu_ip_block *ip_block)
        /* if there is no object header, skip DM */
        if (!amdgpu_atom_parse_data_header(ctx, index, NULL, NULL, NULL, &data_offset)) {
                adev->harvest_ip_mask |= AMD_HARVEST_IP_DMU_MASK;
-               dev_info(adev->dev, "No object header, skipping DM\n");
+               drm_info(adev_to_drm(adev), "No object header, skipping DM\n");
                return -ENOENT;
        }
 

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
index 3e0f45f1711c1b9da52d50cf159fe82cea8c78a9..b7c6e8d13435017f1d449c5a5b85ff4a886b762d 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c
@@ -948,13 +948,13 @@ static int amdgpu_dm_plane_helper_prepare_fb(struct drm_plane *plane,
        adev = amdgpu_ttm_adev(rbo->tbo.bdev);
        r = amdgpu_bo_reserve(rbo, true);
        if (r) {
-               dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
+               drm_err(adev_to_drm(adev), "fail to reserve bo (%d)\n", r);
                return r;
        }
 
        r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
        if (r) {
-               dev_err(adev->dev, "reserving fence slot failed (%d)\n", r);
+               drm_err(adev_to_drm(adev), "reserving fence slot failed (%d)\n", r);
                goto error_unlock;
        }
 

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
index 0d5fefb0f5917cfdca20bec6a4a5d4418eba3ae6..d9527c05fc878ef6916782ff9fde847813938461 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c
@@ -102,13 +102,13 @@ static int amdgpu_dm_wb_prepare_job(struct drm_writeback_connector *wb_connector
 
        r = amdgpu_bo_reserve(rbo, true);
        if (r) {
-               dev_err(adev->dev, "fail to reserve bo (%d)\n", r);
+               drm_err(adev_to_drm(adev), "fail to reserve bo (%d)\n", r);
                return r;
        }
 
        r = dma_resv_reserve_fences(rbo->tbo.base.resv, 1);
        if (r) {
-               dev_err(adev->dev, "reserving fence slot failed (%d)\n", r);
+               drm_err(adev_to_drm(adev), "reserving fence slot failed (%d)\n", r);
                goto error_unlock;
        }