Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a60cd87 authored by Chandra Konduru's avatar Chandra Konduru Committed by Daniel Vetter
Browse files

drm/i915: Dump scaler_state too as part of dumping crtc_state 



Dumps scaler state as part of dumping crtc_state.

v2:
-use regular ints from plane_state->src (me)

v3:
-changes to align with updated scaler structures (Matt)
-interpret plane_state->src as 16.16 format (Matt, Daniel)

Signed-off-by: default avatarChandra Konduru <chandra.konduru@intel.com>
Reviewed-by: default avatarMatt Roper <matthew.d.roper@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 0a5ae1b0

drivers/gpu/drm/i915/intel_display.c

+45 −2
Original line number Diff line number Diff line
@@ -10638,8 +10638,14 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, 
				   struct intel_crtc_state *pipe_config,

				   const char *context)

{

	DRM_DEBUG_KMS("[CRTC:%d]%s config for pipe %c\n", crtc->base.base.id,

		      context, pipe_name(crtc->pipe));

	struct drm_device *dev = crtc->base.dev;

	struct drm_plane *plane;

	struct intel_plane *intel_plane;

	struct intel_plane_state *state;

	struct drm_framebuffer *fb;



	DRM_DEBUG_KMS("[CRTC:%d]%s config %p for pipe %c\n", crtc->base.base.id,

		      context, pipe_config, pipe_name(crtc->pipe));



	DRM_DEBUG_KMS("cpu_transcoder: %c\n", transcoder_name(pipe_config->cpu_transcoder));

	DRM_DEBUG_KMS("pipe bpp: %i, dithering: %i\n",
@@ -10676,6 +10682,9 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, 
	DRM_DEBUG_KMS("port clock: %d\n", pipe_config->port_clock);

	DRM_DEBUG_KMS("pipe src size: %dx%d\n",

		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);

	DRM_DEBUG_KMS("num_scalers: %d\n", crtc->num_scalers);

	DRM_DEBUG_KMS("scaler_users: 0x%x\n", pipe_config->scaler_state.scaler_users);

	DRM_DEBUG_KMS("scaler id: %d\n", pipe_config->scaler_state.scaler_id);

	DRM_DEBUG_KMS("gmch pfit: control: 0x%08x, ratios: 0x%08x, lvds border: 0x%08x\n",

		      pipe_config->gmch_pfit.control,

		      pipe_config->gmch_pfit.pgm_ratios,
@@ -10686,6 +10695,40 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc, 
		      pipe_config->pch_pfit.enabled ? "enabled" : "disabled");

	DRM_DEBUG_KMS("ips: %i\n", pipe_config->ips_enabled);

	DRM_DEBUG_KMS("double wide: %i\n", pipe_config->double_wide);



	DRM_DEBUG_KMS("planes on this crtc\n");

	list_for_each_entry(plane, &dev->mode_config.plane_list, head) {

		intel_plane = to_intel_plane(plane);

		if (intel_plane->pipe != crtc->pipe)

			continue;



		state = to_intel_plane_state(plane->state);

		fb = state->base.fb;

		if (!fb) {

			DRM_DEBUG_KMS("%s PLANE:%d plane: %u.%u idx: %d "

				"disabled, scaler_id = %d\n",

				plane->type == DRM_PLANE_TYPE_CURSOR ? "CURSOR" : "STANDARD",

				plane->base.id, intel_plane->pipe,

				(crtc->base.primary == plane) ? 0 : intel_plane->plane + 1,

				drm_plane_index(plane), state->scaler_id);

			continue;

		}



		DRM_DEBUG_KMS("%s PLANE:%d plane: %u.%u idx: %d enabled",

			plane->type == DRM_PLANE_TYPE_CURSOR ? "CURSOR" : "STANDARD",

			plane->base.id, intel_plane->pipe,

			crtc->base.primary == plane ? 0 : intel_plane->plane + 1,

			drm_plane_index(plane));

		DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = 0x%x",

			fb->base.id, fb->width, fb->height, fb->pixel_format);

		DRM_DEBUG_KMS("\tscaler:%d src (%u, %u) %ux%u dst (%u, %u) %ux%u\n",

			state->scaler_id,

			state->src.x1 >> 16, state->src.y1 >> 16,

			drm_rect_width(&state->src) >> 16,

			drm_rect_height(&state->src) >> 16,

			state->dst.x1, state->dst.y1,

			drm_rect_width(&state->dst), drm_rect_height(&state->dst));

	}

}



static bool encoders_cloneable(const struct intel_encoder *a,