[PATCH v7 3/3] drm: Switch to %p4cc format modifier

Sakari Ailus sakari.ailus at linux.intel.com
Mon Feb 15 17:26:55 UTC 2021


On Mon, Feb 15, 2021 at 03:41:14PM +0200, Andy Shevchenko wrote:
...
> > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > index ca41e8c00ad7..a5c9fe2e56b3 100644
> > --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
> > @@ -771,21 +771,21 @@ static void intel_plane_uapi_info(struct seq_file *m, struct intel_plane *plane)
> >  	const struct intel_plane_state *plane_state =
> >  		to_intel_plane_state(plane->base.state);
> >  	const struct drm_framebuffer *fb = plane_state->uapi.fb;
> > -	struct drm_format_name_buf format_name;
> >  	struct drm_rect src, dst;
> >  	char rot_str[48];
> >  
> >  	src = drm_plane_state_src(&plane_state->uapi);
> >  	dst = drm_plane_state_dest(&plane_state->uapi);
> >  
> > -	if (fb)
> > -		drm_get_format_name(fb->format->format, &format_name);
> > -
> >  	plane_rotation(rot_str, sizeof(rot_str),
> >  		       plane_state->uapi.rotation);
> >  
> > -	seq_printf(m, "\t\tuapi: [FB:%d] %s,0x%llx,%dx%d, visible=%s, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",
> > -		   fb ? fb->base.id : 0, fb ? format_name.str : "n/a",
> > +	seq_printf(m, "\t\tuapi: [FB:%d] ", fb ? fb->base.id : 0);
> > +	if (fb)
> > +		seq_printf(m, "%p4cc", &fb->format->format);
> > +	else
> > +		seq_puts(m, "n/a");
> 
> > +	seq_printf(m, ",0x%llx,%dx%d, visible=%s, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",
> 
> Why not to keep two seq_printf() calls?
> 
> if (fb) {
> 	seq_printf();
> } else {
> 	seq_printf();
> }
> 
> ?

I could, but it'd repeat a lot of the same format string that is very
complicated right now. Therefore I thought it's better to split.

Or do you mean seq_printf() vs. seq_puts()? checkpatch.pl (rightly) warns
about it.

> 
> >  		   fb ? fb->modifier : 0,
> >  		   fb ? fb->width : 0, fb ? fb->height : 0,
> >  		   plane_visibility(plane_state),

-- 
Sakari Ailus


More information about the dri-devel mailing list