All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
To: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>,
	intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH] drm/i915: refactor register fw read/write macros for recent GENs
Date: Mon, 6 Feb 2017 08:51:36 +0000	[thread overview]
Message-ID: <9af76d0e-4963-01ae-5bd5-cf35cb98f805@linux.intel.com> (raw)
In-Reply-To: <1486171409-21542-1-git-send-email-daniele.ceraolospurio@intel.com>


On 04/02/2017 01:23, Daniele Ceraolo Spurio wrote:
> The only difference for the more recent of those macros is the version
> of the *_reg_<read/write>_fw_domains function. Passing the function
> prefix in allows us to re-use the same macro to generate functions for
> different GENs and will make it easier to add new accessors in the future
>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
> Signed-off-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_uncore.c | 40 ++++++++++---------------------------
>  1 file changed, 10 insertions(+), 30 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 3d243fe..1ff8fd9 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -992,29 +992,19 @@ static inline void __force_wake_auto(struct drm_i915_private *dev_priv,
>  		___force_wake_auto(dev_priv, fw_domains);
>  }
>
> -#define __gen6_read(x) \
> +#define __gen_read(func, x) \
>  static u##x \
> -gen6_read##x(struct drm_i915_private *dev_priv, i915_reg_t reg, bool trace) { \
> +func##_read##x(struct drm_i915_private *dev_priv, i915_reg_t reg, bool trace) { \
>  	enum forcewake_domains fw_engine; \
>  	GEN6_READ_HEADER(x); \
> -	fw_engine = __gen6_reg_read_fw_domains(offset); \
> -	if (fw_engine) \
> -		__force_wake_auto(dev_priv, fw_engine); \
> -	val = __raw_i915_read##x(dev_priv, reg); \
> -	GEN6_READ_FOOTER; \
> -}
> -
> -#define __fwtable_read(x) \
> -static u##x \
> -fwtable_read##x(struct drm_i915_private *dev_priv, i915_reg_t reg, bool trace) { \
> -	enum forcewake_domains fw_engine; \
> -	GEN6_READ_HEADER(x); \
> -	fw_engine = __fwtable_reg_read_fw_domains(offset); \
> +	fw_engine = __##func##_reg_read_fw_domains(offset); \
>  	if (fw_engine) \
>  		__force_wake_auto(dev_priv, fw_engine); \
>  	val = __raw_i915_read##x(dev_priv, reg); \
>  	GEN6_READ_FOOTER; \
>  }
> +#define __gen6_read(x) __gen_read(gen6, x)
> +#define __fwtable_read(x) __gen_read(fwtable, x)
>
>  #define __gen9_decoupled_read(x) \
>  static u##x \
> @@ -1115,29 +1105,19 @@ static inline void __force_wake_auto(struct drm_i915_private *dev_priv,
>  	GEN6_WRITE_FOOTER; \
>  }
>
> -#define __gen8_write(x) \
> +#define __gen_write(func, x) \
>  static void \
> -gen8_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool trace) { \
> +func##_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool trace) { \
>  	enum forcewake_domains fw_engine; \
>  	GEN6_WRITE_HEADER; \
> -	fw_engine = __gen8_reg_write_fw_domains(offset); \
> -	if (fw_engine) \
> -		__force_wake_auto(dev_priv, fw_engine); \
> -	__raw_i915_write##x(dev_priv, reg, val); \
> -	GEN6_WRITE_FOOTER; \
> -}
> -
> -#define __fwtable_write(x) \
> -static void \
> -fwtable_write##x(struct drm_i915_private *dev_priv, i915_reg_t reg, u##x val, bool trace) { \
> -	enum forcewake_domains fw_engine; \
> -	GEN6_WRITE_HEADER; \
> -	fw_engine = __fwtable_reg_write_fw_domains(offset); \
> +	fw_engine = __##func##_reg_write_fw_domains(offset); \
>  	if (fw_engine) \
>  		__force_wake_auto(dev_priv, fw_engine); \
>  	__raw_i915_write##x(dev_priv, reg, val); \
>  	GEN6_WRITE_FOOTER; \
>  }
> +#define __gen8_write(x) __gen_write(gen8, x)
> +#define __fwtable_write(x) __gen_write(fwtable, x)
>
>  #define __gen9_decoupled_write(x) \
>  static void \
>

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-02-06  8:51 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-04  1:23 [PATCH] drm/i915: refactor register fw read/write macros for recent GENs Daniele Ceraolo Spurio
2017-02-04  1:58 ` ✗ Fi.CI.BAT: failure for " Patchwork
2017-02-06  8:51 ` Tvrtko Ursulin [this message]
2017-02-06  8:56   ` [PATCH] " Chris Wilson

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=9af76d0e-4963-01ae-5bd5-cf35cb98f805@linux.intel.com \
    --to=tvrtko.ursulin@linux.intel.com \
    --cc=daniele.ceraolospurio@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 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.