Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915/lrc: switch to _MASKED_BIT_ENABLE() and _MASKED_BIT_DISABLE()
Since it's now possible to use _MASKED_BIT_ENABLE() and
_MASKED_BIT_DISABLE() in the array initializer, switch to them. This
allows us to remove __MASKED_FIELD() macro.
Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patch.msgid.link/733568f8a6155b6e2da1dcdce9d21d6aab881449.1772042022.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+4
-8
+3
-6
drivers/gpu/drm/i915/gt/intel_lrc.c
+3
-6
drivers/gpu/drm/i915/gt/intel_lrc.c
···
1736
1736
/* WaDisableGatherAtSetShaderCommonSlice:skl,bxt,kbl,glk */
1737
1737
{
1738
1738
COMMON_SLICE_CHICKEN2,
1739
-
__MASKED_FIELD(GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE,
1740
-
0),
1739
+
_MASKED_BIT_DISABLE(GEN9_DISABLE_GATHER_AT_SET_SHADER_COMMON_SLICE),
1741
1740
},
1742
1741
1743
1742
/* BSpec: 11391 */
1744
1743
{
1745
1744
FF_SLICE_CHICKEN,
1746
-
__MASKED_FIELD(FF_SLICE_CHICKEN_CL_PROVOKING_VERTEX_FIX,
1747
-
FF_SLICE_CHICKEN_CL_PROVOKING_VERTEX_FIX),
1745
+
_MASKED_BIT_ENABLE(FF_SLICE_CHICKEN_CL_PROVOKING_VERTEX_FIX),
1748
1746
},
1749
1747
1750
1748
/* BSpec: 11299 */
1751
1749
{
1752
1750
_3D_CHICKEN3,
1753
-
__MASKED_FIELD(_3D_CHICKEN_SF_PROVOKING_VERTEX_FIX,
1754
-
_3D_CHICKEN_SF_PROVOKING_VERTEX_FIX),
1751
+
_MASKED_BIT_ENABLE(_3D_CHICKEN_SF_PROVOKING_VERTEX_FIX),
1755
1752
}
1756
1753
};
1757
1754
+1
-2
drivers/gpu/drm/i915/i915_reg_defs.h
+1
-2
drivers/gpu/drm/i915/i915_reg_defs.h
···
105
105
BUILD_BUG_ON_ZERO(!IS_POWER_OF_2((__mask) + (1ULL << __bf_shf(__mask)))) + \
106
106
BUILD_BUG_ON_ZERO(__builtin_choose_expr(__is_constexpr(__val), (~((__mask) >> __bf_shf(__mask)) & (__val)), 0))))
107
107
108
-
#define __MASKED_FIELD(mask, value) ((mask) << 16 | (value))
109
108
#define _MASKED_FIELD(mask, value) \
110
109
(BUILD_BUG_ON_ZERO(__builtin_choose_expr(__builtin_constant_p(mask), (mask) & 0xffff0000, 0)) + \
111
110
BUILD_BUG_ON_ZERO(__builtin_choose_expr(__builtin_constant_p(value), (value) & 0xffff0000, 0)) + \
112
111
BUILD_BUG_ON_ZERO(__builtin_choose_expr(__builtin_constant_p(mask) && __builtin_constant_p(value), (value) & ~(mask), 0)) + \
113
-
__MASKED_FIELD(mask, value))
112
+
((mask) << 16 | (value)))
114
113
115
114
#define _MASKED_BIT_ENABLE(a) \
116
115
(__builtin_choose_expr(__builtin_constant_p(a), _MASKED_FIELD((a), (a)), ({ typeof(a) _a = (a); _MASKED_FIELD(_a, _a); })))