public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: "Ville Syrjälä" <ville.syrjala@linux.intel.com>
To: Damien Lespiau <damien.lespiau@intel.com>
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: Make sure our labels start at column 0
Date: Thu, 4 Jun 2015 19:34:25 +0300	[thread overview]
Message-ID: <20150604163425.GR5176@intel.com> (raw)
In-Reply-To: <1433433378-3961-1-git-send-email-damien.lespiau@intel.com>

On Thu, Jun 04, 2015 at 04:56:18PM +0100, Damien Lespiau wrote:
> I noticed one of those and it turned out we have a few lingering around.

Yuck. I'd prefer we got the other way. Consider the following diffs for example:

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 7f6fd85..342509d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -942,6 +942,7 @@ out:
 
 	pps_unlock(intel_dp);
 
+	// foo
 	return ret;
 }

diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index 5901e00..2673347 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -942,6 +942,7 @@ intel_dp_aux_ch(struct intel_dp *intel_dp,
 
 	pps_unlock(intel_dp);
 
+	// foo
 	return ret;
 }

> 
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_display.c | 4 ++--
>  drivers/gpu/drm/i915/intel_sprite.c  | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index a96f181..2354927 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -6980,7 +6980,7 @@ static int i965gm_get_display_clock_speed(struct drm_device *dev)
>  
>  	return DIV_ROUND_CLOSEST(vco, div_table[cdclk_sel]);
>  
> - fail:
> +fail:
>  	DRM_ERROR("Unable to determine CDCLK. HPLL VCO=%u kHz, CFGC=0x%04x\n", vco, tmp);
>  	return 200000;
>  }
> @@ -7021,7 +7021,7 @@ static int g33_get_display_clock_speed(struct drm_device *dev)
>  
>  	return DIV_ROUND_CLOSEST(vco, div_table[cdclk_sel]);
>  
> - fail:
> +fail:
>  	DRM_ERROR("Unable to determine CDCLK. HPLL VCO=%u kHz, CFGC=0x%08x\n", vco, tmp);
>  	return 190476;
>  }
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
> index 8193a35..f5965fb 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -1189,6 +1189,6 @@ intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane)
>  
>  	drm_plane_helper_add(&intel_plane->base, &intel_plane_helper_funcs);
>  
> - out:
> +out:
>  	return ret;
>  }
> -- 
> 2.1.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx

  reply	other threads:[~2015-06-04 16:34 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-04 15:56 [PATCH] drm/i915: Make sure our labels start at column 0 Damien Lespiau
2015-06-04 16:34 ` Ville Syrjälä [this message]
2015-06-05  9:24   ` Jani Nikula
2015-06-05  9:27     ` Ville Syrjälä
2015-06-05 10:04       ` Damien Lespiau
2015-06-05 13:47         ` Dave Gordon
2015-06-15 12:34       ` Daniel Vetter
2015-06-15 18:18         ` Dave Gordon
2015-06-05 14:51 ` shuang.he

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150604163425.GR5176@intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=damien.lespiau@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox