Start cleaning up register definitions
Subsystems (2)
cover Start cleaning up register definitions
Our i915_reg.h file has become a huge unwieldy mess over the years. A lot of definitions don't follow any logical ordering, there's unintentional duplication of registers under different names, the coding style is very inconsistent, and there's tons of unused definitions (nearly a quarter of i915_reg.h is dead code!). This makes it a pain to work with and also needlessly slows down development since any trivial change to i915_reg.h forces us to unnecessarily rebuild the entire i915 driver instead of just the affected are of the code.
I'd like to start cleaning up the register definitions in a few steps:
(1) Eliminate unnused register and bit definitions. Some of these may get re-added in the future if/when code starts using them but that's fine; we'd prefer to carefully (re)review the register definitions at that time anyway.
(2) Move registers exclusive to the command parser to their own header
(3) Move OA registers to their own header
(4) Move GT registers to their own header
(5) Move display registers to their own header
(6) While moving things to new files, take the opportunity to also update to update to a consistent coding style: consistent indentation, consistent case for hex values, use of REG_BIT/REG_GENMASK, etc.
This will make it easier to find an appropriate place to add new registers and should also improve quality of life for developers since driver builds will be faster in cases where a register is added/updated and only a specific part of the driver needs to be rebuilt.
This only includes step (1) above; the other steps will come as follow-up patches if there's no concern with the general goal.
Matt Roper (1):
drm/i915: Drop unused register definitions
drivers/gpu/drm/i915/i915_reg.h | 3107 +------------------------------ 1 file changed, 9 insertions(+), 3098 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/1 drm/i915: Drop unused register definitions
A large percentage (nearly 25%) of the register and bit definitions in i915_reg.h are not used by the i915 driver and are effectively dead code. There are a few origins for these unused definitions:
* Registers only accessed by workarounds that were either retracted by the hardware team or that only applied to pre-production steppings and have been removed from the driver.
* General refactoring of the codebase (e.g., separate definitions of REG1, REG2, REG3 being replaced by a parameterized REG(n) macro without the original definitions being dropped.
* In the early days of i915, all registers in an area of the hardware, or all bits in a given register got documented in i915_reg.h "just in case" they needed to be used in the future. With the exploding complexity of the hardware and huge number of platforms we now support, mass-documenting everything as #define's doesn't scale. We'd also generally prefer *not* to have definitions already in the driver before they're used since we'd rather review them explicitly alongside new code that is starting to use them.
Let's start cleaning up the register definition file by removing a bunch of dead code. I used a cscope database to track down most of these via searches like:
for x in $(grep '^#define' drivers/gpu/drm/i915/i915_reg.h | awk '{ print $2 }' | cut -d'(' -f1); do count=$(cscope -d -R -L0 $x | wc -l); if (($count <= 1)); then echo $x; fi; donealthough I had to watch out for cases where register/bit names are never referenced directly, but are constructed elsewhere by macro concatenation (e.g., GEN3_IRQ_INIT()).
--- drivers/gpu/drm/i915/i915_reg.h | 3107 +------------------------------ 1 file changed, 9 insertions(+), 3098 deletions(-)
drivers/gpu/drm/i915/i915_reg.h +9 -3098
@@ -298,10 +298,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GC_CLOCK_166_250 (7 << 0)#define I915_GDRST 0xc0/* PCI config register */ -#define GRDOM_FULL (0 << 2)#define GRDOM_RENDER (1 << 2)#define GRDOM_MEDIA (3 << 2) -#define GRDOM_MASK (3 << 2)#define GRDOM_RESET_STATUS (1 << 1)#define GRDOM_RESET_ENABLE (1 << 0)
@@ -311,7 +309,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GCDGMBUS 0xcc -#define GCFGC2 0xda#define GCFGC 0xf0/* 915+ only */ #define GC_LOW_FREQUENCY_ENABLE (1 << 7)#define GC_DISPLAY_CLOCK_190_200_MHZ (0 << 4)
@@ -323,27 +320,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GC_DISPLAY_CLOCK_133_MHZ_PNV (6 << 4)#define GC_DISPLAY_CLOCK_167_MHZ_PNV (7 << 4)#define GC_DISPLAY_CLOCK_MASK (7 << 4) -#define GM45_GC_RENDER_CLOCK_MASK (0xf << 0) -#define GM45_GC_RENDER_CLOCK_266_MHZ (8 << 0) -#define GM45_GC_RENDER_CLOCK_320_MHZ (9 << 0) -#define GM45_GC_RENDER_CLOCK_400_MHZ (0xb << 0) -#define GM45_GC_RENDER_CLOCK_533_MHZ (0xc << 0) -#define I965_GC_RENDER_CLOCK_MASK (0xf << 0) -#define I965_GC_RENDER_CLOCK_267_MHZ (2 << 0) -#define I965_GC_RENDER_CLOCK_333_MHZ (3 << 0) -#define I965_GC_RENDER_CLOCK_444_MHZ (4 << 0) -#define I965_GC_RENDER_CLOCK_533_MHZ (5 << 0) -#define I945_GC_RENDER_CLOCK_MASK (7 << 0) -#define I945_GC_RENDER_CLOCK_166_MHZ (0 << 0) -#define I945_GC_RENDER_CLOCK_200_MHZ (1 << 0) -#define I945_GC_RENDER_CLOCK_250_MHZ (3 << 0) -#define I945_GC_RENDER_CLOCK_400_MHZ (5 << 0) -#define I915_GC_RENDER_CLOCK_MASK (7 << 0) -#define I915_GC_RENDER_CLOCK_166_MHZ (0 << 0) -#define I915_GC_RENDER_CLOCK_200_MHZ (1 << 0) -#define I915_GC_RENDER_CLOCK_333_MHZ (4 << 0) - -#define ASLE 0xe4 +#define ASLS 0xfc#define SWSCI 0xe8
@@ -354,19 +331,13 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ILK_GDSR _MMIO(MCHBAR_MIRROR_BASE + 0x2ca4) -#define ILK_GRDOM_FULL (0 << 1)#define ILK_GRDOM_RENDER (1 << 1)#define ILK_GRDOM_MEDIA (3 << 1) -#define ILK_GRDOM_MASK (3 << 1)#define ILK_GRDOM_RESET_ENABLE (1 << 0)#define GEN6_MBCUNIT_SNPCR _MMIO(0x900c)/* for LLC config */ -#define GEN6_MBC_SNPCR_SHIFT 21#define GEN6_MBC_SNPCR_MASK (3 << 21) -#define GEN6_MBC_SNPCR_MAX (0 << 21)#define GEN6_MBC_SNPCR_MED (1 << 21) -#define GEN6_MBC_SNPCR_LOW (2 << 21) -#define GEN6_MBC_SNPCR_MIN (3 << 21)/* only 1/16th of the cache is shared */ #define VLV_G3DCTL _MMIO(0x9024)#define VLV_GSCKGCTL _MMIO(0x9028)
@@ -376,10 +347,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN6_MBCTL _MMIO(0x0907c)#define GEN6_MBCTL_ENABLE_BOOT_FETCH (1 << 4) -#define GEN6_MBCTL_CTX_FETCH_NEEDED (1 << 3) -#define GEN6_MBCTL_BME_UPDATE_ENABLE (1 << 2) -#define GEN6_MBCTL_MAE_UPDATE_ENABLE (1 << 1) -#define GEN6_MBCTL_BOOT_FETCH_MECH (1 << 0)#define GEN6_GDRST _MMIO(0x941c)#define GEN6_GRDOM_FULL (1 << 0)
@@ -407,9 +374,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_GRDOM_VECS3 (1 << 15)#define GEN11_GRDOM_VECS4 (1 << 16)#define GEN11_GRDOM_SFC0 (1 << 17) -#define GEN11_GRDOM_SFC1 (1 << 18) -#define GEN11_GRDOM_SFC2 (1 << 19) -#define GEN11_GRDOM_SFC3 (1 << 20)#define GEN11_VCS_SFC_RESET_BIT (instance) (GEN11_GRDOM_SFC0 << ((instance) >> 1))#define GEN11_VECS_SFC_RESET_BIT (instance) (GEN11_GRDOM_SFC0 << (instance))
@@ -427,10 +391,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_VECS_SFC_USAGE (engine) _MMIO((engine)->mmio_base + 0x2014)#define GEN11_VECS_SFC_USAGE_BIT (1 << 0) -#define GEN12_HCP_SFC_FORCED_LOCK (engine) _MMIO((engine)->mmio_base + 0x2910) -#define GEN12_HCP_SFC_FORCED_LOCK_BIT REG_BIT(0)#define GEN12_HCP_SFC_LOCK_STATUS (engine) _MMIO((engine)->mmio_base + 0x2914) -#define GEN12_HCP_SFC_LOCK_ACK_BIT REG_BIT(1)#define GEN12_HCP_SFC_USAGE_BIT REG_BIT(0)#define GEN12_SFC_DONE (n) _MMIO(0x1cc000 + (n) * 0x1000)
@@ -460,26 +421,13 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN8_RPCS_EU_MIN_MASK (0xf << GEN8_RPCS_EU_MIN_SHIFT)#define WAIT_FOR_RC6_EXIT _MMIO(0x20CC) -/* HSW only */ -#define HSW_SELECTIVE_READ_ADDRESSING_SHIFT 2 -#define HSW_SELECTIVE_READ_ADDRESSING_MASK (0x3 << HSW_SLECTIVE_READ_ADDRESSING_SHIFT) -#define HSW_SELECTIVE_WRITE_ADDRESS_SHIFT 4 -#define HSW_SELECTIVE_WRITE_ADDRESS_MASK (0x7 << HSW_SELECTIVE_WRITE_ADDRESS_SHIFT)/* HSW+ */ #define HSW_WAIT_FOR_RC6_EXIT_ENABLE (1 << 0) -#define HSW_RCS_CONTEXT_ENABLE (1 << 7) -#define HSW_RCS_INHIBIT (1 << 8)/* Gen8 */ #define GEN8_SELECTIVE_WRITE_ADDRESS_SHIFT 4#define GEN8_SELECTIVE_WRITE_ADDRESS_MASK (0x3 << GEN8_SELECTIVE_WRITE_ADDRESS_SHIFT)#define GEN8_SELECTIVE_WRITE_ADDRESS_SHIFT 4#define GEN8_SELECTIVE_WRITE_ADDRESS_MASK (0x3 << GEN8_SELECTIVE_WRITE_ADDRESS_SHIFT) -#define GEN8_SELECTIVE_WRITE_ADDRESSING_ENABLE (1 << 6) -#define GEN8_SELECTIVE_READ_SUBSLICE_SELECT_SHIFT 9 -#define GEN8_SELECTIVE_READ_SUBSLICE_SELECT_MASK (0x3 << GEN8_SELECTIVE_READ_SUBSLICE_SELECT_SHIFT) -#define GEN8_SELECTIVE_READ_SLICE_SELECT_SHIFT 11 -#define GEN8_SELECTIVE_READ_SLICE_SELECT_MASK (0x3 << GEN8_SELECTIVE_READ_SLICE_SELECT_SHIFT) -#define GEN8_SELECTIVE_READ_ADDRESSING_ENABLE (1 << 13)#define GAM_ECOCHK _MMIO(0x4090)#define BDW_DISABLE_HDC_INVALIDATION (1 << 25)
@@ -487,11 +435,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ECOCHK_DIS_TLB (1 << 8)#define HSW_ECOCHK_ARB_PRIO_SOL (1 << 6)#define ECOCHK_PPGTT_CACHE64B (0x3 << 3) -#define ECOCHK_PPGTT_CACHE4B (0x0 << 3)#define ECOCHK_PPGTT_GFDT_IVB (0x1 << 4)#define ECOCHK_PPGTT_LLC_IVB (0x1 << 3) -#define ECOCHK_PPGTT_UC_HSW (0x1 << 3) -#define ECOCHK_PPGTT_WT_HSW (0x2 << 3)#define ECOCHK_PPGTT_WB_HSW (0x3 << 3)#define GEN8_RC6_CTX_INFO _MMIO(0x8504)
@@ -499,7 +444,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GAC_ECO_BITS _MMIO(0x14090)#define ECOBITS_SNB_BIT (1 << 13)#define ECOBITS_PPGTT_CACHE64B (3 << 8) -#define ECOBITS_PPGTT_CACHE4B (0 << 8)#define GEN12_GAMCNTRL_CTRL _MMIO(0xcf54)#define INVALIDATION_BROADCAST_MODE_DIS REG_BIT(12)
@@ -538,55 +482,18 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN6_STOLEN_RESERVED_ENABLE (1 << 0)#define GEN11_STOLEN_RESERVED_ADDR_MASK (0xFFFFFFFFFFFULL << 20) -/* VGA stuff */ - -#define VGA_ST01_MDA 0x3ba -#define VGA_ST01_CGA 0x3da -#define _VGA_MSR_WRITE _MMIO(0x3c2)#define VGA_MSR_WRITE 0x3c2#define VGA_MSR_READ 0x3cc -#define VGA_MSR_MEM_EN (1 << 1) -#define VGA_MSR_CGA_MODE (1 << 0)#define VGA_SR_INDEX 0x3c4#define SR01 1#define VGA_SR_DATA 0x3c5 -#define VGA_AR_INDEX 0x3c0 -#define VGA_AR_VID_EN (1 << 5) -#define VGA_AR_DATA_WRITE 0x3c0 -#define VGA_AR_DATA_READ 0x3c1 - -#define VGA_GR_INDEX 0x3ce -#define VGA_GR_DATA 0x3cf -/* GR05 */ -#define VGA_GR_MEM_READ_MODE_SHIFT 3 -#define VGA_GR_MEM_READ_MODE_PLANE 1 -/* GR06 */ -#define VGA_GR_MEM_MODE_MASK 0xc -#define VGA_GR_MEM_MODE_SHIFT 2 -#define VGA_GR_MEM_A0000_AFFFF 0 -#define VGA_GR_MEM_A0000_BFFFF 1 -#define VGA_GR_MEM_B0000_B7FFF 2 -#define VGA_GR_MEM_B0000_BFFFF 3 - -#define VGA_DACMASK 0x3c6 -#define VGA_DACRX 0x3c7 -#define VGA_DACWX 0x3c8 -#define VGA_DACDATA 0x3c9 - -#define VGA_CR_INDEX_MDA 0x3b4 -#define VGA_CR_DATA_MDA 0x3b5 -#define VGA_CR_INDEX_CGA 0x3d4 -#define VGA_CR_DATA_CGA 0x3d5 -#define MI_PREDICATE_SRC0 _MMIO(0x2400)#define MI_PREDICATE_SRC0_UDW _MMIO(0x2400 + 4)#define MI_PREDICATE_SRC1 _MMIO(0x2408)#define MI_PREDICATE_SRC1_UDW _MMIO(0x2408 + 4) -#define MI_PREDICATE_DATA _MMIO(0x2410) -#define MI_PREDICATE_RESULT _MMIO(0x2418)#define MI_PREDICATE_RESULT_1 _MMIO(0x241c)#define MI_PREDICATE_RESULT_2 _MMIO(0x2214)#define LOWER_SLICE_ENABLED (1 << 0)
@@ -652,49 +559,26 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN7_OACONTROL _MMIO(0x2360)#define GEN7_OACONTROL_CTX_MASK 0xFFFFF000 -#define GEN7_OACONTROL_TIMER_PERIOD_MASK 0x3F#define GEN7_OACONTROL_TIMER_PERIOD_SHIFT 6#define GEN7_OACONTROL_TIMER_ENABLE (1 << 5) -#define GEN7_OACONTROL_FORMAT_A13 (0 << 2) -#define GEN7_OACONTROL_FORMAT_A29 (1 << 2) -#define GEN7_OACONTROL_FORMAT_A13_B8_C8 (2 << 2) -#define GEN7_OACONTROL_FORMAT_A29_B8_C8 (3 << 2) -#define GEN7_OACONTROL_FORMAT_B4_C8 (4 << 2) -#define GEN7_OACONTROL_FORMAT_A45_B8_C8 (5 << 2) -#define GEN7_OACONTROL_FORMAT_B4_C8_A16 (6 << 2) -#define GEN7_OACONTROL_FORMAT_C4_B8 (7 << 2)#define GEN7_OACONTROL_FORMAT_SHIFT 2#define GEN7_OACONTROL_PER_CTX_ENABLE (1 << 1)#define GEN7_OACONTROL_ENABLE (1 << 0) -#define GEN8_OACTXID _MMIO(0x2364) -#define GEN8_OA_DEBUG _MMIO(0x2B04)#define GEN9_OA_DEBUG_DISABLE_CLK_RATIO_REPORTS (1 << 5)#define GEN9_OA_DEBUG_INCLUDE_CLK_RATIO (1 << 6) -#define GEN9_OA_DEBUG_DISABLE_GO_1_0_REPORTS (1 << 2) -#define GEN9_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS (1 << 1)#define GEN8_OACONTROL _MMIO(0x2B00) -#define GEN8_OA_REPORT_FORMAT_A12 (0 << 2) -#define GEN8_OA_REPORT_FORMAT_A12_B8_C8 (2 << 2) -#define GEN8_OA_REPORT_FORMAT_A36_B8_C8 (5 << 2) -#define GEN8_OA_REPORT_FORMAT_C4_B8 (7 << 2)#define GEN8_OA_REPORT_FORMAT_SHIFT 2 -#define GEN8_OA_SPECIFIC_CONTEXT_ENABLE (1 << 1)#define GEN8_OA_COUNTER_ENABLE (1 << 0)#define GEN8_OACTXCONTROL _MMIO(0x2360) -#define GEN8_OA_TIMER_PERIOD_MASK 0x3F#define GEN8_OA_TIMER_PERIOD_SHIFT 2#define GEN8_OA_TIMER_ENABLE (1 << 1)#define GEN8_OA_COUNTER_RESUME (1 << 0)#define GEN7_OABUFFER _MMIO(0x23B0)/* R/W */ -#define GEN7_OABUFFER_OVERRUN_DISABLE (1 << 3) -#define GEN7_OABUFFER_EDGE_TRIGGER (1 << 2) -#define GEN7_OABUFFER_STOP_RESUME_ENABLE (1 << 1) -#define GEN7_OABUFFER_RESUME (1 << 0)#define GEN8_OABUFFER_UDW _MMIO(0x23b4)#define GEN8_OABUFFER _MMIO(0x2b14)
@@ -702,7 +586,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN7_OASTATUS1 _MMIO(0x2364)#define GEN7_OASTATUS1_TAIL_MASK 0xffffffc0 -#define GEN7_OASTATUS1_COUNTER_OVERFLOW (1 << 2)#define GEN7_OASTATUS1_OABUFFER_OVERFLOW (1 << 1)#define GEN7_OASTATUS1_REPORT_LOST (1 << 0)
@@ -713,23 +596,14 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN8_OASTATUS _MMIO(0x2b08)#define GEN8_OASTATUS_TAIL_POINTER_WRAP (1 << 17)#define GEN8_OASTATUS_HEAD_POINTER_WRAP (1 << 16) -#define GEN8_OASTATUS_OVERRUN_STATUS (1 << 3)#define GEN8_OASTATUS_COUNTER_OVERFLOW (1 << 2)#define GEN8_OASTATUS_OABUFFER_OVERFLOW (1 << 1)#define GEN8_OASTATUS_REPORT_LOST (1 << 0)#define GEN8_OAHEADPTR _MMIO(0x2B0C) -#define GEN8_OAHEADPTR_MASK 0xffffffc0#define GEN8_OATAILPTR _MMIO(0x2B10)#define GEN8_OATAILPTR_MASK 0xffffffc0 -#define OABUFFER_SIZE_128K (0 << 3) -#define OABUFFER_SIZE_256K (1 << 3) -#define OABUFFER_SIZE_512K (2 << 3) -#define OABUFFER_SIZE_1M (3 << 3) -#define OABUFFER_SIZE_2M (4 << 3) -#define OABUFFER_SIZE_4M (5 << 3) -#define OABUFFER_SIZE_8M (6 << 3)#define OABUFFER_SIZE_16M (7 << 3)#define GEN12_OA_TLB_INV_CR _MMIO(0xceec)
@@ -742,9 +616,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_OAR_OACONTROL_COUNTER_FORMAT_SHIFT 1#define GEN12_OAR_OACONTROL_COUNTER_ENABLE (1 << 0) -#define GEN12_OACTXCONTROL _MMIO(0x2360) -#define GEN12_OAR_OASTATUS _MMIO(0x2968) -/* Gen12 OAG unit */ #define GEN12_OAG_OAHEADPTR _MMIO(0xdb00)#define GEN12_OAG_OAHEADPTR_MASK 0xffffffc0
@@ -752,9 +623,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_OAG_OATAILPTR_MASK 0xffffffc0#define GEN12_OAG_OABUFFER _MMIO(0xdb08) -#define GEN12_OAG_OABUFFER_BUFFER_SIZE_MASK (0x7) -#define GEN12_OAG_OABUFFER_BUFFER_SIZE_SHIFT (3) -#define GEN12_OAG_OABUFFER_MEMORY_SELECT (1 << 0)/* 0: PPGTT, 1: GGTT */ #define GEN12_OAG_OAGLBCTXCTRL _MMIO(0x2b28)#define GEN12_OAG_OAGLBCTXCTRL_TIMER_PERIOD_SHIFT 2
@@ -768,13 +636,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_OAG_OA_DEBUG _MMIO(0xdaf8)#define GEN12_OAG_OA_DEBUG_INCLUDE_CLK_RATIO (1 << 6)#define GEN12_OAG_OA_DEBUG_DISABLE_CLK_RATIO_REPORTS (1 << 5) -#define GEN12_OAG_OA_DEBUG_DISABLE_GO_1_0_REPORTS (1 << 2)#define GEN12_OAG_OA_DEBUG_DISABLE_CTX_SWITCH_REPORTS (1 << 1)#define GEN12_OAG_OASTATUS _MMIO(0xdafc) -#define GEN12_OAG_OASTATUS_COUNTER_OVERFLOW (1 << 2) -#define GEN12_OAG_OASTATUS_BUFFER_OVERFLOW (1 << 1) -#define GEN12_OAG_OASTATUS_REPORT_LOST (1 << 0)/* * Flexible, Aggregate EU Counter Registers.
@@ -796,331 +660,34 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)*/ #define OASTARTTRIG1 _MMIO(0x2710) -#define OASTARTTRIG1_THRESHOLD_COUNT_MASK_MBZ 0xffff0000 -#define OASTARTTRIG1_THRESHOLD_MASK 0xffff - -#define OASTARTTRIG2 _MMIO(0x2714) -#define OASTARTTRIG2_INVERT_A_0 (1 << 0) -#define OASTARTTRIG2_INVERT_A_1 (1 << 1) -#define OASTARTTRIG2_INVERT_A_2 (1 << 2) -#define OASTARTTRIG2_INVERT_A_3 (1 << 3) -#define OASTARTTRIG2_INVERT_A_4 (1 << 4) -#define OASTARTTRIG2_INVERT_A_5 (1 << 5) -#define OASTARTTRIG2_INVERT_A_6 (1 << 6) -#define OASTARTTRIG2_INVERT_A_7 (1 << 7) -#define OASTARTTRIG2_INVERT_A_8 (1 << 8) -#define OASTARTTRIG2_INVERT_A_9 (1 << 9) -#define OASTARTTRIG2_INVERT_A_10 (1 << 10) -#define OASTARTTRIG2_INVERT_A_11 (1 << 11) -#define OASTARTTRIG2_INVERT_A_12 (1 << 12) -#define OASTARTTRIG2_INVERT_A_13 (1 << 13) -#define OASTARTTRIG2_INVERT_A_14 (1 << 14) -#define OASTARTTRIG2_INVERT_A_15 (1 << 15) -#define OASTARTTRIG2_INVERT_B_0 (1 << 16) -#define OASTARTTRIG2_INVERT_B_1 (1 << 17) -#define OASTARTTRIG2_INVERT_B_2 (1 << 18) -#define OASTARTTRIG2_INVERT_B_3 (1 << 19) -#define OASTARTTRIG2_INVERT_C_0 (1 << 20) -#define OASTARTTRIG2_INVERT_C_1 (1 << 21) -#define OASTARTTRIG2_INVERT_D_0 (1 << 22) -#define OASTARTTRIG2_THRESHOLD_ENABLE (1 << 23) -#define OASTARTTRIG2_START_TRIG_FLAG_MBZ (1 << 24) -#define OASTARTTRIG2_EVENT_SELECT_0 (1 << 28) -#define OASTARTTRIG2_EVENT_SELECT_1 (1 << 29) -#define OASTARTTRIG2_EVENT_SELECT_2 (1 << 30) -#define OASTARTTRIG2_EVENT_SELECT_3 (1 << 31) - -#define OASTARTTRIG3 _MMIO(0x2718) -#define OASTARTTRIG3_NOA_SELECT_MASK 0xf -#define OASTARTTRIG3_NOA_SELECT_8_SHIFT 0 -#define OASTARTTRIG3_NOA_SELECT_9_SHIFT 4 -#define OASTARTTRIG3_NOA_SELECT_10_SHIFT 8 -#define OASTARTTRIG3_NOA_SELECT_11_SHIFT 12 -#define OASTARTTRIG3_NOA_SELECT_12_SHIFT 16 -#define OASTARTTRIG3_NOA_SELECT_13_SHIFT 20 -#define OASTARTTRIG3_NOA_SELECT_14_SHIFT 24 -#define OASTARTTRIG3_NOA_SELECT_15_SHIFT 28 - -#define OASTARTTRIG4 _MMIO(0x271c) -#define OASTARTTRIG4_NOA_SELECT_MASK 0xf -#define OASTARTTRIG4_NOA_SELECT_0_SHIFT 0 -#define OASTARTTRIG4_NOA_SELECT_1_SHIFT 4 -#define OASTARTTRIG4_NOA_SELECT_2_SHIFT 8 -#define OASTARTTRIG4_NOA_SELECT_3_SHIFT 12 -#define OASTARTTRIG4_NOA_SELECT_4_SHIFT 16 -#define OASTARTTRIG4_NOA_SELECT_5_SHIFT 20 -#define OASTARTTRIG4_NOA_SELECT_6_SHIFT 24 -#define OASTARTTRIG4_NOA_SELECT_7_SHIFT 28 - -#define OASTARTTRIG5 _MMIO(0x2720) -#define OASTARTTRIG5_THRESHOLD_COUNT_MASK_MBZ 0xffff0000 -#define OASTARTTRIG5_THRESHOLD_MASK 0xffff - -#define OASTARTTRIG6 _MMIO(0x2724) -#define OASTARTTRIG6_INVERT_A_0 (1 << 0) -#define OASTARTTRIG6_INVERT_A_1 (1 << 1) -#define OASTARTTRIG6_INVERT_A_2 (1 << 2) -#define OASTARTTRIG6_INVERT_A_3 (1 << 3) -#define OASTARTTRIG6_INVERT_A_4 (1 << 4) -#define OASTARTTRIG6_INVERT_A_5 (1 << 5) -#define OASTARTTRIG6_INVERT_A_6 (1 << 6) -#define OASTARTTRIG6_INVERT_A_7 (1 << 7) -#define OASTARTTRIG6_INVERT_A_8 (1 << 8) -#define OASTARTTRIG6_INVERT_A_9 (1 << 9) -#define OASTARTTRIG6_INVERT_A_10 (1 << 10) -#define OASTARTTRIG6_INVERT_A_11 (1 << 11) -#define OASTARTTRIG6_INVERT_A_12 (1 << 12) -#define OASTARTTRIG6_INVERT_A_13 (1 << 13) -#define OASTARTTRIG6_INVERT_A_14 (1 << 14) -#define OASTARTTRIG6_INVERT_A_15 (1 << 15) -#define OASTARTTRIG6_INVERT_B_0 (1 << 16) -#define OASTARTTRIG6_INVERT_B_1 (1 << 17) -#define OASTARTTRIG6_INVERT_B_2 (1 << 18) -#define OASTARTTRIG6_INVERT_B_3 (1 << 19) -#define OASTARTTRIG6_INVERT_C_0 (1 << 20) -#define OASTARTTRIG6_INVERT_C_1 (1 << 21) -#define OASTARTTRIG6_INVERT_D_0 (1 << 22) -#define OASTARTTRIG6_THRESHOLD_ENABLE (1 << 23) -#define OASTARTTRIG6_START_TRIG_FLAG_MBZ (1 << 24) -#define OASTARTTRIG6_EVENT_SELECT_4 (1 << 28) -#define OASTARTTRIG6_EVENT_SELECT_5 (1 << 29) -#define OASTARTTRIG6_EVENT_SELECT_6 (1 << 30) -#define OASTARTTRIG6_EVENT_SELECT_7 (1 << 31) - -#define OASTARTTRIG7 _MMIO(0x2728) -#define OASTARTTRIG7_NOA_SELECT_MASK 0xf -#define OASTARTTRIG7_NOA_SELECT_8_SHIFT 0 -#define OASTARTTRIG7_NOA_SELECT_9_SHIFT 4 -#define OASTARTTRIG7_NOA_SELECT_10_SHIFT 8 -#define OASTARTTRIG7_NOA_SELECT_11_SHIFT 12 -#define OASTARTTRIG7_NOA_SELECT_12_SHIFT 16 -#define OASTARTTRIG7_NOA_SELECT_13_SHIFT 20 -#define OASTARTTRIG7_NOA_SELECT_14_SHIFT 24 -#define OASTARTTRIG7_NOA_SELECT_15_SHIFT 28 -#define OASTARTTRIG8 _MMIO(0x272c) -#define OASTARTTRIG8_NOA_SELECT_MASK 0xf -#define OASTARTTRIG8_NOA_SELECT_0_SHIFT 0 -#define OASTARTTRIG8_NOA_SELECT_1_SHIFT 4 -#define OASTARTTRIG8_NOA_SELECT_2_SHIFT 8 -#define OASTARTTRIG8_NOA_SELECT_3_SHIFT 12 -#define OASTARTTRIG8_NOA_SELECT_4_SHIFT 16 -#define OASTARTTRIG8_NOA_SELECT_5_SHIFT 20 -#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_TRIGGER_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_TRIGGER_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/* Same layout as OASTARTTRIGX */ #define GEN12_OAG_OASTARTTRIG1 _MMIO(0xd900) -#define GEN12_OAG_OASTARTTRIG2 _MMIO(0xd904) -#define GEN12_OAG_OASTARTTRIG3 _MMIO(0xd908) -#define GEN12_OAG_OASTARTTRIG4 _MMIO(0xd90c) -#define GEN12_OAG_OASTARTTRIG5 _MMIO(0xd910) -#define GEN12_OAG_OASTARTTRIG6 _MMIO(0xd914) -#define GEN12_OAG_OASTARTTRIG7 _MMIO(0xd918)#define GEN12_OAG_OASTARTTRIG8 _MMIO(0xd91c)/* Same layout as OAREPORTTRIGX */ #define GEN12_OAG_OAREPORTTRIG1 _MMIO(0xd920) -#define GEN12_OAG_OAREPORTTRIG2 _MMIO(0xd924) -#define GEN12_OAG_OAREPORTTRIG3 _MMIO(0xd928) -#define GEN12_OAG_OAREPORTTRIG4 _MMIO(0xd92c) -#define GEN12_OAG_OAREPORTTRIG5 _MMIO(0xd930) -#define GEN12_OAG_OAREPORTTRIG6 _MMIO(0xd934) -#define GEN12_OAG_OAREPORTTRIG7 _MMIO(0xd938)#define GEN12_OAG_OAREPORTTRIG8 _MMIO(0xd93c) -/* CECX_0 */ -#define OACEC_COMPARE_LESS_OR_EQUAL 6 -#define OACEC_COMPARE_NOT_EQUAL 5 -#define OACEC_COMPARE_LESS_THAN 4 -#define OACEC_COMPARE_GREATER_OR_EQUAL 3 -#define OACEC_COMPARE_EQUAL 2 -#define OACEC_COMPARE_GREATER_THAN 1 -#define OACEC_COMPARE_ANY_EQUAL 0 - -#define OACEC_COMPARE_VALUE_MASK 0xffff -#define OACEC_COMPARE_VALUE_SHIFT 3 - -#define OACEC_SELECT_NOA (0 << 19) -#define OACEC_SELECT_PREV (1 << 19) -#define OACEC_SELECT_BOOLEAN (2 << 19) - -/* 11-bit array 0: pass-through, 1: negated */ -#define GEN12_OASCEC_NEGATE_MASK 0x7ff -#define GEN12_OASCEC_NEGATE_SHIFT 21 - -/* CECX_1 */ -#define OACEC_MASK_MASK 0xffff -#define OACEC_CONSIDERATIONS_MASK 0xffff -#define OACEC_CONSIDERATIONS_SHIFT 16 -#define OACEC0_0 _MMIO(0x2770) -#define OACEC0_1 _MMIO(0x2774) -#define OACEC1_0 _MMIO(0x2778) -#define OACEC1_1 _MMIO(0x277c) -#define OACEC2_0 _MMIO(0x2780) -#define OACEC2_1 _MMIO(0x2784) -#define OACEC3_0 _MMIO(0x2788) -#define OACEC3_1 _MMIO(0x278c) -#define OACEC4_0 _MMIO(0x2790) -#define OACEC4_1 _MMIO(0x2794) -#define OACEC5_0 _MMIO(0x2798) -#define OACEC5_1 _MMIO(0x279c) -#define OACEC6_0 _MMIO(0x27a0) -#define OACEC6_1 _MMIO(0x27a4) -#define OACEC7_0 _MMIO(0x27a8)#define OACEC7_1 _MMIO(0x27ac)/* Same layout as CECX_Y */ #define GEN12_OAG_CEC0_0 _MMIO(0xd940) -#define GEN12_OAG_CEC0_1 _MMIO(0xd944) -#define GEN12_OAG_CEC1_0 _MMIO(0xd948) -#define GEN12_OAG_CEC1_1 _MMIO(0xd94c) -#define GEN12_OAG_CEC2_0 _MMIO(0xd950) -#define GEN12_OAG_CEC2_1 _MMIO(0xd954) -#define GEN12_OAG_CEC3_0 _MMIO(0xd958) -#define GEN12_OAG_CEC3_1 _MMIO(0xd95c) -#define GEN12_OAG_CEC4_0 _MMIO(0xd960) -#define GEN12_OAG_CEC4_1 _MMIO(0xd964) -#define GEN12_OAG_CEC5_0 _MMIO(0xd968) -#define GEN12_OAG_CEC5_1 _MMIO(0xd96c) -#define GEN12_OAG_CEC6_0 _MMIO(0xd970) -#define GEN12_OAG_CEC6_1 _MMIO(0xd974) -#define GEN12_OAG_CEC7_0 _MMIO(0xd978)#define GEN12_OAG_CEC7_1 _MMIO(0xd97c)/* Same layout as CECX_Y + negate 11-bit array */ #define GEN12_OAG_SCEC0_0 _MMIO(0xdc00) -#define GEN12_OAG_SCEC0_1 _MMIO(0xdc04) -#define GEN12_OAG_SCEC1_0 _MMIO(0xdc08) -#define GEN12_OAG_SCEC1_1 _MMIO(0xdc0c) -#define GEN12_OAG_SCEC2_0 _MMIO(0xdc10) -#define GEN12_OAG_SCEC2_1 _MMIO(0xdc14) -#define GEN12_OAG_SCEC3_0 _MMIO(0xdc18) -#define GEN12_OAG_SCEC3_1 _MMIO(0xdc1c) -#define GEN12_OAG_SCEC4_0 _MMIO(0xdc20) -#define GEN12_OAG_SCEC4_1 _MMIO(0xdc24) -#define GEN12_OAG_SCEC5_0 _MMIO(0xdc28) -#define GEN12_OAG_SCEC5_1 _MMIO(0xdc2c) -#define GEN12_OAG_SCEC6_0 _MMIO(0xdc30) -#define GEN12_OAG_SCEC6_1 _MMIO(0xdc34) -#define GEN12_OAG_SCEC7_0 _MMIO(0xdc38)#define GEN12_OAG_SCEC7_1 _MMIO(0xdc3c)/* OA perf counters */ #define OA_PERFCNT1_LO _MMIO(0x91B8) -#define OA_PERFCNT1_HI _MMIO(0x91BC) -#define OA_PERFCNT2_LO _MMIO(0x91C0)#define OA_PERFCNT2_HI _MMIO(0x91C4)#define OA_PERFCNT3_LO _MMIO(0x91C8) -#define OA_PERFCNT3_HI _MMIO(0x91CC) -#define OA_PERFCNT4_LO _MMIO(0x91D8)#define OA_PERFCNT4_HI _MMIO(0x91DC)#define OA_PERFMATRIX_LO _MMIO(0x91C8)
@@ -1147,24 +714,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* GPM unit config (Gen9+) */ #define CTC_MODE _MMIO(0xA26C)#define CTC_SOURCE_PARAMETER_MASK 1 -#define CTC_SOURCE_CRYSTAL_CLOCK 0#define CTC_SOURCE_DIVIDE_LOGIC 1#define CTC_SHIFT_PARAMETER_SHIFT 1#define CTC_SHIFT_PARAMETER_MASK (0x3 << CTC_SHIFT_PARAMETER_SHIFT) -/* RCP unit config (Gen8+) */ -#define RCP_CONFIG _MMIO(0x0D08) -/* NOA (HSW) */ #define HSW_MBVID2_NOA0 _MMIO(0x9E80) -#define HSW_MBVID2_NOA1 _MMIO(0x9E84) -#define HSW_MBVID2_NOA2 _MMIO(0x9E88) -#define HSW_MBVID2_NOA3 _MMIO(0x9E8C) -#define HSW_MBVID2_NOA4 _MMIO(0x9E90) -#define HSW_MBVID2_NOA5 _MMIO(0x9E94) -#define HSW_MBVID2_NOA6 _MMIO(0x9E98) -#define HSW_MBVID2_NOA7 _MMIO(0x9E9C) -#define HSW_MBVID2_NOA8 _MMIO(0x9EA0)#define HSW_MBVID2_NOA9 _MMIO(0x9EA4)#define HSW_MBVID2_MISR0 _MMIO(0x9EC0)
@@ -1173,25 +728,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define NOA_CONFIG (i) _MMIO(0x0D0C + (i) * 4)#define MICRO_BP0_0 _MMIO(0x9800) -#define MICRO_BP0_2 _MMIO(0x9804) -#define MICRO_BP0_1 _MMIO(0x9808) - -#define MICRO_BP1_0 _MMIO(0x980C) -#define MICRO_BP1_2 _MMIO(0x9810) -#define MICRO_BP1_1 _MMIO(0x9814) - -#define MICRO_BP2_0 _MMIO(0x9818) -#define MICRO_BP2_2 _MMIO(0x981C) -#define MICRO_BP2_1 _MMIO(0x9820) - -#define MICRO_BP3_0 _MMIO(0x9824) -#define MICRO_BP3_2 _MMIO(0x9828) -#define MICRO_BP3_1 _MMIO(0x982C) - -#define MICRO_BP_TRIGGER _MMIO(0x9830) -#define MICRO_BP3_COUNT_STATUS01 _MMIO(0x9834) -#define MICRO_BP3_COUNT_STATUS23 _MMIO(0x9838) -#define MICRO_BP_FIRED_ARMED _MMIO(0x983C)#define GEN12_OAA_DBG_REG _MMIO(0xdc44)#define GEN12_OAG_OA_PESS _MMIO(0x2b2c)
@@ -1200,22 +736,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GDT_CHICKEN_BITS _MMIO(0x9840)#define GT_NOA_ENABLE 0x00000080 -#define NOA_DATA _MMIO(0x986C)#define NOA_WRITE _MMIO(0x9888)#define GEN10_NOA_WRITE_HIGH _MMIO(0x9884) -#define _GEN7_PIPEA_DE_LOAD_SL 0x70068 -#define _GEN7_PIPEB_DE_LOAD_SL 0x71068 -#define GEN7_PIPE_DE_LOAD_SL (pipe) _MMIO_PIPE(pipe, _GEN7_PIPEA_DE_LOAD_SL, _GEN7_PIPEB_DE_LOAD_SL) - -/* -* Reset registers -*/ -#define DEBUG_RESET_I830 _MMIO(0x6070) -#define DEBUG_RESET_FULL (1 << 7) -#define DEBUG_RESET_RENDER (1 << 8) -#define DEBUG_RESET_DISPLAY (1 << 9) -/* * IOSF sideband */
@@ -1234,8 +757,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define IOSF_PORT_CCK 0x14#define IOSF_PORT_DPIO_2 0x1a#define IOSF_PORT_FLISDSI 0x1b -#define IOSF_PORT_GPIO_SC 0x48 -#define IOSF_PORT_GPIO_SUS 0xa8#define IOSF_PORT_CCU 0xa9#define CHV_IOSF_PORT_GPIO_N 0x13#define CHV_IOSF_PORT_GPIO_SE 0x48
@@ -1250,27 +771,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* PUNIT_REG_*SSPM0 */ #define _SSPM0_SSC (val) ((val) << 0)#define SSPM0_SSC_MASK _SSPM0_SSC(0x3) -#define SSPM0_SSC_PWR_ON _SSPM0_SSC(0x0) -#define SSPM0_SSC_CLK_GATE _SSPM0_SSC(0x1) -#define SSPM0_SSC_RESET _SSPM0_SSC(0x2)#define SSPM0_SSC_PWR_GATE _SSPM0_SSC(0x3) -#define _SSPM0_SSS (val) ((val) << 24) -#define SSPM0_SSS_MASK _SSPM0_SSS(0x3) -#define SSPM0_SSS_PWR_ON _SSPM0_SSS(0x0) -#define SSPM0_SSS_CLK_GATE _SSPM0_SSS(0x1) -#define SSPM0_SSS_RESET _SSPM0_SSS(0x2) -#define SSPM0_SSS_PWR_GATE _SSPM0_SSS(0x3) - -/* PUNIT_REG_*SSPM1 */ -#define SSPM1_FREQSTAT_SHIFT 24 -#define SSPM1_FREQSTAT_MASK (0x1f << SSPM1_FREQSTAT_SHIFT) -#define SSPM1_FREQGUAR_SHIFT 8 -#define SSPM1_FREQGUAR_MASK (0x1f << SSPM1_FREQGUAR_SHIFT) -#define SSPM1_FREQ_SHIFT 0 -#define SSPM1_FREQ_MASK (0x1f << SSPM1_FREQ_SHIFT)#define PUNIT_REG_VEDSSPM0 0x32 -#define PUNIT_REG_VEDSSPM1 0x33#define PUNIT_REG_DSPSSPM 0x36#define DSPFREQSTAT_SHIFT_CHV 24
@@ -1281,55 +784,36 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DSPFREQSTAT_MASK (0x3 << DSPFREQSTAT_SHIFT)#define DSPFREQGUAR_SHIFT 14#define DSPFREQGUAR_MASK (0x3 << DSPFREQGUAR_SHIFT) -#define DSP_MAXFIFO_PM5_STATUS (1 << 22)/* chv */ -#define DSP_AUTO_CDCLK_GATE_DISABLE (1 << 7)/* chv */ #define DSP_MAXFIFO_PM5_ENABLE (1 << 6)/* chv */ #define _DP_SSC (val, pipe) ((val) << (2 * (pipe)))#define DP_SSC_MASK (pipe) _DP_SSC(0x3, (pipe))#define DP_SSC_PWR_ON (pipe) _DP_SSC(0x0, (pipe)) -#define DP_SSC_CLK_GATE (pipe) _DP_SSC(0x1, (pipe)) -#define DP_SSC_RESET (pipe) _DP_SSC(0x2, (pipe))#define DP_SSC_PWR_GATE (pipe) _DP_SSC(0x3, (pipe))#define _DP_SSS (val, pipe) ((val) << (2 * (pipe) + 16))#define DP_SSS_MASK (pipe) _DP_SSS(0x3, (pipe))#define DP_SSS_PWR_ON (pipe) _DP_SSS(0x0, (pipe)) -#define DP_SSS_CLK_GATE (pipe) _DP_SSS(0x1, (pipe)) -#define DP_SSS_RESET (pipe) _DP_SSS(0x2, (pipe))#define DP_SSS_PWR_GATE (pipe) _DP_SSS(0x3, (pipe))#define PUNIT_REG_ISPSSPM0 0x39 -#define PUNIT_REG_ISPSSPM1 0x3a#define PUNIT_REG_PWRGT_CTRL 0x60#define PUNIT_REG_PWRGT_STATUS 0x61#define PUNIT_PWRGT_MASK (pw_idx) (3 << ((pw_idx) * 2))#define PUNIT_PWRGT_PWR_ON (pw_idx) (0 << ((pw_idx) * 2)) -#define PUNIT_PWRGT_CLK_GATE (pw_idx) (1 << ((pw_idx) * 2)) -#define PUNIT_PWRGT_RESET (pw_idx) (2 << ((pw_idx) * 2))#define PUNIT_PWRGT_PWR_GATE (pw_idx) (3 << ((pw_idx) * 2)) -#define PUNIT_PWGT_IDX_RENDER 0 -#define PUNIT_PWGT_IDX_MEDIA 1#define PUNIT_PWGT_IDX_DISP2D 3#define PUNIT_PWGT_IDX_DPIO_CMN_BC 5#define PUNIT_PWGT_IDX_DPIO_TX_B_LANES_01 6#define PUNIT_PWGT_IDX_DPIO_TX_B_LANES_23 7#define PUNIT_PWGT_IDX_DPIO_TX_C_LANES_01 8#define PUNIT_PWGT_IDX_DPIO_TX_C_LANES_23 9 -#define PUNIT_PWGT_IDX_DPIO_RX0 10 -#define PUNIT_PWGT_IDX_DPIO_RX1 11#define PUNIT_PWGT_IDX_DPIO_CMN_D 12#define PUNIT_REG_GPU_LFM 0xd3#define PUNIT_REG_GPU_FREQ_REQ 0xd4#define PUNIT_REG_GPU_FREQ_STS 0xd8#define GPLLENABLE (1 << 4) -#define GENFREQSTATUS (1 << 0) -#define PUNIT_REG_MEDIA_TURBO_FREQ_REQ 0xdc -#define PUNIT_REG_CZ_TIMESTAMP 0xce - -#define PUNIT_FUSE_BUS2 0xf6/* bits 47:40 */ -#define PUNIT_FUSE_BUS1 0xf5/* bits 55:48 */ #define FB_GFX_FMAX_AT_VMAX_FUSE 0x136#define FB_GFX_FREQ_FUSE_MASK 0xff
@@ -1345,12 +829,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define FORCE_DDR_LOW_FREQ (1 << 1)#define FORCE_DDR_HIGH_FREQ (1 << 0) -#define PUNIT_GPU_STATUS_REG 0xdb -#define PUNIT_GPU_STATUS_MAX_FREQ_SHIFT 16 -#define PUNIT_GPU_STATUS_MAX_FREQ_MASK 0xff -#define PUNIT_GPU_STATIS_GFX_MIN_FREQ_SHIFT 8 -#define PUNIT_GPU_STATUS_GFX_MIN_FREQ_MASK 0xff -#define PUNIT_GPU_DUTYCYCLE_REG 0xdf#define PUNIT_GPU_DUTYCYCLE_RPE_FREQ_SHIFT 8#define PUNIT_GPU_DUTYCYCLE_RPE_FREQ_MASK 0xff
@@ -1375,32 +853,15 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* vlv2 north clock has */ #define CCK_FUSE_REG 0x8#define CCK_FUSE_HPLL_FREQ_MASK 0x3 -#define CCK_REG_DSI_PLL_FUSE 0x44#define CCK_REG_DSI_PLL_CONTROL 0x48#define DSI_PLL_VCO_EN (1 << 31)#define DSI_PLL_LDO_GATE (1 << 30)#define DSI_PLL_P1_POST_DIV_SHIFT 17#define DSI_PLL_P1_POST_DIV_MASK (0x1ff << 17) -#define DSI_PLL_P2_MUX_DSI0_DIV2 (1 << 13) -#define DSI_PLL_P3_MUX_DSI1_DIV2 (1 << 12) -#define DSI_PLL_MUX_MASK (3 << 9) -#define DSI_PLL_MUX_DSI0_DSIPLL (0 << 10) -#define DSI_PLL_MUX_DSI0_CCK (1 << 10) -#define DSI_PLL_MUX_DSI1_DSIPLL (0 << 9) -#define DSI_PLL_MUX_DSI1_CCK (1 << 9) -#define DSI_PLL_CLK_GATE_MASK (0xf << 5)#define DSI_PLL_CLK_GATE_DSI0_DSIPLL (1 << 8)#define DSI_PLL_CLK_GATE_DSI1_DSIPLL (1 << 7) -#define DSI_PLL_CLK_GATE_DSI0_CCK (1 << 6) -#define DSI_PLL_CLK_GATE_DSI1_CCK (1 << 5)#define DSI_PLL_LOCK (1 << 0)#define CCK_REG_DSI_PLL_DIVIDER 0x4c -#define DSI_PLL_LFSR (1 << 31) -#define DSI_PLL_FRACTION_EN (1 << 30) -#define DSI_PLL_FRAC_COUNTER_SHIFT 27 -#define DSI_PLL_FRAC_COUNTER_MASK (7 << 27) -#define DSI_PLL_USYNC_CNT_SHIFT 18 -#define DSI_PLL_USYNC_CNT_MASK (0x1ff << 18)#define DSI_PLL_N1_DIV_SHIFT 16#define DSI_PLL_N1_DIV_MASK (3 << 16)#define DSI_PLL_M1_DIV_SHIFT 0
@@ -1409,8 +870,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define CCK_GPLL_CLOCK_CONTROL 0x67#define CCK_DISPLAY_CLOCK_CONTROL 0x6b#define CCK_DISPLAY_REF_CLOCK_CONTROL 0x6c -#define CCK_TRUNK_FORCE_ON (1 << 17) -#define CCK_TRUNK_FORCE_OFF (1 << 16)#define CCK_FREQUENCY_STATUS (0x1f << 8)#define CCK_FREQUENCY_STATUS_SHIFT 8#define CCK_FREQUENCY_VALUES (0x1f << 0)
@@ -1419,8 +878,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DPIO_DEVFN 0#define DPIO_CTL _MMIO(VLV_DISPLAY_BASE + 0x2110) -#define DPIO_MODSEL1 (1 << 3)/* if ref clk b == 27 */ -#define DPIO_MODSEL0 (1 << 2)/* if ref clk a == 27 */ #define DPIO_SFR_BYPASS (1 << 1)#define DPIO_CMNRST (1 << 0)
@@ -1431,10 +888,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)*/ #define _VLV_PLL_DW3_CH0 0x800c#define DPIO_POST_DIV_SHIFT (28)/* 3 bits */ -#define DPIO_POST_DIV_DAC 0#define DPIO_POST_DIV_HDMIDP 1/* DAC 225-400M rate */ -#define DPIO_POST_DIV_LVDS1 2 -#define DPIO_POST_DIV_LVDS2 3#define DPIO_K_SHIFT (24)/* 4 bits */ #define DPIO_P1_SHIFT (21)/* 3 bits */ #define DPIO_P2_SHIFT (16)/* 5 bits */
@@ -1446,13 +900,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define VLV_PLL_DW3 (ch) _PIPE(ch, _VLV_PLL_DW3_CH0, _VLV_PLL_DW3_CH1)#define _VLV_PLL_DW5_CH0 0x8014 -#define DPIO_REFSEL_OVERRIDE 27 -#define DPIO_PLL_MODESEL_SHIFT 24/* 3 bits */ -#define DPIO_BIAS_CURRENT_CTL_SHIFT 21/* 3 bits, always 0x7 */ -#define DPIO_PLL_REFCLK_SEL_SHIFT 16/* 2 bits */ -#define DPIO_PLL_REFCLK_SEL_MASK 3 -#define DPIO_DRIVER_CTL_SHIFT 12/* always set to 0x8 */ -#define DPIO_CLK_BIAS_CTL_SHIFT 8/* always set to 0x5 */ #define _VLV_PLL_DW5_CH1 0x8034#define VLV_PLL_DW5 (ch) _PIPE(ch, _VLV_PLL_DW5_CH0, _VLV_PLL_DW5_CH1)
@@ -1490,8 +937,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _VLV_PCS_DW0_CH1 0x8400#define DPIO_PCS_TX_LANE2_RESET (1 << 16)#define DPIO_PCS_TX_LANE1_RESET (1 << 7) -#define DPIO_LEFT_TXFIFO_RST_MASTER2 (1 << 4) -#define DPIO_RIGHT_TXFIFO_RST_MASTER2 (1 << 3)#define VLV_PCS_DW0 (ch) _PORT(ch, _VLV_PCS_DW0_CH0, _VLV_PCS_DW0_CH1)#define _VLV_PCS01_DW0_CH0 0x200
@@ -1534,10 +979,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _VLV_PCS_DW9_CH1 0x8424#define DPIO_PCS_TX2MARGIN_MASK (0x7 << 13)#define DPIO_PCS_TX2MARGIN_000 (0 << 13) -#define DPIO_PCS_TX2MARGIN_101 (1 << 13)#define DPIO_PCS_TX1MARGIN_MASK (0x7 << 10)#define DPIO_PCS_TX1MARGIN_000 (0 << 10) -#define DPIO_PCS_TX1MARGIN_101 (1 << 10)#define VLV_PCS_DW9 (ch) _PORT(ch, _VLV_PCS_DW9_CH0, _VLV_PCS_DW9_CH1)#define _VLV_PCS01_DW9_CH0 0x224
@@ -1547,17 +990,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define VLV_PCS01_DW9 (ch) _PORT(ch, _VLV_PCS01_DW9_CH0, _VLV_PCS01_DW9_CH1)#define VLV_PCS23_DW9 (ch) _PORT(ch, _VLV_PCS23_DW9_CH0, _VLV_PCS23_DW9_CH1) -#define _CHV_PCS_DW10_CH0 0x8228 -#define _CHV_PCS_DW10_CH1 0x8428#define DPIO_PCS_SWING_CALC_TX0_TX2 (1 << 30)#define DPIO_PCS_SWING_CALC_TX1_TX3 (1 << 31)#define DPIO_PCS_TX2DEEMP_MASK (0xf << 24)#define DPIO_PCS_TX2DEEMP_9P5 (0 << 24) -#define DPIO_PCS_TX2DEEMP_6P0 (2 << 24)#define DPIO_PCS_TX1DEEMP_MASK (0xf << 16)#define DPIO_PCS_TX1DEEMP_9P5 (0 << 16) -#define DPIO_PCS_TX1DEEMP_6P0 (2 << 16) -#define CHV_PCS_DW10 (ch) _PORT(ch, _CHV_PCS_DW10_CH0, _CHV_PCS_DW10_CH1)#define _VLV_PCS01_DW10_CH0 0x0228#define _VLV_PCS23_DW10_CH0 0x0428
@@ -1570,8 +1008,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _VLV_PCS_DW11_CH1 0x842c#define DPIO_TX2_STAGGER_MASK (x) ((x) << 24)#define DPIO_LANEDESKEW_STRAP_OVRD (1 << 3) -#define DPIO_LEFT_TXFIFO_RST_MASTER (1 << 1) -#define DPIO_RIGHT_TXFIFO_RST_MASTER (1 << 0)#define VLV_PCS_DW11 (ch) _PORT(ch, _VLV_PCS_DW11_CH0, _VLV_PCS_DW11_CH1)#define _VLV_PCS01_DW11_CH0 0x022c
@@ -1616,16 +1052,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _VLV_TX_DW3_CH1 0x848c/* The following bit for CHV phy */ #define DPIO_TX_UNIQ_TRANS_SCALE_EN (1 << 27) -#define DPIO_SWING_MARGIN101_SHIFT 16 -#define DPIO_SWING_MARGIN101_MASK (0xff << DPIO_SWING_MARGIN101_SHIFT)#define VLV_TX_DW3 (ch) _PORT(ch, _VLV_TX_DW3_CH0, _VLV_TX_DW3_CH1)#define _VLV_TX_DW4_CH0 0x8290#define _VLV_TX_DW4_CH1 0x8490#define DPIO_SWING_DEEMPH9P5_SHIFT 24#define DPIO_SWING_DEEMPH9P5_MASK (0xff << DPIO_SWING_DEEMPH9P5_SHIFT) -#define DPIO_SWING_DEEMPH6P0_SHIFT 16 -#define DPIO_SWING_DEEMPH6P0_MASK (0xff << DPIO_SWING_DEEMPH6P0_SHIFT)#define VLV_TX_DW4 (ch) _PORT(ch, _VLV_TX_DW4_CH0, _VLV_TX_DW4_CH1)#define _VLV_TX3_DW4_CH0 0x690
@@ -1663,8 +1095,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _CHV_PLL_DW3_CH0 0x800c#define _CHV_PLL_DW3_CH1 0x818c#define DPIO_CHV_FRAC_DIV_EN (1 << 16) -#define DPIO_CHV_FIRST_MOD (0 << 8) -#define DPIO_CHV_SECOND_MOD (1 << 8)#define DPIO_CHV_FEEDFWD_GAIN_SHIFT 0#define DPIO_CHV_FEEDFWD_GAIN_MASK (0xF << 0)#define CHV_PLL_DW3 (ch) _PIPE(ch, _CHV_PLL_DW3_CH0, _CHV_PLL_DW3_CH1)
@@ -1690,18 +1120,13 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define CHV_PLL_DW9 (ch) _PIPE(ch, _CHV_PLL_DW9_CH0, _CHV_PLL_DW9_CH1)#define _CHV_CMN_DW0_CH0 0x8100 -#define DPIO_ALLDL_POWERDOWN_SHIFT_CH0 19#define DPIO_ANYDL_POWERDOWN_SHIFT_CH0 18#define DPIO_ALLDL_POWERDOWN (1 << 1)#define DPIO_ANYDL_POWERDOWN (1 << 0)#define _CHV_CMN_DW5_CH0 0x8114 -#define CHV_BUFRIGHTENA1_DISABLE (0 << 20) -#define CHV_BUFRIGHTENA1_NORMAL (1 << 20)#define CHV_BUFRIGHTENA1_FORCE (3 << 20)#define CHV_BUFRIGHTENA1_MASK (3 << 20) -#define CHV_BUFLEFTENA1_DISABLE (0 << 22) -#define CHV_BUFLEFTENA1_NORMAL (1 << 22)#define CHV_BUFLEFTENA1_FORCE (3 << 22)#define CHV_BUFLEFTENA1_MASK (3 << 22)
@@ -1711,27 +1136,20 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DPIO_CHV_P1_DIV_SHIFT 13/* 3 bits */ #define DPIO_CHV_P2_DIV_SHIFT 8/* 5 bits */ #define DPIO_CHV_K_DIV_SHIFT 4 -#define DPIO_PLL_FREQLOCK (1 << 1) -#define DPIO_PLL_LOCK (1 << 0)#define CHV_CMN_DW13 (ch) _PIPE(ch, _CHV_CMN_DW13_CH0, _CHV_CMN_DW0_CH1)#define _CHV_CMN_DW14_CH0 0x8138#define _CHV_CMN_DW1_CH1 0x8084#define DPIO_AFC_RECAL (1 << 14)#define DPIO_DCLKP_EN (1 << 13) -#define CHV_BUFLEFTENA2_DISABLE (0 << 17)/* CL2 DW1 only */ -#define CHV_BUFLEFTENA2_NORMAL (1 << 17)/* CL2 DW1 only */ #define CHV_BUFLEFTENA2_FORCE (3 << 17)/* CL2 DW1 only */ #define CHV_BUFLEFTENA2_MASK (3 << 17)/* CL2 DW1 only */ -#define CHV_BUFRIGHTENA2_DISABLE (0 << 19)/* CL2 DW1 only */ -#define CHV_BUFRIGHTENA2_NORMAL (1 << 19)/* CL2 DW1 only */ #define CHV_BUFRIGHTENA2_FORCE (3 << 19)/* CL2 DW1 only */ #define CHV_BUFRIGHTENA2_MASK (3 << 19)/* CL2 DW1 only */ #define CHV_CMN_DW14 (ch) _PIPE(ch, _CHV_CMN_DW14_CH0, _CHV_CMN_DW1_CH1)#define _CHV_CMN_DW19_CH0 0x814c#define _CHV_CMN_DW6_CH1 0x8098 -#define DPIO_ALLDL_POWERDOWN_SHIFT_CH1 30/* CL2 DW6 only */ #define DPIO_ANYDL_POWERDOWN_SHIFT_CH1 29/* CL2 DW6 only */ #define DPIO_DYNPWRDOWNEN_CH1 (1 << 28)/* CL2 DW6 only */ #define CHV_CMN_USEDCLKCHANNEL (1 << 13)
@@ -1741,31 +1159,17 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define CHV_CMN_DW28 0x8170#define DPIO_CL1POWERDOWNEN (1 << 23)#define DPIO_DYNPWRDOWNEN_CH0 (1 << 22) -#define DPIO_SUS_CLK_CONFIG_ON (0 << 0) -#define DPIO_SUS_CLK_CONFIG_CLKREQ (1 << 0) -#define DPIO_SUS_CLK_CONFIG_GATE (2 << 0)#define DPIO_SUS_CLK_CONFIG_GATE_CLKREQ (3 << 0)#define CHV_CMN_DW30 0x8178#define DPIO_CL2_LDOFUSE_PWRENB (1 << 6) -#define DPIO_LRC_BYPASS (1 << 3)#define _TXLANE (ch, lane, offset) ((ch ? 0x2400 : 0) + \ (lane) * 0x200 + (offset)) -#define CHV_TX_DW0 (ch, lane) _TXLANE(ch, lane, 0x80) -#define CHV_TX_DW1 (ch, lane) _TXLANE(ch, lane, 0x84)#define CHV_TX_DW2 (ch, lane) _TXLANE(ch, lane, 0x88)#define CHV_TX_DW3 (ch, lane) _TXLANE(ch, lane, 0x8c)#define CHV_TX_DW4 (ch, lane) _TXLANE(ch, lane, 0x90) -#define CHV_TX_DW5 (ch, lane) _TXLANE(ch, lane, 0x94) -#define CHV_TX_DW6 (ch, lane) _TXLANE(ch, lane, 0x98) -#define CHV_TX_DW7 (ch, lane) _TXLANE(ch, lane, 0x9c) -#define CHV_TX_DW8 (ch, lane) _TXLANE(ch, lane, 0xa0) -#define CHV_TX_DW9 (ch, lane) _TXLANE(ch, lane, 0xa4) -#define CHV_TX_DW10 (ch, lane) _TXLANE(ch, lane, 0xa8) -#define CHV_TX_DW11 (ch, lane) _TXLANE(ch, lane, 0xac) -#define DPIO_FRC_LATENCY_SHFIT 8#define CHV_TX_DW14 (ch, lane) _TXLANE(ch, lane, 0xb8)#define DPIO_UPAR_SHIFT 30
@@ -1809,7 +1213,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* BXT PHY PLL registers */ #define _PORT_PLL_A 0x46074#define _PORT_PLL_B 0x46078 -#define _PORT_PLL_C 0x4607c#define PORT_PLL_ENABLE (1 << 31)#define PORT_PLL_LOCK (1 << 30)#define PORT_PLL_REF_SEL (1 << 27)
@@ -1817,7 +1220,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define PORT_PLL_POWER_STATE (1 << 25)#define BXT_PORT_PLL_ENABLE (port) _MMIO_PORT(port, _PORT_PLL_A, _PORT_PLL_B) -#define _PORT_PLL_EBB_0_A 0x162034#define _PORT_PLL_EBB_0_B 0x6C034#define _PORT_PLL_EBB_0_C 0x6C340#define PORT_PLL_P1_SHIFT 13
@@ -1830,7 +1232,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) _PORT_PLL_EBB_0_B, \ _PORT_PLL_EBB_0_C) -#define _PORT_PLL_EBB_4_A 0x162038#define _PORT_PLL_EBB_4_B 0x6C038#define _PORT_PLL_EBB_4_C 0x6C344#define PORT_PLL_10BIT_CLK_ENABLE (1 << 13)
@@ -1839,7 +1240,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) _PORT_PLL_EBB_4_B, \ _PORT_PLL_EBB_4_C) -#define _PORT_PLL_0_A 0x162100#define _PORT_PLL_0_B 0x6C100#define _PORT_PLL_0_C 0x6C380/* PORT_PLL_0_A */
@@ -1875,34 +1275,28 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) (idx) * 4)/* BXT PHY common lane registers */ -#define _PORT_CL1CM_DW0_A 0x162000#define _PORT_CL1CM_DW0_BC 0x6C000#define PHY_POWER_GOOD (1 << 16)#define PHY_RESERVED (1 << 7)#define BXT_PORT_CL1CM_DW0 (phy) _BXT_PHY((phy), _PORT_CL1CM_DW0_BC) -#define _PORT_CL1CM_DW9_A 0x162024#define _PORT_CL1CM_DW9_BC 0x6C024#define IREF0RC_OFFSET_SHIFT 8#define IREF0RC_OFFSET_MASK (0xFF << IREF0RC_OFFSET_SHIFT)#define BXT_PORT_CL1CM_DW9 (phy) _BXT_PHY((phy), _PORT_CL1CM_DW9_BC) -#define _PORT_CL1CM_DW10_A 0x162028#define _PORT_CL1CM_DW10_BC 0x6C028#define IREF1RC_OFFSET_SHIFT 8#define IREF1RC_OFFSET_MASK (0xFF << IREF1RC_OFFSET_SHIFT)#define BXT_PORT_CL1CM_DW10 (phy) _BXT_PHY((phy), _PORT_CL1CM_DW10_BC) -#define _PORT_CL1CM_DW28_A 0x162070#define _PORT_CL1CM_DW28_BC 0x6C070#define OCL1_POWER_DOWN_EN (1 << 23)#define DW28_OLDO_DYN_PWR_DOWN_EN (1 << 22)#define SUS_CLK_CONFIG 0x3#define BXT_PORT_CL1CM_DW28 (phy) _BXT_PHY((phy), _PORT_CL1CM_DW28_BC) -#define _PORT_CL1CM_DW30_A 0x162078#define _PORT_CL1CM_DW30_BC 0x6C078 -#define OCL2_LDOFUSE_PWR_DIS (1 << 6)#define BXT_PORT_CL1CM_DW30 (phy) _BXT_PHY((phy), _PORT_CL1CM_DW30_BC)/*
@@ -1929,9 +1323,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SUS_CLOCK_CONFIG (3 << 0)#define ICL_PORT_CL_DW10 (phy) _MMIO(_ICL_PORT_CL_DW(10, phy)) -#define PG_SEQ_DELAY_OVERRIDE_MASK (3 << 25) -#define PG_SEQ_DELAY_OVERRIDE_SHIFT 25 -#define PG_SEQ_DELAY_OVERRIDE_ENABLE (1 << 24)#define PWR_UP_ALL_LANES (0x0 << 4)#define PWR_DOWN_LN_3_2_1 (0xe << 4)#define PWR_DOWN_LN_3_2 (0xc << 4)
@@ -1941,7 +1332,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define PWR_DOWN_LN_3_1 (0xa << 4)#define PWR_DOWN_LN_3_1_0 (0xb << 4)#define PWR_DOWN_LN_MASK (0xf << 4) -#define PWR_DOWN_LN_SHIFT 4#define EDP4K2K_MODE_OVRD_EN (1 << 3)#define EDP4K2K_MODE_OVRD_OPTIMIZED (1 << 2)
@@ -1961,14 +1351,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ICL_PORT_COMP_DW3 (phy) _MMIO(_ICL_PORT_COMP_DW(3, phy))#define PROCESS_INFO_DOT_0 (0 << 26)#define PROCESS_INFO_DOT_1 (1 << 26) -#define PROCESS_INFO_DOT_4 (2 << 26)#define PROCESS_INFO_MASK (7 << 26) -#define PROCESS_INFO_SHIFT 26#define VOLTAGE_INFO_0_85V (0 << 24)#define VOLTAGE_INFO_0_95V (1 << 24)#define VOLTAGE_INFO_1_05V (2 << 24)#define VOLTAGE_INFO_MASK (3 << 24) -#define VOLTAGE_INFO_SHIFT 24#define ICL_PORT_COMP_DW8 (phy) _MMIO(_ICL_PORT_COMP_DW(8, phy))#define IREFGEN (1 << 24)
@@ -2021,7 +1408,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define RCOMP_SCALAR_MASK (0xFF << 0)#define ICL_PORT_TX_DW4_AUX (phy) _MMIO(_ICL_PORT_TX_DW_AUX(4, phy)) -#define ICL_PORT_TX_DW4_GRP (phy) _MMIO(_ICL_PORT_TX_DW_GRP(4, phy))#define ICL_PORT_TX_DW4_LN (ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(4, ln, phy))#define LOADGEN_SELECT (1 << 31)#define POST_CURSOR_1 (x) ((x) << 12)
@@ -2042,13 +1428,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define RTERM_SELECT (x) ((x) << 3)#define RTERM_SELECT_MASK (0x7 << 3) -#define ICL_PORT_TX_DW7_AUX (phy) _MMIO(_ICL_PORT_TX_DW_AUX(7, phy)) -#define ICL_PORT_TX_DW7_GRP (phy) _MMIO(_ICL_PORT_TX_DW_GRP(7, phy))#define ICL_PORT_TX_DW7_LN (ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(7, ln, phy))#define N_SCALAR (x) ((x) << 24)#define N_SCALAR_MASK (0x7F << 24) -#define ICL_PORT_TX_DW8_AUX (phy) _MMIO(_ICL_PORT_TX_DW_AUX(8, phy))#define ICL_PORT_TX_DW8_GRP (phy) _MMIO(_ICL_PORT_TX_DW_GRP(8, phy))#define ICL_PORT_TX_DW8_LN (ln, phy) _MMIO(_ICL_PORT_TX_DW_LN(8, ln, phy))#define ICL_PORT_TX_DW8_ODCC_CLK_SEL REG_BIT(31)
@@ -2065,11 +1448,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_LINK_PARAMS_TX1LN0_PORT1 0x16812C#define MG_TX_LINK_PARAMS_TX1LN1_PORT1 0x16852C#define MG_TX_LINK_PARAMS_TX1LN0_PORT2 0x16912C -#define MG_TX_LINK_PARAMS_TX1LN1_PORT2 0x16952C -#define MG_TX_LINK_PARAMS_TX1LN0_PORT3 0x16A12C -#define MG_TX_LINK_PARAMS_TX1LN1_PORT3 0x16A52C -#define MG_TX_LINK_PARAMS_TX1LN0_PORT4 0x16B12C -#define MG_TX_LINK_PARAMS_TX1LN1_PORT4 0x16B52C#define MG_TX1_LINK_PARAMS (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_LINK_PARAMS_TX1LN0_PORT1, \ MG_TX_LINK_PARAMS_TX1LN0_PORT2, \
@@ -2078,11 +1456,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_LINK_PARAMS_TX2LN0_PORT1 0x1680AC#define MG_TX_LINK_PARAMS_TX2LN1_PORT1 0x1684AC#define MG_TX_LINK_PARAMS_TX2LN0_PORT2 0x1690AC -#define MG_TX_LINK_PARAMS_TX2LN1_PORT2 0x1694AC -#define MG_TX_LINK_PARAMS_TX2LN0_PORT3 0x16A0AC -#define MG_TX_LINK_PARAMS_TX2LN1_PORT3 0x16A4AC -#define MG_TX_LINK_PARAMS_TX2LN0_PORT4 0x16B0AC -#define MG_TX_LINK_PARAMS_TX2LN1_PORT4 0x16B4AC#define MG_TX2_LINK_PARAMS (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_LINK_PARAMS_TX2LN0_PORT1, \ MG_TX_LINK_PARAMS_TX2LN0_PORT2, \
@@ -2092,11 +1465,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_PISO_READLOAD_TX1LN0_PORT1 0x16814C#define MG_TX_PISO_READLOAD_TX1LN1_PORT1 0x16854C#define MG_TX_PISO_READLOAD_TX1LN0_PORT2 0x16914C -#define MG_TX_PISO_READLOAD_TX1LN1_PORT2 0x16954C -#define MG_TX_PISO_READLOAD_TX1LN0_PORT3 0x16A14C -#define MG_TX_PISO_READLOAD_TX1LN1_PORT3 0x16A54C -#define MG_TX_PISO_READLOAD_TX1LN0_PORT4 0x16B14C -#define MG_TX_PISO_READLOAD_TX1LN1_PORT4 0x16B54C#define MG_TX1_PISO_READLOAD (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_PISO_READLOAD_TX1LN0_PORT1, \ MG_TX_PISO_READLOAD_TX1LN0_PORT2, \
@@ -2105,11 +1473,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_PISO_READLOAD_TX2LN0_PORT1 0x1680CC#define MG_TX_PISO_READLOAD_TX2LN1_PORT1 0x1684CC#define MG_TX_PISO_READLOAD_TX2LN0_PORT2 0x1690CC -#define MG_TX_PISO_READLOAD_TX2LN1_PORT2 0x1694CC -#define MG_TX_PISO_READLOAD_TX2LN0_PORT3 0x16A0CC -#define MG_TX_PISO_READLOAD_TX2LN1_PORT3 0x16A4CC -#define MG_TX_PISO_READLOAD_TX2LN0_PORT4 0x16B0CC -#define MG_TX_PISO_READLOAD_TX2LN1_PORT4 0x16B4CC#define MG_TX2_PISO_READLOAD (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_PISO_READLOAD_TX2LN0_PORT1, \ MG_TX_PISO_READLOAD_TX2LN0_PORT2, \
@@ -2119,11 +1482,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_SWINGCTRL_TX1LN0_PORT1 0x168148#define MG_TX_SWINGCTRL_TX1LN1_PORT1 0x168548#define MG_TX_SWINGCTRL_TX1LN0_PORT2 0x169148 -#define MG_TX_SWINGCTRL_TX1LN1_PORT2 0x169548 -#define MG_TX_SWINGCTRL_TX1LN0_PORT3 0x16A148 -#define MG_TX_SWINGCTRL_TX1LN1_PORT3 0x16A548 -#define MG_TX_SWINGCTRL_TX1LN0_PORT4 0x16B148 -#define MG_TX_SWINGCTRL_TX1LN1_PORT4 0x16B548#define MG_TX1_SWINGCTRL (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_SWINGCTRL_TX1LN0_PORT1, \ MG_TX_SWINGCTRL_TX1LN0_PORT2, \
@@ -2132,11 +1490,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_SWINGCTRL_TX2LN0_PORT1 0x1680C8#define MG_TX_SWINGCTRL_TX2LN1_PORT1 0x1684C8#define MG_TX_SWINGCTRL_TX2LN0_PORT2 0x1690C8 -#define MG_TX_SWINGCTRL_TX2LN1_PORT2 0x1694C8 -#define MG_TX_SWINGCTRL_TX2LN0_PORT3 0x16A0C8 -#define MG_TX_SWINGCTRL_TX2LN1_PORT3 0x16A4C8 -#define MG_TX_SWINGCTRL_TX2LN0_PORT4 0x16B0C8 -#define MG_TX_SWINGCTRL_TX2LN1_PORT4 0x16B4C8#define MG_TX2_SWINGCTRL (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_SWINGCTRL_TX2LN0_PORT1, \ MG_TX_SWINGCTRL_TX2LN0_PORT2, \
@@ -2147,11 +1500,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_DRVCTRL_TX1LN0_TXPORT1 0x168144#define MG_TX_DRVCTRL_TX1LN1_TXPORT1 0x168544#define MG_TX_DRVCTRL_TX1LN0_TXPORT2 0x169144 -#define MG_TX_DRVCTRL_TX1LN1_TXPORT2 0x169544 -#define MG_TX_DRVCTRL_TX1LN0_TXPORT3 0x16A144 -#define MG_TX_DRVCTRL_TX1LN1_TXPORT3 0x16A544 -#define MG_TX_DRVCTRL_TX1LN0_TXPORT4 0x16B144 -#define MG_TX_DRVCTRL_TX1LN1_TXPORT4 0x16B544#define MG_TX1_DRVCTRL (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_DRVCTRL_TX1LN0_TXPORT1, \ MG_TX_DRVCTRL_TX1LN0_TXPORT2, \
@@ -2160,11 +1508,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_DRVCTRL_TX2LN0_PORT1 0x1680C4#define MG_TX_DRVCTRL_TX2LN1_PORT1 0x1684C4#define MG_TX_DRVCTRL_TX2LN0_PORT2 0x1690C4 -#define MG_TX_DRVCTRL_TX2LN1_PORT2 0x1694C4 -#define MG_TX_DRVCTRL_TX2LN0_PORT3 0x16A0C4 -#define MG_TX_DRVCTRL_TX2LN1_PORT3 0x16A4C4 -#define MG_TX_DRVCTRL_TX2LN0_PORT4 0x16B0C4 -#define MG_TX_DRVCTRL_TX2LN1_PORT4 0x16B4C4#define MG_TX2_DRVCTRL (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_DRVCTRL_TX2LN0_PORT1, \ MG_TX_DRVCTRL_TX2LN0_PORT2, \
@@ -2174,17 +1517,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define CRI_TXDEEMPH_OVERRIDE_EN (1 << 22)#define CRI_TXDEEMPH_OVERRIDE_5_0 (x) ((x) << 16)#define CRI_TXDEEMPH_OVERRIDE_5_0_MASK (0x3F << 16) -#define CRI_LOADGEN_SEL (x) ((x) << 12) -#define CRI_LOADGEN_SEL_MASK (0x3 << 12)#define MG_CLKHUB_LN0_PORT1 0x16839C#define MG_CLKHUB_LN1_PORT1 0x16879C#define MG_CLKHUB_LN0_PORT2 0x16939C -#define MG_CLKHUB_LN1_PORT2 0x16979C -#define MG_CLKHUB_LN0_PORT3 0x16A39C -#define MG_CLKHUB_LN1_PORT3 0x16A79C -#define MG_CLKHUB_LN0_PORT4 0x16B39C -#define MG_CLKHUB_LN1_PORT4 0x16B79C#define MG_CLKHUB (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_CLKHUB_LN0_PORT1, \ MG_CLKHUB_LN0_PORT2, \
@@ -2194,11 +1530,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_DCC_TX1LN0_PORT1 0x168110#define MG_TX_DCC_TX1LN1_PORT1 0x168510#define MG_TX_DCC_TX1LN0_PORT2 0x169110 -#define MG_TX_DCC_TX1LN1_PORT2 0x169510 -#define MG_TX_DCC_TX1LN0_PORT3 0x16A110 -#define MG_TX_DCC_TX1LN1_PORT3 0x16A510 -#define MG_TX_DCC_TX1LN0_PORT4 0x16B110 -#define MG_TX_DCC_TX1LN1_PORT4 0x16B510#define MG_TX1_DCC (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_DCC_TX1LN0_PORT1, \ MG_TX_DCC_TX1LN0_PORT2, \
@@ -2206,11 +1537,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_TX_DCC_TX2LN0_PORT1 0x168090#define MG_TX_DCC_TX2LN1_PORT1 0x168490#define MG_TX_DCC_TX2LN0_PORT2 0x169090 -#define MG_TX_DCC_TX2LN1_PORT2 0x169490 -#define MG_TX_DCC_TX2LN0_PORT3 0x16A090 -#define MG_TX_DCC_TX2LN1_PORT3 0x16A490 -#define MG_TX_DCC_TX2LN0_PORT4 0x16B090 -#define MG_TX_DCC_TX2LN1_PORT4 0x16B490#define MG_TX2_DCC (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_TX_DCC_TX2LN0_PORT1, \ MG_TX_DCC_TX2LN0_PORT2, \
@@ -2222,11 +1548,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MG_DP_MODE_LN0_ACU_PORT1 0x1683A0#define MG_DP_MODE_LN1_ACU_PORT1 0x1687A0#define MG_DP_MODE_LN0_ACU_PORT2 0x1693A0 -#define MG_DP_MODE_LN1_ACU_PORT2 0x1697A0 -#define MG_DP_MODE_LN0_ACU_PORT3 0x16A3A0 -#define MG_DP_MODE_LN1_ACU_PORT3 0x16A7A0 -#define MG_DP_MODE_LN0_ACU_PORT4 0x16B3A0 -#define MG_DP_MODE_LN1_ACU_PORT4 0x16B7A0#define MG_DP_MODE (ln, tc_port) \ MG_PHY_PORT_LN(ln, tc_port, MG_DP_MODE_LN0_ACU_PORT1, \ MG_DP_MODE_LN0_ACU_PORT2, \
@@ -2285,7 +1606,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SNPS_PHY_MPLLB_SSC_STEPSIZE REG_GENMASK(31, 11)#define SNPS_PHY_MPLLB_DIV2 (phy) _MMIO_SNPS(phy, 0x16801C) -#define SNPS_PHY_MPLLB_HDMI_PIXEL_CLK_DIV REG_GENMASK(19, 18)#define SNPS_PHY_MPLLB_HDMI_DIV REG_GENMASK(17, 15)#define SNPS_PHY_MPLLB_REF_CLK_DIV REG_GENMASK(14, 12)#define SNPS_PHY_MPLLB_MULTIPLIER REG_GENMASK(11, 0)
@@ -2304,7 +1624,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* The spec defines this only for BXT PHY0, but lets assume that this * would exist for PHY1 too if it had a second channel. */ -#define _PORT_CL2CM_DW6_A 0x162358#define _PORT_CL2CM_DW6_BC 0x6C358#define BXT_PORT_CL2CM_DW6 (phy) _BXT_PHY((phy), _PORT_CL2CM_DW6_BC)#define DW6_OLDO_DYN_PWR_DOWN_EN (1 << 28)
@@ -2325,12 +1644,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DFLEXDPMLE1_DPMLETC_ML3_0 (idx) (15 << (4 * (idx)))/* BXT PHY Ref registers */ -#define _PORT_REF_DW3_A 0x16218C#define _PORT_REF_DW3_BC 0x6C18C#define GRC_DONE (1 << 22)#define BXT_PORT_REF_DW3 (phy) _BXT_PHY((phy), _PORT_REF_DW3_BC) -#define _PORT_REF_DW6_A 0x162198#define _PORT_REF_DW6_BC 0x6C198#define GRC_CODE_SHIFT 24#define GRC_CODE_MASK (0xFF << GRC_CODE_SHIFT)
@@ -2341,17 +1658,14 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GRC_CODE_NOM_MASK 0xFF#define BXT_PORT_REF_DW6 (phy) _BXT_PHY((phy), _PORT_REF_DW6_BC) -#define _PORT_REF_DW8_A 0x1621A0#define _PORT_REF_DW8_BC 0x6C1A0#define GRC_DIS (1 << 15)#define GRC_RDY_OVRD (1 << 1)#define BXT_PORT_REF_DW8 (phy) _BXT_PHY((phy), _PORT_REF_DW8_BC)/* BXT PHY PCS registers */ -#define _PORT_PCS_DW10_LN01_A 0x162428#define _PORT_PCS_DW10_LN01_B 0x6C428#define _PORT_PCS_DW10_LN01_C 0x6C828 -#define _PORT_PCS_DW10_GRP_A 0x162C28#define _PORT_PCS_DW10_GRP_B 0x6CC28#define _PORT_PCS_DW10_GRP_C 0x6CE28#define BXT_PORT_PCS_DW10_LN01 (phy, ch) _MMIO_BXT_PHY_CH(phy, ch, \
@@ -2364,10 +1678,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define TX2_SWING_CALC_INIT (1 << 31)#define TX1_SWING_CALC_INIT (1 << 30) -#define _PORT_PCS_DW12_LN01_A 0x162430#define _PORT_PCS_DW12_LN01_B 0x6C430#define _PORT_PCS_DW12_LN01_C 0x6C830 -#define _PORT_PCS_DW12_LN23_A 0x162630#define _PORT_PCS_DW12_LN23_B 0x6C630#define _PORT_PCS_DW12_LN23_C 0x6CA30#define _PORT_PCS_DW12_GRP_A 0x162c30
@@ -2389,10 +1701,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _BXT_LANE_OFFSET (lane) (((lane) >> 1) * 0x200 + \ ((lane) & 1) * 0x80) -#define _PORT_TX_DW2_LN0_A 0x162508#define _PORT_TX_DW2_LN0_B 0x6C508#define _PORT_TX_DW2_LN0_C 0x6C908 -#define _PORT_TX_DW2_GRP_A 0x162D08#define _PORT_TX_DW2_GRP_B 0x6CD08#define _PORT_TX_DW2_GRP_C 0x6CF08#define BXT_PORT_TX_DW2_LN0 (phy, ch) _MMIO_BXT_PHY_CH(phy, ch, \
@@ -2406,10 +1716,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define UNIQ_TRANS_SCALE_SHIFT 8#define UNIQ_TRANS_SCALE (0xFF << UNIQ_TRANS_SCALE_SHIFT) -#define _PORT_TX_DW3_LN0_A 0x16250C#define _PORT_TX_DW3_LN0_B 0x6C50C#define _PORT_TX_DW3_LN0_C 0x6C90C -#define _PORT_TX_DW3_GRP_A 0x162D0C#define _PORT_TX_DW3_GRP_B 0x6CD0C#define _PORT_TX_DW3_GRP_C 0x6CF0C#define BXT_PORT_TX_DW3_LN0 (phy, ch) _MMIO_BXT_PHY_CH(phy, ch, \
@@ -2421,10 +1729,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SCALE_DCOMP_METHOD (1 << 26)#define UNIQUE_TRANGE_EN_METHOD (1 << 27) -#define _PORT_TX_DW4_LN0_A 0x162510#define _PORT_TX_DW4_LN0_B 0x6C510#define _PORT_TX_DW4_LN0_C 0x6C910 -#define _PORT_TX_DW4_GRP_A 0x162D10#define _PORT_TX_DW4_GRP_B 0x6CD10#define _PORT_TX_DW4_GRP_C 0x6CF10#define BXT_PORT_TX_DW4_LN0 (phy, ch) _MMIO_BXT_PHY_CH(phy, ch, \
@@ -2436,10 +1742,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DEEMPH_SHIFT 24#define DE_EMPHASIS (0xFF << DEEMPH_SHIFT) -#define _PORT_TX_DW5_LN0_A 0x162514#define _PORT_TX_DW5_LN0_B 0x6C514#define _PORT_TX_DW5_LN0_C 0x6C914 -#define _PORT_TX_DW5_GRP_A 0x162D14#define _PORT_TX_DW5_GRP_B 0x6CD14#define _PORT_TX_DW5_GRP_C 0x6CF14#define BXT_PORT_TX_DW5_LN0 (phy, ch) _MMIO_BXT_PHY_CH(phy, ch, \
@@ -2448,10 +1752,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define BXT_PORT_TX_DW5_GRP (phy, ch) _MMIO_BXT_PHY_CH(phy, ch, \ _PORT_TX_DW5_GRP_B, \ _PORT_TX_DW5_GRP_C) -#define DCC_DELAY_RANGE_1 (1 << 9)#define DCC_DELAY_RANGE_2 (1 << 8) -#define _PORT_TX_DW14_LN0_A 0x162538#define _PORT_TX_DW14_LN0_B 0x6C538#define _PORT_TX_DW14_LN0_C 0x6C938#define LATENCY_OPTIM_SHIFT 30
@@ -2461,17 +1763,12 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) _PORT_TX_DW14_LN0_C) + \ _BXT_LANE_OFFSET(lane)) -/* UAIMI scratch pad register 1 */ -#define UAIMI_SPR1 _MMIO(0x4F074) -/* SKL VccIO mask */ -#define SKL_VCCIO_MASK 0x1/* SKL balance leg register */ #define DISPIO_CR_TX_BMU_CR0 _MMIO(0x6C00C)/* I_boost values */ #define BALANCE_LEG_SHIFT (port) (8 + 3 * (port))#define BALANCE_LEG_MASK (port) (7 << (8 + 3 * (port)))/* Balance leg disable bits */ -#define BALANCE_LEG_DISABLE_SHIFT 23#define BALANCE_LEG_DISABLE (port) (1 << (23 + (port)))/*
@@ -2485,16 +1782,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)* [0-31] @ 0x100000 gen7+ */ #define FENCE_REG (i) _MMIO(0x2000 + (((i) & 8) << 9) + ((i) & 7) * 4) -#define I830_FENCE_START_MASK 0x07f80000#define I830_FENCE_TILING_Y_SHIFT 12#define I830_FENCE_SIZE_BITS (size) ((ffs((size) >> 19) - 1) << 8)#define I830_FENCE_PITCH_SHIFT 4#define I830_FENCE_REG_VALID (1 << 0) -#define I915_FENCE_MAX_PITCH_VAL 4 -#define I830_FENCE_MAX_PITCH_VAL 6 -#define I830_FENCE_MAX_SIZE_VAL (1 << 8) -#define I915_FENCE_START_MASK 0x0ff00000#define I915_FENCE_SIZE_BITS (size) ((ffs((size) >> 20) - 1) << 8)#define FENCE_REG_965_LO (i) _MMIO(0x03000 + (i) * 8)
@@ -2513,9 +1805,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* control register for cpu gtt access */ #define TILECTL _MMIO(0x101000)#define TILECTL_SWZCTL (1 << 0) -#define TILECTL_TLBPF (1 << 1) -#define TILECTL_TLB_PREFETCH_DIS (1 << 2) -#define TILECTL_BACKSNOOP_DIS (1 << 3)/* * Instruction and interrupt control regs
@@ -2524,7 +1813,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define PGTBL_ADDRESS_LO_MASK 0xfffff000/* bits [31:12] */ #define PGTBL_ADDRESS_HI_MASK 0x000000f0/* bits [35:32] (gen4) */ #define PGTBL_ER _MMIO(0x02024) -#define PRB0_BASE (0x2030 - 0x30)#define PRB1_BASE (0x2040 - 0x30)/* 830,gen3 */ #define PRB2_BASE (0x2050 - 0x30)/* gen3 */ #define SRB0_BASE (0x2100 - 0x30)/* gen2 */
@@ -2556,20 +1844,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define RING_CTL_SIZE (size) ((size) - PAGE_SIZE)/* in bytes -> pages */ #define RING_SYNC_0 (base) _MMIO((base) + 0x40)#define RING_SYNC_1 (base) _MMIO((base) + 0x44) -#define RING_SYNC_2 (base) _MMIO((base) + 0x48) -#define GEN6_RVSYNC (RING_SYNC_0(RENDER_RING_BASE)) -#define GEN6_RBSYNC (RING_SYNC_1(RENDER_RING_BASE)) -#define GEN6_RVESYNC (RING_SYNC_2(RENDER_RING_BASE)) -#define GEN6_VBSYNC (RING_SYNC_0(GEN6_BSD_RING_BASE)) -#define GEN6_VRSYNC (RING_SYNC_1(GEN6_BSD_RING_BASE)) -#define GEN6_VVESYNC (RING_SYNC_2(GEN6_BSD_RING_BASE)) -#define GEN6_BRSYNC (RING_SYNC_0(BLT_RING_BASE)) -#define GEN6_BVSYNC (RING_SYNC_1(BLT_RING_BASE)) -#define GEN6_BVESYNC (RING_SYNC_2(BLT_RING_BASE)) -#define GEN6_VEBSYNC (RING_SYNC_0(VEBOX_RING_BASE)) -#define GEN6_VERSYNC (RING_SYNC_1(VEBOX_RING_BASE)) -#define GEN6_VEVSYNC (RING_SYNC_2(VEBOX_RING_BASE)) -#define GEN6_NOSYNC INVALID_MMIO_REG#define RING_PSMI_CTL (base) _MMIO((base) + 0x50)#define RING_MAX_IDLE (base) _MMIO((base) + 0x54)#define RING_HWS_PGA (base) _MMIO((base) + 0x80)
@@ -2624,7 +1898,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN7_GFX_MAX_REQ_COUNT _MMIO(0x4074)#define GAMTARBMODE _MMIO(0x04a08) -#define ARB_MODE_BWGTLB_DISABLE (1 << 9)#define ARB_MODE_SWIZZLE_BDW (1 << 1)#define RENDER_HWS_PGA_GEN7 _MMIO(0x04080)
@@ -2680,15 +1953,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define RING_VALID_MASK 0x00000001#define RING_VALID 0x00000001#define RING_INVALID 0x00000000 -#define RING_WAIT_I8XX (1 << 0)/* gen2, PRBx_HEAD */ #define RING_WAIT (1 << 11)/* gen3+, PRBx_CTL */ #define RING_WAIT_SEMAPHORE (1 << 10)/* gen6+ */ -#define GUCPMTIMESTAMP _MMIO(0xC3E8) -/* There are 16 64-bit CS General Purpose Registers per-engine on Gen8+ */ #define GEN8_RING_CS_GPR (base, n) _MMIO((base) + 0x600 + (n) * 8) -#define GEN8_RING_CS_GPR_UDW (base, n) _MMIO((base) + 0x600 + (n) * 8 + 4)#define RING_FORCE_TO_NONPRIV (base, i) _MMIO(((base) + 0x4D0) + (i) * 4)#define RING_FORCE_TO_NONPRIV_ADDRESS_MASK REG_GENMASK(25, 2)
@@ -2697,10 +1966,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define RING_FORCE_TO_NONPRIV_ACCESS_WR (2 << 28)#define RING_FORCE_TO_NONPRIV_ACCESS_INVALID (3 << 28)#define RING_FORCE_TO_NONPRIV_ACCESS_MASK (3 << 28) -#define RING_FORCE_TO_NONPRIV_RANGE_1 (0 << 0)/* CFL+ & Gen11+ */ #define RING_FORCE_TO_NONPRIV_RANGE_4 (1 << 0) -#define RING_FORCE_TO_NONPRIV_RANGE_16 (2 << 0) -#define RING_FORCE_TO_NONPRIV_RANGE_64 (3 << 0)#define RING_FORCE_TO_NONPRIV_RANGE_MASK (3 << 0)#define RING_FORCE_TO_NONPRIV_MASK_VALID \ (RING_FORCE_TO_NONPRIV_RANGE_MASK \
@@ -2719,20 +1985,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GAMT_CHKN_BIT_REG _MMIO(0x4ab8)#define GAMT_CHKN_DISABLE_L3_COH_PIPE (1 << 31)#define GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING (1 << 28) -#define GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT (1 << 24) - -#if 0 -#define PRB0_TAIL _MMIO(0x2030) -#define PRB0_HEAD _MMIO(0x2034) -#define PRB0_START _MMIO(0x2038) -#define PRB0_CTL _MMIO(0x203c) -#define PRB1_TAIL _MMIO(0x2040)/* 915+ only */ -#define PRB1_HEAD _MMIO(0x2044)/* 915+ only */ -#define PRB1_START _MMIO(0x2048)/* 915+ only */ -#define PRB1_CTL _MMIO(0x204c)/* 915+ only */ -#endif +#define IPEIR_I965 _MMIO(0x2064) -#define IPEHR_I965 _MMIO(0x2068)#define GEN7_SC_INSTDONE _MMIO(0x7100)#define GEN12_SC_INSTDONE_EXTRA _MMIO(0x7104)#define GEN12_SC_INSTDONE_EXTRA2 _MMIO(0x7108)
@@ -2767,25 +2021,14 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define RING_INSTPM (base) _MMIO((base) + 0xc0)#define RING_MI_MODE (base) _MMIO((base) + 0x9c)#define RING_CMD_BUF_CCTL (base) _MMIO((base) + 0x84) -#define INSTPS _MMIO(0x2070)/* 965+ only */ #define GEN4_INSTDONE1 _MMIO(0x207c)/* 965+ only, aka INSTDONE_2 on SNB */ -#define ACTHD_I965 _MMIO(0x2074)#define HWS_PGA _MMIO(0x2080) -#define HWS_ADDRESS_MASK 0xfffff000 -#define HWS_START_ADDRESS_SHIFT 4 -#define PWRCTXA _MMIO(0x2088)/* 965GM+ only */ -#define PWRCTX_EN (1 << 0)#define IPEIR (base) _MMIO((base) + 0x88)#define IPEHR (base) _MMIO((base) + 0x8c)#define GEN2_INSTDONE _MMIO(0x2090) -#define NOPID _MMIO(0x2094)#define HWSTAM _MMIO(0x2098)#define DMA_FADD_I8XX (base) _MMIO((base) + 0xd0)#define RING_BBSTATE (base) _MMIO((base) + 0x110) -#define RING_BB_PPGTT (1 << 5) -#define RING_SBBADDR (base) _MMIO((base) + 0x114)/* hsw+ */ -#define RING_SBBSTATE (base) _MMIO((base) + 0x118)/* hsw+ */ -#define RING_SBBADDR_UDW (base) _MMIO((base) + 0x11c)/* gen8+ */ #define RING_BBADDR (base) _MMIO((base) + 0x140)#define RING_BBADDR_UDW (base) _MMIO((base) + 0x168)/* gen8+ */ #define RING_BB_PER_CTX_PTR (base) _MMIO((base) + 0x1c0)/* gen8+ */
@@ -2802,14 +2045,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ERROR_GEN6 _MMIO(0x40a0)#define GEN7_ERR_INT _MMIO(0x44040)#define ERR_INT_POISON (1 << 31) -#define ERR_INT_MMIO_UNCLAIMED (1 << 13) -#define ERR_INT_PIPE_CRC_DONE_C (1 << 8) -#define ERR_INT_FIFO_UNDERRUN_C (1 << 6) -#define ERR_INT_PIPE_CRC_DONE_B (1 << 5) -#define ERR_INT_FIFO_UNDERRUN_B (1 << 3) -#define ERR_INT_PIPE_CRC_DONE_A (1 << 2)#define ERR_INT_PIPE_CRC_DONE (pipe) (1 << (2 + (pipe) * 3)) -#define ERR_INT_FIFO_UNDERRUN_A (1 << 0)#define ERR_INT_FIFO_UNDERRUN (pipe) (1 << ((pipe) * 3))#define GEN8_FAULT_TLB_DATA0 _MMIO(0x4b10)
@@ -2830,24 +2066,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define CLAIM_ER_CTR_MASK REG_GENMASK(15, 0)#define DERRMR _MMIO(0x44050) -/* Note that HBLANK events are reserved on bdw+ */ -#define DERRMR_PIPEA_SCANLINE (1 << 0) -#define DERRMR_PIPEA_PRI_FLIP_DONE (1 << 1) -#define DERRMR_PIPEA_SPR_FLIP_DONE (1 << 2) -#define DERRMR_PIPEA_VBLANK (1 << 3) -#define DERRMR_PIPEA_HBLANK (1 << 5) -#define DERRMR_PIPEB_SCANLINE (1 << 8) -#define DERRMR_PIPEB_PRI_FLIP_DONE (1 << 9) -#define DERRMR_PIPEB_SPR_FLIP_DONE (1 << 10) -#define DERRMR_PIPEB_VBLANK (1 << 11) -#define DERRMR_PIPEB_HBLANK (1 << 13) -/* Note that PIPEC is not a simple translation of PIPEA/PIPEB */ -#define DERRMR_PIPEC_SCANLINE (1 << 14) -#define DERRMR_PIPEC_PRI_FLIP_DONE (1 << 15) -#define DERRMR_PIPEC_SPR_FLIP_DONE (1 << 20) -#define DERRMR_PIPEC_VBLANK (1 << 21) -#define DERRMR_PIPEC_HBLANK (1 << 22) -/* GM45+ chicken bits -- debug workaround bits that may be required * for various sorts of correct behavior. The top 16 bits of each are
@@ -2870,12 +2088,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _3D_CHICKEN_SF_DISABLE_OBJEND_CULL (1 << 10)#define _3D_CHICKEN3_AA_LINE_QUALITY_FIX_ENABLE (1 << 5)#define _3D_CHICKEN3_SF_DISABLE_FASTCLIP_CULL (1 << 5) -#define _3D_CHICKEN_SDE_LIMIT_FIFO_POLY_DEPTH (x) ((x) << 1)/* gen8+ */ #define _3D_CHICKEN3_SF_DISABLE_PIPELINED_ATTR_FETCH (1 << 1)/* gen6 */ #define MI_MODE _MMIO(0x209c)# define VS_TIMER_DISPATCH (1 << 6) -# define MI_FLUSH_ENABLE (1 << 12)# define TGL_NESTED_BB_EN (1 << 12)# define ASYNC_FLIP_PERF_DISABLE (1 << 14)# define MODE_IDLE (1 << 9)
@@ -2884,11 +2100,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN6_GT_MODE _MMIO(0x20d0)#define GEN7_GT_MODE _MMIO(0x7008)#define GEN6_WIZ_HASHING (hi, lo) (((hi) << 9) | ((lo) << 7)) -#define GEN6_WIZ_HASHING_8x8 GEN6_WIZ_HASHING(0, 0) -#define GEN6_WIZ_HASHING_8x4 GEN6_WIZ_HASHING(0, 1)#define GEN6_WIZ_HASHING_16x4 GEN6_WIZ_HASHING(1, 0)#define GEN6_WIZ_HASHING_MASK GEN6_WIZ_HASHING(1, 1) -#define GEN6_TD_FOUR_ROW_DISPATCH_DISABLE (1 << 5)#define GEN9_IZ_HASHING_MASK (slice) (0x3 << ((slice) * 2))#define GEN9_IZ_HASHING (slice, val) ((val) << ((slice) * 2))
@@ -2906,34 +2119,13 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define L3SQCREG1_CCS0 _MMIO(0xb200)#define FLUSHALLNONCOH REG_BIT(5) -/* WaClearTdlStateAckDirtyBits */ -#define GEN8_STATE_ACK _MMIO(0x20F0) -#define GEN9_STATE_ACK_SLICE1 _MMIO(0x20F8) -#define GEN9_STATE_ACK_SLICE2 _MMIO(0x2100) -#define GEN9_STATE_ACK_TDL0 (1 << 12) -#define GEN9_STATE_ACK_TDL1 (1 << 13) -#define GEN9_STATE_ACK_TDL2 (1 << 14) -#define GEN9_STATE_ACK_TDL3 (1 << 15) -#define GEN9_SUBSLICE_TDL_ACK_BITS \ - (GEN9_STATE_ACK_TDL3 | GEN9_STATE_ACK_TDL2 | \ - GEN9_STATE_ACK_TDL1 | GEN9_STATE_ACK_TDL0) -#define GFX_MODE _MMIO(0x2520)#define GFX_MODE_GEN7 _MMIO(0x229c)#define RING_MODE_GEN7 (base) _MMIO((base) + 0x29c)#define GFX_RUN_LIST_ENABLE (1 << 15) -#define GFX_INTERRUPT_STEERING (1 << 14)#define GFX_TLB_INVALIDATE_EXPLICIT (1 << 13) -#define GFX_SURFACE_FAULT_ENABLE (1 << 12)#define GFX_REPLAY_MODE (1 << 11) -#define GFX_PSMI_GRANULARITY (1 << 10)#define GFX_PPGTT_ENABLE (1 << 9) -#define GEN8_GFX_PPGTT_48B (1 << 7) - -#define GFX_FORWARD_VBLANK_MASK (3 << 5) -#define GFX_FORWARD_VBLANK_NEVER (0 << 5) -#define GFX_FORWARD_VBLANK_ALWAYS (1 << 5) -#define GFX_FORWARD_VBLANK_COND (2 << 5)#define GEN11_GFX_DISABLE_LEGACY_MODE (1 << 3)
@@ -2947,18 +2139,14 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN2_IMR _MMIO(0x20a8)#define GEN2_ISR _MMIO(0x20ac)#define VLV_GUNIT_CLOCK_GATE _MMIO(VLV_DISPLAY_BASE + 0x2060) -#define GINT_DIS (1 << 22)#define GCFG_DIS (1 << 8)#define VLV_GUNIT_CLOCK_GATE2 _MMIO(VLV_DISPLAY_BASE + 0x2064) -#define VLV_IIR_RW _MMIO(VLV_DISPLAY_BASE + 0x2084)#define VLV_IER _MMIO(VLV_DISPLAY_BASE + 0x20a0)#define VLV_IIR _MMIO(VLV_DISPLAY_BASE + 0x20a4)#define VLV_IMR _MMIO(VLV_DISPLAY_BASE + 0x20a8) -#define VLV_ISR _MMIO(VLV_DISPLAY_BASE + 0x20ac)#define VLV_PCBR _MMIO(VLV_DISPLAY_BASE + 0x2120)#define VLV_PCBR_ADDR_SHIFT 12 -#define DISPLAY_PLANE_FLIP_PENDING (plane) (1 << (11 - (plane)))/* A and B only */ #define EIR _MMIO(0x20b0)#define EMR _MMIO(0x20b4)#define ESR _MMIO(0x20b8)
@@ -2984,13 +2172,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define FW_BLC _MMIO(0x20d8)#define FW_BLC2 _MMIO(0x20dc)#define FW_BLC_SELF _MMIO(0x20e0)/* 915+ only */ -#define FW_BLC_SELF_EN_MASK (1 << 31)#define FW_BLC_SELF_FIFO_MASK (1 << 16)/* 945 only */ #define FW_BLC_SELF_EN (1 << 15)/* 945 only */ -#define MM_BURST_LENGTH 0x00700000 -#define MM_FIFO_WATERMARK 0x0001F000 -#define LM_BURST_LENGTH 0x00000700 -#define LM_FIFO_WATERMARK 0x0000001F#define MI_ARB_STATE _MMIO(0x20e4)/* 915+ only */ #define _MBUS_ABOX0_CTL 0x45038
@@ -3012,17 +2195,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _PIPEB_MBUS_DBOX_CTL 0x7103C#define PIPE_MBUS_DBOX_CTL (pipe) _MMIO_PIPE(pipe, _PIPEA_MBUS_DBOX_CTL, \ _PIPEB_MBUS_DBOX_CTL) -#define MBUS_DBOX_BW_CREDIT_MASK (3 << 14)#define MBUS_DBOX_BW_CREDIT (x) ((x) << 14) -#define MBUS_DBOX_B_CREDIT_MASK (0x1F << 8)#define MBUS_DBOX_B_CREDIT (x) ((x) << 8) -#define MBUS_DBOX_A_CREDIT_MASK (0xF << 0)#define MBUS_DBOX_A_CREDIT (x) ((x) << 0) -#define MBUS_UBOX_CTL _MMIO(0x4503C) -#define MBUS_BBOX_CTL_S1 _MMIO(0x45040) -#define MBUS_BBOX_CTL_S2 _MMIO(0x45044) -#define MBUS_CTL _MMIO(0x4438C)#define MBUS_JOIN REG_BIT(31)#define MBUS_HASHING_MODE_MASK REG_BIT(30)
@@ -3037,82 +2213,22 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define HDPORT_DDI_USED (phy) REG_BIT(2 * (phy) + 1)#define HDPORT_ENABLED REG_BIT(0) -/* Make render/texture TLB fetches lower priorty than associated data -* fetches. This is not turned on by default -*/ -#define MI_ARB_RENDER_TLB_LOW_PRIORITY (1 << 15) - -/* Isoch request wait on GTT enable (Display A/B/C streams). -* Make isoch requests stall on the TLB update. May cause -* display underruns (test mode only) -*/ -#define MI_ARB_ISOCH_WAIT_GTT (1 << 14) - -/* Block grant count for isoch requests when block count is -* set to a finite value. -*/ -#define MI_ARB_BLOCK_GRANT_MASK (3 << 12) -#define MI_ARB_BLOCK_GRANT_8 (0 << 12)/* for 3 display planes */ -#define MI_ARB_BLOCK_GRANT_4 (1 << 12)/* for 2 display planes */ -#define MI_ARB_BLOCK_GRANT_2 (2 << 12)/* for 1 display plane */ -#define MI_ARB_BLOCK_GRANT_0 (3 << 12)/* don't use */ -/* Enable render writes to complete in C2/C3/C4 power states. * If this isn't enabled, render writes are prevented in low * power states. That seems bad to me. */ #define MI_ARB_C3_LP_WRITE_ENABLE (1 << 11) -/* This acknowledges an async flip immediately instead -* of waiting for 2TLB fetches. -*/ -#define MI_ARB_ASYNC_FLIP_ACK_IMMEDIATE (1 << 10) - -/* Enables non-sequential data reads through arbiter -*/ -#define MI_ARB_DUAL_DATA_PHASE_DISABLE (1 << 9) - -/* Disable FSB snooping of cacheable write cycles from binner/render -* command stream -*/ -#define MI_ARB_CACHE_SNOOP_DISABLE (1 << 8) - -/* Arbiter time slice for non-isoch streams */ -#define MI_ARB_TIME_SLICE_MASK (7 << 5) -#define MI_ARB_TIME_SLICE_1 (0 << 5) -#define MI_ARB_TIME_SLICE_2 (1 << 5) -#define MI_ARB_TIME_SLICE_4 (2 << 5) -#define MI_ARB_TIME_SLICE_6 (3 << 5) -#define MI_ARB_TIME_SLICE_8 (4 << 5) -#define MI_ARB_TIME_SLICE_10 (5 << 5) -#define MI_ARB_TIME_SLICE_14 (6 << 5) -#define MI_ARB_TIME_SLICE_16 (7 << 5) - -/* Low priority grace period page size */ -#define MI_ARB_LOW_PRIORITY_GRACE_4KB (0 << 4)/* default */ -#define MI_ARB_LOW_PRIORITY_GRACE_8KB (1 << 4) -/* Disable display A/B trickle feed */ #define MI_ARB_DISPLAY_TRICKLE_FEED_DISABLE (1 << 2) -/* Set display plane priority */ -#define MI_ARB_DISPLAY_PRIORITY_A_B (0 << 0)/* display A > display B */ -#define MI_ARB_DISPLAY_PRIORITY_B_A (1 << 0)/* display B > display A */ -#define MI_STATE _MMIO(0x20e4)/* gen2 only */ #define MI_AGPBUSY_INT_EN (1 << 1)/* 85x only */ #define MI_AGPBUSY_830_MODE (1 << 0)/* 85x only */ #define CACHE_MODE_0 _MMIO(0x2120)/* 915+ only */ #define CM0_PIPELINED_RENDER_FLUSH_DISABLE (1 << 8) -#define CM0_IZ_OPT_DISABLE (1 << 6) -#define CM0_ZR_OPT_DISABLE (1 << 5)#define CM0_STC_EVICT_DISABLE_LRA_SNB (1 << 5) -#define CM0_DEPTH_EVICT_DISABLE (1 << 4) -#define CM0_COLOR_EVICT_DISABLE (1 << 3) -#define CM0_DEPTH_WRITE_DISABLE (1 << 1) -#define CM0_RC_OP_FLUSH_DISABLE (1 << 0) -#define GFX_FLSH_CNTL _MMIO(0x2170)/* 915+ only */ #define GFX_FLSH_CNTL_GEN6 _MMIO(0x101008)#define GFX_FLSH_CNTL_EN (1 << 0)#define ECOSKPD _MMIO(0x21d0)
@@ -3129,17 +2245,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN9_PARTIAL_RESOLVE_IN_VC_DISABLE (1 << 1)#define GEN6_BLITTER_ECOSKPD _MMIO(0x221d0) -#define GEN6_BLITTER_LOCK_SHIFT 16 -#define GEN6_BLITTER_FBC_NOTIFY (1 << 3)#define GEN6_RC_SLEEP_PSMI_CONTROL _MMIO(0x2050)#define GEN6_PSMI_SLEEP_MSG_DISABLE (1 << 0)#define GEN12_WAIT_FOR_EVENT_POWER_DOWN_DISABLE REG_BIT(7)#define GEN8_RC_SEMA_IDLE_MSG_DISABLE (1 << 12) -#define GEN8_FF_DOP_CLOCK_GATE_DISABLE (1 << 10) - -#define GEN6_RCS_PWR_FSM _MMIO(0x22ac) -#define GEN9_RCS_FE_FSM2 _MMIO(0x22a4)#define GEN10_CACHE_MODE_SS _MMIO(0xe420)#define ENABLE_PREFETCH_INTO_IC REG_BIT(3)
@@ -3174,13 +2284,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN9_F2_SS_DIS_SHIFT 20#define GEN9_F2_SS_DIS_MASK (0xf << GEN9_F2_SS_DIS_SHIFT) -#define GEN10_F2_S_ENA_SHIFT 22 -#define GEN10_F2_S_ENA_MASK (0x3f << GEN10_F2_S_ENA_SHIFT) -#define GEN10_F2_SS_DIS_SHIFT 18 -#define GEN10_F2_SS_DIS_MASK (0xf << GEN10_F2_SS_DIS_SHIFT) -#define GEN10_MIRROR_FUSE3 _MMIO(0x9118) -#define GEN10_L3BANK_PAIR_COUNT 4#define GEN10_L3BANK_MASK 0x0F/* on Xe_HP the same fuses indicates mslices instead of L3 banks */ #define GEN12_MAX_MSLICES 4
@@ -3189,21 +2293,16 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN8_EU_DISABLE0 _MMIO(0x9134)#define GEN8_EU_DIS0_S0_MASK 0xffffff#define GEN8_EU_DIS0_S1_SHIFT 24 -#define GEN8_EU_DIS0_S1_MASK (0xff << GEN8_EU_DIS0_S1_SHIFT)#define GEN8_EU_DISABLE1 _MMIO(0x9138)#define GEN8_EU_DIS1_S1_MASK 0xffff#define GEN8_EU_DIS1_S2_SHIFT 16 -#define GEN8_EU_DIS1_S2_MASK (0xffff << GEN8_EU_DIS1_S2_SHIFT)#define GEN8_EU_DISABLE2 _MMIO(0x913c)#define GEN8_EU_DIS2_S2_MASK 0xff#define GEN9_EU_DISABLE (slice) _MMIO(0x9134 + (slice) * 0x4) -#define GEN10_EU_DISABLE3 _MMIO(0x9140) -#define GEN10_EU_DIS_SS_MASK 0xff -#define GEN11_GT_VEBOX_VDBOX_DISABLE _MMIO(0x9140)#define GEN11_GT_VDBOX_DISABLE_MASK 0xff#define GEN11_GT_VEBOX_DISABLE_SHIFT 16
@@ -3225,9 +2324,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0) -#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)#define GEN6_BSD_SLEEP_INDICATOR (1 << 3) -#define GEN6_BSD_GO_INDICATOR (1 << 4)/* On modern GEN architectures interrupt control consists of two sets * of registers. The first set pertains to the ring generating the
@@ -3240,7 +2337,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)* These defines should cover us well from SNB->HSW with minor exceptions * it can also work on ILK. */ -#define GT_BLT_FLUSHDW_NOTIFY_INTERRUPT (1 << 26)#define GT_BLT_CS_ERROR_INTERRUPT (1 << 25)#define GT_BLT_USER_INTERRUPT (1 << 22)#define GT_BSD_CS_ERROR_INTERRUPT (1 << 15)
@@ -3249,10 +2345,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GT_WAIT_SEMAPHORE_INTERRUPT REG_BIT(11)/* bdw+ */ #define GT_CONTEXT_SWITCH_INTERRUPT (1 << 8)#define GT_RENDER_L3_PARITY_ERROR_INTERRUPT (1 << 5)/* !snb */ -#define GT_RENDER_PIPECTL_NOTIFY_INTERRUPT (1 << 4)#define GT_CS_MASTER_ERROR_INTERRUPT REG_BIT(3) -#define GT_RENDER_SYNC_STATUS_INTERRUPT (1 << 2) -#define GT_RENDER_DEBUG_INTERRUPT (1 << 1)#define GT_RENDER_USER_INTERRUPT (1 << 0)#define PM_VEBOX_CS_ERROR_INTERRUPT (1 << 12)/* hsw+ */
@@ -3265,38 +2358,15 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* These are all the "old" interrupts */ #define ILK_BSD_USER_INTERRUPT (1 << 5) -#define I915_PM_INTERRUPT (1 << 31) -#define I915_ISP_INTERRUPT (1 << 22)#define I915_LPE_PIPE_B_INTERRUPT (1 << 21)#define I915_LPE_PIPE_A_INTERRUPT (1 << 20) -#define I915_MIPIC_INTERRUPT (1 << 19) -#define I915_MIPIA_INTERRUPT (1 << 18) -#define I915_PIPE_CONTROL_NOTIFY_INTERRUPT (1 << 18)#define I915_DISPLAY_PORT_INTERRUPT (1 << 17) -#define I915_DISPLAY_PIPE_C_HBLANK_INTERRUPT (1 << 16)#define I915_MASTER_ERROR_INTERRUPT (1 << 15) -#define I915_DISPLAY_PIPE_B_HBLANK_INTERRUPT (1 << 14) -#define I915_GMCH_THERMAL_SENSOR_EVENT_INTERRUPT (1 << 14)/* p-state */ -#define I915_DISPLAY_PIPE_A_HBLANK_INTERRUPT (1 << 13) -#define I915_HWB_OOM_INTERRUPT (1 << 13)#define I915_LPE_PIPE_C_INTERRUPT (1 << 12) -#define I915_SYNC_STATUS_INTERRUPT (1 << 12) -#define I915_MISC_INTERRUPT (1 << 11) -#define I915_DISPLAY_PLANE_A_FLIP_PENDING_INTERRUPT (1 << 11) -#define I915_DISPLAY_PIPE_C_VBLANK_INTERRUPT (1 << 10) -#define I915_DISPLAY_PLANE_B_FLIP_PENDING_INTERRUPT (1 << 10)#define I915_DISPLAY_PIPE_C_EVENT_INTERRUPT (1 << 9)#define I915_OVERLAY_PLANE_FLIP_PENDING_INTERRUPT (1 << 9) -#define I915_DISPLAY_PIPE_C_DPBM_INTERRUPT (1 << 8) -#define I915_DISPLAY_PLANE_C_FLIP_PENDING_INTERRUPT (1 << 8) -#define I915_DISPLAY_PIPE_A_VBLANK_INTERRUPT (1 << 7)#define I915_DISPLAY_PIPE_A_EVENT_INTERRUPT (1 << 6) -#define I915_DISPLAY_PIPE_B_VBLANK_INTERRUPT (1 << 5)#define I915_DISPLAY_PIPE_B_EVENT_INTERRUPT (1 << 4) -#define I915_DISPLAY_PIPE_A_DPBM_INTERRUPT (1 << 3) -#define I915_DISPLAY_PIPE_B_DPBM_INTERRUPT (1 << 2) -#define I915_DEBUG_INTERRUPT (1 << 2) -#define I915_WINVALID_INTERRUPT (1 << 1)#define I915_USER_INTERRUPT (1 << 1)#define I915_ASLE_INTERRUPT (1 << 0)#define I915_BSD_USER_INTERRUPT (1 << 25)
@@ -3323,18 +2393,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN7_FF_SCHED_MASK 0x0077070#define GEN8_FF_DS_REF_CNT_FFME (1 << 19)#define GEN12_FF_TESSELATION_DOP_GATE_DISABLE BIT(19) -#define GEN7_FF_TS_SCHED_HS1 (0x5 << 16) -#define GEN7_FF_TS_SCHED_HS0 (0x3 << 16) -#define GEN7_FF_TS_SCHED_LOAD_BALANCE (0x1 << 16)#define GEN7_FF_TS_SCHED_HW (0x0 << 16)/* Default */ #define GEN7_FF_VS_REF_CNT_FFME (1 << 15) -#define GEN7_FF_VS_SCHED_HS1 (0x5 << 12) -#define GEN7_FF_VS_SCHED_HS0 (0x3 << 12) -#define GEN7_FF_VS_SCHED_LOAD_BALANCE (0x1 << 12)/* Default */ #define GEN7_FF_VS_SCHED_HW (0x0 << 12) -#define GEN7_FF_DS_SCHED_HS1 (0x5 << 4) -#define GEN7_FF_DS_SCHED_HS0 (0x3 << 4) -#define GEN7_FF_DS_SCHED_LOAD_BALANCE (0x1 << 4)/* Default */ #define GEN7_FF_DS_SCHED_HW (0x0 << 4)/*
@@ -3348,40 +2409,23 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define FBC_CTL_PERIODIC REG_BIT(30)#define FBC_CTL_INTERVAL_MASK REG_GENMASK(29, 16)#define FBC_CTL_INTERVAL (x) REG_FIELD_PREP(FBC_CTL_INTERVAL_MASK, (x)) -#define FBC_CTL_STOP_ON_MOD REG_BIT(15) -#define FBC_CTL_UNCOMPRESSIBLE REG_BIT(14)/* i915+ */ #define FBC_CTL_C3_IDLE REG_BIT(13)/* i945gm only */ #define FBC_CTL_STRIDE_MASK REG_GENMASK(12, 5)#define FBC_CTL_STRIDE (x) REG_FIELD_PREP(FBC_CTL_STRIDE_MASK, (x))#define FBC_CTL_FENCENO_MASK REG_GENMASK(3, 0)#define FBC_CTL_FENCENO (x) REG_FIELD_PREP(FBC_CTL_FENCENO_MASK, (x)) -#define FBC_COMMAND _MMIO(0x320c) -#define FBC_CMD_COMPRESS REG_BIT(0)#define FBC_STATUS _MMIO(0x3210)#define FBC_STAT_COMPRESSING REG_BIT(31)#define FBC_STAT_COMPRESSED REG_BIT(30) -#define FBC_STAT_MODIFIED REG_BIT(29) -#define FBC_STAT_CURRENT_LINE_MASK REG_GENMASK(10, 0)#define FBC_CONTROL2 _MMIO(0x3214)/* i965gm only */ #define FBC_CTL_FENCE_DBL REG_BIT(4)#define FBC_CTL_IDLE_MASK REG_GENMASK(3, 2)#define FBC_CTL_IDLE_IMM REG_FIELD_PREP(FBC_CTL_IDLE_MASK, 0) -#define FBC_CTL_IDLE_FULL REG_FIELD_PREP(FBC_CTL_IDLE_MASK, 1) -#define FBC_CTL_IDLE_LINE REG_FIELD_PREP(FBC_CTL_IDLE_MASK, 2) -#define FBC_CTL_IDLE_DEBUG REG_FIELD_PREP(FBC_CTL_IDLE_MASK, 3)#define FBC_CTL_CPU_FENCE_EN REG_BIT(1)#define FBC_CTL_PLANE_MASK REG_GENMASK(1, 0)#define FBC_CTL_PLANE (i9xx_plane) REG_FIELD_PREP(FBC_CTL_PLANE_MASK, (i9xx_plane))#define FBC_FENCE_OFF _MMIO(0x3218)/* i965gm only, BSpec typo has 321Bh */ -#define FBC_MOD_NUM _MMIO(0x3220)/* i965gm only */ -#define FBC_MOD_NUM_MASK REG_GENMASK(31, 1) -#define FBC_MOD_NUM_VALID REG_BIT(0)#define FBC_TAG (i) _MMIO(0x3300 + (i) * 4)/* 49 reisters */ -#define FBC_TAG_MASK REG_GENMASK(1, 0)/* 16 tags per register */ -#define FBC_TAG_MODIFIED REG_FIELD_PREP(FBC_TAG_MASK, 0) -#define FBC_TAG_UNCOMPRESSED REG_FIELD_PREP(FBC_TAG_MASK, 1) -#define FBC_TAG_UNCOMPRESSIBLE REG_FIELD_PREP(FBC_TAG_MASK, 2) -#define FBC_TAG_COMPRESSED REG_FIELD_PREP(FBC_TAG_MASK, 3)#define FBC_LL_SIZE (1536)
@@ -3397,33 +2441,23 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DPFC_CTL_PLANE_MASK_IVB REG_GENMASK(30, 29)/* ivb only */ #define DPFC_CTL_PLANE_IVB (i9xx_plane) REG_FIELD_PREP(DPFC_CTL_PLANE_MASK_IVB, (i9xx_plane))#define DPFC_CTL_FENCE_EN_IVB REG_BIT(28)/* ivb+ */ -#define DPFC_CTL_PERSISTENT_MODE REG_BIT(25)/* g4x-snb */ #define DPFC_CTL_FALSE_COLOR REG_BIT(10)/* ivb+ */ #define DPFC_CTL_SR_EN REG_BIT(10)/* g4x only */ -#define DPFC_CTL_SR_EXIT_DIS REG_BIT(9)/* g4x only */ #define DPFC_CTL_LIMIT_MASK REG_GENMASK(7, 6)#define DPFC_CTL_LIMIT_1X REG_FIELD_PREP(DPFC_CTL_LIMIT_MASK, 0)#define DPFC_CTL_LIMIT_2X REG_FIELD_PREP(DPFC_CTL_LIMIT_MASK, 1)#define DPFC_CTL_LIMIT_4X REG_FIELD_PREP(DPFC_CTL_LIMIT_MASK, 2)#define DPFC_CTL_FENCENO_MASK REG_GENMASK(3, 0)#define DPFC_CTL_FENCENO (fence) REG_FIELD_PREP(DPFC_CTL_FENCENO_MASK, (fence)) -#define DPFC_RECOMP_CTL _MMIO(0x320c)#define ILK_DPFC_RECOMP_CTL (fbc_id) _MMIO_PIPE((fbc_id), 0x4320c, 0x4324c) -#define DPFC_RECOMP_STALL_EN REG_BIT(27) -#define DPFC_RECOMP_STALL_WM_MASK REG_GENMASK(26, 16) -#define DPFC_RECOMP_TIMER_COUNT_MASK REG_GENMASK(5, 0)#define DPFC_STATUS _MMIO(0x3210)#define ILK_DPFC_STATUS (fbc_id) _MMIO_PIPE((fbc_id), 0x43210, 0x43250) -#define DPFC_INVAL_SEG_MASK REG_GENMASK(26, 16)#define DPFC_COMP_SEG_MASK REG_GENMASK(10, 0) -#define DPFC_STATUS2 _MMIO(0x3214)#define ILK_DPFC_STATUS2 (fbc_id) _MMIO_PIPE((fbc_id), 0x43214, 0x43254)#define DPFC_COMP_SEG_MASK_IVB REG_GENMASK(11, 0)#define DPFC_FENCE_YOFF _MMIO(0x3218)#define ILK_DPFC_FENCE_YOFF (fbc_id) _MMIO_PIPE((fbc_id), 0x43218, 0x43258) -#define DPFC_CHICKEN _MMIO(0x3224)#define ILK_DPFC_CHICKEN (fbc_id) _MMIO_PIPE((fbc_id), 0x43224, 0x43264) -#define DPFC_HT_MODIFY REG_BIT(31)/* pre-ivb */ #define DPFC_NUKE_ON_ANY_MODIFICATION REG_BIT(23)/* bdw+ */ #define DPFC_CHICKEN_COMP_DUMMY_PIXEL REG_BIT(14)/* glk+ */ #define DPFC_DISABLE_DUMMY0 REG_BIT(8)/* ivb+ */
@@ -3435,23 +2469,10 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define ILK_FBC_RT_BASE _MMIO(0x2128)#define ILK_FBC_RT_VALID REG_BIT(0) -#define SNB_FBC_FRONT_BUFFER REG_BIT(1)#define ILK_DISPLAY_CHICKEN1 _MMIO(0x42000)#define ILK_FBCQ_DIS (1 << 22)#define ILK_PABSTRETCH_DIS REG_BIT(21) -#define ILK_SABSTRETCH_DIS REG_BIT(20) -#define IVB_PRI_STRETCH_MAX_MASK REG_GENMASK(21, 20) -#define IVB_PRI_STRETCH_MAX_X8 REG_FIELD_PREP(IVB_PRI_STRETCH_MAX_MASK, 0) -#define IVB_PRI_STRETCH_MAX_X4 REG_FIELD_PREP(IVB_PRI_STRETCH_MAX_MASK, 1) -#define IVB_PRI_STRETCH_MAX_X2 REG_FIELD_PREP(IVB_PRI_STRETCH_MAX_MASK, 2) -#define IVB_PRI_STRETCH_MAX_X1 REG_FIELD_PREP(IVB_PRI_STRETCH_MAX_MASK, 3) -#define IVB_SPR_STRETCH_MAX_MASK REG_GENMASK(19, 18) -#define IVB_SPR_STRETCH_MAX_X8 REG_FIELD_PREP(IVB_SPR_STRETCH_MAX_MASK, 0) -#define IVB_SPR_STRETCH_MAX_X4 REG_FIELD_PREP(IVB_SPR_STRETCH_MAX_MASK, 1) -#define IVB_SPR_STRETCH_MAX_X2 REG_FIELD_PREP(IVB_SPR_STRETCH_MAX_MASK, 2) -#define IVB_SPR_STRETCH_MAX_X1 REG_FIELD_PREP(IVB_SPR_STRETCH_MAX_MASK, 3) -/* * Framebuffer compression for Sandybridge
@@ -3473,7 +2494,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MSG_FBC_REND_STATE (fbc_id) _MMIO_PIPE((fbc_id), 0x50380, 0x50384)#define FBC_REND_NUKE REG_BIT(2) -#define FBC_REND_CACHE_CLEAN REG_BIT(1)/* * GPIO regs
@@ -3546,17 +2566,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define _CHV_DPLL_C (DISPLAY_MMIO_BASE(dev_priv) + 0x6030)#define DPLL (pipe) _MMIO_PIPE3((pipe), _DPLL_A, _DPLL_B, _CHV_DPLL_C) -#define VGA0 _MMIO(0x6000) -#define VGA1 _MMIO(0x6004)#define VGA_PD _MMIO(0x6010) -#define VGA0_PD_P2_DIV_4 (1 << 7) -#define VGA0_PD_P1_DIV_2 (1 << 5) -#define VGA0_PD_P1_SHIFT 0 -#define VGA0_PD_P1_MASK (0x1f << 0) -#define VGA1_PD_P2_DIV_4 (1 << 15) -#define VGA1_PD_P1_DIV_2 (1 << 13) -#define VGA1_PD_P1_SHIFT 8 -#define VGA1_PD_P1_MASK (0x1f << 8)#define DPLL_VCO_ENABLE (1 << 31)#define DPLL_SDVO_HIGH_SPEED (1 << 30)#define DPLL_DVO_2X_MODE (1 << 30)
@@ -3588,12 +2598,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DPLL_PORTD_READY_MASK (0xf)#define DISPLAY_PHY_CONTROL _MMIO(VLV_DISPLAY_BASE + 0x60100)#define PHY_CH_POWER_DOWN_OVRD_EN (phy, ch) (1 << (2 * (phy) + (ch) + 27)) -#define PHY_LDO_DELAY_0NS 0x0 -#define PHY_LDO_DELAY_200NS 0x1#define PHY_LDO_DELAY_600NS 0x2#define PHY_LDO_SEQ_DELAY (delay, phy) ((delay) << (2 * (phy) + 23))#define PHY_CH_POWER_DOWN_OVRD (mask, phy, ch) ((mask) << (8 * (phy) + 4 * (ch) + 11)) -#define PHY_CH_SU_PSR 0x1#define PHY_CH_DEEP_PSR 0x7#define PHY_CH_POWER_MODE (mode, phy, ch) ((mode) << (6 * (phy) + 3 * (ch) + 2))#define PHY_COM_LANE_RESET_DEASSERT (phy) (1 << (phy))
@@ -3621,9 +2628,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)/* Ironlake */ # define PLL_REF_SDVO_HDMI_MULTIPLIER_SHIFT 9# define PLL_REF_SDVO_HDMI_MULTIPLIER_MASK (7 << 9) -# define PLL_REF_SDVO_HDMI_MULTIPLIER (x) (((x) - 1) << 9)# define DPLL_FPA1_P1_POST_DIV_SHIFT 0 -# define DPLL_FPA1_P1_POST_DIV_MASK 0xff/* * Parallel to Serial Load Pulse phase selection.
@@ -3710,113 +2715,34 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define DPLLA_TEST_M_BYPASS (1 << 2)#define DPLLA_INPUT_BUFFER_ENABLE (1 << 0)#define D_STATE _MMIO(0x6104) -#define DSTATE_GFX_RESET_I830 (1 << 6)#define DSTATE_PLL_D3_OFF (1 << 3)#define DSTATE_GFX_CLOCK_GATING (1 << 1)#define DSTATE_DOT_CLOCK_GATING (1 << 0)#define DSPCLK_GATE_D _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x6200) -# define DPUNIT_B_CLOCK_GATE_DISABLE (1 << 30)/* 965 */ -# define VSUNIT_CLOCK_GATE_DISABLE (1 << 29)/* 965 */ # define VRHUNIT_CLOCK_GATE_DISABLE (1 << 28)/* 965 */ -# define VRDUNIT_CLOCK_GATE_DISABLE (1 << 27)/* 965 */ -# define AUDUNIT_CLOCK_GATE_DISABLE (1 << 26)/* 965 */ -# define DPUNIT_A_CLOCK_GATE_DISABLE (1 << 25)/* 965 */ # define DPCUNIT_CLOCK_GATE_DISABLE (1 << 24)/* 965 */ # define PNV_GMBUSUNIT_CLOCK_GATE_DISABLE (1 << 24)/* pnv */ -# define TVRUNIT_CLOCK_GATE_DISABLE (1 << 23)/* 915-945 */ -# define TVCUNIT_CLOCK_GATE_DISABLE (1 << 22)/* 915-945 */ -# define TVFUNIT_CLOCK_GATE_DISABLE (1 << 21)/* 915-945 */ -# define TVEUNIT_CLOCK_GATE_DISABLE (1 << 20)/* 915-945 */ -# define DVSUNIT_CLOCK_GATE_DISABLE (1 << 19)/* 915-945 */ # define DSSUNIT_CLOCK_GATE_DISABLE (1 << 18)/* 915-945 */ -# define DDBUNIT_CLOCK_GATE_DISABLE (1 << 17)/* 915-945 */ -# define DPRUNIT_CLOCK_GATE_DISABLE (1 << 16)/* 915-945 */ -# define DPFUNIT_CLOCK_GATE_DISABLE (1 << 15)/* 915-945 */ -# define DPBMUNIT_CLOCK_GATE_DISABLE (1 << 14)/* 915-945 */ # define DPLSUNIT_CLOCK_GATE_DISABLE (1 << 13)/* 915-945 */ -# define DPLUNIT_CLOCK_GATE_DISABLE (1 << 12)/* 915-945 */ # define DPOUNIT_CLOCK_GATE_DISABLE (1 << 11) -# define DPBUNIT_CLOCK_GATE_DISABLE (1 << 10) -# define DCUNIT_CLOCK_GATE_DISABLE (1 << 9) -# define DPUNIT_CLOCK_GATE_DISABLE (1 << 8) -# define VRUNIT_CLOCK_GATE_DISABLE (1 << 7)/* 915+: reserved */ -# define OVHUNIT_CLOCK_GATE_DISABLE (1 << 6)/* 830-865 */ # define DPIOUNIT_CLOCK_GATE_DISABLE (1 << 6)/* 915-945 */ -# define OVFUNIT_CLOCK_GATE_DISABLE (1 << 5) -# define OVBUNIT_CLOCK_GATE_DISABLE (1 << 4)/* * This bit must be set on the 830 to prevent hangs when turning off the * overlay scaler. */ # define OVRUNIT_CLOCK_GATE_DISABLE (1 << 3)# define OVCUNIT_CLOCK_GATE_DISABLE (1 << 2) -# define OVUUNIT_CLOCK_GATE_DISABLE (1 << 1) -# define ZVUNIT_CLOCK_GATE_DISABLE (1 << 0)/* 830 */ -# define OVLUNIT_CLOCK_GATE_DISABLE (1 << 0)/* 845,865 */ #define RENCLK_GATE_D1 _MMIO(0x6204) -# define BLITTER_CLOCK_GATE_DISABLE (1 << 13)/* 945GM only */ -# define MPEG_CLOCK_GATE_DISABLE (1 << 12)/* 945GM only */ -# define PC_FE_CLOCK_GATE_DISABLE (1 << 11) -# define PC_BE_CLOCK_GATE_DISABLE (1 << 10) -# define WINDOWER_CLOCK_GATE_DISABLE (1 << 9) -# define INTERPOLATOR_CLOCK_GATE_DISABLE (1 << 8) -# define COLOR_CALCULATOR_CLOCK_GATE_DISABLE (1 << 7) -# define MOTION_COMP_CLOCK_GATE_DISABLE (1 << 6) -# define MAG_CLOCK_GATE_DISABLE (1 << 5) -/* This bit must be unset on 855,865 */ -# define MECI_CLOCK_GATE_DISABLE (1 << 4) -# define DCMP_CLOCK_GATE_DISABLE (1 << 3) -# define MEC_CLOCK_GATE_DISABLE (1 << 2) -# define MECO_CLOCK_GATE_DISABLE (1 << 1)/* This bit must be set on 855,865. */ # define SV_CLOCK_GATE_DISABLE (1 << 0) -# define I915_MPEG_CLOCK_GATE_DISABLE (1 << 16) -# define I915_VLD_IP_PR_CLOCK_GATE_DISABLE (1 << 15) -# define I915_MOTION_COMP_CLOCK_GATE_DISABLE (1 << 14) -# define I915_BD_BF_CLOCK_GATE_DISABLE (1 << 13) -# define I915_SF_SE_CLOCK_GATE_DISABLE (1 << 12) -# define I915_WM_CLOCK_GATE_DISABLE (1 << 11) -# define I915_IZ_CLOCK_GATE_DISABLE (1 << 10) -# define I915_PI_CLOCK_GATE_DISABLE (1 << 9) -# define I915_DI_CLOCK_GATE_DISABLE (1 << 8) -# define I915_SH_SV_CLOCK_GATE_DISABLE (1 << 7) -# define I915_PL_DG_QC_FT_CLOCK_GATE_DISABLE (1 << 6) -# define I915_SC_CLOCK_GATE_DISABLE (1 << 5) -# define I915_FL_CLOCK_GATE_DISABLE (1 << 4) -# define I915_DM_CLOCK_GATE_DISABLE (1 << 3) -# define I915_PS_CLOCK_GATE_DISABLE (1 << 2) -# define I915_CC_CLOCK_GATE_DISABLE (1 << 1) -# define I915_BY_CLOCK_GATE_DISABLE (1 << 0) -# define I965_RCZ_CLOCK_GATE_DISABLE (1 << 30)/* This bit must always be set on 965G/965GM */ # define I965_RCC_CLOCK_GATE_DISABLE (1 << 29)# define I965_RCPB_CLOCK_GATE_DISABLE (1 << 28) -# define I965_DAP_CLOCK_GATE_DISABLE (1 << 27) -# define I965_ROC_CLOCK_GATE_DISABLE (1 << 26) -# define I965_GW_CLOCK_GATE_DISABLE (1 << 25) -# define I965_TD_CLOCK_GATE_DISABLE (1 << 24)/* This bit must always be set on 965G */ # define I965_ISC_CLOCK_GATE_DISABLE (1 << 23) -# define I965_IC_CLOCK_GATE_DISABLE (1 << 22) -# define I965_EU_CLOCK_GATE_DISABLE (1 << 21) -# define I965_IF_CLOCK_GATE_DISABLE (1 << 20) -# define I965_TC_CLOCK_GATE_DISABLE (1 << 19) -# define I965_SO_CLOCK_GATE_DISABLE (1 << 17)# define I965_FBC_CLOCK_GATE_DISABLE (1 << 16) -# define I965_MARI_CLOCK_GATE_DISABLE (1 << 15) -# define I965_MASF_CLOCK_GATE_DISABLE (1 << 14) -# define I965_MAWB_CLOCK_GATE_DISABLE (1 << 13) -# define I965_EM_CLOCK_GATE_DISABLE (1 << 12) -# define I965_UC_CLOCK_GATE_DISABLE (1 << 11) -# define I965_SI_CLOCK_GATE_DISABLE (1 << 6) -# define I965_MT_CLOCK_GATE_DISABLE (1 << 5) -# define I965_PL_CLOCK_GATE_DISABLE (1 << 4) -# define I965_DG_CLOCK_GATE_DISABLE (1 << 3) -# define I965_QC_CLOCK_GATE_DISABLE (1 << 2) -# define I965_FT_CLOCK_GATE_DISABLE (1 << 1) -# define I965_DM_CLOCK_GATE_DISABLE (1 << 0)#define RENCLK_GATE_D2 _MMIO(0x6208)#define VF_UNIT_CLOCK_GATE_DISABLE (1 << 9)
@@ -3834,14 +2760,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MI_ARB_VLV _MMIO(VLV_DISPLAY_BASE + 0x6504) -#define CZCLK_CDCLK_FREQ_RATIO _MMIO(VLV_DISPLAY_BASE + 0x6508) -#define CDCLK_FREQ_SHIFT 4 -#define CDCLK_FREQ_MASK (0x1f << CDCLK_FREQ_SHIFT) -#define CZCLK_FREQ_MASK 0xf -#define GCI_CONTROL _MMIO(VLV_DISPLAY_BASE + 0x650C)#define PFI_CREDIT_63 (9 << 28)/* chv only */ -#define PFI_CREDIT_31 (8 << 28)/* chv only */ #define PFI_CREDIT (x) (((x) - 8) << 28)/* 8-15 */ #define PFI_CREDIT_RESEND (1 << 27)#define VGA_FAST_MODE_DISABLE (1 << 14)
@@ -3910,18 +2830,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define MAD_DIMM_C0 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5004)#define MAD_DIMM_C1 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5008)#define MAD_DIMM_C2 _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x500C) -#define MAD_DIMM_ECC_MASK (0x3 << 24) -#define MAD_DIMM_ECC_OFF (0x0 << 24) -#define MAD_DIMM_ECC_IO_ON_LOGIC_OFF (0x1 << 24) -#define MAD_DIMM_ECC_IO_OFF_LOGIC_ON (0x2 << 24) -#define MAD_DIMM_ECC_ON (0x3 << 24) -#define MAD_DIMM_ENH_INTERLEAVE (0x1 << 22) -#define MAD_DIMM_RANK_INTERLEAVE (0x1 << 21) -#define MAD_DIMM_B_WIDTH_X16 (0x1 << 20)/* X8 chips if unset */ -#define MAD_DIMM_A_WIDTH_X16 (0x1 << 19)/* X8 chips if unset */ -#define MAD_DIMM_B_DUAL_RANK (0x1 << 18) -#define MAD_DIMM_A_DUAL_RANK (0x1 << 17) -#define MAD_DIMM_A_SELECT (0x1 << 16)/* DIMM sizes are in multiples of 256mb. */ #define MAD_DIMM_B_SIZE_SHIFT 8#define MAD_DIMM_B_SIZE_MASK (0xff << MAD_DIMM_B_SIZE_SHIFT)
@@ -3966,130 +2874,36 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define PXVFREQ (fstart) _MMIO(0x11110 + (fstart) * 4)/* P[0-15]VIDFREQ (0x1114c) (Ironlake) */ #define PXVFREQ_PX_MASK 0x7f000000#define PXVFREQ_PX_SHIFT 24 -#define VIDFREQ_BASE _MMIO(0x11110) -#define VIDFREQ1 _MMIO(0x11110)/* VIDFREQ1-4 (0x1111c) (Cantiga) */ -#define VIDFREQ2 _MMIO(0x11114) -#define VIDFREQ3 _MMIO(0x11118) -#define VIDFREQ4 _MMIO(0x1111c) -#define VIDFREQ_P0_MASK 0x1f000000 -#define VIDFREQ_P0_SHIFT 24 -#define VIDFREQ_P0_CSCLK_MASK 0x00f00000 -#define VIDFREQ_P0_CSCLK_SHIFT 20 -#define VIDFREQ_P0_CRCLK_MASK 0x000f0000 -#define VIDFREQ_P0_CRCLK_SHIFT 16 -#define VIDFREQ_P1_MASK 0x00001f00 -#define VIDFREQ_P1_SHIFT 8 -#define VIDFREQ_P1_CSCLK_MASK 0x000000f0 -#define VIDFREQ_P1_CSCLK_SHIFT 4 -#define VIDFREQ_P1_CRCLK_MASK 0x0000000f -#define INTTOEXT_BASE_ILK _MMIO(0x11300) -#define INTTOEXT_BASE _MMIO(0x11120)/* INTTOEXT1-8 (0x1113c) */ -#define INTTOEXT_MAP3_SHIFT 24 -#define INTTOEXT_MAP3_MASK (0x1f << INTTOEXT_MAP3_SHIFT) -#define INTTOEXT_MAP2_SHIFT 16 -#define INTTOEXT_MAP2_MASK (0x1f << INTTOEXT_MAP2_SHIFT) -#define INTTOEXT_MAP1_SHIFT 8 -#define INTTOEXT_MAP1_MASK (0x1f << INTTOEXT_MAP1_SHIFT) -#define INTTOEXT_MAP0_SHIFT 0 -#define INTTOEXT_MAP0_MASK (0x1f << INTTOEXT_MAP0_SHIFT)#define MEMSWCTL _MMIO(0x11170)/* Ironlake only */ -#define MEMCTL_CMD_MASK 0xe000#define MEMCTL_CMD_SHIFT 13 -#define MEMCTL_CMD_RCLK_OFF 0 -#define MEMCTL_CMD_RCLK_ON 1#define MEMCTL_CMD_CHFREQ 2 -#define MEMCTL_CMD_CHVID 3 -#define MEMCTL_CMD_VMMOFF 4 -#define MEMCTL_CMD_VMMON 5#define MEMCTL_CMD_STS (1 << 12)/* write 1 triggers command, clears when command complete */ -#define MEMCTL_FREQ_MASK 0x0f00/* jitter, from 0-15 */ #define MEMCTL_FREQ_SHIFT 8#define MEMCTL_SFCAVM (1 << 7) -#define MEMCTL_TGT_VID_MASK 0x007f#define MEMIHYST _MMIO(0x1117c)#define MEMINTREN _MMIO(0x11180)/* 16 bits */ -#define MEMINT_RSEXIT_EN (1 << 8)#define MEMINT_CX_SUPR_EN (1 << 7) -#define MEMINT_CONT_BUSY_EN (1 << 6) -#define MEMINT_AVG_BUSY_EN (1 << 5)#define MEMINT_EVAL_CHG_EN (1 << 4) -#define MEMINT_MON_IDLE_EN (1 << 3) -#define MEMINT_UP_EVAL_EN (1 << 2) -#define MEMINT_DOWN_EVAL_EN (1 << 1) -#define MEMINT_SW_CMD_EN (1 << 0) -#define MEMINTRSTR _MMIO(0x11182)/* 16 bits */ -#define MEM_RSEXIT_MASK 0xc000 -#define MEM_RSEXIT_SHIFT 14 -#define MEM_CONT_BUSY_MASK 0x3000 -#define MEM_CONT_BUSY_SHIFT 12 -#define MEM_AVG_BUSY_MASK 0x0c00 -#define MEM_AVG_BUSY_SHIFT 10 -#define MEM_EVAL_CHG_MASK 0x0300 -#define MEM_EVAL_BUSY_SHIFT 8 -#define MEM_MON_IDLE_MASK 0x00c0 -#define MEM_MON_IDLE_SHIFT 6 -#define MEM_UP_EVAL_MASK 0x0030 -#define MEM_UP_EVAL_SHIFT 4 -#define MEM_DOWN_EVAL_MASK 0x000c -#define MEM_DOWN_EVAL_SHIFT 2 -#define MEM_SW_CMD_MASK 0x0003 -#define MEM_INT_STEER_GFX 0 -#define MEM_INT_STEER_CMR 1 -#define MEM_INT_STEER_SMI 2 -#define MEM_INT_STEER_SCI 3#define MEMINTRSTS _MMIO(0x11184) -#define MEMINT_RSEXIT (1 << 7) -#define MEMINT_CONT_BUSY (1 << 6) -#define MEMINT_AVG_BUSY (1 << 5)#define MEMINT_EVAL_CHG (1 << 4) -#define MEMINT_MON_IDLE (1 << 3) -#define MEMINT_UP_EVAL (1 << 2) -#define MEMINT_DOWN_EVAL (1 << 1) -#define MEMINT_SW_CMD (1 << 0)#define MEMMODECTL _MMIO(0x11190)#define MEMMODE_BOOST_EN (1 << 31)#define MEMMODE_BOOST_FREQ_MASK 0x0f000000/* jitter for boost, 0-15 */ #define MEMMODE_BOOST_FREQ_SHIFT 24 -#define MEMMODE_IDLE_MODE_MASK 0x00030000 -#define MEMMODE_IDLE_MODE_SHIFT 16 -#define MEMMODE_IDLE_MODE_EVAL 0 -#define MEMMODE_IDLE_MODE_CONT 1#define MEMMODE_HWIDLE_EN (1 << 15)#define MEMMODE_SWMODE_EN (1 << 14)#define MEMMODE_RCLK_GATE (1 << 13) -#define MEMMODE_HW_UPDATE (1 << 12)#define MEMMODE_FSTART_MASK 0x00000f00/* starting jitter, 0-15 */ #define MEMMODE_FSTART_SHIFT 8#define MEMMODE_FMAX_MASK 0x000000f0/* max jitter, 0-15 */ #define MEMMODE_FMAX_SHIFT 4#define MEMMODE_FMIN_MASK 0x0000000f/* min jitter, 0-15 */ #define RCBMAXAVG _MMIO(0x1119c) -#define MEMSWCTL2 _MMIO(0x1119e)/* Cantiga only */ -#define SWMEMCMD_RENDER_OFF (0 << 13) -#define SWMEMCMD_RENDER_ON (1 << 13) -#define SWMEMCMD_SWFREQ (2 << 13) -#define SWMEMCMD_TARVID (3 << 13) -#define SWMEMCMD_VRM_OFF (4 << 13) -#define SWMEMCMD_VRM_ON (5 << 13) -#define CMDSTS (1 << 12) -#define SFCAVM (1 << 11) -#define SWFREQ_MASK 0x0380/* P0-7 */ -#define SWFREQ_SHIFT 7 -#define TARVID_MASK 0x001f -#define MEMSTAT_CTG _MMIO(0x111a0)#define RCBMINAVG _MMIO(0x111a0)#define RCUPEI _MMIO(0x111b0)#define RCDNEI _MMIO(0x111b4)#define RSTDBYCTL _MMIO(0x111b8) -#define RS1EN (1 << 31) -#define RS2EN (1 << 30) -#define RS3EN (1 << 29) -#define D3RS3EN (1 << 28)/* Display D3 imlies RS3 */ -#define SWPROMORSX (1 << 27)/* RSx promotion timers ignored */ -#define RCWAKERW (1 << 26)/* Resetwarn from PCH causes wakeup */ -#define DPRSLPVREN (1 << 25)/* Fast voltage ramp enable */ -#define GFXTGHYST (1 << 24)/* Hysteresis to allow trunk gating */ #define RCX_SW_EXIT (1 << 23)/* Leave RSx and prevent re-entry */ #define RSX_STATUS_MASK (7 << 20)#define RSX_STATUS_ON (0 << 20)
@@ -4097,48 +2911,13 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define RSX_STATUS_RC1E (2 << 20)#define RSX_STATUS_RS1 (3 << 20)#define RSX_STATUS_RS2 (4 << 20)/* aka rc6 */ -#define RSX_STATUS_RSVD (5 << 20)/* deep rc6 unsupported on ilk */ #define RSX_STATUS_RS3 (6 << 20)/* rs3 unsupported on ilk */ -#define RSX_STATUS_RSVD2 (7 << 20) -#define UWRCRSXE (1 << 19)/* wake counter limit prevents rsx */ -#define RSCRP (1 << 18)/* rs requests control on rs1/2 reqs */ -#define JRSC (1 << 17)/* rsx coupled to cpu c-state */ -#define RS2INC0 (1 << 16)/* allow rs2 in cpu c0 */ -#define RS1CONTSAV_MASK (3 << 14) -#define RS1CONTSAV_NO_RS1 (0 << 14)/* rs1 doesn't save/restore context */ -#define RS1CONTSAV_RSVD (1 << 14) -#define RS1CONTSAV_SAVE_RS1 (2 << 14)/* rs1 saves context */ -#define RS1CONTSAV_FULL_RS1 (3 << 14)/* rs1 saves and restores context */ -#define NORMSLEXLAT_MASK (3 << 12) -#define SLOW_RS123 (0 << 12) -#define SLOW_RS23 (1 << 12) -#define SLOW_RS3 (2 << 12) -#define NORMAL_RS123 (3 << 12) -#define RCMODE_TIMEOUT (1 << 11)/* 0 is eval interval method */ -#define IMPROMOEN (1 << 10)/* promo is immediate or delayed until next idle interval (only for timeout method above) */ -#define RCENTSYNC (1 << 9)/* rs coupled to cpu c-state (3/6/7) */ -#define STATELOCK (1 << 7)/* locked to rs_cstate if 0 */ -#define RS_CSTATE_MASK (3 << 4) -#define RS_CSTATE_C367_RS1 (0 << 4) -#define RS_CSTATE_C36_RS1_C7_RS2 (1 << 4) -#define RS_CSTATE_RSVD (2 << 4) -#define RS_CSTATE_C367_RS2 (3 << 4) -#define REDSAVES (1 << 3)/* no context save if was idle during rs0 */ -#define REDRESTORES (1 << 2)/* no restore if was idle during rs0 */ -#define VIDCTL _MMIO(0x111c0) -#define VIDSTS _MMIO(0x111c8)#define VIDSTART _MMIO(0x111cc)/* 8 bits */ #define MEMSTAT_ILK _MMIO(0x111f8)#define MEMSTAT_VID_MASK 0x7f00#define MEMSTAT_VID_SHIFT 8#define MEMSTAT_PSTATE_MASK 0x00f8#define MEMSTAT_PSTATE_SHIFT 3 -#define MEMSTAT_MON_ACTV (1 << 2) -#define MEMSTAT_SRC_CTL_MASK 0x0003 -#define MEMSTAT_SRC_CTL_CORE 0 -#define MEMSTAT_SRC_CTL_TRB 1 -#define MEMSTAT_SRC_CTL_THM 2 -#define MEMSTAT_SRC_CTL_STDBY 3#define RCPREVBSYTUPAVG _MMIO(0x113b8)#define RCPREVBSYTDNAVG _MMIO(0x113bc)#define PMMISC _MMIO(0x11214)
@@ -4149,19 +2928,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define CSIEW2 _MMIO(0x11258)#define PEW (i) _MMIO(0x1125c + (i) * 4)/* 5 registers */ #define DEW (i) _MMIO(0x11270 + (i) * 4)/* 3 registers */ -#define MCHAFE _MMIO(0x112c0)#define CSIEC _MMIO(0x112e0)#define DMIEC _MMIO(0x112e4)#define DDREC _MMIO(0x112e8) -#define PEG0EC _MMIO(0x112ec) -#define PEG1EC _MMIO(0x112f0)#define GFXEC _MMIO(0x112f4) -#define RPPREVBSYTUPAVG _MMIO(0x113b8) -#define RPPREVBSYTDNAVG _MMIO(0x113bc)#define ECR _MMIO(0x11600) -#define ECR_GPFE (1 << 31) -#define ECR_IMONE (1 << 30) -#define ECR_CAP_MASK 0x0000001f/* Event range, 0-31 */ #define OGW0 _MMIO(0x11608)#define OGW1 _MMIO(0x1160c)#define EG0 _MMIO(0x11610)
@@ -4198,9 +2969,6 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)* Logical Context regs */ #define CCID (base) _MMIO((base) + 0x180) -#define CCID_EN BIT(0) -#define CCID_EXTENDED_STATE_RESTORE BIT(2) -#define CCID_EXTENDED_STATE_SAVE BIT(3)/* * Notes on SNB/IVB/VLV context size: * - Power context is saved elsewhere (LLC or stolen)
@@ -4215,20 +2983,14 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)* doesn't need saving on GT1 */ #define CXT_SIZE _MMIO(0x21a0) -#define GEN6_CXT_POWER_SIZE (cxt_reg) (((cxt_reg) >> 24) & 0x3f)#define GEN6_CXT_RING_SIZE (cxt_reg) (((cxt_reg) >> 18) & 0x3f) -#define GEN6_CXT_RENDER_SIZE (cxt_reg) (((cxt_reg) >> 12) & 0x3f)#define GEN6_CXT_EXTENDED_SIZE (cxt_reg) (((cxt_reg) >> 6) & 0x3f)#define GEN6_CXT_PIPELINE_SIZE (cxt_reg) (((cxt_reg) >> 0) & 0x3f)#define GEN6_CXT_TOTAL_SIZE (cxt_reg) (GEN6_CXT_RING_SIZE(cxt_reg) + \ GEN6_CXT_EXTENDED_SIZE(cxt_reg) + \ GEN6_CXT_PIPELINE_SIZE(cxt_reg))#define GEN7_CXT_SIZE _MMIO(0x21a8) -#define GEN7_CXT_POWER_SIZE (ctx_reg) (((ctx_reg) >> 25) & 0x7f) -#define GEN7_CXT_RING_SIZE (ctx_reg) (((ctx_reg) >> 22) & 0x7) -#define GEN7_CXT_RENDER_SIZE (ctx_reg) (((ctx_reg) >> 16) & 0x3f)#define GEN7_CXT_EXTENDED_SIZE (ctx_reg) (((ctx_reg) >> 9) & 0x7f) -#define GEN7_CXT_GT1_SIZE (ctx_reg) (((ctx_reg) >> 6) & 0x7)#define GEN7_CXT_VFSTATE_SIZE (ctx_reg) (((ctx_reg) >> 0) & 0x3f)#define GEN7_CXT_TOTAL_SIZE (ctx_reg) (GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \ GEN7_CXT_VFSTATE_SIZE(ctx_reg))
@@ -4249,13 +3011,10 @@ enum {#define CTX_GTT_ADDRESS_MASK GENMASK(31, 12)#define GEN8_CTX_VALID (1 << 0) -#define GEN8_CTX_FORCE_PD_RESTORE (1 << 1) -#define GEN8_CTX_FORCE_RESTORE (1 << 2)#define GEN8_CTX_L3LLC_COHERENT (1 << 5)#define GEN8_CTX_PRIVILEGE (1 << 8)#define GEN8_CTX_ADDRESSING_MODE_SHIFT 3 -#define GEN8_CTX_ID_SHIFT 32#define GEN8_CTX_ID_WIDTH 21#define GEN11_SW_CTX_ID_SHIFT 37#define GEN11_SW_CTX_ID_WIDTH 11
@@ -4266,20 +3025,12 @@ enum {#define XEHP_SW_CTX_ID_SHIFT 39#define XEHP_SW_CTX_ID_WIDTH 16 -#define XEHP_SW_COUNTER_SHIFT 58 -#define XEHP_SW_COUNTER_WIDTH 6 - -#define CHV_CLK_CTL1 _MMIO(0x101100) -#define VLV_CLK_CTL2 _MMIO(0x101104) -#define CLK_CTL2_CZCOUNT_30NS_SHIFT 28/* * Overlay regs */ -#define OVADD _MMIO(0x30000)#define DOVSTA _MMIO(0x30008) -#define OC_BUF (0x3 << 20)#define OGAMC5 _MMIO(0x30010)#define OGAMC4 _MMIO(0x30014)#define OGAMC3 _MMIO(0x30018)
@@ -4307,10 +3058,8 @@ enum {#define _CLKGATE_DIS_PSL_A 0x46520#define _CLKGATE_DIS_PSL_B 0x46524 -#define _CLKGATE_DIS_PSL_C 0x46528#define DUPS1_GATING_DIS (1 << 15)#define DUPS2_GATING_DIS (1 << 19) -#define DUPS3_GATING_DIS (1 << 23)#define CURSOR_GATING_DIS REG_BIT(28)#define DPF_GATING_DIS (1 << 10)#define DPF_RAM_GATING_DIS (1 << 9)
@@ -4356,9 +3105,6 @@ enum {#define LTCDD_CLKGATE_DIS REG_BIT(10)#define SLICE_UNIT_LEVEL_CLKGATE _MMIO(0x94d4) -#define SARBUNIT_CLKGATE_DIS (1 << 5) -#define RCCUNIT_CLKGATE_DIS (1 << 7) -#define MSCUNIT_CLKGATE_DIS (1 << 10)#define NODEDSS_CLKGATE_DIS REG_BIT(12)#define L3_CLKGATE_DIS REG_BIT(16)#define L3_CR2X_CLKGATE_DIS REG_BIT(17)
@@ -4385,9 +3131,6 @@ enum {#define VSUNIT_CLKGATE_DIS_TGL REG_BIT(19)#define PSDUNIT_CLKGATE_DIS REG_BIT(5) -#define INF_UNIT_LEVEL_CLKGATE _MMIO(0x9560) -#define CGPSF_CLKGATE_DIS (1 << 3) -/* * Display engine regs */
@@ -4415,14 +3158,9 @@ enum {#define PIPE_CRC_SOURCE_PRIMARY_ILK REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_ILK, 0)#define PIPE_CRC_SOURCE_SPRITE_ILK REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_ILK, 1)#define PIPE_CRC_SOURCE_PIPE_ILK REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_ILK, 2) -/* embedded DP port on the north display block */ -#define PIPE_CRC_SOURCE_PORT_A_ILK REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_ILK, 4) -#define PIPE_CRC_SOURCE_FDI_ILK REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_ILK, 5)/* vlv source selection */ #define PIPE_CRC_SOURCE_MASK_VLV REG_GENMASK(30, 27)#define PIPE_CRC_SOURCE_PIPE_VLV REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_VLV, 0) -#define PIPE_CRC_SOURCE_HDMIB_VLV REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_VLV, 1) -#define PIPE_CRC_SOURCE_HDMIC_VLV REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_VLV, 2)/* with DP port the pipe source is invalid */ #define PIPE_CRC_SOURCE_DP_D_VLV REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_VLV, 3)#define PIPE_CRC_SOURCE_DP_B_VLV REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_VLV, 6)
@@ -4430,14 +3168,8 @@ enum {/* gen3+ source selection */ #define PIPE_CRC_SOURCE_MASK_I9XX REG_GENMASK(30, 28)#define PIPE_CRC_SOURCE_PIPE_I9XX REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 0) -#define PIPE_CRC_SOURCE_SDVOB_I9XX REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 1) -#define PIPE_CRC_SOURCE_SDVOC_I9XX REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 2)/* with DP/TV port the pipe source is invalid */ -#define PIPE_CRC_SOURCE_DP_D_G4X REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 3)#define PIPE_CRC_SOURCE_TV_PRE REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 4) -#define PIPE_CRC_SOURCE_TV_POST REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 5) -#define PIPE_CRC_SOURCE_DP_B_G4X REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 6) -#define PIPE_CRC_SOURCE_DP_C_G4X REG_FIELD_PREP(PIPE_CRC_SOURCE_MASK_I9XX, 7)/* gen2 doesn't have source selection bits */ #define PIPE_CRC_INCLUDE_BORDER_I8XX REG_BIT(30)
@@ -4453,13 +3185,6 @@ enum {#define _PIPE_CRC_RES_RES1_A_I915 0x6006c#define _PIPE_CRC_RES_RES2_A_G4X 0x60080 -/* Pipe B CRC regs */ -#define _PIPE_CRC_RES_1_B_IVB 0x61064 -#define _PIPE_CRC_RES_2_B_IVB 0x61068 -#define _PIPE_CRC_RES_3_B_IVB 0x6106c -#define _PIPE_CRC_RES_4_B_IVB 0x61070 -#define _PIPE_CRC_RES_5_B_IVB 0x61074 -#define PIPE_CRC_CTL (pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_CTL_A)#define PIPE_CRC_RES_1_IVB (pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_1_A_IVB)#define PIPE_CRC_RES_2_IVB (pipe) _MMIO_TRANS2(pipe, _PIPE_CRC_RES_2_A_IVB)
@@ -4486,32 +3211,6 @@ enum {#define _VSYNCSHIFT_A 0x60028#define _PIPE_MULT_A 0x6002c -/* Pipe B timing regs */ -#define _HTOTAL_B 0x61000 -#define _HBLANK_B 0x61004 -#define _HSYNC_B 0x61008 -#define _VTOTAL_B 0x6100c -#define _VBLANK_B 0x61010 -#define _VSYNC_B 0x61014 -#define _PIPEBSRC 0x6101c -#define _BCLRPAT_B 0x61020 -#define _VSYNCSHIFT_B 0x61028 -#define _PIPE_MULT_B 0x6102c - -/* DSI 0 timing regs */ -#define _HTOTAL_DSI0 0x6b000 -#define _HSYNC_DSI0 0x6b008 -#define _VTOTAL_DSI0 0x6b00c -#define _VSYNC_DSI0 0x6b014 -#define _VSYNCSHIFT_DSI0 0x6b028 - -/* DSI 1 timing regs */ -#define _HTOTAL_DSI1 0x6b800 -#define _HSYNC_DSI1 0x6b808 -#define _VTOTAL_DSI1 0x6b80c -#define _VSYNC_DSI1 0x6b814 -#define _VSYNCSHIFT_DSI1 0x6b828 -#define TRANSCODER_A_OFFSET 0x60000#define TRANSCODER_B_OFFSET 0x61000#define TRANSCODER_C_OFFSET 0x62000
@@ -4539,9 +3238,6 @@ enum {/* VRR registers */ #define _TRANS_VRR_CTL_A 0x60420 -#define _TRANS_VRR_CTL_B 0x61420 -#define _TRANS_VRR_CTL_C 0x62420 -#define _TRANS_VRR_CTL_D 0x63420#define TRANS_VRR_CTL (trans) _MMIO_TRANS2(trans, _TRANS_VRR_CTL_A)#define VRR_CTL_VRR_ENABLE REG_BIT(31)#define VRR_CTL_IGN_MAX_SHIFT REG_BIT(30)
@@ -4553,79 +3249,17 @@ enum {#define XELPD_VRR_CTL_VRR_GUARDBAND (x) REG_FIELD_PREP(XELPD_VRR_CTL_VRR_GUARDBAND_MASK, (x))#define _TRANS_VRR_VMAX_A 0x60424 -#define _TRANS_VRR_VMAX_B 0x61424 -#define _TRANS_VRR_VMAX_C 0x62424 -#define _TRANS_VRR_VMAX_D 0x63424#define TRANS_VRR_VMAX (trans) _MMIO_TRANS2(trans, _TRANS_VRR_VMAX_A) -#define VRR_VMAX_MASK REG_GENMASK(19, 0)#define _TRANS_VRR_VMIN_A 0x60434 -#define _TRANS_VRR_VMIN_B 0x61434 -#define _TRANS_VRR_VMIN_C 0x62434 -#define _TRANS_VRR_VMIN_D 0x63434#define TRANS_VRR_VMIN (trans) _MMIO_TRANS2(trans, _TRANS_VRR_VMIN_A) -#define VRR_VMIN_MASK REG_GENMASK(15, 0) - -#define _TRANS_VRR_VMAXSHIFT_A 0x60428 -#define _TRANS_VRR_VMAXSHIFT_B 0x61428 -#define _TRANS_VRR_VMAXSHIFT_C 0x62428 -#define _TRANS_VRR_VMAXSHIFT_D 0x63428 -#define TRANS_VRR_VMAXSHIFT (trans) _MMIO_TRANS2(trans, \ - _TRANS_VRR_VMAXSHIFT_A) -#define VRR_VMAXSHIFT_DEC_MASK REG_GENMASK(29, 16) -#define VRR_VMAXSHIFT_DEC REG_BIT(16) -#define VRR_VMAXSHIFT_INC_MASK REG_GENMASK(12, 0) - -#define _TRANS_VRR_STATUS_A 0x6042C -#define _TRANS_VRR_STATUS_B 0x6142C -#define _TRANS_VRR_STATUS_C 0x6242C -#define _TRANS_VRR_STATUS_D 0x6342C -#define TRANS_VRR_STATUS (trans) _MMIO_TRANS2(trans, _TRANS_VRR_STATUS_A) -#define VRR_STATUS_VMAX_REACHED REG_BIT(31) -#define VRR_STATUS_NOFLIP_TILL_BNDR REG_BIT(30) -#define VRR_STATUS_FLIP_BEF_BNDR REG_BIT(29) -#define VRR_STATUS_NO_FLIP_FRAME REG_BIT(28) -#define VRR_STATUS_VRR_EN_LIVE REG_BIT(27) -#define VRR_STATUS_FLIPS_SERVICED REG_BIT(26) -#define VRR_STATUS_VBLANK_MASK REG_GENMASK(22, 20) -#define STATUS_FSM_IDLE REG_FIELD_PREP(VRR_STATUS_VBLANK_MASK, 0) -#define STATUS_FSM_WAIT_TILL_FDB REG_FIELD_PREP(VRR_STATUS_VBLANK_MASK, 1) -#define STATUS_FSM_WAIT_TILL_FS REG_FIELD_PREP(VRR_STATUS_VBLANK_MASK, 2) -#define STATUS_FSM_WAIT_TILL_FLIP REG_FIELD_PREP(VRR_STATUS_VBLANK_MASK, 3) -#define STATUS_FSM_PIPELINE_FILL REG_FIELD_PREP(VRR_STATUS_VBLANK_MASK, 4) -#define STATUS_FSM_ACTIVE REG_FIELD_PREP(VRR_STATUS_VBLANK_MASK, 5) -#define STATUS_FSM_LEGACY_VBLANK REG_FIELD_PREP(VRR_STATUS_VBLANK_MASK, 6) - -#define _TRANS_VRR_VTOTAL_PREV_A 0x60480 -#define _TRANS_VRR_VTOTAL_PREV_B 0x61480 -#define _TRANS_VRR_VTOTAL_PREV_C 0x62480 -#define _TRANS_VRR_VTOTAL_PREV_D 0x63480 -#define TRANS_VRR_VTOTAL_PREV (trans) _MMIO_TRANS2(trans, \ - _TRANS_VRR_VTOTAL_PREV_A) -#define VRR_VTOTAL_FLIP_BEFR_BNDR REG_BIT(31) -#define VRR_VTOTAL_FLIP_AFTER_BNDR REG_BIT(30) -#define VRR_VTOTAL_FLIP_AFTER_DBLBUF REG_BIT(29) -#define VRR_VTOTAL_PREV_FRAME_MASK REG_GENMASK(19, 0)#define _TRANS_VRR_FLIPLINE_A 0x60438 -#define _TRANS_VRR_FLIPLINE_B 0x61438 -#define _TRANS_VRR_FLIPLINE_C 0x62438 -#define _TRANS_VRR_FLIPLINE_D 0x63438#define TRANS_VRR_FLIPLINE (trans) _MMIO_TRANS2(trans, \ _TRANS_VRR_FLIPLINE_A) -#define VRR_FLIPLINE_MASK REG_GENMASK(19, 0) -#define _TRANS_VRR_STATUS2_A 0x6043C -#define _TRANS_VRR_STATUS2_B 0x6143C -#define _TRANS_VRR_STATUS2_C 0x6243C -#define _TRANS_VRR_STATUS2_D 0x6343C -#define TRANS_VRR_STATUS2 (trans) _MMIO_TRANS2(trans, _TRANS_VRR_STATUS2_A) -#define VRR_STATUS2_VERT_LN_CNT_MASK REG_GENMASK(19, 0)#define _TRANS_PUSH_A 0x60A70 -#define _TRANS_PUSH_B 0x61A70 -#define _TRANS_PUSH_C 0x62A70 -#define _TRANS_PUSH_D 0x63A70#define TRANS_PUSH (trans) _MMIO_TRANS2(trans, _TRANS_PUSH_A)#define TRANS_PUSH_EN REG_BIT(31)#define TRANS_PUSH_SEND REG_BIT(30)
@@ -4640,16 +3274,10 @@ enum {#define _SRD_CTL_EDP 0x6f800#define EDP_PSR_CTL (tran) _MMIO(_TRANS2(tran, _SRD_CTL_A))#define EDP_PSR_ENABLE (1 << 31) -#define BDW_PSR_SINGLE_FRAME (1 << 30)#define EDP_PSR_RESTORE_PSR_ACTIVE_CTX_MASK (1 << 29)/* SW can't modify */ #define EDP_PSR_LINK_STANDBY (1 << 27) -#define EDP_PSR_MIN_LINK_ENTRY_TIME_MASK (3 << 25)#define EDP_PSR_MIN_LINK_ENTRY_TIME_8_LINES (0 << 25) -#define EDP_PSR_MIN_LINK_ENTRY_TIME_4_LINES (1 << 25) -#define EDP_PSR_MIN_LINK_ENTRY_TIME_2_LINES (2 << 25) -#define EDP_PSR_MIN_LINK_ENTRY_TIME_0_LINES (3 << 25)#define EDP_PSR_MAX_SLEEP_TIME_SHIFT 20 -#define EDP_PSR_SKIP_AUX_EXIT (1 << 12)#define EDP_PSR_TP1_TP2_SEL (0 << 11)#define EDP_PSR_TP1_TP3_SEL (1 << 11)#define EDP_PSR_CRC_ENABLE (1 << 10)/* BDW+ */
@@ -4682,94 +3310,50 @@ enum {#define EDP_PSR_POST_EXIT (trans) (0x2 << _EDP_PSR_TRANS_SHIFT(trans))#define EDP_PSR_PRE_ENTRY (trans) (0x1 << _EDP_PSR_TRANS_SHIFT(trans)) -#define _SRD_AUX_DATA_A 0x60814 -#define _SRD_AUX_DATA_EDP 0x6f814 -#define EDP_PSR_AUX_DATA (tran, i) _MMIO(_TRANS2(tran, _SRD_AUX_DATA_A) + (i) + 4)/* 5 registers */ -#define _SRD_STATUS_A 0x60840 -#define _SRD_STATUS_EDP 0x6f840#define EDP_PSR_STATUS (tran) _MMIO(_TRANS2(tran, _SRD_STATUS_A))#define EDP_PSR_STATUS_STATE_MASK (7 << 29)#define EDP_PSR_STATUS_STATE_SHIFT 29 -#define EDP_PSR_STATUS_STATE_IDLE (0 << 29) -#define EDP_PSR_STATUS_STATE_SRDONACK (1 << 29) -#define EDP_PSR_STATUS_STATE_SRDENT (2 << 29) -#define EDP_PSR_STATUS_STATE_BUFOFF (3 << 29) -#define EDP_PSR_STATUS_STATE_BUFON (4 << 29) -#define EDP_PSR_STATUS_STATE_AUXACK (5 << 29) -#define EDP_PSR_STATUS_STATE_SRDOFFACK (6 << 29) -#define EDP_PSR_STATUS_LINK_MASK (3 << 26) -#define EDP_PSR_STATUS_LINK_FULL_OFF (0 << 26) -#define EDP_PSR_STATUS_LINK_FULL_ON (1 << 26) -#define EDP_PSR_STATUS_LINK_STANDBY (2 << 26) -#define EDP_PSR_STATUS_MAX_SLEEP_TIMER_SHIFT 20 -#define EDP_PSR_STATUS_MAX_SLEEP_TIMER_MASK 0x1f -#define EDP_PSR_STATUS_COUNT_SHIFT 16 -#define EDP_PSR_STATUS_COUNT_MASK 0xf -#define EDP_PSR_STATUS_AUX_ERROR (1 << 15) -#define EDP_PSR_STATUS_AUX_SENDING (1 << 12) -#define EDP_PSR_STATUS_SENDING_IDLE (1 << 9) -#define EDP_PSR_STATUS_SENDING_TP2_TP3 (1 << 8) -#define EDP_PSR_STATUS_SENDING_TP1 (1 << 4) -#define EDP_PSR_STATUS_IDLE_MASK 0xf#define _SRD_PERF_CNT_A 0x60844 -#define _SRD_PERF_CNT_EDP 0x6f844#define EDP_PSR_PERF_CNT (tran) _MMIO(_TRANS2(tran, _SRD_PERF_CNT_A))#define EDP_PSR_PERF_CNT_MASK 0xffffff/* PSR_MASK on SKL+ */ #define _SRD_DEBUG_A 0x60860 -#define _SRD_DEBUG_EDP 0x6f860#define EDP_PSR_DEBUG (tran) _MMIO(_TRANS2(tran, _SRD_DEBUG_A))#define EDP_PSR_DEBUG_MASK_MAX_SLEEP (1 << 28)#define EDP_PSR_DEBUG_MASK_LPSP (1 << 27)#define EDP_PSR_DEBUG_MASK_MEMUP (1 << 26)#define EDP_PSR_DEBUG_MASK_HPD (1 << 25)#define EDP_PSR_DEBUG_MASK_DISP_REG_WRITE (1 << 16)/* Reserved in ICL+ */ -#define EDP_PSR_DEBUG_EXIT_ON_PIXEL_UNDERRUN (1 << 15)/* SKL+ */ #define _PSR2_CTL_A 0x60900 -#define _PSR2_CTL_EDP 0x6f900#define EDP_PSR2_CTL (tran) _MMIO_TRANS2(tran, _PSR2_CTL_A)#define EDP_PSR2_ENABLE (1 << 31)#define EDP_SU_TRACK_ENABLE (1 << 30)/* up to adl-p */ #define TGL_EDP_PSR2_BLOCK_COUNT_NUM_2 (0 << 28) -#define TGL_EDP_PSR2_BLOCK_COUNT_NUM_3 (1 << 28)#define EDP_Y_COORDINATE_ENABLE REG_BIT(25)/* display 10, 11 and 12 */ #define EDP_PSR2_SU_SDP_SCANLINE REG_BIT(25)/* display 13+ */ -#define EDP_MAX_SU_DISABLE_TIME (t) ((t) << 20) -#define EDP_MAX_SU_DISABLE_TIME_MASK (0x1f << 20)#define EDP_PSR2_IO_BUFFER_WAKE_MAX_LINES 8#define EDP_PSR2_IO_BUFFER_WAKE (lines) ((EDP_PSR2_IO_BUFFER_WAKE_MAX_LINES - (lines)) << 13) -#define EDP_PSR2_IO_BUFFER_WAKE_MASK (3 << 13)#define TGL_EDP_PSR2_IO_BUFFER_WAKE_MIN_LINES 5#define TGL_EDP_PSR2_IO_BUFFER_WAKE_SHIFT 13#define TGL_EDP_PSR2_IO_BUFFER_WAKE (lines) (((lines) - TGL_EDP_PSR2_IO_BUFFER_WAKE_MIN_LINES) << TGL_EDP_PSR2_IO_BUFFER_WAKE_SHIFT) -#define TGL_EDP_PSR2_IO_BUFFER_WAKE_MASK (7 << 13)#define EDP_PSR2_FAST_WAKE_MAX_LINES 8#define EDP_PSR2_FAST_WAKE (lines) ((EDP_PSR2_FAST_WAKE_MAX_LINES - (lines)) << 11) -#define EDP_PSR2_FAST_WAKE_MASK (3 << 11)#define TGL_EDP_PSR2_FAST_WAKE_MIN_LINES 5#define TGL_EDP_PSR2_FAST_WAKE_MIN_SHIFT 10#define TGL_EDP_PSR2_FAST_WAKE (lines) (((lines) - TGL_EDP_PSR2_FAST_WAKE_MIN_LINES) << TGL_EDP_PSR2_FAST_WAKE_MIN_SHIFT) -#define TGL_EDP_PSR2_FAST_WAKE_MASK (7 << 10)#define EDP_PSR2_TP2_TIME_500us (0 << 8)#define EDP_PSR2_TP2_TIME_100us (1 << 8)#define EDP_PSR2_TP2_TIME_2500us (2 << 8)#define EDP_PSR2_TP2_TIME_50us (3 << 8) -#define EDP_PSR2_TP2_TIME_MASK (3 << 8) -#define EDP_PSR2_FRAME_BEFORE_SU_SHIFT 4 -#define EDP_PSR2_FRAME_BEFORE_SU_MASK (0xf << 4)#define EDP_PSR2_FRAME_BEFORE_SU (a) ((a) << 4)#define EDP_PSR2_IDLE_FRAME_MASK 0xf#define EDP_PSR2_IDLE_FRAME_SHIFT 0#define _PSR_EVENT_TRANS_A 0x60848 -#define _PSR_EVENT_TRANS_B 0x61848 -#define _PSR_EVENT_TRANS_C 0x62848 -#define _PSR_EVENT_TRANS_D 0x63848 -#define _PSR_EVENT_TRANS_EDP 0x6f848#define PSR_EVENT (tran) _MMIO_TRANS2(tran, _PSR_EVENT_TRANS_A)#define PSR_EVENT_PSR2_WD_TIMER_EXPIRE (1 << 17)#define PSR_EVENT_PSR2_DISABLED (1 << 16)
@@ -4789,13 +3373,11 @@ enum {#define PSR_EVENT_PSR_DISABLE (1 << 0)#define _PSR2_STATUS_A 0x60940 -#define _PSR2_STATUS_EDP 0x6f940#define EDP_PSR2_STATUS (tran) _MMIO_TRANS2(tran, _PSR2_STATUS_A)#define EDP_PSR2_STATUS_STATE_MASK REG_GENMASK(31, 28)#define EDP_PSR2_STATUS_STATE_DEEP_SLEEP REG_FIELD_PREP(EDP_PSR2_STATUS_STATE_MASK, 0x8)#define _PSR2_SU_STATUS_A 0x60914 -#define _PSR2_SU_STATUS_EDP 0x6f914#define _PSR2_SU_STATUS (tran, index) _MMIO(_TRANS2(tran, _PSR2_SU_STATUS_A) + (index) * 4)#define PSR2_SU_STATUS (tran, frame) (_PSR2_SU_STATUS(tran, (frame) / 3))#define PSR2_SU_STATUS_SHIFT (frame) (((frame) % 3) * 10)
@@ -4803,7 +3385,6 @@ enum {#define PSR2_SU_STATUS_FRAMES 8#define _PSR2_MAN_TRK_CTL_A 0x60910 -#define _PSR2_MAN_TRK_CTL_EDP 0x6f910#define PSR2_MAN_TRK_CTL (tran) _MMIO_TRANS2(tran, _PSR2_MAN_TRK_CTL_A)#define PSR2_MAN_TRK_CTL_ENABLE REG_BIT(31)#define PSR2_MAN_TRK_CTL_SU_REGION_START_ADDR_MASK REG_GENMASK(30, 21)
@@ -4811,14 +3392,12 @@ enum {#define PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR_MASK REG_GENMASK(20, 11)#define PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR (val) REG_FIELD_PREP(PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR_MASK, val)#define PSR2_MAN_TRK_CTL_SF_SINGLE_FULL_FRAME REG_BIT(3) -#define PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME REG_BIT(2)#define PSR2_MAN_TRK_CTL_SF_PARTIAL_FRAME_UPDATE REG_BIT(1)#define ADLP_PSR2_MAN_TRK_CTL_SU_REGION_START_ADDR_MASK REG_GENMASK(28, 16)#define ADLP_PSR2_MAN_TRK_CTL_SU_REGION_START_ADDR (val) REG_FIELD_PREP(ADLP_PSR2_MAN_TRK_CTL_SU_REGION_START_ADDR_MASK, val)#define ADLP_PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR_MASK REG_GENMASK(12, 0)#define ADLP_PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR (val) REG_FIELD_PREP(ADLP_PSR2_MAN_TRK_CTL_SU_REGION_END_ADDR_MASK, val)#define ADLP_PSR2_MAN_TRK_CTL_SF_SINGLE_FULL_FRAME REG_BIT(14) -#define ADLP_PSR2_MAN_TRK_CTL_SF_CONTINUOS_FULL_FRAME REG_BIT(13)/* Icelake DSC Rate Control Range Parameter Registers */ #define DSCA_RC_RANGE_PARAMETERS_0 _MMIO(0x6B240)
@@ -4938,23 +3517,13 @@ enum {#define ADPA_PIPE_SEL_MASK_CPT (3 << 29)#define ADPA_PIPE_SEL_CPT (pipe) ((pipe) << 29)#define ADPA_CRT_HOTPLUG_MASK 0x03ff0000/* bit 25-16 */ -#define ADPA_CRT_HOTPLUG_MONITOR_NONE (0 << 24)#define ADPA_CRT_HOTPLUG_MONITOR_MASK (3 << 24) -#define ADPA_CRT_HOTPLUG_MONITOR_COLOR (3 << 24) -#define ADPA_CRT_HOTPLUG_MONITOR_MONO (2 << 24)#define ADPA_CRT_HOTPLUG_ENABLE (1 << 23) -#define ADPA_CRT_HOTPLUG_PERIOD_64 (0 << 22)#define ADPA_CRT_HOTPLUG_PERIOD_128 (1 << 22) -#define ADPA_CRT_HOTPLUG_WARMUP_5MS (0 << 21)#define ADPA_CRT_HOTPLUG_WARMUP_10MS (1 << 21) -#define ADPA_CRT_HOTPLUG_SAMPLE_2S (0 << 20)#define ADPA_CRT_HOTPLUG_SAMPLE_4S (1 << 20) -#define ADPA_CRT_HOTPLUG_VOLTAGE_40 (0 << 18)#define ADPA_CRT_HOTPLUG_VOLTAGE_50 (1 << 18) -#define ADPA_CRT_HOTPLUG_VOLTAGE_60 (2 << 18) -#define ADPA_CRT_HOTPLUG_VOLTAGE_70 (3 << 18)#define ADPA_CRT_HOTPLUG_VOLREF_325MV (0 << 17) -#define ADPA_CRT_HOTPLUG_VOLREF_475MV (1 << 17)#define ADPA_CRT_HOTPLUG_FORCE_TRIGGER (1 << 16)#define ADPA_USE_VGA_HVPOLARITY (1 << 15)#define ADPA_SETS_HVPOLARITY 0
@@ -4966,11 +3535,6 @@ enum {#define ADPA_VSYNC_ACTIVE_LOW 0#define ADPA_HSYNC_ACTIVE_HIGH (1 << 3)#define ADPA_HSYNC_ACTIVE_LOW 0 -#define ADPA_DPMS_MASK (~(3 << 10)) -#define ADPA_DPMS_ON (0 << 10) -#define ADPA_DPMS_SUSPEND (1 << 10) -#define ADPA_DPMS_STANDBY (2 << 10) -#define ADPA_DPMS_OFF (3 << 10)/* Hotplug control (945+ only) */
@@ -4989,7 +3553,6 @@ enum { SDVOB_HOTPLUG_INT_EN | \ CRT_HOTPLUG_INT_EN)#define CRT_HOTPLUG_FORCE_DETECT (1 << 3) -#define CRT_HOTPLUG_ACTIVATION_PERIOD_32 (0 << 8)/* must use period 64 on GM45 according to docs */ #define CRT_HOTPLUG_ACTIVATION_PERIOD_64 (1 << 8)#define CRT_HOTPLUG_DAC_ON_TIME_2M (0 << 7)
@@ -5022,13 +3585,10 @@ enum {#define PORTB_HOTPLUG_LIVE_STATUS_G4X (1 << 29)#define PORTD_HOTPLUG_INT_STATUS (3 << 21)#define PORTD_HOTPLUG_INT_LONG_PULSE (2 << 21) -#define PORTD_HOTPLUG_INT_SHORT_PULSE (1 << 21)#define PORTC_HOTPLUG_INT_STATUS (3 << 19)#define PORTC_HOTPLUG_INT_LONG_PULSE (2 << 19) -#define PORTC_HOTPLUG_INT_SHORT_PULSE (1 << 19)#define PORTB_HOTPLUG_INT_STATUS (3 << 17)#define PORTB_HOTPLUG_INT_LONG_PULSE (2 << 17) -#define PORTB_HOTPLUG_INT_SHORT_PLUSE (1 << 17)/* CRT/TV common between gen3+ */ #define CRT_HOTPLUG_INT_STATUS (1 << 11)#define TV_HOTPLUG_INT_STATUS (1 << 10)
@@ -5036,9 +3596,6 @@ enum {#define CRT_HOTPLUG_MONITOR_COLOR (3 << 8)#define CRT_HOTPLUG_MONITOR_MONO (2 << 8)#define CRT_HOTPLUG_MONITOR_NONE (0 << 8) -#define DP_AUX_CHANNEL_D_INT_STATUS_G4X (1 << 6) -#define DP_AUX_CHANNEL_C_INT_STATUS_G4X (1 << 5) -#define DP_AUX_CHANNEL_B_INT_STATUS_G4X (1 << 4)#define DP_AUX_CHANNEL_MASK_INT_STATUS_G4X (7 << 4)/* SDVO is different across gen3/4 */
@@ -5050,8 +3607,6 @@ enum {* bits here (and the comment!) to help any other lost wanderers back onto the * right tracks. */ -#define SDVOC_HOTPLUG_INT_STATUS_I965 (3 << 4) -#define SDVOB_HOTPLUG_INT_STATUS_I965 (3 << 2)#define SDVOC_HOTPLUG_INT_STATUS_I915 (1 << 7)#define SDVOB_HOTPLUG_INT_STATUS_I915 (1 << 6)#define HOTPLUG_INT_STATUS_G4X (CRT_HOTPLUG_INT_STATUS | \
@@ -5084,8 +3639,6 @@ enum {#define PCH_HDMIC _MMIO(0xe1150)#define PCH_HDMID _MMIO(0xe1160) -#define PORT_DFT_I9XX _MMIO(0x61150) -#define DC_BALANCE_RESET (1 << 25)#define PORT_DFT2_G4X _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61154)#define DC_BALANCE_RESET_VLV (1 << 31)#define PIPE_SCRAMBLE_RESET_MASK ((1 << 14) | (0x3 << 0))
@@ -5122,10 +3675,8 @@ enum {/* Gen 4 SDVO/HDMI bits: */ #define SDVO_COLOR_FORMAT_8bpc (0 << 26)#define SDVO_COLOR_FORMAT_MASK (7 << 26) -#define SDVO_ENCODING_SDVO (0 << 10)#define SDVO_ENCODING_HDMI (2 << 10)#define HDMI_MODE_SELECT_HDMI (1 << 9)/* HDMI only */ -#define HDMI_MODE_SELECT_DVI (0 << 9)/* HDMI only */ #define HDMI_COLOR_RANGE_16_235 (1 << 8)/* HDMI only */ #define HDMI_AUDIO_ENABLE (1 << 6)/* HDMI only */ /* VSYNC/HSYNC bits new with 965, default is to be set */
@@ -5134,7 +3685,6 @@ enum {/* Gen 5 (IBX) SDVO/HDMI bits: */ #define HDMI_COLOR_FORMAT_12bpc (3 << 26)/* HDMI only */ -#define SDVOB_HOTPLUG_ENABLE (1 << 23)/* SDVO only */ /* Gen 6 (CPT) SDVO/HDMI bits: */ #define SDVO_PIPE_SEL_SHIFT_CPT 29
@@ -5158,27 +3708,13 @@ enum {#define DVO_PIPE_SEL_SHIFT 30#define DVO_PIPE_SEL_MASK (1 << 30)#define DVO_PIPE_SEL (pipe) ((pipe) << 30) -#define DVO_PIPE_STALL_UNUSED (0 << 28)#define DVO_PIPE_STALL (1 << 28) -#define DVO_PIPE_STALL_TV (2 << 28) -#define DVO_PIPE_STALL_MASK (3 << 28) -#define DVO_USE_VGA_SYNC (1 << 15) -#define DVO_DATA_ORDER_I740 (0 << 14)#define DVO_DATA_ORDER_FP (1 << 14) -#define DVO_VSYNC_DISABLE (1 << 11) -#define DVO_HSYNC_DISABLE (1 << 10) -#define DVO_VSYNC_TRISTATE (1 << 9) -#define DVO_HSYNC_TRISTATE (1 << 8)#define DVO_BORDER_ENABLE (1 << 7)#define DVO_DATA_ORDER_GBRG (1 << 6) -#define DVO_DATA_ORDER_RGGB (0 << 6) -#define DVO_DATA_ORDER_GBRG_ERRATA (0 << 6) -#define DVO_DATA_ORDER_RGGB_ERRATA (1 << 6)#define DVO_VSYNC_ACTIVE_HIGH (1 << 4)#define DVO_HSYNC_ACTIVE_HIGH (1 << 3)#define DVO_BLANK_ACTIVE_HIGH (1 << 2) -#define DVO_OUTPUT_CSTATE_PIXELS (1 << 1)/* SDG only */ -#define DVO_OUTPUT_SOURCE_SIZE_PIXELS (1 << 0)/* SDG only */ #define DVO_PRESERVE_MASK (0x7 << 24)#define DVOA_SRCDIM _MMIO(0x61124)#define DVOB_SRCDIM _MMIO(0x61144)
@@ -5263,19 +3799,10 @@ enum {#define VIDEO_DIP_SELECT_GAMUT (2 << 19)#define VIDEO_DIP_SELECT_SPD (3 << 19)#define VIDEO_DIP_SELECT_MASK (3 << 19) -#define VIDEO_DIP_FREQ_ONCE (0 << 16)#define VIDEO_DIP_FREQ_VSYNC (1 << 16) -#define VIDEO_DIP_FREQ_2VSYNC (2 << 16)#define VIDEO_DIP_FREQ_MASK (3 << 16)/* HSW and later: */ #define VIDEO_DIP_ENABLE_DRM_GLK (1 << 28) -#define PSR_VSC_BIT_7_SET (1 << 27) -#define VSC_SELECT_MASK (0x3 << 25) -#define VSC_SELECT_SHIFT 25 -#define VSC_DIP_HW_HEA_DATA (0 << 25) -#define VSC_DIP_HW_HEA_SW_DATA (1 << 25) -#define VSC_DIP_HW_DATA_SW_HEA (2 << 25) -#define VSC_DIP_SW_HEA_DATA (3 << 25)#define VDIP_ENABLE_PPS (1 << 24)#define VIDEO_DIP_ENABLE_VSC_HSW (1 << 20)#define VIDEO_DIP_ENABLE_GCP_HSW (1 << 16)
@@ -5306,19 +3833,11 @@ enum {#define PP_READY REG_BIT(30)#define PP_SEQUENCE_MASK REG_GENMASK(29, 28)#define PP_SEQUENCE_NONE REG_FIELD_PREP(PP_SEQUENCE_MASK, 0) -#define PP_SEQUENCE_POWER_UP REG_FIELD_PREP(PP_SEQUENCE_MASK, 1)#define PP_SEQUENCE_POWER_DOWN REG_FIELD_PREP(PP_SEQUENCE_MASK, 2)#define PP_CYCLE_DELAY_ACTIVE REG_BIT(27)#define PP_SEQUENCE_STATE_MASK REG_GENMASK(3, 0)#define PP_SEQUENCE_STATE_OFF_IDLE REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0x0) -#define PP_SEQUENCE_STATE_OFF_S0_1 REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0x1) -#define PP_SEQUENCE_STATE_OFF_S0_2 REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0x2) -#define PP_SEQUENCE_STATE_OFF_S0_3 REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0x3)#define PP_SEQUENCE_STATE_ON_IDLE REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0x8) -#define PP_SEQUENCE_STATE_ON_S1_1 REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0x9) -#define PP_SEQUENCE_STATE_ON_S1_2 REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0xa) -#define PP_SEQUENCE_STATE_ON_S1_3 REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0xb) -#define PP_SEQUENCE_STATE_RESET REG_FIELD_PREP(PP_SEQUENCE_STATE_MASK, 0xf)#define _PP_CONTROL 0x61204#define PP_CONTROL (pps_idx) _MMIO_PPS(pps_idx, _PP_CONTROL)
@@ -5368,7 +3887,6 @@ enum {#define PANEL_8TO6_DITHER_ENABLE (1 << 3)#define PFIT_FILTER_FUZZY (0 << 24)#define PFIT_SCALING_AUTO (0 << 26) -#define PFIT_SCALING_PROGRAMMED (1 << 26)#define PFIT_SCALING_PILLAR (2 << 26)#define PFIT_SCALING_LETTER (3 << 26)#define PFIT_PGM_RATIOS _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61234)
@@ -5379,9 +3897,6 @@ enum {#define PFIT_HORIZ_SCALE_MASK 0x0000fff0/* 965+ */ #define PFIT_VERT_SCALE_SHIFT_965 16 -#define PFIT_VERT_SCALE_MASK_965 0x1fff0000 -#define PFIT_HORIZ_SCALE_SHIFT_965 0 -#define PFIT_HORIZ_SCALE_MASK_965 0x00001fff#define PFIT_AUTO_RATIOS _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61238)
@@ -5395,35 +3910,13 @@ enum {#define VLV_BLC_PWM_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_PWM_CTL_A, \ _VLV_BLC_PWM_CTL_B) -#define _VLV_BLC_HIST_CTL_A (DISPLAY_MMIO_BASE(dev_priv) + 0x61260) -#define _VLV_BLC_HIST_CTL_B (DISPLAY_MMIO_BASE(dev_priv) + 0x61360) -#define VLV_BLC_HIST_CTL (pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, \ - _VLV_BLC_HIST_CTL_B) -/* Backlight control */ #define BLC_PWM_CTL2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61250)/* 965+ only */ #define BLM_PWM_ENABLE (1 << 31)#define BLM_COMBINATION_MODE (1 << 30)/* gen4 only */ -#define BLM_PIPE_SELECT (1 << 29) -#define BLM_PIPE_SELECT_IVB (3 << 29) -#define BLM_PIPE_A (0 << 29) -#define BLM_PIPE_B (1 << 29) -#define BLM_PIPE_C (2 << 29)/* ivb + */ -#define BLM_TRANSCODER_A BLM_PIPE_A/* hsw */ -#define BLM_TRANSCODER_B BLM_PIPE_B -#define BLM_TRANSCODER_C BLM_PIPE_C#define BLM_TRANSCODER_EDP (3 << 29)#define BLM_PIPE (pipe) ((pipe) << 29)#define BLM_POLARITY_I965 (1 << 28)/* gen4 only */ -#define BLM_PHASE_IN_INTERUPT_STATUS (1 << 26) -#define BLM_PHASE_IN_ENABLE (1 << 25) -#define BLM_PHASE_IN_INTERUPT_ENABL (1 << 24) -#define BLM_PHASE_IN_TIME_BASE_SHIFT (16) -#define BLM_PHASE_IN_TIME_BASE_MASK (0xff << 16) -#define BLM_PHASE_IN_COUNT_SHIFT (8) -#define BLM_PHASE_IN_COUNT_MASK (0xff << 8) -#define BLM_PHASE_IN_INCR_SHIFT (0) -#define BLM_PHASE_IN_INCR_MASK (0xff << 0)#define BLC_PWM_CTL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61254)/* * This is the most significant 15 bits of the number of backlight cycles in a
@@ -5466,18 +3959,10 @@ enum {#define UTIL_PIN_CTL _MMIO(0x48400)#define UTIL_PIN_ENABLE (1 << 31) -#define UTIL_PIN_PIPE_MASK (3 << 29)#define UTIL_PIN_PIPE (x) ((x) << 29) -#define UTIL_PIN_MODE_MASK (0xf << 24) -#define UTIL_PIN_MODE_DATA (0 << 24)#define UTIL_PIN_MODE_PWM (1 << 24) -#define UTIL_PIN_MODE_VBLANK (4 << 24) -#define UTIL_PIN_MODE_VSYNC (5 << 24) -#define UTIL_PIN_MODE_EYE_LEVEL (8 << 24) -#define UTIL_PIN_OUTPUT_DATA (1 << 23)#define UTIL_PIN_POLARITY (1 << 22)#define UTIL_PIN_DIRECTION_INPUT (1 << 19) -#define UTIL_PIN_INPUT_DATA (1 << 16)/* BXT backlight register definition. */ #define _BXT_BLC_PWM_CTL1 0xC8250
@@ -5514,11 +3999,7 @@ enum {# define TV_ENC_OUTPUT_SVIDEO (1 << 28)/* Outputs Component video (DAC A/B/C) */ # define TV_ENC_OUTPUT_COMPONENT (2 << 28) -/* Outputs Composite and SVideo (DAC A/B/C) */ -# define TV_ENC_OUTPUT_SVIDEO_COMPOSITE (3 << 28)# define TV_TRILEVEL_SYNC (1 << 21) -/* Enables slow sync generation (945GM only) */ -# define TV_SLOW_SYNC (1 << 20)/* Selects 4x oversampling for 480i and 576p */ # define TV_OVERSAMPLE_4X (0 << 18)/* Selects 2x oversampling for 720p and 1080i */
@@ -5532,8 +4013,6 @@ enum {# define TV_PROGRESSIVE (1 << 17)/* Sets the colorburst to PAL mode. Required for non-M PAL modes. */ # define TV_PAL_BURST (1 << 16)
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.34.1
Part of the diff is not shown here. View the raw message.
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 1/1] drm/i915: Drop unused register definitions
Quoted 12 lines · Matt Roper
A large percentage (nearly 25%) of the register and bit definitions in
i915_reg.hare not used by the i915 driver and are effectively dead code. There are a few origins for these unused definitions:* Registers only accessed by workarounds that were either retracted by the hardware team or that only applied to pre-production steppings and have been removed from the driver.
* General refactoring of the codebase (e.g., separate definitions of REG1, REG2, REG3 being replaced by a parameterized REG(n) macro without the original definitions being dropped.
Quoted 8 lines
* In the early days of i915, all registers in an area of the hardware, or all bits in a given register got documented in
i915_reg.h"just in case" they needed to be used in the future. With the exploding complexity of the hardware and huge number of platforms we now support, mass-documenting everything as #define's doesn't scale. We'd also generally prefer *not* to have definitions already in the driver before they're used since we'd rather review them explicitly alongside new code that is starting to use them.
I still tell people to 1) split out register definitions to separate patches, and 2) add macros for the entire feature and full contents for each register, even if they remain unused.
One of the main reasons is review economics. It's pretty easy to look at a patch adding register contents, review it against the bspec and be done with it. And while you have the right bspec page open, it only takes a very short time to add and review the entire register, instead of having to return to it later. A patch adding just the registers could get reviewed and merged at v1. It's one less patch the developer has to keep carrying and rebasing, and it's one less portion the reviewer has to worry about.
Overall it's about getting the easy stuff done and behind you first. And that's a huge part of my whole approach to kernel development, and what I try to tell others to follow.
I also think the documentation aspect is still valid, and especially so for older hardware. It may be fine to remove some of the accumulated cruft, *after* the register macros have been split up to smaller files by functionality. But I don't think it should be an indiscriminate mass removal of macros. For example, I don't think I want any of the sideband or VGA or PCI register macros removed.
Bottom line, I don't mind adding or having unused register macros at all. Heck, I'd be on board for switching to auto-generated register macros with absolutely everything.
Of course, this is only about register macros that describe the hardware, not so much about driver implementation where I'd toss unused code to the curb in a heartbeat.
From a purely pragmatic perspective, please proceed with the non-controversial splitting up i915_reg.h to individual files, switching to REG_* macros for contents, etc, etc, first. Just please don't start with this one because it's going to be a long tedious debate that will suck the life force right out of us and make you want to stop doing the whole thing. (Remember, get the easy stuff done and behind you first. ;)
BR,
Jani.
Quoted 16 lines
Let's start cleaning up the register definition file by removing a bunch of dead code. I used a cscope database to track down most of these via searches like:
for x in $(grep '^#define' drivers/gpu/drm/i915/i915_reg.h | awk '{ print $2 }' | cut -d'(' -f1); do count=$(cscope -d -R -L0 $x | wc -l); if (($count <= 1)); then echo $x; fi; donealthough I had to watch out for cases where register/bit names are never referenced directly, but are constructed elsewhere by macro concatenation (e.g.,
GEN3_IRQ_INIT()).Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by Matt Roper <[email protected]>
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 1/1] drm/i915: Drop unused register definitions
Quoted 26 lines · Jani Nikula
Quoted 12 lines · Matt Roper
A large percentage (nearly 25%) of the register and bit definitions in
i915_reg.hare not used by the i915 driver and are effectively dead code. There are a few origins for these unused definitions:* Registers only accessed by workarounds that were either retracted by the hardware team or that only applied to pre-production steppings and have been removed from the driver.
* General refactoring of the codebase (e.g., separate definitions of REG1, REG2, REG3 being replaced by a parameterized REG(n) macro without the original definitions being dropped.
Quoted 8 lines
* In the early days of i915, all registers in an area of the hardware, or all bits in a given register got documented in
i915_reg.h"just in case" they needed to be used in the future. With the exploding complexity of the hardware and huge number of platforms we now support, mass-documenting everything as #define's doesn't scale. We'd also generally prefer *not* to have definitions already in the driver before they're used since we'd rather review them explicitly alongside new code that is starting to use them.I still tell people to 1) split out register definitions to separate patches, and 2) add macros for the entire feature and full contents for each register, even if they remain unused.
Quoted 8 lines
One of the main reasons is review economics. It's pretty easy to look at a patch adding register contents, review it against the bspec and be done with it. And while you have the right bspec page open, it only takes a very short time to add and review the entire register, instead of having to return to it later. A patch adding just the registers could get reviewed and merged at v1. It's one less patch the developer has to keep carrying and rebasing, and it's one less portion the reviewer has to worry about.
this failed multiple times though, so I'm on the other side of the fence and think this actually makes things worse. Main reasons is because we have several registers doing things like:
#define BLA(idx) REG_BIT(idx * 2 + 1)
And it's easy to get this wrong when it was not tested. It may be for example that one phy or port doesn't follow the same logic. When I review code I prefer reviewing code people actually tested.
It's less of an issue when it's a 1:1 map from bspec, but for a lot of registers we need just 1 or 2 bits, e.g. for workarounds. Being able to filter out workarounds we don't need because we don't even define the register/bit is also another con to defining the complete register in a separate patch.
So from my POV, the cons outweigtht the pros.
Quoted 12 lines
Overall it's about getting the easy stuff done and behind you first. And that's a huge part of my whole approach to kernel development, and what I try to tell others to follow.
I also think the documentation aspect is still valid, and especially so for older hardware. It may be fine to remove some of the accumulated cruft, *after* the register macros have been split up to smaller files by functionality. But I don't think it should be an indiscriminate mass removal of macros. For example, I don't think I want any of the sideband or VGA or PCI register macros removed.
Quoted 3 lines
Bottom line, I don't mind adding or having unused register macros at all. Heck, I'd be on board for switching to auto-generated register macros with absolutely everything.
if it can be generated.... Then we'd have some additional headers for the accessor functions that deal with index math to the to the right bits or the right register instance.
Lucas De Marchi
Quoted 36 lines
Of course, this is only about register macros that describe the hardware, not so much about driver implementation where I'd toss unused code to the curb in a heartbeat.
From a purely pragmatic perspective, please proceed with the non-controversial splitting up
i915_reg.hto individual files, switching to REG_* macros for contents, etc, etc, first. Just please don't start with this one because it's going to be a long tedious debate that will suck the life force right out of us and make you want to stop doing the whole thing. (Remember, get the easy stuff done and behind you first. ;)BR,
Jani.Quoted 16 lines
Let's start cleaning up the register definition file by removing a bunch of dead code. I used a cscope database to track down most of these via searches like:
for x in $(grep '^#define' drivers/gpu/drm/i915/i915_reg.h | awk '{ print $2 }' | cut -d'(' -f1); do count=$(cscope -d -R -L0 $x | wc -l); if (($count <= 1)); then echo $x; fi; donealthough I had to watch out for cases where register/bit names are never referenced directly, but are constructed elsewhere by macro concatenation (e.g.,
GEN3_IRQ_INIT()).Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by Matt Roper <[email protected]>Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Jani Nikula
maintainerRe: [Intel-gfx] [PATCH 1/1] drm/i915: Drop unused register definitions
Quoted 24 lines · Lucas De Marchi
Quoted 4 lines · Jani Nikula
I still tell people to 1) split out register definitions to separate patches, and 2) add macros for the entire feature and full contents for each register, even if they remain unused.
Quoted 8 lines
One of the main reasons is review economics. It's pretty easy to look at a patch adding register contents, review it against the bspec and be done with it. And while you have the right bspec page open, it only takes a very short time to add and review the entire register, instead of having to return to it later. A patch adding just the registers could get reviewed and merged at v1. It's one less patch the developer has to keep carrying and rebasing, and it's one less portion the reviewer has to worry about.
this failed multiple times though, so I'm on the other side of the fence and think this actually makes things worse. Main reasons is because we have several registers doing things like:
#define BLA(idx) REG_BIT(idx * 2 + 1)And it's easy to get this wrong when it was not tested. It may be for example that one phy or port doesn't follow the same logic. When I review code I prefer reviewing code people actually tested.
Quoted 8 lines
It's less of an issue when it's a 1:1 map from bspec, but for a lot of registers we need just 1 or 2 bits, e.g. for workarounds. Being able to filter out workarounds we don't need because we don't even define the register/bit is also another con to defining the complete register in a separate patch.
So from my POV, the cons outweigtht the pros.
Okay, let's not forget this part of the conversation, but let's also not let this block the cleanup. We don't have to do a blanket removal of unused stuff before splitting the file up, and we don't have to decide how we how we approach this in the future before that either, i.e. let's get the uncontroversial stuff merged.
Quoted 13 lines
Quoted 13 lines
Overall it's about getting the easy stuff done and behind you first. And that's a huge part of my whole approach to kernel development, and what I try to tell others to follow.
I also think the documentation aspect is still valid, and especially so for older hardware. It may be fine to remove some of the accumulated cruft, *after* the register macros have been split up to smaller files by functionality. But I don't think it should be an indiscriminate mass removal of macros. For example, I don't think I want any of the sideband or VGA or PCI register macros removed.
Quoted 7 lines
Quoted 3 lines
Bottom line, I don't mind adding or having unused register macros at all. Heck, I'd be on board for switching to auto-generated register macros with absolutely everything.
if it can be generated.... Then we'd have some additional headers for the accessor functions that deal with index math to the to the right bits or the right register instance.
Yeah, it's somewhat of an unicorn I guess.
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 1/1] drm/i915: Drop unused register definitions
Quoted 32 lines · Jani Nikula
Quoted 31 lines · Lucas De Marchi
Quoted 4 lines · Jani Nikula
I still tell people to 1) split out register definitions to separate patches, and 2) add macros for the entire feature and full contents for each register, even if they remain unused.
Quoted 8 lines
One of the main reasons is review economics. It's pretty easy to look at a patch adding register contents, review it against the bspec and be done with it. And while you have the right bspec page open, it only takes a very short time to add and review the entire register, instead of having to return to it later. A patch adding just the registers could get reviewed and merged at v1. It's one less patch the developer has to keep carrying and rebasing, and it's one less portion the reviewer has to worry about.
this failed multiple times though, so I'm on the other side of the fence and think this actually makes things worse. Main reasons is because we have several registers doing things like:
#define BLA(idx) REG_BIT(idx * 2 + 1)And it's easy to get this wrong when it was not tested. It may be for example that one phy or port doesn't follow the same logic. When I review code I prefer reviewing code people actually tested.
It's less of an issue when it's a 1:1 map from bspec, but for a lot of registers we need just 1 or 2 bits, e.g. for workarounds. Being able to filter out workarounds we don't need because we don't even define the register/bit is also another con to defining the complete register in a separate patch.
Quoted 7 lines
Quoted 1 line
So from my POV, the cons outweigtht the pros.
Okay, let's not forget this part of the conversation, but let's also not let this block the cleanup. We don't have to do a blanket removal of unused stuff before splitting the file up, and we don't have to decide how we how we approach this in the future before that either, i.e. let's get the uncontroversial stuff merged.
agreed,
Lucas De Marchi
Quoted 30 lines
Quoted 14 lines
Quoted 14 lines
Overall it's about getting the easy stuff done and behind you first. And that's a huge part of my whole approach to kernel development, and what I try to tell others to follow.
I also think the documentation aspect is still valid, and especially so for older hardware. It may be fine to remove some of the accumulated cruft, *after* the register macros have been split up to smaller files by functionality. But I don't think it should be an indiscriminate mass removal of macros. For example, I don't think I want any of the sideband or VGA or PCI register macros removed.
Quoted 7 lines
Quoted 3 lines
Bottom line, I don't mind adding or having unused register macros at all. Heck, I'd be on board for switching to auto-generated register macros with absolutely everything.
if it can be generated.... Then we'd have some additional headers for the accessor functions that deal with index math to the to the right bits or the right register instance.
Yeah, it's somewhat of an unicorn I guess.
BR,
Jani.Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Start cleaning up register definitions
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Start cleaning up register definitions
URL : https://patchwork.freedesktop.org/series/98575/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip
cd93e9e13e3d drm/i915: Drop unused register definitions
-:34: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#34:
for x in $(grep '^#define' drivers/gpu/drm/i915/i915_reg.h | awk '{ print $2 }' | cut -d'(' -f1); do count=$(cscope -d -R -L0 $x | wc -l); if (($count <= 1)); then echo $x; fi; donetotal: 0 errors, 1 warnings, 0 checks, 6539 lines checked
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Start cleaning up register definitions
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Start cleaning up register definitions
URL : https://patchwork.freedesktop.org/series/98575/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Start cleaning up register definitions
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Start cleaning up register definitions
URL : https://patchwork.freedesktop.org/series/98575/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11052 -> Patchwork_21935
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/index.html
Participating hosts (44 -> 37)
------------------------------
Additional (1): fi-pnv-d510
Missing (8): bat-dg1-6 bat-dg1-5 fi-icl-u2 fi-bsw-cyan bat-adlp-6 bat-rpls-1 fi-bdw-samus bat-jsl-1
Known issues
------------
Here are the changes found in Patchwork_21935 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_basic@semaphore:
- fi-bdw-5557u: NOTRUN -> [SKIP][1] ([fdo#109271]) +31 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-bdw-5557u/igt@amdgpu/[email protected]
* igt@amdgpu/amd_cs_nop@sync-fork-compute0:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271]) +10 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-kbl-soraka/igt@amdgpu/[email protected]
* igt@amdgpu/amd_prime@i915-to-amd:
- fi-snb-2520m: NOTRUN -> [SKIP][3] ([fdo#109271]) +17 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-snb-2520m/igt@amdgpu/[email protected]
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][4] -> [INCOMPLETE][5] ([i915#3921])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/fi-snb-2600/igt@i915_selftest@[email protected]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-snb-2600/igt@i915_selftest@[email protected]
* igt@kms_chamelium@dp-crc-fast:
- fi-bdw-5557u: NOTRUN -> [SKIP][6] ([fdo#109271] / [fdo#111827]) +8 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-bdw-5557u/igt@[email protected]
* igt@prime_vgem@basic-userptr:
- fi-pnv-d510: NOTRUN -> [SKIP][7] ([fdo#109271]) +57 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-pnv-d510/igt@[email protected]
* igt@runner@aborted:
- fi-skl-6600u: NOTRUN -> [FAIL][8] ([i915#4312])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-skl-6600u/igt@[email protected]
#### Possible fixes ####
* igt@i915_selftest@live@gt_contexts:
- fi-snb-2520m: [DMESG-FAIL][9] ([i915#4610]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/fi-snb-2520m/igt@i915_selftest@live@gt_contexts.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-snb-2520m/igt@i915_selftest@live@gt_contexts.html
#### Warnings ####
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][11] ([i915#4785]) -> [INCOMPLETE][12] ([i915#3303])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/fi-hsw-4770/igt@i915_selftest@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-hsw-4770/igt@i915_selftest@[email protected]
* igt@kms_psr@primary_page_flip:
- fi-skl-6600u: [INCOMPLETE][13] ([i915#4838]) -> [FAIL][14] ([i915#4547])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4610]: https://gitlab.freedesktop.org/drm/intel/issues/4610
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4838]: https://gitlab.freedesktop.org/drm/intel/issues/4838
Build changes
-------------
* Linux: CI_DRM_11052 -> Patchwork_21935
CI-20190529: 20190529
CI_DRM_11052: 5926026a36a658f615b8a5aaa74a90a2a3c5e6c5 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6324: 6e009504d5f7cc39866191e4bff813a4512c3e9b @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21935: cd93e9e13e3dd4e94df145881a7bf99c4ba2348a @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
cd93e9e13e3d drm/i915: Drop unused register definitions
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/index.html
Jani Nikula
maintainerQuoted 8 lines · Matt Roper
Our
i915_reg.hfile has become a huge unwieldy mess over the years. A lot of definitions don't follow any logical ordering, there's unintentional duplication of registers under different names, the coding style is very inconsistent, and there's tons of unused definitions (nearly a quarter ofi915_reg.his dead code!). This makes it a pain to work with and also needlessly slows down development since any trivial change toi915_reg.hforces us to unnecessarily rebuild the entire i915 driver instead of just the affected are of the code.
Agreed.
Quoted 5 lines
I'd like to start cleaning up the register definitions in a few steps:
(1) Eliminate unnused register and bit definitions. Some of these may get re-added in the future if/when code starts using them but that's fine; we'd prefer to carefully (re)review the register definitions at that time anyway.
I don't agree with this one, though. I'll reply to the actual patch on details.
I think step 1 should be splitting out the generic register type and helper macros to a separate file. It's needed by a number of other headers for i915_reg_t while most of them don't need any actual register macros, and the ones that do should be refactored to not require them.
Another early step should be splitting out the non-MMIO macros, for example the IOSF and PUNIT sideband stuff. They don't necessarily fall to the below categories.
Quoted 4 lines
(2) Move registers exclusive to the command parser to their own header
(3) Move OA registers to their own header
(4) Move GT registers to their own header
(5) Move display registers to their own header
Agreed.
Quoted 4 lines
(6) While moving things to new files, take the opportunity to also update to update to a consistent coding style: consistent indentation, consistent case for hex values, use of REG_BIT/REG_GENMASK, etc.
I think this should be split to separate move and cleanup patches. More than anything, this is because of review mechanics. It's trivial to review code movement by comparing diffs where the only difference in content is +/- at the beginning of the lines. Submit, review, merge, forget. Switching to REG_BIT/REG_GENMASK etc. needs though, and is easier done when the diff is limited to those changes. If there are issues found in review, you don't have to double check the code movement anymore.
Quoted 4 lines
This will make it easier to find an appropriate place to add new registers and should also improve quality of life for developers since driver builds will be faster in cases where a register is added/updated and only a specific part of the driver needs to be rebuilt.
Agreed. Basically only .c files should include the headers that have register macros, and only the ones that are actually needed.
Quoted 2 lines
This only includes step (1) above; the other steps will come as follow-up patches if there's no concern with the general goal.
While I appreciate and agree with the overall effort and goal, I don't think this should be the first patch, nor do I think this should be an indiscriminate automated mass removal of macros. More on that later.
BR,
Jani.
Quoted 12 lines
Cc Jani Nikula <[email protected]>Cc Ville Syrjälä <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Lucas De Marchi <[email protected]>Signed-off-by Matt Roper <[email protected]>Matt Roper (1):
drm/i915: Drop unused register definitionsdrivers/gpu/drm/i915/i915_reg.h | 3107 +------------------------------ 1 file changed, 9 insertions(+), 3098 deletions(-)
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Jani Nikula
maintainerQuoted 3 lines · Jani Nikula
Another early step should be splitting out the non-MMIO macros, for example the IOSF and PUNIT sideband stuff. They don't necessarily fall to the below categories.
Funny. I actually had a branch from a few months back splitting out PCI config space, VGA, and VLV sideband registers. Added some commit messages and sent it out. [1]
BR,
Jani.
[1] https://patchwork.freedesktop.org/series/98597/
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for Start cleaning up register definitions
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Start cleaning up register definitions
URL : https://patchwork.freedesktop.org/series/98575/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11052_full -> Patchwork_21935_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Participating hosts (13 -> 13)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21935_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_create@create-clear:
- {shard-rkl}: [PASS][1] -> [INCOMPLETE][2] +3 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-rkl-2/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-rkl-5/igt@[email protected]
* igt@gem_exec_whisper@basic-contexts-forked-all:
- {shard-rkl}: NOTRUN -> [INCOMPLETE][3] +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-rkl-5/igt@[email protected]
* igt@i915_pm_dc@dc6-psr:
- {shard-tglu}: NOTRUN -> [SKIP][4] +1 similar issue
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-3/igt@[email protected]
* igt@kms_flip@dpms-off-confusion-interruptible@b-hdmi-a1:
- {shard-dg1}: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-dg1-12/igt@kms_flip@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-dg1-15/igt@kms_flip@[email protected]
* igt@kms_vblank@pipe-b-ts-continuation-dpms-suspend:
- {shard-tglu}: [PASS][7] -> [DMESG-WARN][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglu-6/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-1/igt@[email protected]
* igt@runner@aborted:
- {shard-tglu}: ([FAIL][9], [FAIL][10], [FAIL][11], [FAIL][12]) ([i915#3002] / [i915#3690] / [i915#4312]) -> ([FAIL][13], [FAIL][14], [FAIL][15], [FAIL][16]) ([i915#3002] / [i915#4312])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglu-7/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglu-7/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglu-5/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglu-3/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-3/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-2/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-1/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_21935_full that come from known issues:
### CI changes ###
#### Possible fixes ####
* boot:
- shard-apl: ([PASS][17], [PASS][18], [PASS][19], [PASS][20], [PASS][21], [PASS][22], [PASS][23], [PASS][24], [PASS][25], [PASS][26], [PASS][27], [PASS][28], [PASS][29], [PASS][30], [PASS][31], [PASS][32], [PASS][33], [PASS][34], [PASS][35], [FAIL][36], [PASS][37], [PASS][38], [PASS][39], [PASS][40], [PASS][41]) ([i915#4386]) -> ([PASS][42], [PASS][43], [PASS][44], [PASS][45], [PASS][46], [PASS][47], [PASS][48], [PASS][49], [PASS][50], [PASS][51], [PASS][52], [PASS][53], [PASS][54], [PASS][55], [PASS][56], [PASS][57], [PASS][58], [PASS][59], [PASS][60], [PASS][61], [PASS][62], [PASS][63], [PASS][64], [PASS][65], [PASS][66])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl8/boot.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl8/boot.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl8/boot.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl7/boot.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl7/boot.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl7/boot.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl6/boot.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl6/boot.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl6/boot.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl6/boot.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl4/boot.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl4/boot.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl4/boot.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl4/boot.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl3/boot.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl3/boot.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl3/boot.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl2/boot.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl2/boot.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl2/boot.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl2/boot.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl1/boot.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl1/boot.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl1/boot.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl1/boot.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl8/boot.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl8/boot.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl8/boot.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl7/boot.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl7/boot.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl7/boot.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/boot.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/boot.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/boot.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/boot.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl4/boot.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl4/boot.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl4/boot.html
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl3/boot.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl3/boot.html
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl3/boot.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl3/boot.html
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl2/boot.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl2/boot.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl2/boot.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl2/boot.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl1/boot.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl1/boot.html
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl1/boot.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl8/boot.html
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_sseu@invalid-sseu:
- shard-tglb: NOTRUN -> [SKIP][67] ([i915#280])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@[email protected]
* igt@gem_eio@in-flight-1us:
- shard-tglb: [PASS][68] -> [TIMEOUT][69] ([i915#3063])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglb7/igt@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb1/igt@[email protected]
* igt@gem_exec_balancer@parallel-contexts:
- shard-iclb: [PASS][70] -> [SKIP][71] ([i915#4525])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-iclb1/igt@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb6/igt@[email protected]
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-kbl: [PASS][72] -> [FAIL][73] ([i915#2842]) +4 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-kbl7/igt@gem_exec_fair@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vcs1:
- shard-kbl: NOTRUN -> [FAIL][74] ([i915#2842])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-glk: [PASS][75] -> [FAIL][76] ([i915#2842]) +3 similar issues
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-glk4/igt@gem_exec_fair@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-glk8/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs0:
- shard-iclb: [PASS][77] -> [FAIL][78] ([i915#2842])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-iclb7/igt@gem_exec_fair@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb6/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [PASS][79] -> [FAIL][80] ([i915#2849])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-iclb6/igt@gem_exec_fair@[email protected]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_params@no-vebox:
- shard-skl: NOTRUN -> [SKIP][81] ([fdo#109271]) +41 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl9/igt@[email protected]
* igt@gem_exec_whisper@basic-contexts-forked-all:
- shard-glk: [PASS][82] -> [DMESG-WARN][83] ([i915#118]) +2 similar issues
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-glk6/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-glk2/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- shard-apl: NOTRUN -> [SKIP][84] ([fdo#109271] / [i915#4613])
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl7/igt@[email protected]
* igt@gem_lmem_swapping@heavy-multi:
- shard-kbl: NOTRUN -> [SKIP][85] ([fdo#109271] / [i915#4613])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl7/igt@[email protected]
* igt@gem_lmem_swapping@parallel-multi:
- shard-iclb: NOTRUN -> [SKIP][86] ([i915#4613])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb4/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][87] ([i915#4613])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@[email protected]
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
- shard-apl: NOTRUN -> [SKIP][88] ([fdo#109271] / [i915#1937])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl7/igt@i915_pm_lpsp@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][89] ([i915#3743])
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl5/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0:
- shard-apl: NOTRUN -> [SKIP][90] ([fdo#109271]) +92 similar issues
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/igt@[email protected]
* igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][91] ([fdo#109271] / [i915#3886]) +3 similar issues
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/igt@kms_ccs@pipe-a-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-kbl: NOTRUN -> [SKIP][92] ([fdo#109271] / [i915#3886]) +2 similar issues
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl3/igt@kms_ccs@pipe-a-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][93] ([fdo#109271] / [i915#3886]) +1 similar issue
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl9/igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-iclb: NOTRUN -> [SKIP][94] ([fdo#109278] / [i915#3886])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb4/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-d-crc-primary-basic-yf_tiled_ccs:
- shard-iclb: NOTRUN -> [SKIP][95] ([fdo#109278]) +4 similar issues
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb4/igt@kms_ccs@pipe-d-crc-primary-basic-yf_tiled_ccs.html
- shard-tglb: NOTRUN -> [SKIP][96] ([fdo#111615] / [i915#3689])
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@kms_ccs@pipe-d-crc-primary-basic-yf_tiled_ccs.html
* igt@kms_ccs@pipe-d-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][97] ([i915#3689]) +1 similar issue
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@kms_ccs@pipe-d-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_rc_ccs:
- shard-kbl: NOTRUN -> [SKIP][98] ([fdo#109271]) +102 similar issues
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl6/igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_rc_ccs.html
* igt@kms_chamelium@dp-hpd-with-enabled-mode:
- shard-iclb: NOTRUN -> [SKIP][99] ([fdo#109284] / [fdo#111827]) +2 similar issues
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb8/igt@[email protected]
* igt@kms_chamelium@vga-hpd:
- shard-apl: NOTRUN -> [SKIP][100] ([fdo#109271] / [fdo#111827]) +6 similar issues
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl7/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-negative:
- shard-tglb: NOTRUN -> [SKIP][101] ([fdo#109284] / [fdo#111827]) +1 similar issue
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-gamma:
- shard-kbl: NOTRUN -> [SKIP][102] ([fdo#109271] / [fdo#111827]) +7 similar issues
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl6/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-0-5:
- shard-skl: NOTRUN -> [SKIP][103] ([fdo#109271] / [fdo#111827]) +2 similar issues
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl9/igt@[email protected]
* igt@kms_content_protection@atomic:
- shard-kbl: NOTRUN -> [TIMEOUT][104] ([i915#1319])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl3/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-512x512-random:
- shard-iclb: NOTRUN -> [SKIP][105] ([fdo#109278] / [fdo#109279])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb4/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][106] ([fdo#109279] / [i915#3359])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][107] -> [FAIL][108] ([i915#2346] / [i915#533])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-skl8/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-kbl: NOTRUN -> [SKIP][109] ([fdo#109271] / [i915#533])
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl6/igt@[email protected]
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: NOTRUN -> [INCOMPLETE][110] ([i915#180] / [i915#636])
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl1/igt@[email protected]
* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [PASS][111] -> [DMESG-WARN][112] ([i915#180]) +1 similar issue
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-apl7/igt@kms_flip@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl8/igt@kms_flip@[email protected]
* igt@kms_flip@flip-vs-suspend@b-vga1:
- shard-snb: [PASS][113] -> [SKIP][114] ([fdo#109271])
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-snb6/igt@kms_flip@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-snb6/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling:
- shard-glk: [PASS][115] -> [FAIL][116] ([i915#4911])
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-glk4/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-glk8/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling:
- shard-iclb: [PASS][117] -> [SKIP][118] ([i915#3701])
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-iclb6/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-downscaling.html
* igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite:
- shard-tglb: NOTRUN -> [SKIP][119] ([fdo#109280] / [fdo#111825]) +2 similar issues
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@kms_frontbuffer_tracking@fbc-2p-primscrn-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-pwrite:
- shard-iclb: NOTRUN -> [SKIP][120] ([fdo#109280]) +2 similar issues
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-spr-indfb-draw-pwrite.html
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][121] -> [FAIL][122] ([fdo#108145] / [i915#265])
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-skl1/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl1/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][123] ([fdo#108145] / [i915#265]) +1 similar issue
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/igt@[email protected]
* igt@kms_plane_lowres@pipe-b-tiling-x:
- shard-iclb: NOTRUN -> [SKIP][124] ([i915#3536])
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb8/igt@[email protected]
* igt@kms_plane_lowres@pipe-d-tiling-y:
- shard-tglb: NOTRUN -> [SKIP][125] ([i915#3536])
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-apl: NOTRUN -> [SKIP][126] ([fdo#109271] / [i915#658])
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/igt@[email protected]
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][127] -> [SKIP][128] ([fdo#109441]) +2 similar issues
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb1/igt@kms_psr@psr2_no_drrs.html
* igt@kms_psr@psr2_sprite_mmap_cpu:
- shard-tglb: NOTRUN -> [FAIL][129] ([i915#132] / [i915#3467])
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglb2/igt@kms_psr@psr2_sprite_mmap_cpu.html
- shard-iclb: NOTRUN -> [SKIP][130] ([fdo#109441])
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb4/igt@kms_psr@psr2_sprite_mmap_cpu.html
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][131] ([IGT#2])
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl6/igt@kms_sysfs_edid_timing.html
* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [PASS][132] -> [DMESG-WARN][133] ([i915#180] / [i915#295])
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-kbl3/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl1/igt@[email protected]
* igt@kms_vblank@pipe-c-ts-continuation-dpms-suspend:
- shard-skl: [PASS][134] -> [INCOMPLETE][135] ([i915#4939])
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-skl9/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl3/igt@[email protected]
* igt@kms_writeback@writeback-check-output:
- shard-apl: NOTRUN -> [SKIP][136] ([fdo#109271] / [i915#2437]) +1 similar issue
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-apl7/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-skl: [PASS][137] -> [FAIL][138] ([i915#1542])
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-skl1/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl7/igt@[email protected]
* igt@sysfs_clients@sema-10:
- shard-kbl: NOTRUN -> [SKIP][139] ([fdo#109271] / [i915#2994])
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-kbl6/igt@[email protected]
#### Possible fixes ####
* igt@api_intel_allocator@fork-simple-stress:
- {shard-rkl}: [INCOMPLETE][140] -> [PASS][141]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-rkl-5/igt@[email protected]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-rkl-1/igt@[email protected]
* igt@gem_ctx_isolation@preservation-s3@vcs0:
- shard-skl: [INCOMPLETE][142] ([i915#4793]) -> [PASS][143]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-skl8/igt@gem_ctx_isolation@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl5/igt@gem_ctx_isolation@[email protected]
* igt@gem_ctx_persistence@many-contexts:
- {shard-tglu}: [INCOMPLETE][144] -> [PASS][145] +1 similar issue
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglu-7/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-8/igt@[email protected]
* igt@gem_exec_fair@basic-deadline:
- shard-iclb: [FAIL][146] ([i915#2846]) -> [PASS][147]
[146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-iclb7/igt@[email protected]
[147]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb6/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [FAIL][148] ([i915#2842]) -> [PASS][149]
[148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-iclb3/igt@gem_exec_fair@[email protected]
[149]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-iclb7/igt@gem_exec_fair@[email protected]
* igt@gem_lmem_swapping@smem-oom@lmem0:
- {shard-dg1}: [DMESG-WARN][150] ([i915#4936]) -> [PASS][151]
[150]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-dg1-15/igt@gem_lmem_swapping@[email protected]
[151]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-dg1-18/igt@gem_lmem_swapping@[email protected]
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- {shard-dg1}: [SKIP][152] -> [PASS][153]
[152]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-dg1-18/igt@i915_pm_lpsp@[email protected]
[153]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-dg1-16/igt@i915_pm_lpsp@[email protected]
* igt@i915_pm_rpm@dpms-non-lpsp:
- {shard-dg1}: [SKIP][154] ([i915#1397]) -> [PASS][155]
[154]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-dg1-15/igt@[email protected]
[155]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-dg1-18/igt@[email protected]
* igt@i915_pm_rps@basic-api:
- {shard-dg1}: [FAIL][156] ([i915#4032]) -> [PASS][157]
[156]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-dg1-12/igt@[email protected]
[157]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-dg1-15/igt@[email protected]
* igt@i915_suspend@forcewake:
- shard-skl: [INCOMPLETE][158] ([i915#636]) -> [PASS][159]
[158]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-skl9/igt@[email protected]
[159]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl9/igt@[email protected]
* igt@kms_big_fb@x-tiled-32bpp-rotate-0:
- shard-glk: [DMESG-WARN][160] ([i915#118]) -> [PASS][161]
[160]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-glk8/igt@[email protected]
[161]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-glk6/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-256x85-random:
- {shard-tglu}: [FAIL][162] ([i915#1888]) -> [PASS][163]
[162]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-tglu-8/igt@[email protected]
[163]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-tglu-5/igt@[email protected]
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-atomic:
- shard-glk: [FAIL][164] ([i915#72]) -> [PASS][165]
[164]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-glk8/igt@[email protected]
[165]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-glk6/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-skl: [DMESG-WARN][166] ([i915#1982] / [i915#533]) -> [PASS][167]
[166]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-skl10/igt@[email protected]
[167]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-skl7/igt@[email protected]
* igt@kms_cursor_legacy@pipe-c-torture-bo:
- {shard-rkl}: [SKIP][168] ([i915#4070]) -> [PASS][169]
[168]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11052/shard-rkl-2/igt@[email protected]
[169]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/shard-rkl-5/igt@[email protected]
* igt@kms_draw_crc@draw-method-xrgb2101010-mmap-gtt-xtiled:
- {shard-rkl}: [SKIP][170] ([i915#4098]) -> [PASS][171]
[170]: https://intel-gfx-ci.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21935/index.html