From: Jani Nikula <jani.nikula@linux.intel.com>
To: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>,
Intel graphics driver community testing & development
<intel-gfx@lists.freedesktop.org>
Subject: Re: [PATCH 1/2] drm/i915: Reduce trickery in DEV_INFO_FOR_EACH_FLAG
Date: Tue, 04 Oct 2016 17:19:59 +0300 [thread overview]
Message-ID: <87wphogprk.fsf@intel.com> (raw)
In-Reply-To: <1475584978-801-1-git-send-email-joonas.lahtinen@linux.intel.com>
On Tue, 04 Oct 2016, Joonas Lahtinen <joonas.lahtinen@linux.intel.com> wrote:
> Get rid of SEP_SEMICOLON and SEP_BLANK in DEV_INFO_FOR_EACH_FLAG.
>
> Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_debugfs.c | 6 +-
> drivers/gpu/drm/i915/i915_drv.h | 98 +++++++++++++++-----------------
> drivers/gpu/drm/i915/i915_gpu_error.c | 6 +-
> drivers/gpu/drm/i915/intel_device_info.c | 11 ++--
> 4 files changed, 55 insertions(+), 66 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
> index 4fb9d82..4119235 100644
> --- a/drivers/gpu/drm/i915/i915_debugfs.c
> +++ b/drivers/gpu/drm/i915/i915_debugfs.c
> @@ -68,11 +68,9 @@ static int i915_capabilities(struct seq_file *m, void *data)
>
> seq_printf(m, "gen: %d\n", INTEL_GEN(dev_priv));
> seq_printf(m, "pch: %d\n", INTEL_PCH_TYPE(dev_priv));
> -#define PRINT_FLAG(x) seq_printf(m, #x ": %s\n", yesno(info->x))
> -#define SEP_SEMICOLON ;
> - DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG, SEP_SEMICOLON);
> +#define PRINT_FLAG(x) seq_printf(m, #x ": %s\n", yesno(info->x));
> + DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG)
NAK.
Leaving out the semicolon throws off a bunch of editor autoidenting
stuff. And is aesthetically displeasing.
BR,
Jani.
> #undef PRINT_FLAG
> -#undef SEP_SEMICOLON
>
> return 0;
> }
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 91ff3d7..f13b958 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -634,55 +634,52 @@ struct intel_csr {
> uint32_t allowed_dc_mask;
> };
>
> -#define DEV_INFO_FOR_EACH_FLAG(func, sep) \
> - func(is_mobile) sep \
> - func(is_i85x) sep \
> - func(is_i915g) sep \
> - func(is_i945gm) sep \
> - func(is_g33) sep \
> - func(hws_needs_physical) sep \
> - func(is_g4x) sep \
> - func(is_pineview) sep \
> - func(is_broadwater) sep \
> - func(is_crestline) sep \
> - func(is_ivybridge) sep \
> - func(is_valleyview) sep \
> - func(is_cherryview) sep \
> - func(is_haswell) sep \
> - func(is_broadwell) sep \
> - func(is_skylake) sep \
> - func(is_broxton) sep \
> - func(is_kabylake) sep \
> - func(is_preliminary) sep \
> - func(has_fbc) sep \
> - func(has_psr) sep \
> - func(has_runtime_pm) sep \
> - func(has_csr) sep \
> - func(has_resource_streamer) sep \
> - func(has_rc6) sep \
> - func(has_rc6p) sep \
> - func(has_dp_mst) sep \
> - func(has_gmbus_irq) sep \
> - func(has_hw_contexts) sep \
> - func(has_logical_ring_contexts) sep \
> - func(has_l3_dpf) sep \
> - func(has_gmch_display) sep \
> - func(has_guc) sep \
> - func(has_pipe_cxsr) sep \
> - func(has_hotplug) sep \
> - func(cursor_needs_physical) sep \
> - func(has_overlay) sep \
> - func(overlay_needs_physical) sep \
> - func(supports_tv) sep \
> - func(has_llc) sep \
> - func(has_snoop) sep \
> - func(has_ddi) sep \
> - func(has_fpga_dbg) sep \
> +#define DEV_INFO_FOR_EACH_FLAG(func) \
> + func(is_mobile) \
> + func(is_i85x) \
> + func(is_i915g) \
> + func(is_i945gm) \
> + func(is_g33) \
> + func(hws_needs_physical) \
> + func(is_g4x) \
> + func(is_pineview) \
> + func(is_broadwater) \
> + func(is_crestline) \
> + func(is_ivybridge) \
> + func(is_valleyview) \
> + func(is_cherryview) \
> + func(is_haswell) \
> + func(is_broadwell) \
> + func(is_skylake) \
> + func(is_broxton) \
> + func(is_kabylake) \
> + func(is_preliminary) \
> + func(has_fbc) \
> + func(has_psr) \
> + func(has_runtime_pm) \
> + func(has_csr) \
> + func(has_resource_streamer) \
> + func(has_rc6) \
> + func(has_rc6p) \
> + func(has_dp_mst) \
> + func(has_gmbus_irq) \
> + func(has_hw_contexts) \
> + func(has_logical_ring_contexts) \
> + func(has_l3_dpf) \
> + func(has_gmch_display) \
> + func(has_guc) \
> + func(has_pipe_cxsr) \
> + func(has_hotplug) \
> + func(cursor_needs_physical) \
> + func(has_overlay) \
> + func(overlay_needs_physical) \
> + func(supports_tv) \
> + func(has_llc) \
> + func(has_snoop) \
> + func(has_ddi) \
> + func(has_fpga_dbg) \
> func(has_pooled_eu)
>
> -#define DEFINE_FLAG(name) u8 name:1
> -#define SEP_SEMICOLON ;
> -
> struct sseu_dev_info {
> u8 slice_mask;
> u8 subslice_mask;
> @@ -710,7 +707,9 @@ struct intel_device_info {
> u16 gen_mask;
> u8 ring_mask; /* Rings supported by the HW */
> u8 num_rings;
> - DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG, SEP_SEMICOLON);
> +#define DEFINE_FLAG(name) u8 name:1;
> + DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG)
> +#undef DEFINE_FLAG
> u16 ddb_size; /* in blocks */
> /* Register offsets for the various display pipes and transcoders */
> int pipe_offsets[I915_MAX_TRANSCODERS];
> @@ -727,9 +726,6 @@ struct intel_device_info {
> } color;
> };
>
> -#undef DEFINE_FLAG
> -#undef SEP_SEMICOLON
> -
> struct intel_display_error_state;
>
> struct drm_i915_error_state {
> diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i915_gpu_error.c
> index 2bbab22..37fcd34 100644
> --- a/drivers/gpu/drm/i915/i915_gpu_error.c
> +++ b/drivers/gpu/drm/i915/i915_gpu_error.c
> @@ -355,11 +355,9 @@ static void print_error_obj(struct drm_i915_error_state_buf *m,
> static void err_print_capabilities(struct drm_i915_error_state_buf *m,
> const struct intel_device_info *info)
> {
> -#define PRINT_FLAG(x) err_printf(m, #x ": %s\n", yesno(info->x))
> -#define SEP_SEMICOLON ;
> - DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG, SEP_SEMICOLON);
> +#define PRINT_FLAG(x) err_printf(m, #x ": %s\n", yesno(info->x));
> + DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG)
> #undef PRINT_FLAG
> -#undef SEP_SEMICOLON
> }
>
> int i915_error_state_to_str(struct drm_i915_error_state_buf *m,
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 73b6858..decdc8e 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -29,19 +29,16 @@ void intel_device_info_dump(struct drm_i915_private *dev_priv)
> const struct intel_device_info *info = &dev_priv->info;
>
> #define PRINT_S(name) "%s"
> -#define SEP_EMPTY
> -#define PRINT_FLAG(name) info->name ? #name "," : ""
> -#define SEP_COMMA ,
> +#define PRINT_FLAG(name) info->name ? #name "," : "",
> DRM_DEBUG_DRIVER("i915 device info: gen=%i, pciid=0x%04x rev=0x%02x flags="
> - DEV_INFO_FOR_EACH_FLAG(PRINT_S, SEP_EMPTY),
> + DEV_INFO_FOR_EACH_FLAG(PRINT_S) "%s",
> info->gen,
> dev_priv->drm.pdev->device,
> dev_priv->drm.pdev->revision,
> - DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG, SEP_COMMA));
> + DEV_INFO_FOR_EACH_FLAG(PRINT_FLAG)
> + "");
> #undef PRINT_S
> -#undef SEP_EMPTY
> #undef PRINT_FLAG
> -#undef SEP_COMMA
> }
>
> static void cherryview_sseu_info_init(struct drm_i915_private *dev_priv)
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
prev parent reply other threads:[~2016-10-04 14:20 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-04 12:42 [PATCH 1/2] drm/i915: Reduce trickery in DEV_INFO_FOR_EACH_FLAG Joonas Lahtinen
2016-10-04 12:42 ` [PATCH 2/2] drm/i915: Sort DEV_INFO_FOR_EACH_FLAG Joonas Lahtinen
2016-10-04 13:32 ` Chris Wilson
2016-10-06 10:10 ` Tvrtko Ursulin
2016-10-04 13:23 ` [PATCH 1/2] drm/i915: Reduce trickery in DEV_INFO_FOR_EACH_FLAG Chris Wilson
2016-10-04 13:49 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] " Patchwork
2016-10-04 14:19 ` Jani Nikula [this message]
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=87wphogprk.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=joonas.lahtinen@linux.intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.