diff mbox

drm/i915: Try to group more logically in intel_dump_pipe_config

Message ID 1479467957-7554-1-git-send-email-tvrtko.ursulin@linux.intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Tvrtko Ursulin Nov. 18, 2016, 11:19 a.m. UTC 
From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Keep parameters relating to the pipe and crtc respectively together.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/i915/intel_display.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

Comments

Tvrtko Ursulin Nov. 21, 2016, 10:44 a.m. UTC | #1 
On 18/11/2016 11:19, Tvrtko Ursulin wrote:
> From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
>
> Keep parameters relating to the pipe and crtc respectively together.
>
> Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Cc: Ville Syrjälä <ville.syrjala@linux.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 200f09778776..155910c93896 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -12739,9 +12739,14 @@ 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, pipe bpp: %i, dithering: %i\n",
> +	DRM_DEBUG_KMS("cpu_transcoder: %s, port clock: %d, ips: %i\n",
>  		      transcoder_name(pipe_config->cpu_transcoder),
> -		      pipe_config->pipe_bpp, pipe_config->dither);
> +		      pipe_config->port_clock, pipe_config->ips_enabled);
> +
> +	DRM_DEBUG_KMS("pipe src size: %dx%d, bpp: %i, dithering: %i, double wide: %i\n",
> +		      pipe_config->pipe_src_w, pipe_config->pipe_src_h,
> +		      pipe_config->pipe_bpp, pipe_config->dither,
> +		      pipe_config->double_wide);


Better grouping yay/nay? :)

Regards,

Tvrtko

>
>  	if (pipe_config->has_pch_encoder)
>  		intel_dump_m_n_config(pipe_config, "fdi",
> @@ -12765,9 +12770,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
>  	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, pipe src size: %dx%d\n",
> -		      pipe_config->port_clock,
> -		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
>
>  	if (INTEL_GEN(dev_priv) >= 9)
>  		DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
> @@ -12786,9 +12788,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
>  			      pipe_config->pch_pfit.size,
>  		              enableddisabled(pipe_config->pch_pfit.enabled));
>
> -	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,"
>  			      "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "
>
Ville Syrjälä Nov. 21, 2016, 3:11 p.m. UTC | #2 
On Mon, Nov 21, 2016 at 10:44:46AM +0000, Tvrtko Ursulin wrote:
> 
> 
> On 18/11/2016 11:19, Tvrtko Ursulin wrote:
> > From: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> >
> > Keep parameters relating to the pipe and crtc respectively together.
> >
> > Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> > Cc: Ville Syrjälä <ville.syrjala@linux.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 200f09778776..155910c93896 100644
> > --- a/drivers/gpu/drm/i915/intel_display.c
> > +++ b/drivers/gpu/drm/i915/intel_display.c
> > @@ -12739,9 +12739,14 @@ 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, pipe bpp: %i, dithering: %i\n",
> > +	DRM_DEBUG_KMS("cpu_transcoder: %s, port clock: %d, ips: %i\n",
> >  		      transcoder_name(pipe_config->cpu_transcoder),
> > -		      pipe_config->pipe_bpp, pipe_config->dither);
> > +		      pipe_config->port_clock, pipe_config->ips_enabled);
> > +
> > +	DRM_DEBUG_KMS("pipe src size: %dx%d, bpp: %i, dithering: %i, double wide: %i\n",
> > +		      pipe_config->pipe_src_w, pipe_config->pipe_src_h,
> > +		      pipe_config->pipe_bpp, pipe_config->dither,
> > +		      pipe_config->double_wide);
> 
> 
> Better grouping yay/nay? :)

Looks a lot like random shuffling.

I would suggest we just leave it as is for now. If I get
sufficiently annoyed at it when looking at bugs, I might come
up with something more sensible.

> 
> Regards,
> 
> Tvrtko
> 
> >
> >  	if (pipe_config->has_pch_encoder)
> >  		intel_dump_m_n_config(pipe_config, "fdi",
> > @@ -12765,9 +12770,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
> >  	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, pipe src size: %dx%d\n",
> > -		      pipe_config->port_clock,
> > -		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
> >
> >  	if (INTEL_GEN(dev_priv) >= 9)
> >  		DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
> > @@ -12786,9 +12788,6 @@ static void intel_dump_pipe_config(struct intel_crtc *crtc,
> >  			      pipe_config->pch_pfit.size,
> >  		              enableddisabled(pipe_config->pch_pfit.enabled));
> >
> > -	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,"
> >  			      "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "
> >
diff mbox

Patch

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 200f09778776..155910c93896 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -12739,9 +12739,14 @@  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, pipe bpp: %i, dithering: %i\n",
+	DRM_DEBUG_KMS("cpu_transcoder: %s, port clock: %d, ips: %i\n",
 		      transcoder_name(pipe_config->cpu_transcoder),
-		      pipe_config->pipe_bpp, pipe_config->dither);
+		      pipe_config->port_clock, pipe_config->ips_enabled);
+
+	DRM_DEBUG_KMS("pipe src size: %dx%d, bpp: %i, dithering: %i, double wide: %i\n",
+		      pipe_config->pipe_src_w, pipe_config->pipe_src_h,
+		      pipe_config->pipe_bpp, pipe_config->dither,
+		      pipe_config->double_wide);
 
 	if (pipe_config->has_pch_encoder)
 		intel_dump_m_n_config(pipe_config, "fdi",
@@ -12765,9 +12770,6 @@  static void intel_dump_pipe_config(struct intel_crtc *crtc,
 	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, pipe src size: %dx%d\n",
-		      pipe_config->port_clock,
-		      pipe_config->pipe_src_w, pipe_config->pipe_src_h);
 
 	if (INTEL_GEN(dev_priv) >= 9)
 		DRM_DEBUG_KMS("num_scalers: %d, scaler_users: 0x%x, scaler_id: %d\n",
@@ -12786,9 +12788,6 @@  static void intel_dump_pipe_config(struct intel_crtc *crtc,
 			      pipe_config->pch_pfit.size,
 		              enableddisabled(pipe_config->pch_pfit.enabled));
 
-	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,"
 			      "pll0: 0x%x, pll1: 0x%x, pll2: 0x%x, pll3: 0x%x, "