| Message ID | 14f3a1e55729c9157aae93fc45320d05cc4cc7bc.1666614699.git.jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/edid: EDID override refactoring and fixes | expand |
On Mon, Oct 24, 2022 at 03:33:42PM +0300, Jani Nikula wrote: > Conform to device specific logging. > > v2: Include [CONNECTOR:%d:%s] (Ville) > > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/drm_edid_load.c | 12 ++++++++---- > 1 file changed, 8 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c > index 882caaa6e663..ef4ab59d6935 100644 > --- a/drivers/gpu/drm/drm_edid_load.c > +++ b/drivers/gpu/drm/drm_edid_load.c > @@ -177,16 +177,20 @@ static const struct drm_edid *edid_load(struct drm_connector *connector, const c > > pdev = platform_device_register_simple(connector->name, -1, NULL, 0); > if (IS_ERR(pdev)) { > - DRM_ERROR("Failed to register EDID firmware platform device " > - "for connector \"%s\"\n", connector->name); > + drm_err(connector->dev, > + "[CONNECTOR:%d:%s] Failed to register EDID firmware platform device for connector \"%s\"\n", > + connector->base.id, connector->name, > + connector->name); > return ERR_CAST(pdev); > } > > err = request_firmware(&fw, name, &pdev->dev); > platform_device_unregister(pdev); > if (err) { > - DRM_ERROR("Requesting EDID firmware \"%s\" failed (err=%d)\n", > - name, err); > + drm_err(connector->dev, > + "[CONNECTOR:%d:%s] Requesting EDID firmware \"%s\" failed (err=%d)\n", > + connector->base.id, connector->name, > + name, err); > return ERR_PTR(err); > } > > -- > 2.34.1
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c index 882caaa6e663..ef4ab59d6935 100644 --- a/drivers/gpu/drm/drm_edid_load.c +++ b/drivers/gpu/drm/drm_edid_load.c @@ -177,16 +177,20 @@ static const struct drm_edid *edid_load(struct drm_connector *connector, const c pdev = platform_device_register_simple(connector->name, -1, NULL, 0); if (IS_ERR(pdev)) { - DRM_ERROR("Failed to register EDID firmware platform device " - "for connector \"%s\"\n", connector->name); + drm_err(connector->dev, + "[CONNECTOR:%d:%s] Failed to register EDID firmware platform device for connector \"%s\"\n", + connector->base.id, connector->name, + connector->name); return ERR_CAST(pdev); } err = request_firmware(&fw, name, &pdev->dev); platform_device_unregister(pdev); if (err) { - DRM_ERROR("Requesting EDID firmware \"%s\" failed (err=%d)\n", - name, err); + drm_err(connector->dev, + "[CONNECTOR:%d:%s] Requesting EDID firmware \"%s\" failed (err=%d)\n", + connector->base.id, connector->name, + name, err); return ERR_PTR(err); }
Conform to device specific logging. v2: Include [CONNECTOR:%d:%s] (Ville) Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/drm_edid_load.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)