From: Paulo Zanoni <paulo.r.zanoni@intel.com>
To: ville.syrjala@linux.intel.com, intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 7/9] drm/i915: s/plane/plane_id/ in skl+ plane register defines
Date: Thu, 15 Dec 2016 16:33:43 -0200 [thread overview]
Message-ID: <1481826823.2548.149.camel@intel.com> (raw)
In-Reply-To: <1479830524-7882-8-git-send-email-ville.syrjala@linux.intel.com>
Em Ter, 2016-11-22 às 18:02 +0200, ville.syrjala@linux.intel.com
escreveu:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Rename the SKL plane register define 'plane' parameter to 'plane_id'
> to
> reflect the fact that you're supposed to pass in the enum plane_id
> rather than enum plane.
>
> Do the same for the scaler plane selector bits.
>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Suggested-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/i915_reg.h | 46 ++++++++++++++++++++-----------
> ----------
> 1 file changed, 23 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_reg.h
> b/drivers/gpu/drm/i915/i915_reg.h
> index d03491089f9c..8ceea23ba63b 100644
> --- a/drivers/gpu/drm/i915/i915_reg.h
> +++ b/drivers/gpu/drm/i915/i915_reg.h
> @@ -5502,8 +5502,8 @@ enum {
> #define _PLANE_CTL_1(pipe) _PIPE(pipe, _PLANE_CTL_1_A,
> _PLANE_CTL_1_B)
> #define _PLANE_CTL_2(pipe) _PIPE(pipe, _PLANE_CTL_2_A,
> _PLANE_CTL_2_B)
> #define _PLANE_CTL_3(pipe) _PIPE(pipe, _PLANE_CTL_3_A,
> _PLANE_CTL_3_B)
> -#define PLANE_CTL(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_CTL_1(pipe), _PLANE_CTL_2(pipe))
> +#define PLANE_CTL(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_CTL_1(pipe),
> _PLANE_CTL_2(pipe))
>
> #define _PLANE_STRIDE_1_B 0x71188
> #define _PLANE_STRIDE_2_B 0x71288
> @@ -5514,8 +5514,8 @@ enum {
> _PIPE(pipe, _PLANE_STRIDE_2_A, _PLANE_STRIDE_2_B)
> #define _PLANE_STRIDE_3(pipe) \
> _PIPE(pipe, _PLANE_STRIDE_3_A, _PLANE_STRIDE_3_B)
> -#define PLANE_STRIDE(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_STRIDE_1(pipe),
> _PLANE_STRIDE_2(pipe))
> +#define PLANE_STRIDE(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_STRIDE_1(pipe),
> _PLANE_STRIDE_2(pipe))
>
> #define _PLANE_POS_1_B 0x7118c
> #define _PLANE_POS_2_B 0x7128c
> @@ -5523,8 +5523,8 @@ enum {
> #define _PLANE_POS_1(pipe) _PIPE(pipe, _PLANE_POS_1_A,
> _PLANE_POS_1_B)
> #define _PLANE_POS_2(pipe) _PIPE(pipe, _PLANE_POS_2_A,
> _PLANE_POS_2_B)
> #define _PLANE_POS_3(pipe) _PIPE(pipe, _PLANE_POS_3_A,
> _PLANE_POS_3_B)
> -#define PLANE_POS(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_POS_1(pipe), _PLANE_POS_2(pipe))
> +#define PLANE_POS(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_POS_1(pipe),
> _PLANE_POS_2(pipe))
>
> #define _PLANE_SIZE_1_B 0x71190
> #define _PLANE_SIZE_2_B 0x71290
> @@ -5532,8 +5532,8 @@ enum {
> #define _PLANE_SIZE_1(pipe) _PIPE(pipe, _PLANE_SIZE_1_A,
> _PLANE_SIZE_1_B)
> #define _PLANE_SIZE_2(pipe) _PIPE(pipe, _PLANE_SIZE_2_A,
> _PLANE_SIZE_2_B)
> #define _PLANE_SIZE_3(pipe) _PIPE(pipe, _PLANE_SIZE_3_A,
> _PLANE_SIZE_3_B)
> -#define PLANE_SIZE(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_SIZE_1(pipe), _PLANE_SIZE_2(pipe))
> +#define PLANE_SIZE(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_SIZE_1(pipe),
> _PLANE_SIZE_2(pipe))
>
> #define _PLANE_SURF_1_B 0x7119c
> #define _PLANE_SURF_2_B 0x7129c
> @@ -5541,36 +5541,36 @@ enum {
> #define _PLANE_SURF_1(pipe) _PIPE(pipe, _PLANE_SURF_1_A,
> _PLANE_SURF_1_B)
> #define _PLANE_SURF_2(pipe) _PIPE(pipe, _PLANE_SURF_2_A,
> _PLANE_SURF_2_B)
> #define _PLANE_SURF_3(pipe) _PIPE(pipe, _PLANE_SURF_3_A,
> _PLANE_SURF_3_B)
> -#define PLANE_SURF(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_SURF_1(pipe), _PLANE_SURF_2(pipe))
> +#define PLANE_SURF(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_SURF_1(pipe),
> _PLANE_SURF_2(pipe))
>
> #define _PLANE_OFFSET_1_B 0x711a4
> #define _PLANE_OFFSET_2_B 0x712a4
> #define _PLANE_OFFSET_1(pipe) _PIPE(pipe, _PLANE_OFFSET_1_A,
> _PLANE_OFFSET_1_B)
> #define _PLANE_OFFSET_2(pipe) _PIPE(pipe, _PLANE_OFFSET_2_A,
> _PLANE_OFFSET_2_B)
> -#define PLANE_OFFSET(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_OFFSET_1(pipe),
> _PLANE_OFFSET_2(pipe))
> +#define PLANE_OFFSET(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_OFFSET_1(pipe),
> _PLANE_OFFSET_2(pipe))
>
> #define _PLANE_KEYVAL_1_B 0x71194
> #define _PLANE_KEYVAL_2_B 0x71294
> #define _PLANE_KEYVAL_1(pipe) _PIPE(pipe, _PLANE_KEYVAL_1_A,
> _PLANE_KEYVAL_1_B)
> #define _PLANE_KEYVAL_2(pipe) _PIPE(pipe, _PLANE_KEYVAL_2_A,
> _PLANE_KEYVAL_2_B)
> -#define PLANE_KEYVAL(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_KEYVAL_1(pipe),
> _PLANE_KEYVAL_2(pipe))
> +#define PLANE_KEYVAL(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_KEYVAL_1(pipe),
> _PLANE_KEYVAL_2(pipe))
>
> #define _PLANE_KEYMSK_1_B 0x71198
> #define _PLANE_KEYMSK_2_B 0x71298
> #define _PLANE_KEYMSK_1(pipe) _PIPE(pipe, _PLANE_KEYMSK_1_A,
> _PLANE_KEYMSK_1_B)
> #define _PLANE_KEYMSK_2(pipe) _PIPE(pipe, _PLANE_KEYMSK_2_A,
> _PLANE_KEYMSK_2_B)
> -#define PLANE_KEYMSK(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_KEYMSK_1(pipe),
> _PLANE_KEYMSK_2(pipe))
> +#define PLANE_KEYMSK(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_KEYMSK_1(pipe),
> _PLANE_KEYMSK_2(pipe))
>
> #define _PLANE_KEYMAX_1_B 0x711a0
> #define _PLANE_KEYMAX_2_B 0x712a0
> #define _PLANE_KEYMAX_1(pipe) _PIPE(pipe, _PLANE_KEYMAX_1_A,
> _PLANE_KEYMAX_1_B)
> #define _PLANE_KEYMAX_2(pipe) _PIPE(pipe, _PLANE_KEYMAX_2_A,
> _PLANE_KEYMAX_2_B)
> -#define PLANE_KEYMAX(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_KEYMAX_1(pipe),
> _PLANE_KEYMAX_2(pipe))
> +#define PLANE_KEYMAX(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_KEYMAX_1(pipe),
> _PLANE_KEYMAX_2(pipe))
>
> #define _PLANE_BUF_CFG_1_B 0x7127c
> #define _PLANE_BUF_CFG_2_B 0x7137c
> @@ -5578,8 +5578,8 @@ enum {
> _PIPE(pipe, _PLANE_BUF_CFG_1_A, _PLANE_BUF_CFG_1_B)
> #define _PLANE_BUF_CFG_2(pipe) \
> _PIPE(pipe, _PLANE_BUF_CFG_2_A, _PLANE_BUF_CFG_2_B)
> -#define PLANE_BUF_CFG(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_BUF_CFG_1(pipe),
> _PLANE_BUF_CFG_2(pipe))
> +#define PLANE_BUF_CFG(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_BUF_CFG_1(pipe),
> _PLANE_BUF_CFG_2(pipe))
>
> #define _PLANE_NV12_BUF_CFG_1_B 0x71278
> #define _PLANE_NV12_BUF_CFG_2_B 0x71378
> @@ -5587,8 +5587,8 @@ enum {
> _PIPE(pipe, _PLANE_NV12_BUF_CFG_1_A,
> _PLANE_NV12_BUF_CFG_1_B)
> #define _PLANE_NV12_BUF_CFG_2(pipe) \
> _PIPE(pipe, _PLANE_NV12_BUF_CFG_2_A,
> _PLANE_NV12_BUF_CFG_2_B)
> -#define PLANE_NV12_BUF_CFG(pipe, plane) \
> - _MMIO_PLANE(plane, _PLANE_NV12_BUF_CFG_1(pipe),
> _PLANE_NV12_BUF_CFG_2(pipe))
> +#define PLANE_NV12_BUF_CFG(pipe, plane_id) \
> + _MMIO_PLANE(plane_id, _PLANE_NV12_BUF_CFG_1(pipe),
> _PLANE_NV12_BUF_CFG_2(pipe))
>
> /* SKL new cursor registers */
> #define _CUR_BUF_CFG_A 0x7017c
> @@ -5737,7 +5737,7 @@ enum {
> #define PS_SCALER_MODE_DYN (0 << 28)
> #define PS_SCALER_MODE_HQ (1 << 28)
> #define PS_PLANE_SEL_MASK (7 << 25)
> -#define PS_PLANE_SEL(plane) (((plane) + 1) << 25)
> +#define PS_PLANE_SEL(plane_id) (((plane_id) + 1) << 25)
> #define PS_FILTER_MASK (3 << 23)
> #define PS_FILTER_MEDIUM (0 << 23)
> #define PS_FILTER_EDGE_ENHANCE (2 << 23)
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2016-12-15 18:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-22 16:01 [PATCH v2 0/9] drm/i915: Add a per-pipe plane identifier enum (v2) ville.syrjala
2016-11-22 16:01 ` [PATCH 1/9] drm/i915: Add per-pipe plane identifier ville.syrjala
2016-11-22 16:01 ` [PATCH 2/9] drm/i915: Add crtc->plane_ids_mask ville.syrjala
2016-11-22 16:01 ` [PATCH 3/9] drm/i915: Use enum plane_id in SKL wm code ville.syrjala
2016-11-22 20:27 ` Lyude Paul
2016-11-22 16:01 ` [PATCH 4/9] drm/i915: Use enum plane_id in SKL plane code ville.syrjala
2016-11-22 16:02 ` [PATCH 5/9] drm/i915: Use enum plane_id in VLV/CHV sprite code ville.syrjala
2016-11-22 16:02 ` [PATCH 6/9] drm/i915: Use enum plane_id in VLV/CHV wm code ville.syrjala
2016-11-22 16:02 ` [PATCH 7/9] drm/i915: s/plane/plane_id/ in skl+ plane register defines ville.syrjala
2016-12-15 18:33 ` Paulo Zanoni [this message]
2016-11-22 16:02 ` [PATCH 8/9] drm/i915: Don't populate plane->plane for cursors and sprites ville.syrjala
2016-12-15 19:05 ` Paulo Zanoni
2016-12-15 19:11 ` Ville Syrjälä
2016-12-15 19:50 ` Paulo Zanoni
2016-12-15 19:59 ` Ville Syrjälä
2016-12-16 14:07 ` Paulo Zanoni
2016-12-16 14:56 ` Ander Conselvan De Oliveira
2016-12-19 18:24 ` Matt Roper
2016-12-19 18:55 ` Ville Syrjälä
2016-11-22 16:02 ` [PATCH 9/9] drm/i915: Rename the local 'plane' variable to 'plane_id' in primary plane code ville.syrjala
2016-11-22 16:45 ` ✓ Fi.CI.BAT: success for drm/i915: Add a per-pipe plane identifier enum (rev5) Patchwork
2016-11-23 20:16 ` [PATCH v2 0/9] drm/i915: Add a per-pipe plane identifier enum (v2) Ville Syrjälä
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=1481826823.2548.149.camel@intel.com \
--to=paulo.r.zanoni@intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@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.