* [PATCH 1/7] drm/i915: Extract intel_link_m_n config printing into a helper
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
@ 2016-11-17 12:30 ` Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 2/7] drm/i915: Dump FDI config only where applicable Tvrtko Ursulin
` (7 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
And also only dump DP config for crtcs with DP encoders.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index cd5256c0b2d6..2fbc18081f81 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12733,6 +12733,16 @@ static void intel_dump_crtc_timings(const struct drm_display_mode *mode)
mode->crtc_vsync_end, mode->crtc_vtotal, mode->type, mode->flags);
}
+static inline void
+intel_dump_m_n_config(struct intel_crtc_state *pipe_config, char *id,
+ struct intel_link_m_n *m_n)
+{
+ DRM_DEBUG_KMS("dp: lanes: %i; %s: gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n",
+ pipe_config->lane_count, id,
+ m_n->gmch_m, m_n->gmch_n,
+ m_n->link_m, m_n->link_n, m_n->tu);
+}
+
static void intel_dump_pipe_config(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config,
const char *context)
@@ -12757,21 +12767,13 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
pipe_config->fdi_m_n.gmch_m, pipe_config->fdi_m_n.gmch_n,
pipe_config->fdi_m_n.link_m, pipe_config->fdi_m_n.link_n,
pipe_config->fdi_m_n.tu);
- DRM_DEBUG_KMS("dp: %i, lanes: %i, gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n",
- intel_crtc_has_dp_encoder(pipe_config),
- pipe_config->lane_count,
- pipe_config->dp_m_n.gmch_m, pipe_config->dp_m_n.gmch_n,
- pipe_config->dp_m_n.link_m, pipe_config->dp_m_n.link_n,
- pipe_config->dp_m_n.tu);
-
- DRM_DEBUG_KMS("dp: %i, lanes: %i, gmch_m2: %u, gmch_n2: %u, link_m2: %u, link_n2: %u, tu2: %u\n",
- intel_crtc_has_dp_encoder(pipe_config),
- pipe_config->lane_count,
- pipe_config->dp_m2_n2.gmch_m,
- pipe_config->dp_m2_n2.gmch_n,
- pipe_config->dp_m2_n2.link_m,
- pipe_config->dp_m2_n2.link_n,
- pipe_config->dp_m2_n2.tu);
+
+ if (intel_crtc_has_dp_encoder(pipe_config)) {
+ intel_dump_m_n_config(pipe_config, "m_n",
+ &pipe_config->dp_m_n);
+ intel_dump_m_n_config(pipe_config, "m2_n2",
+ &pipe_config->dp_m2_n2);
+ }
DRM_DEBUG_KMS("audio: %i, infoframes: %i\n",
pipe_config->has_audio,
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/7] drm/i915: Dump FDI config only where applicable
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 1/7] drm/i915: Extract intel_link_m_n config printing into a helper Tvrtko Ursulin
@ 2016-11-17 12:30 ` Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 3/7] drm/i915: Don't log pipe config kernel pointer and duplicated pipe name Tvrtko Ursulin
` (6 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 2fbc18081f81..1932d1eed52f 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12735,10 +12735,10 @@ static void intel_dump_crtc_timings(const struct drm_display_mode *mode)
static inline void
intel_dump_m_n_config(struct intel_crtc_state *pipe_config, char *id,
- struct intel_link_m_n *m_n)
+ unsigned int lane_count, struct intel_link_m_n *m_n)
{
- DRM_DEBUG_KMS("dp: lanes: %i; %s: gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n",
- pipe_config->lane_count, id,
+ DRM_DEBUG_KMS("%s: lanes: %i; gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n",
+ id, lane_count,
m_n->gmch_m, m_n->gmch_n,
m_n->link_m, m_n->link_n, m_n->tu);
}
@@ -12761,18 +12761,18 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
DRM_DEBUG_KMS("cpu_transcoder: %s\n", transcoder_name(pipe_config->cpu_transcoder));
DRM_DEBUG_KMS("pipe bpp: %i, dithering: %i\n",
pipe_config->pipe_bpp, pipe_config->dither);
- DRM_DEBUG_KMS("fdi/pch: %i, lanes: %i, gmch_m: %u, gmch_n: %u, link_m: %u, link_n: %u, tu: %u\n",
- pipe_config->has_pch_encoder,
- pipe_config->fdi_lanes,
- pipe_config->fdi_m_n.gmch_m, pipe_config->fdi_m_n.gmch_n,
- pipe_config->fdi_m_n.link_m, pipe_config->fdi_m_n.link_n,
- pipe_config->fdi_m_n.tu);
+
+ if (pipe_config->has_pch_encoder)
+ intel_dump_m_n_config(pipe_config, "fdi",
+ pipe_config->fdi_lanes,
+ &pipe_config->fdi_m_n);
if (intel_crtc_has_dp_encoder(pipe_config)) {
- intel_dump_m_n_config(pipe_config, "m_n",
- &pipe_config->dp_m_n);
- intel_dump_m_n_config(pipe_config, "m2_n2",
- &pipe_config->dp_m2_n2);
+ intel_dump_m_n_config(pipe_config, "dp m_n",
+ pipe_config->lane_count, &pipe_config->dp_m_n);
+ intel_dump_m_n_config(pipe_config, "dp m2_n2",
+ pipe_config->lane_count,
+ &pipe_config->dp_m2_n2);
}
DRM_DEBUG_KMS("audio: %i, infoframes: %i\n",
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/7] drm/i915: Don't log pipe config kernel pointer and duplicated pipe name
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 1/7] drm/i915: Extract intel_link_m_n config printing into a helper Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 2/7] drm/i915: Dump FDI config only where applicable Tvrtko Ursulin
@ 2016-11-17 12:30 ` Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 4/7] drm/i915: Compact a few pipe config debug lines Tvrtko Ursulin
` (5 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Kernel pointer does not sound like an useful thing to log and
pipe name is already contained in the crtc name.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 1932d1eed52f..05afd628b9f2 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12754,9 +12754,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
struct intel_plane_state *state;
struct drm_framebuffer *fb;
- DRM_DEBUG_KMS("[CRTC:%d:%s]%s config %p for pipe %c\n",
- crtc->base.base.id, crtc->base.name,
- context, pipe_config, pipe_name(crtc->pipe));
+ DRM_DEBUG_KMS("[CRTC:%d:%s]%s\n",
+ crtc->base.base.id, crtc->base.name, context);
DRM_DEBUG_KMS("cpu_transcoder: %s\n", transcoder_name(pipe_config->cpu_transcoder));
DRM_DEBUG_KMS("pipe bpp: %i, dithering: %i\n",
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 4/7] drm/i915: Compact a few pipe config debug lines
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
` (2 preceding siblings ...)
2016-11-17 12:30 ` [PATCH 3/7] drm/i915: Don't log pipe config kernel pointer and duplicated pipe name Tvrtko Ursulin
@ 2016-11-17 12:30 ` Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 5/7] drm/i915: Only dump scaler config where supported Tvrtko Ursulin
` (4 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 05afd628b9f2..3c03c0172a2d 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12757,8 +12757,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
DRM_DEBUG_KMS("[CRTC:%d:%s]%s\n",
crtc->base.base.id, crtc->base.name, context);
- DRM_DEBUG_KMS("cpu_transcoder: %s\n", transcoder_name(pipe_config->cpu_transcoder));
- DRM_DEBUG_KMS("pipe bpp: %i, dithering: %i\n",
+ DRM_DEBUG_KMS("cpu_transcoder: %s, pipe bpp: %i, dithering: %i\n",
+ transcoder_name(pipe_config->cpu_transcoder),
pipe_config->pipe_bpp, pipe_config->dither);
if (pipe_config->has_pch_encoder)
@@ -12775,16 +12775,15 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
}
DRM_DEBUG_KMS("audio: %i, infoframes: %i\n",
- pipe_config->has_audio,
- pipe_config->has_infoframe);
+ pipe_config->has_audio, pipe_config->has_infoframe);
DRM_DEBUG_KMS("requested mode:\n");
drm_mode_debug_printmodeline(&pipe_config->base.mode);
DRM_DEBUG_KMS("adjusted mode:\n");
drm_mode_debug_printmodeline(&pipe_config->base.adjusted_mode);
intel_dump_crtc_timings(&pipe_config->base.adjusted_mode);
- DRM_DEBUG_KMS("port clock: %d\n", pipe_config->port_clock);
- DRM_DEBUG_KMS("pipe src size: %dx%d\n",
+ DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n",
+ pipe_config->port_clock,
pipe_config->pipe_src_w, pipe_config->pipe_src_h);
DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
crtc->num_scalers,
@@ -12798,8 +12797,8 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
pipe_config->pch_pfit.pos,
pipe_config->pch_pfit.size,
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("ips: %i, double wide: %i\n",
+ pipe_config->ips_enabled, pipe_config->double_wide);
if (IS_BROXTON(dev_priv)) {
DRM_DEBUG_KMS("dpll_hw_state: ebb0: 0x%x, ebb4: 0x%x,"
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/7] drm/i915: Only dump scaler config where supported
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
` (3 preceding siblings ...)
2016-11-17 12:30 ` [PATCH 4/7] drm/i915: Compact a few pipe config debug lines Tvrtko Ursulin
@ 2016-11-17 12:30 ` Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 6/7] drm/i915: Only dump possible panel fitter config for the platform Tvrtko Ursulin
` (3 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3c03c0172a2d..3cbf9fa98512 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12785,10 +12785,12 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
DRM_DEBUG_KMS("port clock: %d, pipe src size: %dx%d\n",
pipe_config->port_clock,
pipe_config->pipe_src_w, pipe_config->pipe_src_h);
- DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
- crtc->num_scalers,
- pipe_config->scaler_state.scaler_users,
- pipe_config->scaler_state.scaler_id);
+
+ if (INTEL_GEN(dev_priv) >= 9)
+ DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
+ crtc->num_scalers,
+ pipe_config->scaler_state.scaler_users,
+ 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,
@@ -12849,20 +12851,20 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
continue;
}
- DRM_DEBUG_KMS("[PLANE:%d:%s] enabled",
- plane->base.id, plane->name);
- DRM_DEBUG_KMS("\tFB:%d, fb = %ux%u format = %s",
+ DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d, fb = %ux%u format = %s\n",
+ plane->base.id, plane->name,
fb->base.id, fb->width, fb->height,
drm_get_format_name(fb->pixel_format, &format_name));
- DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n",
- state->scaler_id,
- state->base.src.x1 >> 16,
- state->base.src.y1 >> 16,
- drm_rect_width(&state->base.src) >> 16,
- drm_rect_height(&state->base.src) >> 16,
- state->base.dst.x1, state->base.dst.y1,
- drm_rect_width(&state->base.dst),
- drm_rect_height(&state->base.dst));
+ if (INTEL_GEN(dev_priv) >= 9)
+ DRM_DEBUG_KMS("\tscaler:%d src %dx%d+%d+%d dst %dx%d+%d+%d\n",
+ state->scaler_id,
+ state->base.src.x1 >> 16,
+ state->base.src.y1 >> 16,
+ drm_rect_width(&state->base.src) >> 16,
+ drm_rect_height(&state->base.src) >> 16,
+ state->base.dst.x1, state->base.dst.y1,
+ drm_rect_width(&state->base.dst),
+ drm_rect_height(&state->base.dst));
}
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 6/7] drm/i915: Only dump possible panel fitter config for the platform
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
` (4 preceding siblings ...)
2016-11-17 12:30 ` [PATCH 5/7] drm/i915: Only dump scaler config where supported Tvrtko Ursulin
@ 2016-11-17 12:30 ` Tvrtko Ursulin
2016-11-17 12:30 ` [PATCH 7/7] drm/i915: Introduce enableddisabled helper Tvrtko Ursulin
` (2 subsequent siblings)
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/intel_display.c | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3cbf9fa98512..0e31d2c9edde 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12791,14 +12791,18 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
crtc->num_scalers,
pipe_config->scaler_state.scaler_users,
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,
- pipe_config->gmch_pfit.lvds_border_bits);
- DRM_DEBUG_KMS("pch pfit: pos: 0x%08x, size: 0x%08x, %s\n",
- pipe_config->pch_pfit.pos,
- pipe_config->pch_pfit.size,
- pipe_config->pch_pfit.enabled ? "enabled" : "disabled");
+
+ if (HAS_GMCH_DISPLAY(dev_priv))
+ 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,
+ pipe_config->gmch_pfit.lvds_border_bits);
+ else
+ DRM_DEBUG_KMS("pch pfit: pos: 0x%08x, size: 0x%08x, %s\n",
+ pipe_config->pch_pfit.pos,
+ pipe_config->pch_pfit.size,
+ pipe_config->pch_pfit.enabled ? "enabled" : "disabled");
+
DRM_DEBUG_KMS("ips: %i, double wide: %i\n",
pipe_config->ips_enabled, pipe_config->double_wide);
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 7/7] drm/i915: Introduce enableddisabled helper
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
` (5 preceding siblings ...)
2016-11-17 12:30 ` [PATCH 6/7] drm/i915: Only dump possible panel fitter config for the platform Tvrtko Ursulin
@ 2016-11-17 12:30 ` Tvrtko Ursulin
2016-11-17 13:16 ` ✓ Fi.CI.BAT: success for Pipe config debug dump diet Patchwork
2016-11-17 14:46 ` [PATCH 0/7] " Maarten Lankhorst
8 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 12:30 UTC (permalink / raw)
To: Intel-gfx
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Similar to existing yesno and onoff and use it throughout the code.
Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 3 +--
drivers/gpu/drm/i915/i915_drv.h | 5 +++++
drivers/gpu/drm/i915/intel_display.c | 14 ++++++--------
drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +++-----
drivers/gpu/drm/i915/intel_panel.c | 2 +-
drivers/gpu/drm/i915/intel_pm.c | 3 +--
6 files changed, 17 insertions(+), 18 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 1cc971cb6cb1..96407f684f7f 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1762,8 +1762,7 @@ static int i915_sr_status(struct seq_file *m, void *unused)
intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);
intel_runtime_pm_put(dev_priv);
- seq_printf(m, "self-refresh: %s\n",
- sr_enabled ? "enabled" : "disabled");
+ seq_printf(m, "self-refresh: %s\n", enableddisabled(sr_enabled));
return 0;
}
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 5192206c62e2..c42842d97b67 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -129,6 +129,11 @@ static inline const char *onoff(bool v)
return v ? "on" : "off";
}
+static inline const char *enableddisabled(bool v)
+{
+ return v ? "enabled" : "disabled";
+}
+
enum pipe {
INVALID_PIPE = -1,
PIPE_A = 0,
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 0e31d2c9edde..7f9cd47a9bad 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12801,7 +12801,7 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
DRM_DEBUG_KMS("pch pfit: pos: 0x%08x, size: 0x%08x, %s\n",
pipe_config->pch_pfit.pos,
pipe_config->pch_pfit.size,
- pipe_config->pch_pfit.enabled ? "enabled" : "disabled");
+ enableddisabled(pipe_config->pch_pfit.enabled));
DRM_DEBUG_KMS("ips: %i, double wide: %i\n",
pipe_config->ips_enabled, pipe_config->double_wide);
@@ -16863,7 +16863,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
DRM_DEBUG_KMS("[CRTC:%d:%s] hw state readout: %s\n",
crtc->base.base.id, crtc->base.name,
- crtc->active ? "enabled" : "disabled");
+ enableddisabled(crtc->active));
}
for (i = 0; i < dev_priv->num_shared_dpll; i++) {
@@ -16896,9 +16896,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
}
DRM_DEBUG_KMS("[ENCODER:%d:%s] hw state readout: %s, pipe %c\n",
- encoder->base.base.id,
- encoder->base.name,
- encoder->base.crtc ? "enabled" : "disabled",
+ encoder->base.base.id, encoder->base.name,
+ enableddisabled(encoder->base.crtc),
pipe_name(pipe));
}
@@ -16927,9 +16926,8 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
connector->base.encoder = NULL;
}
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] hw state readout: %s\n",
- connector->base.base.id,
- connector->base.name,
- connector->base.encoder ? "enabled" : "disabled");
+ connector->base.base.id, connector->base.name,
+ enableddisabled(connector->base.encoder));
}
for_each_intel_crtc(dev, crtc) {
diff --git a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
index 9f279a3d0f74..0d8ff0034b88 100644
--- a/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
+++ b/drivers/gpu/drm/i915/intel_dsi_panel_vbt.c
@@ -774,9 +774,8 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id)
8);
intel_dsi->clk_hs_to_lp_count += extra_byte_count;
- DRM_DEBUG_KMS("Eot %s\n", intel_dsi->eotp_pkt ? "enabled" : "disabled");
- DRM_DEBUG_KMS("Clockstop %s\n", intel_dsi->clock_stop ?
- "disabled" : "enabled");
+ DRM_DEBUG_KMS("Eot %s\n", enableddisabled(intel_dsi->eotp_pkt));
+ DRM_DEBUG_KMS("Clockstop %s\n", enableddisabled(!intel_dsi->clock_stop));
DRM_DEBUG_KMS("Mode %s\n", intel_dsi->operation_mode ? "command" : "video");
if (intel_dsi->dual_link == DSI_DUAL_LINK_FRONT_BACK)
DRM_DEBUG_KMS("Dual link: DSI_DUAL_LINK_FRONT_BACK\n");
@@ -795,8 +794,7 @@ struct drm_panel *vbt_panel_init(struct intel_dsi *intel_dsi, u16 panel_id)
DRM_DEBUG_KMS("LP to HS Clock Count 0x%x\n", intel_dsi->clk_lp_to_hs_count);
DRM_DEBUG_KMS("HS to LP Clock Count 0x%x\n", intel_dsi->clk_hs_to_lp_count);
DRM_DEBUG_KMS("BTA %s\n",
- intel_dsi->video_frmt_cfg_bits & DISABLE_VIDEO_BTA ?
- "disabled" : "enabled");
+ enableddisabled(!(intel_dsi->video_frmt_cfg_bits & DISABLE_VIDEO_BTA)));
/* delays in VBT are in unit of 100us, so need to convert
* here in ms
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index be4b4d546fd9..d04745115034 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1722,7 +1722,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector, enum pipe pipe)
DRM_DEBUG_KMS("Connector %s backlight initialized, %s, brightness %u/%u\n",
connector->name,
- panel->backlight.enabled ? "enabled" : "disabled",
+ enableddisabled(panel->backlight.enabled),
panel->backlight.level, panel->backlight.max);
return 0;
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 1331bcc41868..9ce55c0ad3ec 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -347,8 +347,7 @@ void intel_set_memory_cxsr(struct drm_i915_private *dev_priv, bool enable)
return;
}
- DRM_DEBUG_KMS("memory self-refresh is %s\n",
- enable ? "enabled" : "disabled");
+ DRM_DEBUG_KMS("memory self-refresh is %s\n", enableddisabled(enable));
}
--
2.7.4
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 13+ messages in thread* ✓ Fi.CI.BAT: success for Pipe config debug dump diet
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
` (6 preceding siblings ...)
2016-11-17 12:30 ` [PATCH 7/7] drm/i915: Introduce enableddisabled helper Tvrtko Ursulin
@ 2016-11-17 13:16 ` Patchwork
2016-11-17 15:13 ` Tvrtko Ursulin
2016-11-17 14:46 ` [PATCH 0/7] " Maarten Lankhorst
8 siblings, 1 reply; 13+ messages in thread
From: Patchwork @ 2016-11-17 13:16 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
== Series Details ==
Series: Pipe config debug dump diet
URL : https://patchwork.freedesktop.org/series/15493/
State : success
== Summary ==
Series 15493v1 Pipe config debug dump diet
https://patchwork.freedesktop.org/api/1.0/series/15493/revisions/1/mbox/
fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40
fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53
fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21
fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21
fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
ccd01198820ab7286f0b98f7b28dbf6ad29fa861 drm-intel-nightly: 2016y-11m-17d-10h-54m-57s UTC integration manifest
a9bf7b7 drm/i915: Introduce enableddisabled helper
1cd61af drm/i915: Only dump possible panel fitter config for the platform
e5069f1 drm/i915: Only dump scaler config where supported
5d6948f drm/i915: Compact a few pipe config debug lines
63a49f1 drm/i915: Don't log pipe config kernel pointer and duplicated pipe name
f711717 drm/i915: Dump FDI config only where applicable
2a89809 drm/i915: Extract intel_link_m_n config printing into a helper
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_3035/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: ✓ Fi.CI.BAT: success for Pipe config debug dump diet
2016-11-17 13:16 ` ✓ Fi.CI.BAT: success for Pipe config debug dump diet Patchwork
@ 2016-11-17 15:13 ` Tvrtko Ursulin
2016-11-17 16:52 ` Ville Syrjälä
0 siblings, 1 reply; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-17 15:13 UTC (permalink / raw)
To: intel-gfx, Tvrtko Ursulin
On 17/11/2016 13:16, Patchwork wrote:
> == Series Details ==
>
> Series: Pipe config debug dump diet
> URL : https://patchwork.freedesktop.org/series/15493/
> State : success
>
> == Summary ==
>
> Series 15493v1 Pipe config debug dump diet
> https://patchwork.freedesktop.org/api/1.0/series/15493/revisions/1/mbox/
>
>
> fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
> fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40
> fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
> fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
> fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
> fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
> fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
> fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53
> fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
> fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21
> fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21
> fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
> fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
> fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
>
> ccd01198820ab7286f0b98f7b28dbf6ad29fa861 drm-intel-nightly: 2016y-11m-17d-10h-54m-57s UTC integration manifest
> a9bf7b7 drm/i915: Introduce enableddisabled helper
> 1cd61af drm/i915: Only dump possible panel fitter config for the platform
> e5069f1 drm/i915: Only dump scaler config where supported
> 5d6948f drm/i915: Compact a few pipe config debug lines
> 63a49f1 drm/i915: Don't log pipe config kernel pointer and duplicated pipe name
> f711717 drm/i915: Dump FDI config only where applicable
> 2a89809 drm/i915: Extract intel_link_m_n config printing into a helper
Merged to dinq and thanks Maarten for the review. Unfortunately I forgot
to apply his r-b's manually before pushing. :(
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: ✓ Fi.CI.BAT: success for Pipe config debug dump diet
2016-11-17 15:13 ` Tvrtko Ursulin
@ 2016-11-17 16:52 ` Ville Syrjälä
2016-11-18 11:00 ` Tvrtko Ursulin
0 siblings, 1 reply; 13+ messages in thread
From: Ville Syrjälä @ 2016-11-17 16:52 UTC (permalink / raw)
To: Tvrtko Ursulin; +Cc: intel-gfx
On Thu, Nov 17, 2016 at 03:13:55PM +0000, Tvrtko Ursulin wrote:
>
> On 17/11/2016 13:16, Patchwork wrote:
> > == Series Details ==
> >
> > Series: Pipe config debug dump diet
> > URL : https://patchwork.freedesktop.org/series/15493/
> > State : success
> >
> > == Summary ==
> >
> > Series 15493v1 Pipe config debug dump diet
> > https://patchwork.freedesktop.org/api/1.0/series/15493/revisions/1/mbox/
> >
> >
> > fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
> > fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40
> > fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
> > fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
> > fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
> > fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
> > fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
> > fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53
> > fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> > fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> > fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
> > fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
> > fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21
> > fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21
> > fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
> > fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
> > fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
> >
> > ccd01198820ab7286f0b98f7b28dbf6ad29fa861 drm-intel-nightly: 2016y-11m-17d-10h-54m-57s UTC integration manifest
> > a9bf7b7 drm/i915: Introduce enableddisabled helper
> > 1cd61af drm/i915: Only dump possible panel fitter config for the platform
> > e5069f1 drm/i915: Only dump scaler config where supported
> > 5d6948f drm/i915: Compact a few pipe config debug lines
> > 63a49f1 drm/i915: Don't log pipe config kernel pointer and duplicated pipe name
> > f711717 drm/i915: Dump FDI config only where applicable
> > 2a89809 drm/i915: Extract intel_link_m_n config printing into a helper
>
> Merged to dinq and thanks Maarten for the review. Unfortunately I forgot
> to apply his r-b's manually before pushing. :(
I'm not a big fan of this series. It merged some totally unrelated stuff
to the same line, and I don't really like making the dump look different
depending on the output_types either. Just makes life more confusing to
look at the thing, and potentually we might fail to notice some
discrepancies.
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: ✓ Fi.CI.BAT: success for Pipe config debug dump diet
2016-11-17 16:52 ` Ville Syrjälä
@ 2016-11-18 11:00 ` Tvrtko Ursulin
0 siblings, 0 replies; 13+ messages in thread
From: Tvrtko Ursulin @ 2016-11-18 11:00 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx
On 17/11/2016 16:52, Ville Syrjälä wrote:
> On Thu, Nov 17, 2016 at 03:13:55PM +0000, Tvrtko Ursulin wrote:
>>
>> On 17/11/2016 13:16, Patchwork wrote:
>>> == Series Details ==
>>>
>>> Series: Pipe config debug dump diet
>>> URL : https://patchwork.freedesktop.org/series/15493/
>>> State : success
>>>
>>> == Summary ==
>>>
>>> Series 15493v1 Pipe config debug dump diet
>>> https://patchwork.freedesktop.org/api/1.0/series/15493/revisions/1/mbox/
>>>
>>>
>>> fi-bdw-5557u total:244 pass:229 dwarn:0 dfail:0 fail:0 skip:15
>>> fi-bsw-n3050 total:244 pass:204 dwarn:0 dfail:0 fail:0 skip:40
>>> fi-bxt-t5700 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
>>> fi-byt-j1900 total:244 pass:216 dwarn:0 dfail:0 fail:0 skip:28
>>> fi-byt-n2820 total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
>>> fi-hsw-4770 total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
>>> fi-hsw-4770r total:244 pass:224 dwarn:0 dfail:0 fail:0 skip:20
>>> fi-ilk-650 total:244 pass:191 dwarn:0 dfail:0 fail:0 skip:53
>>> fi-ivb-3520m total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
>>> fi-ivb-3770 total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
>>> fi-kbl-7200u total:244 pass:222 dwarn:0 dfail:0 fail:0 skip:22
>>> fi-skl-6260u total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
>>> fi-skl-6700hq total:244 pass:223 dwarn:0 dfail:0 fail:0 skip:21
>>> fi-skl-6700k total:244 pass:222 dwarn:1 dfail:0 fail:0 skip:21
>>> fi-skl-6770hq total:244 pass:230 dwarn:0 dfail:0 fail:0 skip:14
>>> fi-snb-2520m total:244 pass:212 dwarn:0 dfail:0 fail:0 skip:32
>>> fi-snb-2600 total:244 pass:211 dwarn:0 dfail:0 fail:0 skip:33
>>>
>>> ccd01198820ab7286f0b98f7b28dbf6ad29fa861 drm-intel-nightly: 2016y-11m-17d-10h-54m-57s UTC integration manifest
>>> a9bf7b7 drm/i915: Introduce enableddisabled helper
>>> 1cd61af drm/i915: Only dump possible panel fitter config for the platform
>>> e5069f1 drm/i915: Only dump scaler config where supported
>>> 5d6948f drm/i915: Compact a few pipe config debug lines
>>> 63a49f1 drm/i915: Don't log pipe config kernel pointer and duplicated pipe name
>>> f711717 drm/i915: Dump FDI config only where applicable
>>> 2a89809 drm/i915: Extract intel_link_m_n config printing into a helper
>>
>> Merged to dinq and thanks Maarten for the review. Unfortunately I forgot
>> to apply his r-b's manually before pushing. :(
>
> I'm not a big fan of this series. It merged some totally unrelated stuff
> to the same line, and I don't really like making the dump look different
> depending on the output_types either. Just makes life more confusing to
> look at the thing, and potentually we might fail to notice some
> discrepancies.
Oh.. sorry to hear this. My logic was that absence of a line tells you
that the respective set is not applicable/relevant so no information is
lost. Maybe give it a few days and then if you still dislike it we can
tweak it a bit? Maybe improve the grouping like move the pipe bpp, size
and maybe dithering on a line. Or something.
Regards,
Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 0/7] Pipe config debug dump diet
2016-11-17 12:30 [PATCH 0/7] Pipe config debug dump diet Tvrtko Ursulin
` (7 preceding siblings ...)
2016-11-17 13:16 ` ✓ Fi.CI.BAT: success for Pipe config debug dump diet Patchwork
@ 2016-11-17 14:46 ` Maarten Lankhorst
8 siblings, 0 replies; 13+ messages in thread
From: Maarten Lankhorst @ 2016-11-17 14:46 UTC (permalink / raw)
To: Tvrtko Ursulin, Intel-gfx
Op 17-11-16 om 13:30 schreef Tvrtko Ursulin:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> My Nth attempt to trim this by merging some short lines together and also by
> not dumping data not relevant for the platform at hand.
>
> On Skylake it saves six lines from a typical modesetting dump, from 26:
>
> [i915]] [CRTC:29:pipe A][modeset] config ffff88014b886800 for pipe A
> [i915]] cpu_transcoder: EDP
> [i915]] pipe bpp: 18, dithering: 1
> [i915]] fdi/pch: 0, lanes: 0, gmch_m: 0, gmch_n: 0, link_m: 0, link_n: 0, tu: 0
> [i915]] dp: 1, lanes: 2, gmch_m: 4847916, gmch_n: 8388608, link_m: 269328, link_n: 524288, tu: 64
> [i915]] dp: 1, lanes: 2, gmch_m2: 0, gmch_n2: 0, link_m2: 0, link_n2: 0, tu2: 0
> [i915]] audio: 0, infoframes: 0
> [i915]] requested mode:
> [drm]] Modeline 0:"1920x1080" 60 138700 1920 1968 2000 2080 1080 1083 1088 1111 0x48 0xa
> [i915]] adjusted mode:
> [drm]] Modeline 0:"1920x1080" 60 138700 1920 1968 2000 2080 1080 1083 1088 1111 0x48 0xa
> [i915]] crtc timings: 138700 1920 1968 2000 2080 1080 1083 1088 1111, type: 0x48 flags: 0xa
> [i915]] port clock: 270000
> [i915]] pipe src size: 1920x1080
> [i915]] num_scalers: 2, scaler_users: 0x0, scaler_id: -1
> [i915]] gmch pfit: control: 0x00000000, ratios: 0x00000000, lvds border: 0x00000000
> [i915]] pch pfit: pos: 0x00000000, size: 0x00000000, disabled
> [i915]] ips: 0
> [i915]] double wide: 0
> [i915]] dpll_hw_state: ctrl1: 0x3, cfgcr1: 0x0, cfgcr2: 0x0
> [i915]] planes on this crtc
> [i915]] [PLANE:23:plane 1A] enabled
> [i915]] FB:61, fb = 1920x1080 format = XR24 little-endian (0x34325258)
> [i915]] scaler:-1 src 0x0+1920+1080 dst 0x0+1920+1080
> [i915]] [PLANE:25:plane 2A] disabled, scaler_id = -1
> [i915]] [PLANE:27:cursor A] disabled, scaler_id = -1
>
> To 20 lines:
>
> [i915]] [CRTC:31:pipe A][modeset]
> [i915]] cpu_transcoder: EDP, pipe bpp: 18, dithering: 1
> [i915]] dp m_n: lanes: 2; gmch_m: 4847916, gmch_n: 8388608, link_m: 269328, link_n: 524288, tu: 64
> [i915]] dp m2_n2: lanes: 2; gmch_m: 0, gmch_n: 0, link_m: 0, link_n: 0, tu: 0
> [i915]] audio: 0, infoframes: 0
> [i915]] requested mode:
> [drm]] Modeline 0:"1920x1080" 60 138700 1920 1968 2000 2080 1080 1083 1088 1111 0x48 0xa
> [i915]] adjusted mode:
> [drm]] Modeline 0:"1920x1080" 60 138700 1920 1968 2000 2080 1080 1083 1088 1111 0x48 0xa
> [i915]] crtc timings: 138700 1920 1968 2000 2080 1080 1083 1088 1111, type: 0x48 flags: 0xa
> [i915]] port clock: 270000, pipe src size: 1920x1080
> [i915]] num_scalers: 2, scaler_users: 0x0, scaler_id: -1
> [i915]] pch pfit: pos: 0x00000000, size: 0x00000000, disabled
> [i915]] ips: 0, double wide: 0
> [i915]] dpll_hw_state: ctrl1: 0x3, cfgcr1: 0x0, cfgcr2: 0x0
> [i915]] planes on this crtc
> [i915]] [PLANE:25:plane 1A] FB:63, fb = 1920x1080 format = XR24 little-endian (0x34325258)
> [i915]] scaler:-1 src 0x0+1920+1080 dst 0x0+1920+1080
> [i915]] [PLANE:27:plane 2A] disabled, scaler_id = -1
> [i915]] [PLANE:29:cursor A] disabled, scaler_id = -1
>
> On older platforms it would save even two more by skipping the scaler lines.
>
> I am uncertain of the DP m_n/m2_n2 business. Perhaps there is an opportunity to
> skip one of those on some platforms?
>
> Anyways.. every little helps! :) (for developers when hunting for interesting
> stuff in logs, disk space on the CI farm, etc,... )
>
> Tvrtko Ursulin (7):
> drm/i915: Extract intel_link_m_n config printing into a helper
> drm/i915: Dump FDI config only where applicable
> drm/i915: Don't log pipe config kernel pointer and duplicated pipe
> name
> drm/i915: Compact a few pipe config debug lines
> drm/i915: Only dump scaler config where supported
> drm/i915: Only dump possible panel fitter config for the platform
> drm/i915: Introduce enableddisabled helper
>
> drivers/gpu/drm/i915/i915_debugfs.c | 3 +-
> drivers/gpu/drm/i915/i915_drv.h | 5 ++
> drivers/gpu/drm/i915/intel_display.c | 130 +++++++++++++++--------------
> drivers/gpu/drm/i915/intel_dsi_panel_vbt.c | 8 +-
> drivers/gpu/drm/i915/intel_panel.c | 2 +-
> drivers/gpu/drm/i915/intel_pm.c | 3 +-
> 6 files changed, 78 insertions(+), 73 deletions(-)
if (!pipe_config->has_drrs) m2/n2 are unused.
For whole series:
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 13+ messages in thread