From: Mario Limonciello <mario.limoncie...@amd.com>
Messages emitted from amdgpu connector are currently with legacy DRM
macros. These don't show which device they are using. To make messages
clearer in multi-GPU systems adjust to drm_*() macros.
Signed-off-by: Mario Limonciello <mario.limoncie...@amd.com>
---
.../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 22 +++++++++----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
index 344e0a9ee08a9..2521220e21f93 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -882,7 +882,7 @@ amdgpu_connector_vga_detect(struct drm_connector
*connector, bool force)
amdgpu_connector_get_edid(connector);
if (!amdgpu_connector->edid) {
- DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
+ drm_err(connector->dev, "%s: probed a monitor but
no|invalid EDID\n",
connector->name);
ret = connector_status_connected;
} else {
@@ -1063,7 +1063,7 @@ amdgpu_connector_dvi_detect(struct drm_connector
*connector, bool force)
amdgpu_connector_get_edid(connector);
if (!amdgpu_connector->edid) {
- DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
+ drm_err(adev_to_drm(adev), "%s: probed a monitor but
no|invalid EDID\n",
connector->name);
ret = connector_status_connected;
broken_edid = true; /* defer use_digital to later */
@@ -1638,7 +1638,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
if (router->ddc_valid || router->cd_valid) {
amdgpu_connector->router_bus = amdgpu_i2c_lookup(adev,
&router->i2c_info);
if (!amdgpu_connector->router_bus)
- DRM_ERROR("Failed to assign router i2c bus! Check dmesg
for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "Failed to assign router i2c
bus! Check dmesg for i2c errors.\n");
}
if (is_dp_bridge) {
@@ -1652,7 +1652,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
has_aux = true;
ddc = &amdgpu_connector->ddc_bus->adapter;
} else {
- DRM_ERROR("DP: Failed to assign ddc bus! Check
dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "DP: Failed to
assign ddc bus! Check dmesg for i2c errors.\n");
}
}
switch (connector_type) {
@@ -1746,7 +1746,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
if (i2c_bus->valid) {
amdgpu_connector->ddc_bus =
amdgpu_i2c_lookup(adev, i2c_bus);
if (!amdgpu_connector->ddc_bus)
- DRM_ERROR("VGA: Failed to assign ddc
bus! Check dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "VGA: Failed
to assign ddc bus! Check dmesg for i2c errors.\n");
else
ddc =
&amdgpu_connector->ddc_bus->adapter;
}
@@ -1771,7 +1771,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
if (i2c_bus->valid) {
amdgpu_connector->ddc_bus =
amdgpu_i2c_lookup(adev, i2c_bus);
if (!amdgpu_connector->ddc_bus)
- DRM_ERROR("DVIA: Failed to assign ddc
bus! Check dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "DVIA:
Failed to assign ddc bus! Check dmesg for i2c errors.\n");
else
ddc =
&amdgpu_connector->ddc_bus->adapter;
}
@@ -1801,7 +1801,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
if (i2c_bus->valid) {
amdgpu_connector->ddc_bus =
amdgpu_i2c_lookup(adev, i2c_bus);
if (!amdgpu_connector->ddc_bus)
- DRM_ERROR("DVI: Failed to assign ddc
bus! Check dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "DVI: Failed
to assign ddc bus! Check dmesg for i2c errors.\n");
else
ddc =
&amdgpu_connector->ddc_bus->adapter;
}
@@ -1857,7 +1857,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
if (i2c_bus->valid) {
amdgpu_connector->ddc_bus =
amdgpu_i2c_lookup(adev, i2c_bus);
if (!amdgpu_connector->ddc_bus)
- DRM_ERROR("HDMI: Failed to assign ddc
bus! Check dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "HDMI:
Failed to assign ddc bus! Check dmesg for i2c errors.\n");
else
ddc =
&amdgpu_connector->ddc_bus->adapter;
}
@@ -1908,7 +1908,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
has_aux = true;
ddc =
&amdgpu_connector->ddc_bus->adapter;
} else {
- DRM_ERROR("DP: Failed to assign ddc
bus! Check dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "DP: Failed
to assign ddc bus! Check dmesg for i2c errors.\n");
}
}
drm_connector_init_with_ddc(dev,
&amdgpu_connector->base,
@@ -1956,7 +1956,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
has_aux = true;
ddc =
&amdgpu_connector->ddc_bus->adapter;
} else {
- DRM_ERROR("DP: Failed to assign ddc
bus! Check dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "DP: Failed
to assign ddc bus! Check dmesg for i2c errors.\n");
}
}
drm_connector_init_with_ddc(dev,
&amdgpu_connector->base,
@@ -1979,7 +1979,7 @@ amdgpu_connector_add(struct amdgpu_device *adev,
if (i2c_bus->valid) {
amdgpu_connector->ddc_bus =
amdgpu_i2c_lookup(adev, i2c_bus);
if (!amdgpu_connector->ddc_bus)
- DRM_ERROR("LVDS: Failed to assign ddc
bus! Check dmesg for i2c errors.\n");
+ drm_err(adev_to_drm(adev), "LVDS:
Failed to assign ddc bus! Check dmesg for i2c errors.\n");
else
ddc =
&amdgpu_connector->ddc_bus->adapter;
}
--
2.43.0
