Message ID | 1475885497-6094-11-git-send-email-cpaul@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Em Sex, 2016-10-07 às 20:11 -0400, Lyude escreveu: Bikesheding: it would be nice to write a commit message explaining why, even if the message just tells the user to read Documentation/CodingStyle. Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com> > Signed-off-by: Lyude <cpaul@redhat.com> > Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> > Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> > --- > drivers/gpu/drm/i915/intel_display.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/i915/intel_display.c > b/drivers/gpu/drm/i915/intel_display.c > index 2c682bc..6191baf 100644 > --- a/drivers/gpu/drm/i915/intel_display.c > +++ b/drivers/gpu/drm/i915/intel_display.c > @@ -13498,8 +13498,7 @@ static void verify_wm_state(struct drm_crtc > *crtc, > sw_ddb_entry = &sw_ddb->plane[pipe][plane]; > > if (!skl_ddb_entry_equal(hw_ddb_entry, > sw_ddb_entry)) { > - DRM_ERROR("mismatch in DDB state pipe %c > plane %d " > - "(expected (%u,%u), found > (%u,%u))\n", > + DRM_ERROR("mismatch in DDB state pipe %c > plane %d (expected (%u,%u), found (%u,%u))\n", > pipe_name(pipe), plane + 1, > sw_ddb_entry->start, sw_ddb_entry- > >end, > hw_ddb_entry->start, hw_ddb_entry- > >end); > @@ -13549,8 +13548,7 @@ static void verify_wm_state(struct drm_crtc > *crtc, > sw_ddb_entry = &sw_ddb->plane[pipe][PLANE_CURSOR]; > > if (!skl_ddb_entry_equal(hw_ddb_entry, > sw_ddb_entry)) { > - DRM_ERROR("mismatch in DDB state pipe %c > cursor " > - "(expected (%u,%u), found > (%u,%u))\n", > + DRM_ERROR("mismatch in DDB state pipe %c > cursor (expected (%u,%u), found (%u,%u))\n", > pipe_name(pipe), > sw_ddb_entry->start, sw_ddb_entry- > >end, > hw_ddb_entry->start, hw_ddb_entry- > >end);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 2c682bc..6191baf 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13498,8 +13498,7 @@ static void verify_wm_state(struct drm_crtc *crtc, sw_ddb_entry = &sw_ddb->plane[pipe][plane]; if (!skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) { - DRM_ERROR("mismatch in DDB state pipe %c plane %d " - "(expected (%u,%u), found (%u,%u))\n", + DRM_ERROR("mismatch in DDB state pipe %c plane %d (expected (%u,%u), found (%u,%u))\n", pipe_name(pipe), plane + 1, sw_ddb_entry->start, sw_ddb_entry->end, hw_ddb_entry->start, hw_ddb_entry->end); @@ -13549,8 +13548,7 @@ static void verify_wm_state(struct drm_crtc *crtc, sw_ddb_entry = &sw_ddb->plane[pipe][PLANE_CURSOR]; if (!skl_ddb_entry_equal(hw_ddb_entry, sw_ddb_entry)) { - DRM_ERROR("mismatch in DDB state pipe %c cursor " - "(expected (%u,%u), found (%u,%u))\n", + DRM_ERROR("mismatch in DDB state pipe %c cursor (expected (%u,%u), found (%u,%u))\n", pipe_name(pipe), sw_ddb_entry->start, sw_ddb_entry->end, hw_ddb_entry->start, hw_ddb_entry->end);
Signed-off-by: Lyude <cpaul@redhat.com> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Ville Syrjälä <ville.syrjala@linux.intel.com> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com> --- drivers/gpu/drm/i915/intel_display.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)