| Message ID | 20191129185434.25549-2-ville.syrjala@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/i915: i915_display_info cleanup | expand |
On 2019-11-29 at 20:54:26 +0200, Ville Syrjala wrote: > From: Ville Syrjälä <ville.syrjala@linux.intel.com> > > Use DRM_RECT_FMT & co. to simpify the code. Looks good to me. Reviewed-by: Ramalingam C <ramalingam.c@intel.com> > > Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> > --- > drivers/gpu/drm/i915/i915_debugfs.c | 18 +++++++----------- > 1 file changed, 7 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c > index cab632791f73..3f54e66ab762 100644 > --- a/drivers/gpu/drm/i915/i915_debugfs.c > +++ b/drivers/gpu/drm/i915/i915_debugfs.c > @@ -2599,6 +2599,7 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) > struct drm_plane_state *state; > struct drm_plane *plane = &intel_plane->base; > struct drm_format_name_buf format_name; > + struct drm_rect src, dst; > char rot_str[48]; > > if (!plane->state) { > @@ -2608,6 +2609,9 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) > > state = plane->state; > > + src = drm_plane_state_src(state); > + dst = drm_plane_state_dest(state); > + > if (state->fb) { > drm_get_format_name(state->fb->format->format, > &format_name); > @@ -2617,19 +2621,11 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) > > plane_rotation(rot_str, sizeof(rot_str), state->rotation); > > - seq_printf(m, "\t--Plane id %d: type=%s, crtc_pos=%4dx%4d, crtc_size=%4dx%4d, src_pos=%d.%04ux%d.%04u, src_size=%d.%04ux%d.%04u, format=%s, rotation=%s\n", > + seq_printf(m, "\t--Plane id %d: type=%s, dst=" DRM_RECT_FMT ", src=" DRM_RECT_FP_FMT ", format=%s, rotation=%s\n", > plane->base.id, > plane_type(intel_plane->base.type), > - state->crtc_x, state->crtc_y, > - state->crtc_w, state->crtc_h, > - (state->src_x >> 16), > - ((state->src_x & 0xffff) * 15625) >> 10, > - (state->src_y >> 16), > - ((state->src_y & 0xffff) * 15625) >> 10, > - (state->src_w >> 16), > - ((state->src_w & 0xffff) * 15625) >> 10, > - (state->src_h >> 16), > - ((state->src_h & 0xffff) * 15625) >> 10, > + DRM_RECT_ARG(&dst), > + DRM_RECT_FP_ARG(&src), > format_name.str, > rot_str); > } > -- > 2.23.0 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c index cab632791f73..3f54e66ab762 100644 --- a/drivers/gpu/drm/i915/i915_debugfs.c +++ b/drivers/gpu/drm/i915/i915_debugfs.c @@ -2599,6 +2599,7 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) struct drm_plane_state *state; struct drm_plane *plane = &intel_plane->base; struct drm_format_name_buf format_name; + struct drm_rect src, dst; char rot_str[48]; if (!plane->state) { @@ -2608,6 +2609,9 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) state = plane->state; + src = drm_plane_state_src(state); + dst = drm_plane_state_dest(state); + if (state->fb) { drm_get_format_name(state->fb->format->format, &format_name); @@ -2617,19 +2621,11 @@ static void intel_plane_info(struct seq_file *m, struct intel_crtc *intel_crtc) plane_rotation(rot_str, sizeof(rot_str), state->rotation); - seq_printf(m, "\t--Plane id %d: type=%s, crtc_pos=%4dx%4d, crtc_size=%4dx%4d, src_pos=%d.%04ux%d.%04u, src_size=%d.%04ux%d.%04u, format=%s, rotation=%s\n", + seq_printf(m, "\t--Plane id %d: type=%s, dst=" DRM_RECT_FMT ", src=" DRM_RECT_FP_FMT ", format=%s, rotation=%s\n", plane->base.id, plane_type(intel_plane->base.type), - state->crtc_x, state->crtc_y, - state->crtc_w, state->crtc_h, - (state->src_x >> 16), - ((state->src_x & 0xffff) * 15625) >> 10, - (state->src_y >> 16), - ((state->src_y & 0xffff) * 15625) >> 10, - (state->src_w >> 16), - ((state->src_w & 0xffff) * 15625) >> 10, - (state->src_h >> 16), - ((state->src_h & 0xffff) * 15625) >> 10, + DRM_RECT_ARG(&dst), + DRM_RECT_FP_ARG(&src), format_name.str, rot_str); }