drm/i915: reorder NOA register definition to follow addresses
It makes things easier to read when implementing whitelisting in the following patches. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20170803165812.2373-6-lionel.g.landwerlin@intel.com
This commit is contained in:
parent
28964cf25e
commit
7853d92e8e
|
@ -736,112 +736,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
|
|||
* OA Boolean state
|
||||
*/
|
||||
|
||||
#define OAREPORTTRIG1 _MMIO(0x2740)
|
||||
#define OAREPORTTRIG1_THRESHOLD_MASK 0xffff
|
||||
#define OAREPORTTRIG1_EDGE_LEVEL_TRIGER_SELECT_MASK 0xffff0000 /* 0=level */
|
||||
|
||||
#define OAREPORTTRIG2 _MMIO(0x2744)
|
||||
#define OAREPORTTRIG2_INVERT_A_0 (1<<0)
|
||||
#define OAREPORTTRIG2_INVERT_A_1 (1<<1)
|
||||
#define OAREPORTTRIG2_INVERT_A_2 (1<<2)
|
||||
#define OAREPORTTRIG2_INVERT_A_3 (1<<3)
|
||||
#define OAREPORTTRIG2_INVERT_A_4 (1<<4)
|
||||
#define OAREPORTTRIG2_INVERT_A_5 (1<<5)
|
||||
#define OAREPORTTRIG2_INVERT_A_6 (1<<6)
|
||||
#define OAREPORTTRIG2_INVERT_A_7 (1<<7)
|
||||
#define OAREPORTTRIG2_INVERT_A_8 (1<<8)
|
||||
#define OAREPORTTRIG2_INVERT_A_9 (1<<9)
|
||||
#define OAREPORTTRIG2_INVERT_A_10 (1<<10)
|
||||
#define OAREPORTTRIG2_INVERT_A_11 (1<<11)
|
||||
#define OAREPORTTRIG2_INVERT_A_12 (1<<12)
|
||||
#define OAREPORTTRIG2_INVERT_A_13 (1<<13)
|
||||
#define OAREPORTTRIG2_INVERT_A_14 (1<<14)
|
||||
#define OAREPORTTRIG2_INVERT_A_15 (1<<15)
|
||||
#define OAREPORTTRIG2_INVERT_B_0 (1<<16)
|
||||
#define OAREPORTTRIG2_INVERT_B_1 (1<<17)
|
||||
#define OAREPORTTRIG2_INVERT_B_2 (1<<18)
|
||||
#define OAREPORTTRIG2_INVERT_B_3 (1<<19)
|
||||
#define OAREPORTTRIG2_INVERT_C_0 (1<<20)
|
||||
#define OAREPORTTRIG2_INVERT_C_1 (1<<21)
|
||||
#define OAREPORTTRIG2_INVERT_D_0 (1<<22)
|
||||
#define OAREPORTTRIG2_THRESHOLD_ENABLE (1<<23)
|
||||
#define OAREPORTTRIG2_REPORT_TRIGGER_ENABLE (1<<31)
|
||||
|
||||
#define OAREPORTTRIG3 _MMIO(0x2748)
|
||||
#define OAREPORTTRIG3_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG3_NOA_SELECT_8_SHIFT 0
|
||||
#define OAREPORTTRIG3_NOA_SELECT_9_SHIFT 4
|
||||
#define OAREPORTTRIG3_NOA_SELECT_10_SHIFT 8
|
||||
#define OAREPORTTRIG3_NOA_SELECT_11_SHIFT 12
|
||||
#define OAREPORTTRIG3_NOA_SELECT_12_SHIFT 16
|
||||
#define OAREPORTTRIG3_NOA_SELECT_13_SHIFT 20
|
||||
#define OAREPORTTRIG3_NOA_SELECT_14_SHIFT 24
|
||||
#define OAREPORTTRIG3_NOA_SELECT_15_SHIFT 28
|
||||
|
||||
#define OAREPORTTRIG4 _MMIO(0x274c)
|
||||
#define OAREPORTTRIG4_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG4_NOA_SELECT_0_SHIFT 0
|
||||
#define OAREPORTTRIG4_NOA_SELECT_1_SHIFT 4
|
||||
#define OAREPORTTRIG4_NOA_SELECT_2_SHIFT 8
|
||||
#define OAREPORTTRIG4_NOA_SELECT_3_SHIFT 12
|
||||
#define OAREPORTTRIG4_NOA_SELECT_4_SHIFT 16
|
||||
#define OAREPORTTRIG4_NOA_SELECT_5_SHIFT 20
|
||||
#define OAREPORTTRIG4_NOA_SELECT_6_SHIFT 24
|
||||
#define OAREPORTTRIG4_NOA_SELECT_7_SHIFT 28
|
||||
|
||||
#define OAREPORTTRIG5 _MMIO(0x2750)
|
||||
#define OAREPORTTRIG5_THRESHOLD_MASK 0xffff
|
||||
#define OAREPORTTRIG5_EDGE_LEVEL_TRIGER_SELECT_MASK 0xffff0000 /* 0=level */
|
||||
|
||||
#define OAREPORTTRIG6 _MMIO(0x2754)
|
||||
#define OAREPORTTRIG6_INVERT_A_0 (1<<0)
|
||||
#define OAREPORTTRIG6_INVERT_A_1 (1<<1)
|
||||
#define OAREPORTTRIG6_INVERT_A_2 (1<<2)
|
||||
#define OAREPORTTRIG6_INVERT_A_3 (1<<3)
|
||||
#define OAREPORTTRIG6_INVERT_A_4 (1<<4)
|
||||
#define OAREPORTTRIG6_INVERT_A_5 (1<<5)
|
||||
#define OAREPORTTRIG6_INVERT_A_6 (1<<6)
|
||||
#define OAREPORTTRIG6_INVERT_A_7 (1<<7)
|
||||
#define OAREPORTTRIG6_INVERT_A_8 (1<<8)
|
||||
#define OAREPORTTRIG6_INVERT_A_9 (1<<9)
|
||||
#define OAREPORTTRIG6_INVERT_A_10 (1<<10)
|
||||
#define OAREPORTTRIG6_INVERT_A_11 (1<<11)
|
||||
#define OAREPORTTRIG6_INVERT_A_12 (1<<12)
|
||||
#define OAREPORTTRIG6_INVERT_A_13 (1<<13)
|
||||
#define OAREPORTTRIG6_INVERT_A_14 (1<<14)
|
||||
#define OAREPORTTRIG6_INVERT_A_15 (1<<15)
|
||||
#define OAREPORTTRIG6_INVERT_B_0 (1<<16)
|
||||
#define OAREPORTTRIG6_INVERT_B_1 (1<<17)
|
||||
#define OAREPORTTRIG6_INVERT_B_2 (1<<18)
|
||||
#define OAREPORTTRIG6_INVERT_B_3 (1<<19)
|
||||
#define OAREPORTTRIG6_INVERT_C_0 (1<<20)
|
||||
#define OAREPORTTRIG6_INVERT_C_1 (1<<21)
|
||||
#define OAREPORTTRIG6_INVERT_D_0 (1<<22)
|
||||
#define OAREPORTTRIG6_THRESHOLD_ENABLE (1<<23)
|
||||
#define OAREPORTTRIG6_REPORT_TRIGGER_ENABLE (1<<31)
|
||||
|
||||
#define OAREPORTTRIG7 _MMIO(0x2758)
|
||||
#define OAREPORTTRIG7_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG7_NOA_SELECT_8_SHIFT 0
|
||||
#define OAREPORTTRIG7_NOA_SELECT_9_SHIFT 4
|
||||
#define OAREPORTTRIG7_NOA_SELECT_10_SHIFT 8
|
||||
#define OAREPORTTRIG7_NOA_SELECT_11_SHIFT 12
|
||||
#define OAREPORTTRIG7_NOA_SELECT_12_SHIFT 16
|
||||
#define OAREPORTTRIG7_NOA_SELECT_13_SHIFT 20
|
||||
#define OAREPORTTRIG7_NOA_SELECT_14_SHIFT 24
|
||||
#define OAREPORTTRIG7_NOA_SELECT_15_SHIFT 28
|
||||
|
||||
#define OAREPORTTRIG8 _MMIO(0x275c)
|
||||
#define OAREPORTTRIG8_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG8_NOA_SELECT_0_SHIFT 0
|
||||
#define OAREPORTTRIG8_NOA_SELECT_1_SHIFT 4
|
||||
#define OAREPORTTRIG8_NOA_SELECT_2_SHIFT 8
|
||||
#define OAREPORTTRIG8_NOA_SELECT_3_SHIFT 12
|
||||
#define OAREPORTTRIG8_NOA_SELECT_4_SHIFT 16
|
||||
#define OAREPORTTRIG8_NOA_SELECT_5_SHIFT 20
|
||||
#define OAREPORTTRIG8_NOA_SELECT_6_SHIFT 24
|
||||
#define OAREPORTTRIG8_NOA_SELECT_7_SHIFT 28
|
||||
|
||||
#define OASTARTTRIG1 _MMIO(0x2710)
|
||||
#define OASTARTTRIG1_THRESHOLD_COUNT_MASK_MBZ 0xffff0000
|
||||
#define OASTARTTRIG1_THRESHOLD_MASK 0xffff
|
||||
|
@ -956,6 +850,112 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)
|
|||
#define OASTARTTRIG8_NOA_SELECT_6_SHIFT 24
|
||||
#define OASTARTTRIG8_NOA_SELECT_7_SHIFT 28
|
||||
|
||||
#define OAREPORTTRIG1 _MMIO(0x2740)
|
||||
#define OAREPORTTRIG1_THRESHOLD_MASK 0xffff
|
||||
#define OAREPORTTRIG1_EDGE_LEVEL_TRIGER_SELECT_MASK 0xffff0000 /* 0=level */
|
||||
|
||||
#define OAREPORTTRIG2 _MMIO(0x2744)
|
||||
#define OAREPORTTRIG2_INVERT_A_0 (1<<0)
|
||||
#define OAREPORTTRIG2_INVERT_A_1 (1<<1)
|
||||
#define OAREPORTTRIG2_INVERT_A_2 (1<<2)
|
||||
#define OAREPORTTRIG2_INVERT_A_3 (1<<3)
|
||||
#define OAREPORTTRIG2_INVERT_A_4 (1<<4)
|
||||
#define OAREPORTTRIG2_INVERT_A_5 (1<<5)
|
||||
#define OAREPORTTRIG2_INVERT_A_6 (1<<6)
|
||||
#define OAREPORTTRIG2_INVERT_A_7 (1<<7)
|
||||
#define OAREPORTTRIG2_INVERT_A_8 (1<<8)
|
||||
#define OAREPORTTRIG2_INVERT_A_9 (1<<9)
|
||||
#define OAREPORTTRIG2_INVERT_A_10 (1<<10)
|
||||
#define OAREPORTTRIG2_INVERT_A_11 (1<<11)
|
||||
#define OAREPORTTRIG2_INVERT_A_12 (1<<12)
|
||||
#define OAREPORTTRIG2_INVERT_A_13 (1<<13)
|
||||
#define OAREPORTTRIG2_INVERT_A_14 (1<<14)
|
||||
#define OAREPORTTRIG2_INVERT_A_15 (1<<15)
|
||||
#define OAREPORTTRIG2_INVERT_B_0 (1<<16)
|
||||
#define OAREPORTTRIG2_INVERT_B_1 (1<<17)
|
||||
#define OAREPORTTRIG2_INVERT_B_2 (1<<18)
|
||||
#define OAREPORTTRIG2_INVERT_B_3 (1<<19)
|
||||
#define OAREPORTTRIG2_INVERT_C_0 (1<<20)
|
||||
#define OAREPORTTRIG2_INVERT_C_1 (1<<21)
|
||||
#define OAREPORTTRIG2_INVERT_D_0 (1<<22)
|
||||
#define OAREPORTTRIG2_THRESHOLD_ENABLE (1<<23)
|
||||
#define OAREPORTTRIG2_REPORT_TRIGGER_ENABLE (1<<31)
|
||||
|
||||
#define OAREPORTTRIG3 _MMIO(0x2748)
|
||||
#define OAREPORTTRIG3_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG3_NOA_SELECT_8_SHIFT 0
|
||||
#define OAREPORTTRIG3_NOA_SELECT_9_SHIFT 4
|
||||
#define OAREPORTTRIG3_NOA_SELECT_10_SHIFT 8
|
||||
#define OAREPORTTRIG3_NOA_SELECT_11_SHIFT 12
|
||||
#define OAREPORTTRIG3_NOA_SELECT_12_SHIFT 16
|
||||
#define OAREPORTTRIG3_NOA_SELECT_13_SHIFT 20
|
||||
#define OAREPORTTRIG3_NOA_SELECT_14_SHIFT 24
|
||||
#define OAREPORTTRIG3_NOA_SELECT_15_SHIFT 28
|
||||
|
||||
#define OAREPORTTRIG4 _MMIO(0x274c)
|
||||
#define OAREPORTTRIG4_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG4_NOA_SELECT_0_SHIFT 0
|
||||
#define OAREPORTTRIG4_NOA_SELECT_1_SHIFT 4
|
||||
#define OAREPORTTRIG4_NOA_SELECT_2_SHIFT 8
|
||||
#define OAREPORTTRIG4_NOA_SELECT_3_SHIFT 12
|
||||
#define OAREPORTTRIG4_NOA_SELECT_4_SHIFT 16
|
||||
#define OAREPORTTRIG4_NOA_SELECT_5_SHIFT 20
|
||||
#define OAREPORTTRIG4_NOA_SELECT_6_SHIFT 24
|
||||
#define OAREPORTTRIG4_NOA_SELECT_7_SHIFT 28
|
||||
|
||||
#define OAREPORTTRIG5 _MMIO(0x2750)
|
||||
#define OAREPORTTRIG5_THRESHOLD_MASK 0xffff
|
||||
#define OAREPORTTRIG5_EDGE_LEVEL_TRIGER_SELECT_MASK 0xffff0000 /* 0=level */
|
||||
|
||||
#define OAREPORTTRIG6 _MMIO(0x2754)
|
||||
#define OAREPORTTRIG6_INVERT_A_0 (1<<0)
|
||||
#define OAREPORTTRIG6_INVERT_A_1 (1<<1)
|
||||
#define OAREPORTTRIG6_INVERT_A_2 (1<<2)
|
||||
#define OAREPORTTRIG6_INVERT_A_3 (1<<3)
|
||||
#define OAREPORTTRIG6_INVERT_A_4 (1<<4)
|
||||
#define OAREPORTTRIG6_INVERT_A_5 (1<<5)
|
||||
#define OAREPORTTRIG6_INVERT_A_6 (1<<6)
|
||||
#define OAREPORTTRIG6_INVERT_A_7 (1<<7)
|
||||
#define OAREPORTTRIG6_INVERT_A_8 (1<<8)
|
||||
#define OAREPORTTRIG6_INVERT_A_9 (1<<9)
|
||||
#define OAREPORTTRIG6_INVERT_A_10 (1<<10)
|
||||
#define OAREPORTTRIG6_INVERT_A_11 (1<<11)
|
||||
#define OAREPORTTRIG6_INVERT_A_12 (1<<12)
|
||||
#define OAREPORTTRIG6_INVERT_A_13 (1<<13)
|
||||
#define OAREPORTTRIG6_INVERT_A_14 (1<<14)
|
||||
#define OAREPORTTRIG6_INVERT_A_15 (1<<15)
|
||||
#define OAREPORTTRIG6_INVERT_B_0 (1<<16)
|
||||
#define OAREPORTTRIG6_INVERT_B_1 (1<<17)
|
||||
#define OAREPORTTRIG6_INVERT_B_2 (1<<18)
|
||||
#define OAREPORTTRIG6_INVERT_B_3 (1<<19)
|
||||
#define OAREPORTTRIG6_INVERT_C_0 (1<<20)
|
||||
#define OAREPORTTRIG6_INVERT_C_1 (1<<21)
|
||||
#define OAREPORTTRIG6_INVERT_D_0 (1<<22)
|
||||
#define OAREPORTTRIG6_THRESHOLD_ENABLE (1<<23)
|
||||
#define OAREPORTTRIG6_REPORT_TRIGGER_ENABLE (1<<31)
|
||||
|
||||
#define OAREPORTTRIG7 _MMIO(0x2758)
|
||||
#define OAREPORTTRIG7_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG7_NOA_SELECT_8_SHIFT 0
|
||||
#define OAREPORTTRIG7_NOA_SELECT_9_SHIFT 4
|
||||
#define OAREPORTTRIG7_NOA_SELECT_10_SHIFT 8
|
||||
#define OAREPORTTRIG7_NOA_SELECT_11_SHIFT 12
|
||||
#define OAREPORTTRIG7_NOA_SELECT_12_SHIFT 16
|
||||
#define OAREPORTTRIG7_NOA_SELECT_13_SHIFT 20
|
||||
#define OAREPORTTRIG7_NOA_SELECT_14_SHIFT 24
|
||||
#define OAREPORTTRIG7_NOA_SELECT_15_SHIFT 28
|
||||
|
||||
#define OAREPORTTRIG8 _MMIO(0x275c)
|
||||
#define OAREPORTTRIG8_NOA_SELECT_MASK 0xf
|
||||
#define OAREPORTTRIG8_NOA_SELECT_0_SHIFT 0
|
||||
#define OAREPORTTRIG8_NOA_SELECT_1_SHIFT 4
|
||||
#define OAREPORTTRIG8_NOA_SELECT_2_SHIFT 8
|
||||
#define OAREPORTTRIG8_NOA_SELECT_3_SHIFT 12
|
||||
#define OAREPORTTRIG8_NOA_SELECT_4_SHIFT 16
|
||||
#define OAREPORTTRIG8_NOA_SELECT_5_SHIFT 20
|
||||
#define OAREPORTTRIG8_NOA_SELECT_6_SHIFT 24
|
||||
#define OAREPORTTRIG8_NOA_SELECT_7_SHIFT 28
|
||||
|
||||
/* CECX_0 */
|
||||
#define OACEC_COMPARE_LESS_OR_EQUAL 6
|
||||
#define OACEC_COMPARE_NOT_EQUAL 5
|
||||
|
|
Loading…
Reference in a new issue