From: "Siluvery, Arun" <arun.siluvery@linux.intel.com>
To: Damien Lespiau <damien.lespiau@intel.com>,
intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 1/5] drm/i915: Rename intel_wa_registers with a i915_ prefix
Date: Mon, 01 Sep 2014 12:06:04 +0100 [thread overview]
Message-ID: <5404531C.4030902@linux.intel.com> (raw)
In-Reply-To: <1409413863-7681-2-git-send-email-damien.lespiau@intel.com>
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
next prev parent reply other threads:[~2014-09-01 11:06 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-30 15:50 [PATCH 0/5] A few fixes on top of the wa_regs patches Damien Lespiau
2014-08-30 15:50 ` [PATCH 1/5] drm/i915: Rename intel_wa_registers with a i915_ prefix Damien Lespiau
2014-09-01 11:06 ` Siluvery, Arun [this message]
2014-08-30 15:51 ` [PATCH 2/5] drm/i915: Don't overrun the intel_wa_regs array Damien Lespiau
2014-08-30 15:51 ` [PATCH 3/5] drm/i915: Don't silently discard workarounds Damien Lespiau
2014-08-30 15:51 ` [PATCH 4/5] drm/i915: Remove unneeded brackets Damien Lespiau
2014-08-30 15:51 ` [PATCH 5/5] drm/i915: Don't restrict i915_wa_registers to BDW Damien Lespiau
2014-09-01 11:33 ` Siluvery, Arun
2014-08-31 19:32 ` [PATCH 0/5] A few fixes on top of the wa_regs patches Siluvery, Arun
2014-09-01 9:08 ` Daniel Vetter
2014-09-01 9:29 ` Siluvery, Arun
2014-09-03 9:18 ` Siluvery, Arun
2014-09-03 10:40 ` Daniel Vetter
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=5404531C.4030902@linux.intel.com \
--to=arun.siluvery@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