Re: [Intel-gfx] [PXP CLEAN PATCH v06 06/27] drm/i915: Rename the whitelist to allowlist

Jani Nikula
2020-11-23T15:05:09Z

On Fri, 13 Nov 2020, Sean Z Huang <sean.z.huang@intel.com> wrote:
> From: "Huang, Sean Z" <sean.z.huang@intel.com>
>
> Rename the whitelist to allowlist as suggested

Please post this separately and we can merge this while the rest of the
series is still being reviewed.

BR,
Jani.

>
> Signed-off-by: Huang, Sean Z <sean.z.huang@intel.com>
> ---
> drivers/gpu/drm/i915/intel_uncore.c | 10 +++++-----
> 1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_uncore.c b/drivers/gpu/drm/i915/intel_uncore.c
> index 1c14a07eba7d..c9ef0025c60e 100644
> --- a/drivers/gpu/drm/i915/intel_uncore.c
> +++ b/drivers/gpu/drm/i915/intel_uncore.c
> @@ -1989,12 +1989,12 @@ void intel_uncore_fini_mmio(struct intel_uncore *uncore)
> uncore_mmio_cleanup(uncore);
> }
>
> -static const struct reg_whitelist {
> +static const struct reg_allowlist {
> i915_reg_t offset_ldw;
> i915_reg_t offset_udw;
> u16 gen_mask;
> u8 size;
> -} reg_read_whitelist[] = { {
> +} reg_read_allowlist[] = { {
> .offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE),
> .offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE),
> .gen_mask = INTEL_GEN_MASK(4, 12),
> @@ -2007,14 +2007,14 @@ int i915_reg_read_ioctl(struct drm_device *dev,
> struct drm_i915_private *i915 = to_i915(dev);
> struct intel_uncore *uncore = &i915->uncore;
> struct drm_i915_reg_read *reg = data;
> - struct reg_whitelist const *entry;
> + struct reg_allowlist const *entry;
> intel_wakeref_t wakeref;
> unsigned int flags;
> int remain;
> int ret = 0;
>
> - entry = reg_read_whitelist;
> - remain = ARRAY_SIZE(reg_read_whitelist);
> + entry = reg_read_allowlist;
> + remain = ARRAY_SIZE(reg_read_allowlist);
> while (remain) {
> u32 entry_offset = i915_mmio_reg_offset(entry->offset_ldw);

--
Jani Nikula, Intel Open Source Graphics Center