| Message ID | 20170531101631.26953-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 05/31/2017 03:16 AM, Jani Nikula wrote: > Print DID not VID on the DID error path. Looks like a copy-paste error > from the VID error path. Clarify and clean up error logging, making them > distinguishable from each other, while at it. Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com> -Clint > > Reported-by: Petru Mihancea <petrum@gmail.com> > Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101243 > Signed-off-by: Jani Nikula <jani.nikula@intel.com> > --- > drivers/gpu/drm/i915/dvo_ch7xxx.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c > index 44b3159f2fe8..7aeeffd2428b 100644 > --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c > +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c > @@ -217,9 +217,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, > > name = ch7xxx_get_id(vendor); > if (!name) { > - DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " > - "slave %d.\n", > - vendor, adapter->name, dvo->slave_addr); > + DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s slave %d.\n", > + vendor, adapter->name, dvo->slave_addr); > goto out; > } > > @@ -229,9 +228,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, > > devid = ch7xxx_get_did(device); > if (!devid) { > - DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " > - "slave %d.\n", > - vendor, adapter->name, dvo->slave_addr); > + DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s slave %d.\n", > + device, adapter->name, dvo->slave_addr); > goto out; > } >
On Wed, 31 May 2017, Clint Taylor <clinton.a.taylor@intel.com> wrote: > On 05/31/2017 03:16 AM, Jani Nikula wrote: >> Print DID not VID on the DID error path. Looks like a copy-paste error >> from the VID error path. Clarify and clean up error logging, making them >> distinguishable from each other, while at it. > > Reviewed-by: Clinton Taylor <clinton.a.taylor@intel.com> Thanks, pushed to drm-intel-next-queued. BR, Jani. > > -Clint > >> >> Reported-by: Petru Mihancea <petrum@gmail.com> >> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101243 >> Signed-off-by: Jani Nikula <jani.nikula@intel.com> >> --- >> drivers/gpu/drm/i915/dvo_ch7xxx.c | 10 ++++------ >> 1 file changed, 4 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c >> index 44b3159f2fe8..7aeeffd2428b 100644 >> --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c >> +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c >> @@ -217,9 +217,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, >> >> name = ch7xxx_get_id(vendor); >> if (!name) { >> - DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " >> - "slave %d.\n", >> - vendor, adapter->name, dvo->slave_addr); >> + DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s slave %d.\n", >> + vendor, adapter->name, dvo->slave_addr); >> goto out; >> } >> >> @@ -229,9 +228,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, >> >> devid = ch7xxx_get_did(device); >> if (!devid) { >> - DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " >> - "slave %d.\n", >> - vendor, adapter->name, dvo->slave_addr); >> + DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s slave %d.\n", >> + device, adapter->name, dvo->slave_addr); >> goto out; >> } >> > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/dvo_ch7xxx.c b/drivers/gpu/drm/i915/dvo_ch7xxx.c index 44b3159f2fe8..7aeeffd2428b 100644 --- a/drivers/gpu/drm/i915/dvo_ch7xxx.c +++ b/drivers/gpu/drm/i915/dvo_ch7xxx.c @@ -217,9 +217,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, name = ch7xxx_get_id(vendor); if (!name) { - DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " - "slave %d.\n", - vendor, adapter->name, dvo->slave_addr); + DRM_DEBUG_KMS("ch7xxx not detected; got VID 0x%02x from %s slave %d.\n", + vendor, adapter->name, dvo->slave_addr); goto out; } @@ -229,9 +228,8 @@ static bool ch7xxx_init(struct intel_dvo_device *dvo, devid = ch7xxx_get_did(device); if (!devid) { - DRM_DEBUG_KMS("ch7xxx not detected; got 0x%02x from %s " - "slave %d.\n", - vendor, adapter->name, dvo->slave_addr); + DRM_DEBUG_KMS("ch7xxx not detected; got DID 0x%02x from %s slave %d.\n", + device, adapter->name, dvo->slave_addr); goto out; }
Print DID not VID on the DID error path. Looks like a copy-paste error from the VID error path. Clarify and clean up error logging, making them distinguishable from each other, while at it. Reported-by: Petru Mihancea <petrum@gmail.com> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101243 Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/gpu/drm/i915/dvo_ch7xxx.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)