From: Jani Nikula <jani.nikula@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Subject: Re: [PATCH 4/7] drm/i915: rename _PICK to _PICK3
Date: Thu, 15 Jun 2017 23:22:08 +0300 [thread overview]
Message-ID: <8760fxxaq7.fsf@intel.com> (raw)
In-Reply-To: <20170613193350.10528-5-paulo.r.zanoni@intel.com>
On Tue, 13 Jun 2017, Paulo Zanoni <paulo.r.zanoni@intel.com> wrote:
> All of the macros that call _PICK are named _X_3, so let's rename
> _PICK to _PICK3. The reason we're doing this is because we're going to
> have _PICK and _PICK2. Consider _PICK3 as the third variation of the
> PICK macros (well, actually it *is* the third variation...).
I named it PICK because it "picks" one of a list, i.e. it doesn't
compute anything. I guess I'd like to keep the name.
BR,
Jani.
>
> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 33 ++++++++++++++++-----------------
> 1 file changed, 16 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
> index 1d5a0f8..d271098 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -48,11 +48,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
> return !i915_mmio_reg_equal(reg, INVALID_MMIO_REG);
> }
>
> -#define _PICK(__index, ...) (((const u32 []){ __VA_ARGS__ })[__index])
> +#define _PICK3(__index, ...) (((const u32 []){ __VA_ARGS__ })[__index])
>
> #define _PIPE(pipe, a, b) ((a) + (pipe)*((b)-(a)))
> #define _MMIO_PIPE(pipe, a, b) _MMIO(_PIPE(pipe, a, b))
> -#define _MMIO_PIPE3(pipe, ...) _MMIO(_PICK(pipe, __VA_ARGS__))
> +#define _MMIO_PIPE3(pipe, ...) _MMIO(_PICK3(pipe, __VA_ARGS__))
>
> #define _PLANE(plane, a, b) _PIPE(plane, a, b)
> #define _MMIO_PLANE(plane, a, b) _MMIO_PIPE(plane, a, b)
> @@ -62,15 +62,14 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
>
> #define _PORT(port, a, b) ((a) + (port)*((b)-(a)))
> #define _MMIO_PORT(port, a, b) _MMIO(_PORT(port, a, b))
> -#define _MMIO_PORT3(port, ...) _MMIO(_PICK(port, __VA_ARGS__))
> -#define _MMIO_PORT6(port, ...) _MMIO(_PICK(port, __VA_ARGS__))
> -#define _MMIO_PORT6_LN(port, ln, a0, a1, b, c, d, e, f) \
> - _MMIO(_PICK(port, a0, b, c, d, e, f) + (ln * (a1 - a0)))
> +#define _MMIO_PORT3(port, ...) _MMIO(_PICK3(port, __VA_ARGS__))
> +#define _MMIO_PORT3_LN(port, ln, a0, a1, b, c, d, e, f) \
> + _MMIO(_PICK3(port, a0, b, c, d, e, f) + (ln * (a1 - a0)))
>
> #define _PLL(pll, a, b) ((a) + (pll)*((b)-(a)))
> #define _MMIO_PLL(pll, a, b) _MMIO(_PLL(pll, a, b))
>
> -#define _PHY3(phy, ...) _PICK(phy, __VA_ARGS__)
> +#define _PHY3(phy, ...) _PICK3(phy, __VA_ARGS__)
> #define _MMIO_PHY3(phy, ...) _MMIO(_PHY3(phy, __VA_ARGS__))
>
> #define _MASKED_FIELD(mask, value) ({ \
> @@ -1709,14 +1708,14 @@ enum skl_disp_power_wells {
> #define _CNL_PORT_PCS_DW1_LN0_C 0x162C04
> #define _CNL_PORT_PCS_DW1_LN0_D 0x162E04
> #define _CNL_PORT_PCS_DW1_LN0_F 0x162804
> -#define CNL_PORT_PCS_DW1_GRP(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_PCS_DW1_GRP(port) _MMIO_PORT3(port, \
> _CNL_PORT_PCS_DW1_GRP_AE, \
> _CNL_PORT_PCS_DW1_GRP_B, \
> _CNL_PORT_PCS_DW1_GRP_C, \
> _CNL_PORT_PCS_DW1_GRP_D, \
> _CNL_PORT_PCS_DW1_GRP_AE, \
> _CNL_PORT_PCS_DW1_GRP_F)
> -#define CNL_PORT_PCS_DW1_LN0(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_PCS_DW1_LN0(port) _MMIO_PORT3(port, \
> _CNL_PORT_PCS_DW1_LN0_AE, \
> _CNL_PORT_PCS_DW1_LN0_B, \
> _CNL_PORT_PCS_DW1_LN0_C, \
> @@ -1735,14 +1734,14 @@ enum skl_disp_power_wells {
> #define _CNL_PORT_TX_DW2_LN0_C 0x162C48
> #define _CNL_PORT_TX_DW2_LN0_D 0x162E48
> #define _CNL_PORT_TX_DW2_LN0_F 0x162A48
> -#define CNL_PORT_TX_DW2_GRP(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_TX_DW2_GRP(port) _MMIO_PORT3(port, \
> _CNL_PORT_TX_DW2_GRP_AE, \
> _CNL_PORT_TX_DW2_GRP_B, \
> _CNL_PORT_TX_DW2_GRP_C, \
> _CNL_PORT_TX_DW2_GRP_D, \
> _CNL_PORT_TX_DW2_GRP_AE, \
> _CNL_PORT_TX_DW2_GRP_F)
> -#define CNL_PORT_TX_DW2_LN0(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_TX_DW2_LN0(port) _MMIO_PORT3(port, \
> _CNL_PORT_TX_DW2_LN0_AE, \
> _CNL_PORT_TX_DW2_LN0_B, \
> _CNL_PORT_TX_DW2_LN0_C, \
> @@ -1764,14 +1763,14 @@ enum skl_disp_power_wells {
> #define _CNL_PORT_TX_DW4_LN0_C 0x162C50
> #define _CNL_PORT_TX_DW4_LN0_D 0x162E50
> #define _CNL_PORT_TX_DW4_LN0_F 0x162850
> -#define CNL_PORT_TX_DW4_GRP(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_TX_DW4_GRP(port) _MMIO_PORT3(port, \
> _CNL_PORT_TX_DW4_GRP_AE, \
> _CNL_PORT_TX_DW4_GRP_B, \
> _CNL_PORT_TX_DW4_GRP_C, \
> _CNL_PORT_TX_DW4_GRP_D, \
> _CNL_PORT_TX_DW4_GRP_AE, \
> _CNL_PORT_TX_DW4_GRP_F)
> -#define CNL_PORT_TX_DW4_LN(port, ln) _MMIO_PORT6_LN(port, ln, \
> +#define CNL_PORT_TX_DW4_LN(port, ln) _MMIO_PORT3_LN(port, ln, \
> _CNL_PORT_TX_DW4_LN0_AE, \
> _CNL_PORT_TX_DW4_LN1_AE, \
> _CNL_PORT_TX_DW4_LN0_B, \
> @@ -1794,14 +1793,14 @@ enum skl_disp_power_wells {
> #define _CNL_PORT_TX_DW5_LN0_C 0x162C54
> #define _CNL_PORT_TX_DW5_LN0_D 0x162ED4
> #define _CNL_PORT_TX_DW5_LN0_F 0x162854
> -#define CNL_PORT_TX_DW5_GRP(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_TX_DW5_GRP(port) _MMIO_PORT3(port, \
> _CNL_PORT_TX_DW5_GRP_AE, \
> _CNL_PORT_TX_DW5_GRP_B, \
> _CNL_PORT_TX_DW5_GRP_C, \
> _CNL_PORT_TX_DW5_GRP_D, \
> _CNL_PORT_TX_DW5_GRP_AE, \
> _CNL_PORT_TX_DW5_GRP_F)
> -#define CNL_PORT_TX_DW5_LN0(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_TX_DW5_LN0(port) _MMIO_PORT3(port, \
> _CNL_PORT_TX_DW5_LN0_AE, \
> _CNL_PORT_TX_DW5_LN0_B, \
> _CNL_PORT_TX_DW5_LN0_C, \
> @@ -1823,14 +1822,14 @@ enum skl_disp_power_wells {
> #define _CNL_PORT_TX_DW7_LN0_C 0x162C5C
> #define _CNL_PORT_TX_DW7_LN0_D 0x162EDC
> #define _CNL_PORT_TX_DW7_LN0_F 0x16285C
> -#define CNL_PORT_TX_DW7_GRP(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_TX_DW7_GRP(port) _MMIO_PORT3(port, \
> _CNL_PORT_TX_DW7_GRP_AE, \
> _CNL_PORT_TX_DW7_GRP_B, \
> _CNL_PORT_TX_DW7_GRP_C, \
> _CNL_PORT_TX_DW7_GRP_D, \
> _CNL_PORT_TX_DW7_GRP_AE, \
> _CNL_PORT_TX_DW7_GRP_F)
> -#define CNL_PORT_TX_DW7_LN0(port) _MMIO_PORT6(port, \
> +#define CNL_PORT_TX_DW7_LN0(port) _MMIO_PORT3(port, \
> _CNL_PORT_TX_DW7_LN0_AE, \
> _CNL_PORT_TX_DW7_LN0_B, \
> _CNL_PORT_TX_DW7_LN0_C, \
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2017-06-15 20:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 19:33 [PATCH 0/7] Reorganize the register picking macros Paulo Zanoni
2017-06-13 19:33 ` [PATCH 1/7] drm/i915: reorder " Paulo Zanoni
2017-06-14 17:22 ` Rodrigo Vivi
2017-06-13 19:33 ` [PATCH 2/7] drm/i915: _MMIO_PORT3 takes a port as an argument Paulo Zanoni
2017-06-14 17:23 ` Rodrigo Vivi
2017-06-13 19:33 ` [PATCH 3/7] drm/i915: use variable arguments for the macros that call _PICK Paulo Zanoni
2017-06-14 17:25 ` Rodrigo Vivi
2017-06-13 19:33 ` [PATCH 4/7] drm/i915: rename _PICK to _PICK3 Paulo Zanoni
2017-06-15 20:22 ` Jani Nikula [this message]
2017-06-13 19:33 ` [PATCH 5/7] drm/i915: add _PICK macro for the "a + index * (b - a)" macros Paulo Zanoni
2017-06-15 20:26 ` Jani Nikula
2017-06-19 10:14 ` Chauhan, Madhav
2017-06-13 19:33 ` [PATCH 6/7] drm/i915: also move version 2 of the register picking macros up Paulo Zanoni
2017-06-15 20:37 ` Jani Nikula
2017-06-13 19:33 ` [PATCH 7/7] drm/i915: extract a _PICK2 macro Paulo Zanoni
2017-06-14 15:16 ` Ville Syrjälä
2017-06-14 17:34 ` Paulo Zanoni
2017-06-14 17:38 ` Rodrigo Vivi
2017-06-15 20:33 ` Jani Nikula
2017-06-13 19:49 ` ✓ Fi.CI.BAT: success for Reorganize the register picking macros Patchwork
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=8760fxxaq7.fsf@intel.com \
--to=jani.nikula@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=paulo.r.zanoni@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.