Re: [Intel-gfx] [PATCH] drm/i915/sdvo: Tidy up commentary

2018-02-14 Thread Jani Nikula 
On Wed, 14 Feb 2018, Chris Wilson  wrote:
> Drop the kerneldoc markup from the non-kerneldoc comments and convert
> the multi-line comments to the canonical format.
>
> drivers/gpu/drm/i915/intel_sdvo.c:223: warning: Function parameter or member 
> 'intel_sdvo' not described in 'intel_sdvo_write_sdvox'
> drivers/gpu/drm/i915/intel_sdvo.c:223: warning: Function parameter or member 
> 'val' not described in 'intel_sdvo_write_sdvox'
> drivers/gpu/drm/i915/intel_sdvo.c:653: warning: Function parameter or member 
> 'intel_sdvo' not described in 'intel_sdvo_get_trained_inputs'
> drivers/gpu/drm/i915/intel_sdvo.c:653: warning: Function parameter or member 
> 'input_1' not described in 'intel_sdvo_get_trained_inputs'
> drivers/gpu/drm/i915/intel_sdvo.c:653: warning: Function parameter or member 
> 'input_2' not described in 'intel_sdvo_get_trained_inputs'
> drivers/gpu/drm/i915/intel_sdvo.c:2311: warning: Function parameter or member 
> 'dev_priv' not described in 'intel_sdvo_select_ddc_bus'
> drivers/gpu/drm/i915/intel_sdvo.c:2311: warning: Function parameter or member 
> 'sdvo' not described in 'intel_sdvo_select_ddc_bus'
>
> Signed-off-by: Chris Wilson 

Reviewed-by: Jani Nikula 


> ---
>  drivers/gpu/drm/i915/intel_sdvo.c | 82 
> +--
>  1 file changed, 53 insertions(+), 29 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_sdvo.c 
> b/drivers/gpu/drm/i915/intel_sdvo.c
> index 0bf97ed5ffac..0c14d1c04cbd 100644
> --- a/drivers/gpu/drm/i915/intel_sdvo.c
> +++ b/drivers/gpu/drm/i915/intel_sdvo.c
> @@ -214,7 +214,7 @@ static bool
>  intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo,
>  struct intel_sdvo_connector 
> *intel_sdvo_connector);
>  
> -/**
> +/*
>   * Writes the SDVOB or SDVOC with the given value, but always writes both
>   * SDVOB and SDVOC to work around apparent hardware issues (according to
>   * comments in the BIOS).
> @@ -250,10 +250,10 @@ static void intel_sdvo_write_sdvox(struct intel_sdvo 
> *intel_sdvo, u32 val)
>* writing them only once doesn't appear to 'stick'.
>* The BIOS does this too. Yay, magic
>*/
> - for (i = 0; i < 2; i++)
> - {
> + for (i = 0; i < 2; i++) {
>   I915_WRITE(GEN3_SDVOB, bval);
>   POSTING_READ(GEN3_SDVOB);
> +
>   I915_WRITE(GEN3_SDVOC, cval);
>   POSTING_READ(GEN3_SDVOC);
>   }
> @@ -643,7 +643,7 @@ static bool intel_sdvo_set_target_input(struct intel_sdvo 
> *intel_sdvo)
>   , sizeof(targets));
>  }
>  
> -/**
> +/*
>   * Return whether each input is trained.
>   *
>   * This function is making an assumption about the layout of the response,
> @@ -1061,8 +1061,10 @@ intel_sdvo_set_output_timings_from_mode(struct 
> intel_sdvo *intel_sdvo,
>   return true;
>  }
>  
> -/* Asks the sdvo controller for the preferred input mode given the output 
> mode.
> - * Unfortunately we have to set up the full output mode to do that. */
> +/*
> + * Asks the sdvo controller for the preferred input mode given the output 
> mode.
> + * Unfortunately we have to set up the full output mode to do that.
> + */
>  static bool
>  intel_sdvo_get_preferred_input_mode(struct intel_sdvo *intel_sdvo,
>   const struct drm_display_mode *mode,
> @@ -1095,8 +1097,10 @@ static void i9xx_adjust_sdvo_tv_clock(struct 
> intel_crtc_state *pipe_config)
>   unsigned dotclock = pipe_config->port_clock;
>   struct dpll *clock = _config->dpll;
>  
> - /* SDVO TV has fixed PLL values depend on its clock range,
> -this mirrors vbios setting. */
> + /*
> +  * SDVO TV has fixed PLL values depend on its clock range,
> +  * this mirrors vbios setting.
> +  */
>   if (dotclock >= 10 && dotclock < 140500) {
>   clock->p1 = 2;
>   clock->p2 = 10;
> @@ -1132,7 +1136,8 @@ static bool intel_sdvo_compute_config(struct 
> intel_encoder *encoder,
>   if (HAS_PCH_SPLIT(to_i915(encoder->base.dev)))
>   pipe_config->has_pch_encoder = true;
>  
> - /* We need to construct preferred input timings based on our
> + /*
> +  * We need to construct preferred input timings based on our
>* output timings.  To do that, we have to set the output
>* timings, even though this isn't really the right place in
>* the sequence to do it. Oh well.
> @@ -1155,7 +1160,8 @@ static bool intel_sdvo_compute_config(struct 
> intel_encoder *encoder,
>  adjusted_mode);
>   }
>  
> - /* Make the CRTC code factor in the SDVO pixel multiplier.  The
> + /*
> +  * Make the CRTC code factor in the SDVO pixel multiplier.  The
>* SDVO device will factor out the multiplier during mode_set.
>*/
>   pipe_config->pixel_multiplier =
> @@

[Intel-gfx] [PATCH] drm/i915/sdvo: Tidy up commentary

2018-02-14 Thread Chris Wilson 
Drop the kerneldoc markup from the non-kerneldoc comments and convert
the multi-line comments to the canonical format.

drivers/gpu/drm/i915/intel_sdvo.c:223: warning: Function parameter or member 
'intel_sdvo' not described in 'intel_sdvo_write_sdvox'
drivers/gpu/drm/i915/intel_sdvo.c:223: warning: Function parameter or member 
'val' not described in 'intel_sdvo_write_sdvox'
drivers/gpu/drm/i915/intel_sdvo.c:653: warning: Function parameter or member 
'intel_sdvo' not described in 'intel_sdvo_get_trained_inputs'
drivers/gpu/drm/i915/intel_sdvo.c:653: warning: Function parameter or member 
'input_1' not described in 'intel_sdvo_get_trained_inputs'
drivers/gpu/drm/i915/intel_sdvo.c:653: warning: Function parameter or member 
'input_2' not described in 'intel_sdvo_get_trained_inputs'
drivers/gpu/drm/i915/intel_sdvo.c:2311: warning: Function parameter or member 
'dev_priv' not described in 'intel_sdvo_select_ddc_bus'
drivers/gpu/drm/i915/intel_sdvo.c:2311: warning: Function parameter or member 
'sdvo' not described in 'intel_sdvo_select_ddc_bus'

Signed-off-by: Chris Wilson 
---
 drivers/gpu/drm/i915/intel_sdvo.c | 82 +--
 1 file changed, 53 insertions(+), 29 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_sdvo.c 
b/drivers/gpu/drm/i915/intel_sdvo.c
index 0bf97ed5ffac..0c14d1c04cbd 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -214,7 +214,7 @@ static bool
 intel_sdvo_create_enhance_property(struct intel_sdvo *intel_sdvo,
   struct intel_sdvo_connector 
*intel_sdvo_connector);
 
-/**
+/*
  * Writes the SDVOB or SDVOC with the given value, but always writes both
  * SDVOB and SDVOC to work around apparent hardware issues (according to
  * comments in the BIOS).
@@ -250,10 +250,10 @@ static void intel_sdvo_write_sdvox(struct intel_sdvo 
*intel_sdvo, u32 val)
 * writing them only once doesn't appear to 'stick'.
 * The BIOS does this too. Yay, magic
 */
-   for (i = 0; i < 2; i++)
-   {
+   for (i = 0; i < 2; i++) {
I915_WRITE(GEN3_SDVOB, bval);
POSTING_READ(GEN3_SDVOB);
+
I915_WRITE(GEN3_SDVOC, cval);
POSTING_READ(GEN3_SDVOC);
}
@@ -643,7 +643,7 @@ static bool intel_sdvo_set_target_input(struct intel_sdvo 
*intel_sdvo)
, sizeof(targets));
 }
 
-/**
+/*
  * Return whether each input is trained.
  *
  * This function is making an assumption about the layout of the response,
@@ -1061,8 +1061,10 @@ intel_sdvo_set_output_timings_from_mode(struct 
intel_sdvo *intel_sdvo,
return true;
 }
 
-/* Asks the sdvo controller for the preferred input mode given the output mode.
- * Unfortunately we have to set up the full output mode to do that. */
+/*
+ * Asks the sdvo controller for the preferred input mode given the output mode.
+ * Unfortunately we have to set up the full output mode to do that.
+ */
 static bool
 intel_sdvo_get_preferred_input_mode(struct intel_sdvo *intel_sdvo,
const struct drm_display_mode *mode,
@@ -1095,8 +1097,10 @@ static void i9xx_adjust_sdvo_tv_clock(struct 
intel_crtc_state *pipe_config)
unsigned dotclock = pipe_config->port_clock;
struct dpll *clock = _config->dpll;
 
-   /* SDVO TV has fixed PLL values depend on its clock range,
-  this mirrors vbios setting. */
+   /*
+* SDVO TV has fixed PLL values depend on its clock range,
+* this mirrors vbios setting.
+*/
if (dotclock >= 10 && dotclock < 140500) {
clock->p1 = 2;
clock->p2 = 10;
@@ -1132,7 +1136,8 @@ static bool intel_sdvo_compute_config(struct 
intel_encoder *encoder,
if (HAS_PCH_SPLIT(to_i915(encoder->base.dev)))
pipe_config->has_pch_encoder = true;
 
-   /* We need to construct preferred input timings based on our
+   /*
+* We need to construct preferred input timings based on our
 * output timings.  To do that, we have to set the output
 * timings, even though this isn't really the right place in
 * the sequence to do it. Oh well.
@@ -1155,7 +1160,8 @@ static bool intel_sdvo_compute_config(struct 
intel_encoder *encoder,
   adjusted_mode);
}
 
-   /* Make the CRTC code factor in the SDVO pixel multiplier.  The
+   /*
+* Make the CRTC code factor in the SDVO pixel multiplier.  The
 * SDVO device will factor out the multiplier during mode_set.
 */
pipe_config->pixel_multiplier =
@@ -1169,9 +1175,12 @@ static bool intel_sdvo_compute_config(struct 
intel_encoder *encoder,
pipe_config->has_audio = true;
 
if (intel_sdvo_state->base.broadcast_rgb == INTEL_BROADCAST_RGB_AUTO) {
-   /* See CEA-861-E - 5.1 Default