Commit da254957 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/reg: move masked field helpers to i915_reg_defs.h 



This is a more logical place for generic helpers.

Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/5161a0c6d98df206c6c4c1add3fc3f2f408020b1.1668008071.git.jani.nikula@intel.com
parent 764afecb

drivers/gpu/drm/i915/i915_reg.h

+0 −13
Original line number Diff line number Diff line
@@ -171,19 +171,6 @@ 
					      INTEL_INFO(dev_priv)->display.cursor_offsets[PIPE_A] + \

					      DISPLAY_MMIO_BASE(dev_priv) + (reg))



#define __MASKED_FIELD(mask, value) ((mask) << 16 | (value))

#define _MASKED_FIELD(mask, value) ({					   \

	if (__builtin_constant_p(mask))					   \

		BUILD_BUG_ON_MSG(((mask) & 0xffff0000), "Incorrect mask"); \

	if (__builtin_constant_p(value))				   \

		BUILD_BUG_ON_MSG((value) & 0xffff0000, "Incorrect value"); \

	if (__builtin_constant_p(mask) && __builtin_constant_p(value))	   \

		BUILD_BUG_ON_MSG((value) & ~(mask),			   \

				 "Incorrect value for mask");		   \

	__MASKED_FIELD(mask, value); })

#define _MASKED_BIT_ENABLE(a)	({ typeof(a) _a = (a); _MASKED_FIELD(_a, _a); })

#define _MASKED_BIT_DISABLE(a)	(_MASKED_FIELD((a), 0))



#define GU_CNTL				_MMIO(0x101010)

#define   LMEM_INIT			REG_BIT(7)

drivers/gpu/drm/i915/i915_reg_defs.h

+13 −0
Original line number Diff line number Diff line
@@ -98,6 +98,19 @@ 
 */

#define REG_FIELD_GET64(__mask, __val)	((u64)FIELD_GET(__mask, __val))



#define __MASKED_FIELD(mask, value) ((mask) << 16 | (value))

#define _MASKED_FIELD(mask, value) ({					   \

	if (__builtin_constant_p(mask))					   \

		BUILD_BUG_ON_MSG(((mask) & 0xffff0000), "Incorrect mask"); \

	if (__builtin_constant_p(value))				   \

		BUILD_BUG_ON_MSG((value) & 0xffff0000, "Incorrect value"); \

	if (__builtin_constant_p(mask) && __builtin_constant_p(value))	   \

		BUILD_BUG_ON_MSG((value) & ~(mask),			   \

				 "Incorrect value for mask");		   \

	__MASKED_FIELD(mask, value); })

#define _MASKED_BIT_ENABLE(a)	({ typeof(a) _a = (a); _MASKED_FIELD(_a, _a); })

#define _MASKED_BIT_DISABLE(a)	(_MASKED_FIELD((a), 0))



typedef struct {

	u32 reg;

} i915_reg_t;