diff options
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index 9f96d568acf2..d3e312bda4ed 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c @@ -877,8 +877,9 @@ 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", - connector->name); + drm_err(connector->dev, + "%s: probed a monitor but no|invalid EDID\n", + connector->name); ret = connector_status_connected; } else { amdgpu_connector->use_digital = @@ -1056,7 +1057,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 */ @@ -1667,7 +1668,8 @@ 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) { @@ -1681,7 +1683,8 @@ 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) { @@ -1775,7 +1778,8 @@ 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; } @@ -1800,7 +1804,8 @@ 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; } @@ -1830,7 +1835,8 @@ 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; } @@ -1886,7 +1892,8 @@ 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; } @@ -1937,7 +1944,8 @@ 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, @@ -1985,7 +1993,8 @@ 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), + "eDP: Failed to assign ddc bus! Check dmesg for i2c errors.\n"); } } drm_connector_init_with_ddc(dev, &amdgpu_connector->base, @@ -2008,7 +2017,8 @@ 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; } |