From mboxrd@z Thu Jan  1 00:00:00 1970
From: "Siluvery, Arun" <arun.siluvery@linux.intel.com>
Subject: Re: [PATCH 1/5] drm/i915: Rename intel_wa_registers
 with a i915_ prefix
Date: Mon, 01 Sep 2014 12:06:04 +0100
Message-ID: <5404531C.4030902@linux.intel.com>
References: <1409413863-7681-1-git-send-email-damien.lespiau@intel.com>
 <1409413863-7681-2-git-send-email-damien.lespiau@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"; Format="flowed"
Content-Transfer-Encoding: 7bit
Return-path: <intel-gfx-bounces@lists.freedesktop.org>
Received: from mga01.intel.com (mga01.intel.com [192.55.52.88])
 by gabe.freedesktop.org (Postfix) with ESMTP id A9AB66E12A
 for <intel-gfx@lists.freedesktop.org>; Mon,  1 Sep 2014 04:06:27 -0700 (PDT)
In-Reply-To: <1409413863-7681-2-git-send-email-damien.lespiau@intel.com>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
 <mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
Errors-To: intel-gfx-bounces@lists.freedesktop.org
Sender: "Intel-gfx" <intel-gfx-bounces@lists.freedesktop.org>
To: Damien Lespiau <damien.lespiau@intel.com>, intel-gfx@lists.freedesktop.org
List-Id: intel-gfx@lists.freedesktop.org

On 30/08/2014 16:50, Damien Lespiau wrote:
> Those debugfs files are prefixed by i915, the name of the kernel module,
> presumably to make the difference with files exposed by core DRM.
>
> Also, add a ',' at the end of the last entry. This is to ease the
> conflict resolution when rebasing internal patches that add a member at
> the end of the array. Without it, wiggle can't do its job as we need to
> modify an existing line (appending the ',').
>
> Signed-off-by: Damien Lespiau <damien.lespiau@intel.com>
> ---
>   drivers/gpu/drm/i915/i915_debugfs.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 1467cc1..fc3d582a 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -2628,7 +2628,7 @@ static int i915_shared_dplls_info(struct seq_file *m, void *unused)
>   	return 0;
>   }
>
> -static int intel_wa_registers(struct seq_file *m, void *unused)
> +static int i915_wa_registers(struct seq_file *m, void *unused)
>   {
>   	int i;
>   	int ret;
> @@ -4198,7 +4198,7 @@ static const struct drm_info_list i915_debugfs_list[] = {
>   	{"i915_semaphore_status", i915_semaphore_status, 0},
>   	{"i915_shared_dplls_info", i915_shared_dplls_info, 0},
>   	{"i915_dp_mst_info", i915_dp_mst_info, 0},
> -	{"intel_wa_registers", intel_wa_registers, 0}
> +	{"i915_wa_registers", i915_wa_registers, 0},
>   };
>   #define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)
>
>
Reviewed-by: Arun Siluvery <arun.siluvery@linux.intel.com>
This is only for this patch, remaining patches are not required in the 
rework.

regards
Arun