Commit 54defc10 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Include fb modifier in state dumps 



To help diagnose modifier related issues let's include that
information in the various state dumps.

Cc: Simon Ser <contact@emersion.fr>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201103153026.16566-1-ville.syrjala@linux.intel.com


Acked-by: default avatarSimon Ser <contact@emersion.fr>
parent 04057a1a

drivers/gpu/drm/i915/display/intel_display.c

+2 −2
Original line number Diff line number Diff line
@@ -13218,11 +13218,11 @@ static void intel_dump_plane_state(const struct intel_plane_state *plane_state) 
	}















	drm_dbg_kms(&i915->drm,













		    "[PLANE:%d:%s] fb: [FB:%d] %ux%u format = %s, visible: %s\n",













		    "[PLANE:%d:%s] fb: [FB:%d] %ux%u format = %s modifier = 0x%llx, visible: %s\n",















		    plane->base.base.id, plane->base.name,















		    fb->base.id, fb->width, fb->height,















		    drm_get_format_name(fb->format->format, &format_name),













		    yesno(plane_state->uapi.visible));













		    fb->modifier, yesno(plane_state->uapi.visible));















	drm_dbg_kms(&i915->drm, "\trotation: 0x%x, scaler: %d\n",















		    plane_state->hw.rotation, plane_state->scaler_id);















	if (plane_state->uapi.visible)

































drivers/gpu/drm/i915/display/intel_display_debugfs.c



+4
−3






























Original line number
Diff line number
Diff line








@@ -773,8 +773,9 @@ static void intel_plane_uapi_info(struct seq_file *m, struct intel_plane *plane)













	plane_rotation(rot_str, sizeof(rot_str),















		       plane_state->uapi.rotation);





























	seq_printf(m, "\t\tuapi: fb=%d,%s,%dx%d, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",













	seq_printf(m, "\t\tuapi: [FB:%d] %s,0x%llx,%dx%d, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",















		   fb ? fb->base.id : 0, fb ? format_name.str : "n/a",













		   fb ? fb->modifier : 0,















		   fb ? fb->width : 0, fb ? fb->height : 0,















		   DRM_RECT_FP_ARG(&src),















		   DRM_RECT_ARG(&dst),









@@ -797,9 +798,9 @@ static void intel_plane_hw_info(struct seq_file *m, struct intel_plane *plane)













	plane_rotation(rot_str, sizeof(rot_str),















		       plane_state->hw.rotation);





























	seq_printf(m, "\t\thw: fb=%d,%s,%dx%d, visible=%s, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",













	seq_printf(m, "\t\thw: [FB:%d] %s,0x%llx,%dx%d, visible=%s, src=" DRM_RECT_FP_FMT ", dst=" DRM_RECT_FMT ", rotation=%s\n",















		   fb->base.id, format_name.str,













		   fb->width, fb->height,













		   fb->modifier, fb->width, fb->height,















		   yesno(plane_state->uapi.visible),















		   DRM_RECT_FP_ARG(&plane_state->uapi.src),















		   DRM_RECT_ARG(&plane_state->uapi.dst),



































































CRA Git | Maintained and supported by SUSTech CRA and CCSE