Begin enabling Xe_HP SDV and DG2 platforms
v2 cover Begin enabling Xe_HP SDV and DG2 platforms
This series provides some of the initial enablement patches for two upcoming discrete GPUs:
* XeHP SDV: Xe_HP (version 12.50) graphics IP, no display IP
* DG2: Xe_HPG (version 12.55) graphics IP, Xe_LPD (version 13) display IP
Both platforms will need additional enablement patches beyond what's present in this series before they're truly usable, including various LMEM and GuC work that's already happening separately. The new features/functionality that these platforms bring (such as multi-tile support, dedicated compute engines, etc.) may be referenced in passing in some of these patches but will be fully enabled in future series.
v2:
- General rebase and incorporation of r-b's.
- Re-order intel_gt_info and intel_device_info structures to eliminate some unnecessary padding after the size change of intel_engine_mask_t. (Tvrtko)
- Use 'intel_step' mechanisms for revid->stepping mapping. (Jani)
- Drop the DSC patches for now; they need some rework. (Jani)
Akeem G Abodunrin (1):
drm/i915/dg2: Add new LRI reg offsets
Animesh Manna (1):
drm/i915/dg2: Update to bigjoiner path
Ankit Nautiyal (1):
drm/i915/dg2: Configure PCON in DP pre-enable path
Daniele Ceraolo Spurio (1):
drm/i915/xehp: handle new steering options
Gwan-gyeong Mun (1):
drm/i915/dg2: Update lane disable power state during PSR
John Harrison (4):
drm/i915/selftests: Allow for larger engine counts drm/i915/xehp: Extra media engines - Part 1 (engine definitions) drm/i915/xehp: Extra media engines - Part 2 (interrupts) drm/i915/xehp: Extra media engines - Part 3 (reset)
José Roberto de Souza (1):
drm/i915/dg2: Add DG2 to the PSR2 defeature list
Lucas De Marchi (4):
drm/i915: Add XE_HP initial definitions drm/i915/xehpsdv: add initial XeHP SDV definitions drm/i915/xehpsdv: Define MOCS table for XeHP SDV drm/i915/xehpsdv: factor out function to read RP_STATE_CAP
Matt Roper (29):
drm/i915/xehp: Xe_HP forcewake support
drm/i915/xehp: Define multicast register ranges drm/i915/xehp: Loop over all gslices for INSTDONE processing drm/i915/xehpsdv: Add maximum sseu limits drm/i915/xehpsdv: Define steering tables drm/i915/xehpsdv: Read correct RP_STATE_CAP register drm/i915/dg2: add DG2 platform info
drm/i915/dg2: DG2 uses the same sseu limits as XeHP SDV drm/i915/dg2: Add forcewake table
drm/i915/dg2: Update LNCF steering ranges drm/i915/dg2: Add SQIDI steering
drm/i915/dg2: Maintain backward-compatible nested batch behavior drm/i915/dg2: Report INSTDONE_GEOM values in error state drm/i915/dg2: Define MOCS table for DG2
drm/i915/dg2: Add fake PCH
drm/i915/dg2: Add cdclk table and reference clock drm/i915/dg2: Skip shared DPLL handling
drm/i915/dg2: Don't wait for AUX power well enable ACKs drm/i915/dg2: Setup display outputs
drm/i915/dg2: Add dbuf programming
drm/i915/dg2: Don't program BW_BUDDY registers drm/i915/dg2: Don't read DRAM info
drm/i915/dg2: DG2 has fixed memory bandwidth drm/i915/dg2: Add MPLLB programming for SNPS PHY drm/i915/dg2: Add MPLLB programming for HDMI drm/i915/dg2: Add vswing programming for SNPS phys drm/i915/dg2: Update modeset sequences
drm/i915/dg2: Classify DG2 PHY types
drm/i915/dg2: Wait for SNPS PHY calibration during display init
Matthew Auld (1):
drm/i915/xehp: Changes to ss/eu definitions
Paulo Zanoni (1):
drm/i915: Fork DG1 interrupt handler
Prathap Kumar Valsan (1):
drm/i915/xehp: New engine context offsets
Stuart Summers (2):
drm/i915/xehp: Handle new device context ID format drm/i915/xehpsdv: Add compute DSS type
Tvrtko Ursulin (1):
drm/i915/xehp: VDBOX/VEBOX fusing registers are enable-based
Venkata Sandeep Dhanalakota (1):
drm/i915/gen12: Use fuse info to enable SFC
drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_bw.c | 24 +- drivers/gpu/drm/i915/display/intel_cdclk.c | 24 +- drivers/gpu/drm/i915/display/intel_ddi.c | 161 +++- drivers/gpu/drm/i915/display/intel_display.c | 94 +- drivers/gpu/drm/i915/display/intel_display.h | 1 + .../drm/i915/display/intel_display_power.c | 25 + .../drm/i915/display/intel_display_power.h | 10 + .../drm/i915/display/intel_display_types.h | 17 +- drivers/gpu/drm/i915/display/intel_dpll.c | 12 +- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 5 +- drivers/gpu/drm/i915/display/intel_hdmi.c | 11 + drivers/gpu/drm/i915/display/intel_psr.c | 10 +- drivers/gpu/drm/i915/display/intel_snps_phy.c | 862 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 35 + drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 8 +- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 +- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 144 ++- drivers/gpu/drm/i915/gt/intel_engine_types.h | 29 +- .../drm/i915/gt/intel_execlists_submission.c | 78 +- drivers/gpu/drm/i915/gt/intel_gt.c | 66 +- drivers/gpu/drm/i915/gt/intel_gt.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 13 +- drivers/gpu/drm/i915/gt/intel_gt_types.h | 12 +- drivers/gpu/drm/i915/gt/intel_lrc.c | 156 +++- drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 2 + drivers/gpu/drm/i915/gt/intel_mocs.c | 66 +- drivers/gpu/drm/i915/gt/intel_region_lmem.c | 1 + drivers/gpu/drm/i915/gt/intel_reset.c | 6 + drivers/gpu/drm/i915/gt/intel_rps.c | 19 +- drivers/gpu/drm/i915/gt/intel_rps.h | 1 + drivers/gpu/drm/i915/gt/intel_sseu.c | 116 ++- drivers/gpu/drm/i915/gt/intel_sseu.h | 20 +- drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 2 +- drivers/gpu/drm/i915/gt/intel_workarounds.c | 175 +++- drivers/gpu/drm/i915/gt/selftest_execlists.c | 10 +- .../gpu/drm/i915/gt/selftest_workarounds.c | 32 +- drivers/gpu/drm/i915/i915_debugfs.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 36 +- drivers/gpu/drm/i915/i915_getparam.c | 6 +- drivers/gpu/drm/i915/i915_gpu_error.c | 36 +- drivers/gpu/drm/i915/i915_irq.c | 141 ++- drivers/gpu/drm/i915/i915_pci.c | 63 +- drivers/gpu/drm/i915/i915_perf.c | 29 +- drivers/gpu/drm/i915/i915_reg.h | 109 ++- drivers/gpu/drm/i915/intel_device_info.c | 2 + drivers/gpu/drm/i915/intel_device_info.h | 11 +- drivers/gpu/drm/i915/intel_dram.c | 6 +- drivers/gpu/drm/i915/intel_pch.c | 3 + drivers/gpu/drm/i915/intel_pch.h | 2 + drivers/gpu/drm/i915/intel_pm.c | 120 ++- drivers/gpu/drm/i915/intel_step.c | 30 +- drivers/gpu/drm/i915/intel_step.h | 1 + drivers/gpu/drm/i915/intel_uncore.c | 367 ++++++-- drivers/gpu/drm/i915/intel_uncore.h | 14 +- drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + include/uapi/drm/i915_drm.h | 3 - 57 files changed, 2959 insertions(+), 286 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.c create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.h
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/50 drm/i915: Add XE_HP initial definitions
From: Lucas De Marchi <[email protected]>
Our _FEATURES macro went back to GEN7, extending each other, making it difficult to grasp what was really enabled/disabled. Take the opportunity of the GEN -> XE_HP name break and also break with the feature inheritance.
For XE_HP this basically goes from GEN12 back to GEN7 coalescing the features making sure the overrides remain, remove all the display-specific features and sort it.
Then also remove the definitions that would be overridden by DGFX_FEATURES and those that were 0 (since that is the default). Exception here is has_master_unit_irq: although it is a feature that started with DG1 and is true for all DGFX platforms, it's also true for XE_HP in general.
--- drivers/gpu/drm/i915/i915_pci.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/gpu/drm/i915/i915_pci.c +24 -0
@@ -995,6 +995,30 @@ static const struct intel_device_info adl_p_info = { };#undef GEN + +#define XE_HP_PAGE_SIZES \ + .page_sizes = I915_GTT_PAGE_SIZE_4K | \ + I915_GTT_PAGE_SIZE_64K | \ + I915_GTT_PAGE_SIZE_2M + +#define XE_HP_FEATURES \ + .graphics_ver = 12, \ + .graphics_rel = 50, \ + XE_HP_PAGE_SIZES, \ + .dma_mask_size = 46, \ + .has_64bit_reloc = 1, \ + .has_global_mocs = 1, \ + .has_gt_uc = 1, \ + .has_llc = 1, \ + .has_logical_ring_contexts = 1, \ + .has_logical_ring_elsq = 1, \ + .has_rc6 = 1, \ + .has_reset_engine = 1, \ + .has_rps = 1, \ + .has_runtime_pm = 1, \ + .ppgtt_size = 48, \ + .ppgtt_type = INTEL_PPGTT_FULL +#undef PLATFORM/*
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 01/50] drm/i915: Add XE_HP initial definitions
Quoted 11 lines · Matt Roper
From: Lucas De Marchi <[email protected]>
Our
_FEATURESmacro went back to GEN7, extending each other, making it difficult to grasp what was really enabled/disabled. Take the opportunity of the GEN ->XE_HPname break and also break with the feature inheritance.For
XE_HPthis basically goes from GEN12 back to GEN7 coalescing the features making sure the overrides remain, remove all the display-specific features and sort it.
Quoted 5 lines
Then also remove the definitions that would be overridden by
DGFX_FEATURESand those that were 0 (since that is the default). Exception here ishas_master_unit_irq: although it is a feature that started with DG1 and is true for all DGFX platforms, it's also true forXE_HPin general.
Quoted 32 lines
Signed-off-by Lucas De Marchi <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_pci.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)drivers/gpu/drm/i915/i915_pci.c +17
-0@@ -995,6 +995,30 @@ static const struct intel_device_info adl_p_info = { };#undef GEN + +#define XE_HP_PAGE_SIZES \ + .page_sizes = I915_GTT_PAGE_SIZE_4K | \ + I915_GTT_PAGE_SIZE_64K | \ + I915_GTT_PAGE_SIZE_2M + +#define XE_HP_FEATURES \ + .graphics_ver = 12, \ + .graphics_rel = 50, \ + XE_HP_PAGE_SIZES, \ + .dma_mask_size = 46, \ + .has_64bit_reloc = 1, \ + .has_global_mocs = 1, \ + .has_gt_uc = 1, \ + .has_llc = 1, \ + .has_logical_ring_contexts = 1, \ + .has_logical_ring_elsq = 1, \
drivers/gpu/drm/i915/i915_pci.c static const struct intel_device_info adl_p_info = { · line 1024
Quoted 10 lines
drivers/gpu/drm/i915/i915_pci.c +7
-0+ .has_rc6 = 1, \ + .has_reset_engine = 1, \ + .has_rps = 1, \ + .has_runtime_pm = 1, \ + .ppgtt_size = 48, \ + .ppgtt_type = INTEL_PPGTT_FULL +#undef PLATFORM/*
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 2/50 drm/i915: Fork DG1 interrupt handler
In reply to Matt RoperFrom: Paulo Zanoni <[email protected]>
The current interrupt handler is getting increasingly complicated and Xe_HP changes will bring even more complexity. Let's split off a new interrupt handler starting with DG1 (i.e., when the master tile interrupt register was added to the design) and use that as the basis for the new Xe_HP changes.
Now that we track the hardware IP's release number as well as the version number, we can also properly define DG1 has version "12.10" and replace the has_master_unit_irq feature flag with an IP version test.
Bspec: 50875
--- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 139 +++++++++++++++-------- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_device_info.h | 1 - 5 files changed, 95 insertions(+), 53 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -1648,8 +1648,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_LOGICAL_RING_ELSQ (dev_priv) \ (INTEL_INFO(dev_priv)->has_logical_ring_elsq) -#define HAS_MASTER_UNIT_IRQ (dev_priv) (INTEL_INFO(dev_priv)->has_master_unit_irq) -#define HAS_EXECLISTS (dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)#define INTEL_PPGTT (dev_priv) (INTEL_INFO(dev_priv)->ppgtt_type)
drivers/gpu/drm/i915/i915_irq.c +92 -47
216 lines not on this page · raw message
drivers/gpu/drm/i915/i915_pci.c +1 -1
@@ -907,7 +907,6 @@ static const struct intel_device_info rkl_info = {#define DGFX_FEATURES \ .memory_regions = REGION_SMEM | REGION_LMEM | REGION_STOLEN_LMEM, \ - .has_master_unit_irq = 1, \ .has_llc = 0, \ .has_snoop = 1, \ .is_dgfx = 1
@@ -915,6 +914,7 @@ static const struct intel_device_info rkl_info = {static const struct intel_device_info dg1_info__maybe_unused = {GEN12_FEATURES ,DGFX_FEATURES , + .graphics_rel =10 ,PLATFORM (INTEL_DG1 ), .pipe_mask =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_C ) |BIT (PIPE_D ), .require_force_probe =1 ,
drivers/gpu/drm/i915/i915_reg.h +2 -2
@@ -7985,9 +7985,9 @@ enum {#define GEN11_GT_DW1_IRQ (1 << 1)#define GEN11_GT_DW0_IRQ (1 << 0) -#define DG1_MSTR_UNIT_INTR _MMIO(0x190008) +#define DG1_MSTR_TILE_INTR _MMIO(0x190008)#define DG1_MSTR_IRQ REG_BIT(31) -#define DG1_MSTR_UNIT (u) REG_BIT(u) +#define DG1_MSTR_TILE (t) REG_BIT(t)#define GEN11_DISPLAY_INT_CTL _MMIO(0x44200)#define GEN11_DISPLAY_IRQ_ENABLE (1 << 31)
drivers/gpu/drm/i915/intel_device_info.h +0 -1
@@ -127,7 +127,6 @@ enum intel_ppgtt_type {func (has_llc); \func (has_logical_ring_contexts); \func (has_logical_ring_elsq); \ -func (has_master_unit_irq); \func (has_pooled_eu); \func (has_rc6); \func (has_rc6p); \
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 02/50] drm/i915: Fork DG1 interrupt handler
Quoted 12 lines · Matt Roper
From: Paulo Zanoni <[email protected]>
The current interrupt handler is getting increasingly complicated and
Xe_HPchanges will bring even more complexity. Let's split off a new interrupt handler starting with DG1 (i.e., when the master tile interrupt register was added to the design) and use that as the basis for the newXe_HPchanges.Now that we track the hardware IP's release number as well as the version number, we can also properly define DG1 has version "12.10" and replace the
has_master_unit_irqfeature flag with an IP version test.
Quoted 7 lines
Bspec: 50875
Cc Daniele Spurio Ceraolo <[email protected]>Cc Stuart Summers <[email protected]>Signed-off-by Paulo Zanoni <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Signed-off-by Tomasz Lis <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 305 lines
--- drivers/gpu/drm/i915/i915_drv.h | 2 - drivers/gpu/drm/i915/i915_irq.c | 139 +++++++++++++++-------- drivers/gpu/drm/i915/i915_pci.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 4 +- drivers/gpu/drm/i915/intel_device_info.h | 1 - 5 files changed, 95 insertions(+), 53 deletions(-)drivers/gpu/drm/i915/i915_drv.h +0
-2@@ -1648,8 +1648,6 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_LOGICAL_RING_ELSQ (dev_priv) \ (INTEL_INFO(dev_priv)->has_logical_ring_elsq) -#define HAS_MASTER_UNIT_IRQ (dev_priv) (INTEL_INFO(dev_priv)->has_master_unit_irq) -#define HAS_EXECLISTS (dev_priv) HAS_LOGICAL_RING_CONTEXTS(dev_priv)#define INTEL_PPGTT (dev_priv) (INTEL_INFO(dev_priv)->ppgtt_type)drivers/gpu/drm/i915/i915_irq.c +92
-47@@ -2698,11 +2698,9 @@ gen11_display_irq_handler(struct drm_i915_private *i915)enable_rpm_wakeref_asserts (&i915->runtime_pm); } -static __always_inline irqreturn_t -__gen11_irq_handler (struct drm_i915_private *const i915, -u32 (*intr_disable)(void __iomem *const regs), -void (*intr_enable)(void __iomem *const regs)) +static irqreturn_t gen11_irq_handler (int irq,void *arg) { +struct drm_i915_private *i915 = arg;void __iomem *const regs = i915->uncore.regs;struct intel_gt *gt = &i915->gt;u32 master_ctl;@@ -2711,9 +2709,9 @@ __gen11_irq_handler(struct drm_i915_private * const i915,if (!intel_irqs_enabled (i915))return IRQ_NONE ; - master_ctl =intr_disable (regs); + master_ctl =gen11_master_intr_disable (regs);if (!master_ctl) { -intr_enable (regs); +gen11_master_intr_enable (regs);return IRQ_NONE ; }@@ -2726,7 +2724,7 @@ __gen11_irq_handler(struct drm_i915_private * const i915, gu_misc_iir =gen11_gu_misc_irq_ack (gt, master_ctl); -intr_enable (regs); +gen11_master_intr_enable (regs);gen11_gu_misc_irq_handler (gt, gu_misc_iir);@@ -2735,51 +2733,69 @@ __gen11_irq_handler(struct drm_i915_private * const i915,return IRQ_HANDLED ; } -static irqreturn_t gen11_irq_handler (int irq,void *arg) -{ -return __gen11_irq_handler (arg, - gen11_master_intr_disable, - gen11_master_intr_enable); -} - -static u32 dg1_master_intr_disable_and_ack (void __iomem *const regs) +static inline u32 dg1_master_intr_disable (void __iomem *const regs) {u32 val;/* First disable interrupts */ -raw_reg_write (regs,DG1_MSTR_UNIT_INTR ,0 ); +raw_reg_write (regs,DG1_MSTR_TILE_INTR ,0 );/* Get the indication levels and ack the master unit */ - val =raw_reg_read (regs,DG1_MSTR_UNIT_INTR ); + val =raw_reg_read (regs,DG1_MSTR_TILE_INTR );if (unlikely (!val))return 0 ; -raw_reg_write (regs,DG1_MSTR_UNIT_INTR , val); - -/* -* Now with master disabled, get a sample of level indications -* for this interrupt and ack them right away - we keep GEN11_MASTER_IRQ -* out as this bit doesn't exist anymore for DG1 -*/ - val =raw_reg_read (regs,GEN11_GFX_MSTR_IRQ ) & ~GEN11_MASTER_IRQ ; -if (unlikely (!val)) -return 0 ; - -raw_reg_write (regs,GEN11_GFX_MSTR_IRQ , val); +raw_reg_write (regs,DG1_MSTR_TILE_INTR , val);return val; }static inline void dg1_master_intr_enable (void __iomem *const regs) { -raw_reg_write (regs,DG1_MSTR_UNIT_INTR ,DG1_MSTR_IRQ ); +raw_reg_write (regs,DG1_MSTR_TILE_INTR ,DG1_MSTR_IRQ ); }static irqreturn_t dg1_irq_handler (int irq,void *arg) { -return __gen11_irq_handler (arg, - dg1_master_intr_disable_and_ack, - dg1_master_intr_enable); +struct drm_i915_private *const i915 = arg; +struct intel_gt *gt = &i915->gt; +void __iomem *const regs = i915->uncore.regs; +u32 master_tile_ctl, master_ctl; +u32 gu_misc_iir; + +if (!intel_irqs_enabled (i915)) +return IRQ_NONE ; + + master_tile_ctl =dg1_master_intr_disable (regs); +if (!master_tile_ctl) { +dg1_master_intr_enable (regs); +return IRQ_NONE ; + } + +/* FIXME: we only support tile 0 for now. */ +if (master_tile_ctl &DG1_MSTR_TILE (0 )) { + master_ctl =raw_reg_read (regs,GEN11_GFX_MSTR_IRQ ); +raw_reg_write (regs,GEN11_GFX_MSTR_IRQ , master_ctl); + }else { +DRM_ERROR ("Tile not supported: 0x%08x\n" , master_tile_ctl); +dg1_master_intr_enable (regs); +return IRQ_NONE ; + } + +gen11_gt_irq_handler (gt, master_ctl); + +if (master_ctl &GEN11_DISPLAY_IRQ ) +gen11_display_irq_handler (i915); + + gu_misc_iir =gen11_gu_misc_irq_ack (gt, master_ctl); + +dg1_master_intr_enable (regs); + +gen11_gu_misc_irq_handler (gt, gu_misc_iir); + +pmu_irq_stats (i915,IRQ_HANDLED ); + +return IRQ_HANDLED ; }/* Called from drm generic code, passed 'crtc' which @@ -3167,10 +3183,20 @@ static void gen11_irq_reset(struct drm_i915_private *dev_priv) {struct intel_uncore *uncore = &dev_priv->uncore; -if (HAS_MASTER_UNIT_IRQ (dev_priv)) -dg1_master_intr_disable_and_ack (dev_priv->uncore.regs); -else -gen11_master_intr_disable (dev_priv->uncore.regs); +gen11_master_intr_disable (dev_priv->uncore.regs); + +gen11_gt_irq_reset (&dev_priv->gt); +gen11_display_irq_reset (dev_priv); + +GEN3_IRQ_RESET (uncore,GEN11_GU_MISC_ ); +GEN3_IRQ_RESET (uncore,GEN8_PCU_ ); +} + +static void dg1_irq_reset (struct drm_i915_private *dev_priv) +{ +struct intel_uncore *uncore = &dev_priv->uncore; + +dg1_master_intr_disable (dev_priv->uncore.regs);gen11_gt_irq_reset (&dev_priv->gt);gen11_display_irq_reset (dev_priv);@@ -3862,13 +3888,28 @@ static void gen11_irq_postinstall(struct drm_i915_private *dev_priv)GEN3_IRQ_INIT (uncore,GEN11_GU_MISC_ , ~gu_misc_masked, gu_misc_masked); -if (HAS_MASTER_UNIT_IRQ (dev_priv)) { -dg1_master_intr_enable (uncore->regs); -intel_uncore_posting_read (&dev_priv->uncore,DG1_MSTR_UNIT_INTR ); - }else { -gen11_master_intr_enable (uncore->regs); -intel_uncore_posting_read (&dev_priv->uncore,GEN11_GFX_MSTR_IRQ ); +gen11_master_intr_enable (uncore->regs); +intel_uncore_posting_read (&dev_priv->uncore,GEN11_GFX_MSTR_IRQ ); +} + +static void dg1_irq_postinstall (struct drm_i915_private *dev_priv) +{ +struct intel_uncore *uncore = &dev_priv->uncore; +u32 gu_misc_masked =GEN11_GU_MISC_GSE ; + +gen11_gt_irq_postinstall (&dev_priv->gt); + +GEN3_IRQ_INIT (uncore,GEN11_GU_MISC_ , ~gu_misc_masked, gu_misc_masked); + +if (HAS_DISPLAY (dev_priv)) { +icp_irq_postinstall (dev_priv); +gen8_de_irq_postinstall (dev_priv); +intel_uncore_write (&dev_priv->uncore,GEN11_DISPLAY_INT_CTL , +GEN11_DISPLAY_IRQ_ENABLE ); } + +dg1_master_intr_enable (dev_priv->uncore.regs); +intel_uncore_posting_read (&dev_priv->uncore,DG1_MSTR_TILE_INTR ); }static void cherryview_irq_postinstall (struct drm_i915_private *dev_priv)@@ -4407,9 +4448,9 @@ static irq_handler_t intel_irq_handler(struct drm_i915_private *dev_priv)else return i8xx_irq_handler; }else { -if (HAS_MASTER_UNIT_IRQ (dev_priv)) +if (GRAPHICS_VER_FULL (dev_priv) >=IP_VER (12 ,10 ))return dg1_irq_handler; -if (GRAPHICS_VER (dev_priv) >=11 ) +else if (GRAPHICS_VER (dev_priv) >=11 )return gen11_irq_handler;else if (GRAPHICS_VER (dev_priv) >=8 )return gen8_irq_handler;@@ -4432,7 +4473,9 @@ static void intel_irq_reset(struct drm_i915_private *dev_priv)else i8xx_irq_reset (dev_priv); }else { -if (GRAPHICS_VER (dev_priv) >=11 ) +if (GRAPHICS_VER_FULL (dev_priv) >=IP_VER (12 ,10 )) +dg1_irq_reset (dev_priv); +else if (GRAPHICS_VER (dev_priv) >=11 )gen11_irq_reset (dev_priv);else if (GRAPHICS_VER (dev_priv) >=8 )gen8_irq_reset (dev_priv);@@ -4455,7 +4498,9 @@ static void intel_irq_postinstall(struct drm_i915_private *dev_priv)else i8xx_irq_postinstall (dev_priv); }else { -if (GRAPHICS_VER (dev_priv) >=11 ) +if (GRAPHICS_VER_FULL (dev_priv) >=IP_VER (12 ,10 )) +dg1_irq_postinstall (dev_priv); +else if (GRAPHICS_VER (dev_priv) >=11 )gen11_irq_postinstall (dev_priv);else if (GRAPHICS_VER (dev_priv) >=8 )gen8_irq_postinstall (dev_priv);drivers/gpu/drm/i915/i915_pci.c +1
-1@@ -907,7 +907,6 @@ static const struct intel_device_info rkl_info = {#define DGFX_FEATURES \ .memory_regions = REGION_SMEM | REGION_LMEM | REGION_STOLEN_LMEM, \ - .has_master_unit_irq = 1, \ .has_llc = 0, \ .has_snoop = 1, \ .is_dgfx = 1@@ -915,6 +914,7 @@ static const struct intel_device_info rkl_info = {static const struct intel_device_info dg1_info__maybe_unused = {GEN12_FEATURES ,DGFX_FEATURES , + .graphics_rel =10 ,PLATFORM (INTEL_DG1 ), .pipe_mask =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_C ) |BIT (PIPE_D ), .require_force_probe =1 ,drivers/gpu/drm/i915/i915_reg.h +2
-2@@ -7985,9 +7985,9 @@ enum {#define GEN11_GT_DW1_IRQ (1 << 1)#define GEN11_GT_DW0_IRQ (1 << 0) -#define DG1_MSTR_UNIT_INTR _MMIO(0x190008) +#define DG1_MSTR_TILE_INTR _MMIO(0x190008)#define DG1_MSTR_IRQ REG_BIT(31) -#define DG1_MSTR_UNIT (u) REG_BIT(u) +#define DG1_MSTR_TILE (t) REG_BIT(t)#define GEN11_DISPLAY_INT_CTL _MMIO(0x44200)#define GEN11_DISPLAY_IRQ_ENABLE (1 << 31)drivers/gpu/drm/i915/intel_device_info.h +0
-1@@ -127,7 +127,6 @@ enum intel_ppgtt_type {func (has_llc); \func (has_logical_ring_contexts); \func (has_logical_ring_elsq); \ -func (has_master_unit_irq); \func (has_pooled_eu); \func (has_rc6); \func (has_rc6p); \Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 3/50 drm/i915/xehp: VDBOX/VEBOX fusing registers are enable-based
In reply to Matt RoperFrom: Tvrtko Ursulin <[email protected]>
On Xe_HP the fusing register is renamed and changed to have the "enable" semantics, but otherwise remains compatible (mmio address, bitmask ranges) with older platforms.
To simplify things we do not add a new register definition but just stop inverting the fusing masks before processing them.
Bspec: 52615
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +8 -1
@@ -468,7 +468,14 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)if (GRAPHICS_VER (i915) <11 )return info->engine_mask; - media_fuse = ~intel_uncore_read (uncore,GEN11_GT_VEBOX_VDBOX_DISABLE ); +/* +* On newer platforms the fusing register is called 'enable' and has +* enable semantics, while on older platforms it is called 'disable' +* and bits have disable semantices. +*/ + media_fuse =intel_uncore_read (uncore,GEN11_GT_VEBOX_VDBOX_DISABLE ); +if (GRAPHICS_VER_FULL (i915) <IP_VER (12 ,50 )) + media_fuse = ~media_fuse; vdbox_mask = media_fuse &GEN11_GT_VDBOX_DISABLE_MASK ; vebox_mask = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 03/50] drm/i915/xehp: VDBOX/VEBOX fusing registers are enable-based
Quoted 6 lines · Matt Roper
From: Tvrtko Ursulin <[email protected]>
On
Xe_HPthe fusing register is renamed and changed to have the "enable" semantics, but otherwise remains compatible (mmio address, bitmask ranges) with older platforms.
Quoted 8 lines
To simplify things we do not add a new register definition but just stop inverting the fusing masks before processing them.
Bspec: 52615
Cc Daniele Ceraolo Spurio <[email protected]>Signed-off-by Tvrtko Ursulin <[email protected]>Signed-off-by Matt Roper <[email protected]>Reviewed-by Lucas De Marchi <[email protected]>
Quoted 31 lines
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gt/intel_engine_cs.c +8
-1@@ -468,7 +468,14 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)if (GRAPHICS_VER (i915) <11 )return info->engine_mask; - media_fuse = ~intel_uncore_read (uncore,GEN11_GT_VEBOX_VDBOX_DISABLE ); +/* +* On newer platforms the fusing register is called 'enable' and has +* enable semantics, while on older platforms it is called 'disable' +* and bits have disable semantices. +*/ + media_fuse =intel_uncore_read (uncore,GEN11_GT_VEBOX_VDBOX_DISABLE ); +if (GRAPHICS_VER_FULL (i915) <IP_VER (12 ,50 )) + media_fuse = ~media_fuse; vdbox_mask = media_fuse &GEN11_GT_VDBOX_DISABLE_MASK ; vebox_mask = (media_fuse & GEN11_GT_VEBOX_DISABLE_MASK) >>Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 4/50 drm/i915/gen12: Use fuse info to enable SFC
In reply to Matt RoperFrom: Venkata Sandeep Dhanalakota <[email protected]>
In Gen12 there are various fuse combinations and in each configuration vdbox engine may be connected to SFC depending on which engines are available, so we need to set the SFC capability based on fuse value from the hardware. Even numbered physical instance always have SFC, odd numbered physical instances have SFC only if previous even instance is fused off.
v2:
- Minor style & typo fixes (Tvrtko)
- Drop an unwanted 'inline' (Tvrtko)
Bspec: 48028
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 30 ++++++++++++++++++----- 1 file changed, 24 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +24 -6
@@ -442,6 +442,28 @@ void intel_engines_free(struct intel_gt *gt) } } +static +bool gen11_vdbox_has_sfc (struct drm_i915_private *i915, +unsigned int physical_vdbox, +unsigned int logical_vdbox,u16 vdbox_mask) +{ +/* +* In Gen11, only even numbered logical VDBOXes are hooked +* up to an SFC (Scaler & Format Converter) unit. +* In Gen12, Even numbered physical instance always are connected +* to an SFC. Odd numbered physical instances have SFC only if +* previous even instance is fused off. +*/ +if (GRAPHICS_VER (i915) ==12 ) +return (physical_vdbox %2 ==0 ) || + !(BIT (physical_vdbox -1 ) & vdbox_mask); +else if (GRAPHICS_VER (i915) ==11 ) +return logical_vdbox %2 ==0 ; + +MISSING_CASE (GRAPHICS_VER (i915)); +return false; +} +/* * Determine which engines are fused off in our particular hardware. * Note that we have a catch-22 situation where we need to be able to access
@@ -493,13 +515,9 @@ static intel_engine_mask_t init_engine_mask(struct intel_gt *gt)continue ; } -/* -* In Gen11, only even numbered logical VDBOXes are -* hooked up to an SFC (Scaler & Format Converter) unit. -* In TGL each VDBOX has access to an SFC. -*/ -if (GRAPHICS_VER (i915) >=12 || logical_vdbox++ %2 ==0 ) +if (gen11_vdbox_has_sfc (i915, i, logical_vdbox, vdbox_mask)) gt->info.vdbox_sfc_access |=BIT (i); + logical_vdbox++; }drm_dbg (&i915->drm,"vdbox enable: %04x, instances: %04lx\n" , vdbox_mask,VDBOX_MASK (gt));
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 5/50 drm/i915/selftests: Allow for larger engine counts
In reply to Matt RoperFrom: John Harrison <[email protected]>
Increasing the engine count causes a couple of local array variables to exceed the kernel stack limit. So make them dynamic allocations instead.
--- drivers/gpu/drm/i915/gt/selftest_execlists.c | 10 ++++-- .../gpu/drm/i915/gt/selftest_workarounds.c | 32 ++++++++++++------- 2 files changed, 29 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/gt/selftest_execlists.c +8 -2
@@ -3561,12 +3561,16 @@ static int smoke_crescendo(struct preempt_smoke *smoke, unsigned int flags)#define BATCH BIT(0) {struct task_struct *tsk[I915_NUM_ENGINES ] = {}; -struct preempt_smoke arg[I915_NUM_ENGINES ]; +struct preempt_smoke *arg;struct intel_engine_cs *engine;enum intel_engine_id id;unsigned long count;int err =0 ; + arg =kmalloc_array (I915_NUM_ENGINES ,sizeof (*arg),GFP_KERNEL ); +if (!arg) +return -ENOMEM ; +for_each_engine (engine, smoke->gt, id) { arg[id] = *smoke; arg[id].engine = engine;
@@ -3574,7 +3578,7 @@ static int smoke_crescendo(struct preempt_smoke *smoke, unsigned int flags) arg[id].batch =NULL ; arg[id].count =0 ; - tsk[id] =kthread_run (smoke_crescendo_thread, &arg, + tsk[id] =kthread_run (smoke_crescendo_thread, arg,"igt/smoke:%d" , id);if (IS_ERR (tsk[id])) { err =PTR_ERR (tsk[id]);
@@ -3603,6 +3607,8 @@ static int smoke_crescendo(struct preempt_smoke *smoke, unsigned int flags)pr_info ("Submitted %lu crescendo:%x requests across %d engines and %d contexts\n" , count, flags, smoke->gt->info.num_engines, smoke->ncontext); + +kfree (arg);return 0 ; }
drivers/gpu/drm/i915/gt/selftest_workarounds.c +21 -11
@@ -1175,31 +1175,36 @@ live_gpu_reset_workarounds(void *arg) {struct intel_gt *gt = arg;intel_wakeref_t wakeref; -struct wa_lists lists; +struct wa_lists *lists;bool ok;if (!intel_has_gpu_reset (gt))return 0 ; + lists =kzalloc (sizeof (*lists),GFP_KERNEL ); +if (!lists) +return -ENOMEM ; +pr_info ("Verifying after GPU reset...\n" );igt_global_reset_lock (gt); wakeref =intel_runtime_pm_get (gt->uncore->rpm); -reference_lists_init (gt, &lists); +reference_lists_init (gt, lists); - ok =verify_wa_lists (gt, &lists,"before reset" ); + ok =verify_wa_lists (gt, lists,"before reset" );if (!ok) goto out;intel_gt_reset (gt,ALL_ENGINES ,"live_workarounds" ); - ok =verify_wa_lists (gt, &lists,"after reset" ); + ok =verify_wa_lists (gt, lists,"after reset" ); out: -reference_lists_fini (gt, &lists); +reference_lists_fini (gt, lists);intel_runtime_pm_put (gt->uncore->rpm, wakeref);igt_global_reset_unlock (gt); +kfree (lists);return ok ?0 : -ESRCH ; }
@@ -1214,16 +1219,20 @@ live_engine_reset_workarounds(void *arg)struct igt_spinner spin;struct i915_request *rq;intel_wakeref_t wakeref; -struct wa_lists lists; +struct wa_lists *lists;int ret =0 ;if (!intel_has_reset_engine (gt))return 0 ; + lists =kzalloc (sizeof (*lists),GFP_KERNEL ); +if (!lists) +return -ENOMEM ; +igt_global_reset_lock (gt); wakeref =intel_runtime_pm_get (gt->uncore->rpm); -reference_lists_init (gt, &lists); +reference_lists_init (gt, lists);for_each_engine (engine, gt, id) {bool ok;
@@ -1235,7 +1244,7 @@ live_engine_reset_workarounds(void *arg)break ; } - ok =verify_wa_lists (gt, &lists,"before reset" ); + ok =verify_wa_lists (gt, lists,"before reset" );if (!ok) { ret = -ESRCH ; goto err;
@@ -1247,7 +1256,7 @@ live_engine_reset_workarounds(void *arg) goto err; } - ok =verify_wa_lists (gt, &lists,"after idle reset" ); + ok =verify_wa_lists (gt, lists,"after idle reset" );if (!ok) { ret = -ESRCH ; goto err;
@@ -1282,7 +1291,7 @@ live_engine_reset_workarounds(void *arg)igt_spinner_end (&spin);igt_spinner_fini (&spin); - ok =verify_wa_lists (gt, &lists,"after busy reset" ); + ok =verify_wa_lists (gt, lists,"after busy reset" );if (!ok) { ret = -ESRCH ; goto err;
@@ -1294,9 +1303,10 @@ live_engine_reset_workarounds(void *arg)break ; } -reference_lists_fini (gt, &lists); +reference_lists_fini (gt, lists);intel_runtime_pm_put (gt->uncore->rpm, wakeref);igt_global_reset_unlock (gt); +kfree (lists);igt_flush_test (gt->i915);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 6/50 drm/i915/xehp: Extra media engines - Part 1 (engine definitions)
In reply to Matt RoperFrom: John Harrison <[email protected]>
Xe_HP can have a lot of extra media engines. This patch adds the basic definitions for them.
v2:
- Re-order intel_gt_info and intel_device_info slightly to avoid unnecessary padding now that we've increased the size of intel_engine_mask_t. (Tvrtko)
--- drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 ++- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 50 ++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_engine_types.h | 14 ++++-- drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 +- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_device_info.h | 3 +- 6 files changed, 74 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/gt/gen8_engine_cs.c +3 -4
@@ -279,7 +279,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode)if (mode &EMIT_INVALIDATE ) aux_inv = rq->engine->mask & ~BIT (BCS0 );if (aux_inv) - cmd +=2 *hweight8 (aux_inv) +2 ; + cmd +=2 *hweight32 (aux_inv) +2 ; cs =intel_ring_begin (rq, cmd);if (IS_ERR (cs))
@@ -313,9 +313,8 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode)struct intel_engine_cs *engine;unsigned int tmp; - *cs++ =MI_LOAD_REGISTER_IMM (hweight8 (aux_inv)); -for_each_engine_masked (engine, rq->engine->gt, - aux_inv, tmp) { + *cs++ =MI_LOAD_REGISTER_IMM (hweight32 (aux_inv)); +for_each_engine_masked (engine, rq->engine->gt, aux_inv, tmp) { *cs++ =i915_mmio_reg_offset (aux_inv_reg (engine)); *cs++ =AUX_INV ; }
drivers/gpu/drm/i915/gt/intel_engine_cs.c +50 -0
68 lines not on this page · raw message
drivers/gpu/drm/i915/gt/intel_engine_types.h +10 -4
@@ -46,7 +46,7 @@#define COPY_ENGINE_CLASS 3#define OTHER_CLASS 4#define MAX_ENGINE_CLASS 4 -#define MAX_ENGINE_INSTANCE 3 +#define MAX_ENGINE_INSTANCE 7#define I915_MAX_SLICES 3#define I915_MAX_SUBSLICES 8
@@ -64,7 +64,7 @@ struct intel_gt;struct intel_ring ;struct intel_uncore ; -typedef u8 intel_engine_mask_t ; +typedef u32 intel_engine_mask_t ;#define ALL_ENGINES ((intel_engine_mask_t)~0ul)struct intel_hw_status_page {
@@ -101,8 +101,8 @@ struct i915_ctx_workarounds {struct i915_vma *vma; }; -#define I915_MAX_VCS 4 -#define I915_MAX_VECS 2 +#define I915_MAX_VCS 8 +#define I915_MAX_VECS 4/* * Engine IDs definitions.
@@ -115,9 +115,15 @@ enum intel_engine_id {VCS1 ,VCS2 ,VCS3 , +VCS4 , +VCS5 , +VCS6 , +VCS7 , #define _VCS(n) (VCS0 + (n))VECS0 ,VECS1 , +VECS2 , +VECS3 , #define _VECS(n) (VECS0 + (n)) I915_NUM_ENGINES #define INVALID_ENGINE ((enum intel_engine_id)-1)
drivers/gpu/drm/i915/gt/intel_gt_types.h +3 -2
@@ -174,13 +174,14 @@ struct intel_gt {struct intel_gt_info {intel_engine_mask_t engine_mask; + +u32 l3bank_mask; +u8 num_engines;/* Media engine access to SFC per instance */ u8 vdbox_sfc_access; -u32 l3bank_mask; -/* Slice/subslice/EU info */ struct sseu_dev_info sseu; } info;
drivers/gpu/drm/i915/i915_reg.h +6 -0
@@ -2516,9 +2516,15 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_BSD2_RING_BASE 0x1c4000#define GEN11_BSD3_RING_BASE 0x1d0000#define GEN11_BSD4_RING_BASE 0x1d4000 +#define XEHP_BSD5_RING_BASE 0x1e0000 +#define XEHP_BSD6_RING_BASE 0x1e4000 +#define XEHP_BSD7_RING_BASE 0x1f0000 +#define XEHP_BSD8_RING_BASE 0x1f4000#define VEBOX_RING_BASE 0x1a000#define GEN11_VEBOX_RING_BASE 0x1c8000#define GEN11_VEBOX2_RING_BASE 0x1d8000 +#define XEHP_VEBOX3_RING_BASE 0x1e8000 +#define XEHP_VEBOX4_RING_BASE 0x1f8000#define BLT_RING_BASE 0x22000#define RING_TAIL (base) _MMIO((base) + 0x30)#define RING_HEAD (base) _MMIO((base) + 0x34)
drivers/gpu/drm/i915/intel_device_info.h +2 -1
@@ -166,7 +166,6 @@ struct intel_device_info {u8 media_ver;u8 media_rel; -u8 gt;/* GT number, 0 if undefined */ intel_engine_mask_t platform_engine_mask;/* Engines supported by the HW */ enum intel_platform platform;
@@ -182,6 +181,8 @@ struct intel_device_info {u32 display_mmio_offset; +u8 gt;/* GT number, 0 if undefined */ +u8 pipe_mask;u8 cpu_transcoder_mask;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 06/50] drm/i915/xehp: Extra media engines - Part 1 (engine definitions)
Quoted 53 lines · Matt Roper
From: John Harrison <[email protected]>
Xe_HPcan have a lot of extra media engines. This patch adds the basic definitions for them.v2:
- Re-orderintel_gt_infoandintel_device_infoslightly to avoid unnecessary padding now that we've increased the size ofintel_engine_mask_t. (Tvrtko)Cc Tvrtko Ursulin <[email protected]>Signed-off-by John Harrison <[email protected]>Signed-off-by Tomas Winkler <[email protected]>Signed-off-by Matt Roper <[email protected]>---
drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 ++- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 50 ++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_engine_types.h | 14 ++++-- drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 +- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_device_info.h | 3 +- 6 files changed, 74 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/gt/gen8_engine_cs.c +3
-4@@ -279,7 +279,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode)if (mode &EMIT_INVALIDATE ) aux_inv = rq->engine->mask & ~BIT (BCS0 );if (aux_inv) - cmd +=2 *hweight8 (aux_inv) +2 ; + cmd +=2 *hweight32 (aux_inv) +2 ; cs =intel_ring_begin (rq, cmd);if (IS_ERR (cs))@@ -313,9 +313,8 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode)struct intel_engine_cs *engine;unsigned int tmp; - *cs++ =MI_LOAD_REGISTER_IMM (hweight8 (aux_inv)); -for_each_engine_masked (engine, rq->engine->gt, - aux_inv, tmp) { + *cs++ =MI_LOAD_REGISTER_IMM (hweight32 (aux_inv)); +for_each_engine_masked (engine, rq->engine->gt, aux_inv, tmp) { *cs++ =i915_mmio_reg_offset (aux_inv_reg (engine)); *cs++ =AUX_INV ; }drivers/gpu/drm/i915/gt/intel_engine_cs.c +0
-0
drivers/gpu/drm/i915/gt/intel_engine_cs.c static const struct engine_info intel_engines[] = { · line 108
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +2
-0@@ -104,6 +104,38 @@ static const struct engine_info intel_engines[] = { { .graphics_ver = 11, .base = GEN11_BSD4_RING_BASE } }, }, + [VCS4] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */
I may be misreading this, but hw_id is only used by RING_FAULT_REG() which is not actually used since gen8... they are using GEN8_RING_FAULT_REG().
I'm having a hard time to understand what this comment "see MI_SEMAPHORE_SIGNAL" actually means.
I'd just remove all these .hw_id = 0, ... together with the comment since it will be zero-initiliazed.
Lucas De Marchi
Quoted 183 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +48
-0+ .class = VIDEO_DECODE_CLASS, + .instance = 4, + .mmio_bases = { + { .graphics_ver = 11, .base = XEHP_BSD5_RING_BASE } + }, + }, + [VCS5] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_DECODE_CLASS, + .instance = 5, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_BSD6_RING_BASE } + }, + }, + [VCS6] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_DECODE_CLASS, + .instance = 6, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_BSD7_RING_BASE } + }, + }, + [VCS7] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_DECODE_CLASS, + .instance = 7, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_BSD8_RING_BASE } + }, + }, [VECS0] = { .hw_id = VECS0_HW, .class = VIDEO_ENHANCEMENT_CLASS,@@ -121,6 +153,22 @@ static const struct engine_info intel_engines[] = { { .graphics_ver = 11, .base = GEN11_VEBOX2_RING_BASE } }, }, + [VECS2 ] = { + .hw_id =0 ,/* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class =VIDEO_ENHANCEMENT_CLASS , + .instance =2 , + .mmio_bases = { + { .graphics_ver =12 , .base =XEHP_VEBOX3_RING_BASE } + }, + }, + [VECS3 ] = { + .hw_id =0 ,/* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class =VIDEO_ENHANCEMENT_CLASS , + .instance =3 , + .mmio_bases = { + { .graphics_ver =12 , .base =XEHP_VEBOX4_RING_BASE } + }, + }, };/** @@ -269,6 +317,8 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id)BUILD_BUG_ON (MAX_ENGINE_CLASS >=BIT (GEN11_ENGINE_CLASS_WIDTH ));BUILD_BUG_ON (MAX_ENGINE_INSTANCE >=BIT (GEN11_ENGINE_INSTANCE_WIDTH )); +BUILD_BUG_ON (I915_MAX_VCS > (MAX_ENGINE_INSTANCE +1 )); +BUILD_BUG_ON (I915_MAX_VECS > (MAX_ENGINE_INSTANCE +1 ));if (GEM_DEBUG_WARN_ON (id >=ARRAY_SIZE (gt->engine)))return -EINVAL ;drivers/gpu/drm/i915/gt/intel_engine_types.h +10
-4@@ -46,7 +46,7 @@#define COPY_ENGINE_CLASS 3#define OTHER_CLASS 4#define MAX_ENGINE_CLASS 4 -#define MAX_ENGINE_INSTANCE 3 +#define MAX_ENGINE_INSTANCE 7#define I915_MAX_SLICES 3#define I915_MAX_SUBSLICES 8@@ -64,7 +64,7 @@ struct intel_gt;struct intel_ring ;struct intel_uncore ; -typedef u8 intel_engine_mask_t ; +typedef u32 intel_engine_mask_t ;#define ALL_ENGINES ((intel_engine_mask_t)~0ul)struct intel_hw_status_page {@@ -101,8 +101,8 @@ struct i915_ctx_workarounds {struct i915_vma *vma; }; -#define I915_MAX_VCS 4 -#define I915_MAX_VECS 2 +#define I915_MAX_VCS 8 +#define I915_MAX_VECS 4/* * Engine IDs definitions. @@ -115,9 +115,15 @@ enum intel_engine_id {VCS1 ,VCS2 ,VCS3 , +VCS4 , +VCS5 , +VCS6 , +VCS7 , #define _VCS(n) (VCS0 + (n))VECS0 ,VECS1 , +VECS2 , +VECS3 , #define _VECS(n) (VECS0 + (n)) I915_NUM_ENGINES #define INVALID_ENGINE ((enum intel_engine_id)-1)drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-2@@ -174,13 +174,14 @@ struct intel_gt {struct intel_gt_info {intel_engine_mask_t engine_mask; + +u32 l3bank_mask; +u8 num_engines;/* Media engine access to SFC per instance */ u8 vdbox_sfc_access; -u32 l3bank_mask; -/* Slice/subslice/EU info */ struct sseu_dev_info sseu; } info;drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -2516,9 +2516,15 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_BSD2_RING_BASE 0x1c4000#define GEN11_BSD3_RING_BASE 0x1d0000#define GEN11_BSD4_RING_BASE 0x1d4000 +#define XEHP_BSD5_RING_BASE 0x1e0000 +#define XEHP_BSD6_RING_BASE 0x1e4000 +#define XEHP_BSD7_RING_BASE 0x1f0000 +#define XEHP_BSD8_RING_BASE 0x1f4000#define VEBOX_RING_BASE 0x1a000#define GEN11_VEBOX_RING_BASE 0x1c8000#define GEN11_VEBOX2_RING_BASE 0x1d8000 +#define XEHP_VEBOX3_RING_BASE 0x1e8000 +#define XEHP_VEBOX4_RING_BASE 0x1f8000#define BLT_RING_BASE 0x22000#define RING_TAIL (base) _MMIO((base) + 0x30)#define RING_HEAD (base) _MMIO((base) + 0x34)drivers/gpu/drm/i915/intel_device_info.h +2
-1@@ -166,7 +166,6 @@ struct intel_device_info {u8 media_ver;u8 media_rel; -u8 gt;/* GT number, 0 if undefined */ intel_engine_mask_t platform_engine_mask;/* Engines supported by the HW */ enum intel_platform platform;@@ -182,6 +181,8 @@ struct intel_device_info {u32 display_mmio_offset; +u8 gt;/* GT number, 0 if undefined */ +u8 pipe_mask;u8 cpu_transcoder_mask;Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 06/50] drm/i915/xehp: Extra media engines - Part 1 (engine definitions)
Quoted 66 lines · Lucas De Marchi
Quoted 55 lines · Matt Roper
From: John Harrison <[email protected]>
Xe_HPcan have a lot of extra media engines. This patch adds the basic definitions for them.v2:
- Re-orderintel_gt_infoandintel_device_infoslightly to avoid unnecessary padding now that we've increased the size of intel_engine_mask_t. (Tvrtko)Cc Tvrtko Ursulin <[email protected]>Signed-off-by John Harrison <[email protected]>Signed-off-by Tomas Winkler <[email protected]>Signed-off-by Matt Roper <[email protected]>---
drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 ++- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 50 ++++++++++++++++++++drivers/gpu/drm/i915/gt/intel_engine_types.h| 14 ++++-- drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 +- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_device_info.h | 3 +-6 files changed, 74 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/gt/gen8_engine_cs.c +1
-1@@ -279,7 +279,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode) if (mode & EMIT_INVALIDATE) aux_inv = rq->engine->mask & ~BIT(BCS0); if (aux_inv) - cmd += 2 * hweight8(aux_inv) + 2; + cmd += 2 * hweight32(aux_inv) + 2; cs = intel_ring_begin(rq, cmd);if (
IS_ERR(cs))drivers/gpu/drm/i915/gt/gen8_engine_cs.c +2
-3@@ -313,9 +313,8 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode) struct intel_engine_cs *engine; unsigned int tmp; - *cs++ = MI_LOAD_REGISTER_IMM(hweight8(aux_inv)); - for_each_engine_masked(engine, rq->engine->gt, - aux_inv, tmp) { + *cs++ = MI_LOAD_REGISTER_IMM(hweight32(aux_inv)); + for_each_engine_masked(engine, rq->engine->gt, aux_inv, tmp) { *cs++ = i915_mmio_reg_offset(aux_inv_reg(engine)); *cs++ = AUX_INV;}
drivers/gpu/drm/i915/gt/intel_engine_cs.c +0
-0drivers/gpu/drm/i915/gt/intel_engine_cs.c static const struct engine_info intel_engines[] = { · line 108
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +2
-0@@ -104,6 +104,38 @@ static const struct engine_info intel_engines[] = { { .graphics_ver = 11, .base = GEN11_BSD4_RING_BASE } }, }, + [VCS4] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */I may be misreading this, but
hw_idis only used byRING_FAULT_REG()which is not actually used since gen8... they are usingGEN8_RING_FAULT_REG().
Quoted 2 lines
I'm having a hard time to understand what this comment "see
MI_SEMAPHORE_SIGNAL" actually means.
I vaguely recall something about being told the hw_id field was used in semaphore messages from one engine to another. I.e. if engine X is blocked on a semaphore that is signalled by engine Y then the MI_ instruction executed on Y to do the signal needs to specify X as the target. Whereas, on newer hardware this requirement was no longer applicable because MI_SEMAPHORE_SIGNAL uses memory mailboxes instead of directed engine messages. Maybe that information was wrong or maybe that code has since been removed or reworked?
Quoted 4 lines
I'd just remove all these
.hw_id = 0, ...together with the comment since it will be zero-initiliazed.
Yeah, the reason for explicitly setting it to zero was to avoid confusion over whether it had just been forgotten or not. I.e. to say 'we know semaphores used to use this field but honest guv, we didn't forget to add it, it's just that newer hardware doesn't need it'.
John.
Quoted 185 lines
Lucas De Marchi
Quoted 181 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +48
-0+ .class = VIDEO_DECODE_CLASS, + .instance = 4, + .mmio_bases = { + { .graphics_ver = 11, .base = XEHP_BSD5_RING_BASE } + }, + }, + [VCS5] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_DECODE_CLASS, + .instance = 5, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_BSD6_RING_BASE } + }, + }, + [VCS6] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_DECODE_CLASS, + .instance = 6, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_BSD7_RING_BASE } + }, + }, + [VCS7] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_DECODE_CLASS, + .instance = 7, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_BSD8_RING_BASE } + }, + }, [VECS0] = { .hw_id = VECS0_HW, .class = VIDEO_ENHANCEMENT_CLASS,@@ -121,6 +153,22 @@ static const struct engine_info intel_engines[] = { { .graphics_ver = 11, .base = GEN11_VEBOX2_RING_BASE } }, }, + [VECS2] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_ENHANCEMENT_CLASS, + .instance = 2, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_VEBOX3_RING_BASE } + }, + }, + [VECS3] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_ENHANCEMENT_CLASS, + .instance = 3, + .mmio_bases = { + { .graphics_ver = 12, .base = XEHP_VEBOX4_RING_BASE } + }, + }, };/** @@ -269,6 +317,8 @@ static int intel_engine_setup(struct intel_gt *gt, enum intel_engine_id id) BUILD_BUG_ON(MAX_ENGINE_CLASS >= BIT(GEN11_ENGINE_CLASS_WIDTH)); BUILD_BUG_ON(MAX_ENGINE_INSTANCE >= BIT(GEN11_ENGINE_INSTANCE_WIDTH)); + BUILD_BUG_ON(I915_MAX_VCS > (MAX_ENGINE_INSTANCE + 1)); + BUILD_BUG_ON(I915_MAX_VECS > (MAX_ENGINE_INSTANCE + 1)); if (GEM_DEBUG_WARN_ON(id >= ARRAY_SIZE(gt->engine)))return
-EINVAL;drivers/gpu/drm/i915/gt/intel_engine_types.h +10
-4@@ -46,7 +46,7 @@#define COPY_ENGINE_CLASS 3#define OTHER_CLASS 4#define MAX_ENGINE_CLASS 4 -#define MAX_ENGINE_INSTANCE 3 +#define MAX_ENGINE_INSTANCE 7#define I915_MAX_SLICES 3#define I915_MAX_SUBSLICES 8@@ -64,7 +64,7 @@ struct intel_gt;struct intel_ring ;struct intel_uncore ; -typedef u8 intel_engine_mask_t ; +typedef u32 intel_engine_mask_t ;#define ALL_ENGINES ((intel_engine_mask_t)~0ul)struct intel_hw_status_page {@@ -101,8 +101,8 @@ struct i915_ctx_workarounds { struct i915_vma *vma; }; -#define I915_MAX_VCS 4 -#define I915_MAX_VECS 2 +#define I915_MAX_VCS 8 +#define I915_MAX_VECS 4/* * Engine IDs definitions. @@ -115,9 +115,15 @@ enum intel_engine_id { VCS1, VCS2, VCS3, + VCS4, + VCS5, + VCS6, + VCS7, #define _VCS(n) (VCS0 + (n)) VECS0, VECS1, + VECS2, + VECS3, #define _VECS(n) (VECS0 + (n))I915_NUM_ENGINES
#defineINVALID_ENGINE((enum intel_engine_id)-1)drivers/gpu/drm/i915/gt/intel_gt_types.h +3
-2@@ -174,13 +174,14 @@ struct intel_gt { struct intel_gt_info { intel_engine_mask_t engine_mask; + + u32 l3bank_mask; + u8 num_engines; /* Media engine access to SFC per instance */ u8 vdbox_sfc_access; - u32 l3bank_mask; - /* Slice/subslice/EU info */ struct sseu_dev_info sseu; } info;drivers/gpu/drm/i915/i915_reg.h +6
-0@@ -2516,9 +2516,15 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_BSD2_RING_BASE 0x1c4000#define GEN11_BSD3_RING_BASE 0x1d0000#define GEN11_BSD4_RING_BASE 0x1d4000 +#define XEHP_BSD5_RING_BASE 0x1e0000 +#define XEHP_BSD6_RING_BASE 0x1e4000 +#define XEHP_BSD7_RING_BASE 0x1f0000 +#define XEHP_BSD8_RING_BASE 0x1f4000#define VEBOX_RING_BASE 0x1a000#define GEN11_VEBOX_RING_BASE 0x1c8000#define GEN11_VEBOX2_RING_BASE 0x1d8000 +#define XEHP_VEBOX3_RING_BASE 0x1e8000 +#define XEHP_VEBOX4_RING_BASE 0x1f8000#define BLT_RING_BASE 0x22000#define RING_TAIL (base) _MMIO((base) + 0x30)#define RING_HEAD(base)
_MMIO((base) + 0x34)drivers/gpu/drm/i915/intel_device_info.h +0
-1@@ -166,7 +166,6 @@ struct intel_device_info { u8 media_ver; u8 media_rel; - u8 gt; /* GT number, 0 if undefined */intel_engine_mask_t
platform_engine_mask; /* Engines supported by the HW */enum
intel_platformplatform;drivers/gpu/drm/i915/intel_device_info.h +2
-0@@ -182,6 +181,8 @@ struct intel_device_info { u32 display_mmio_offset; + u8 gt; /* GT number, 0 if undefined */ + u8 pipe_mask; u8 cpu_transcoder_mask;Signature · 1 line
2.25.4
Quoted 8 lines
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 06/50] drm/i915/xehp: Extra media engines - Part 1 (engine definitions)
Quoted 69 lines · John Harrison
Quoted 66 lines · Lucas De Marchi
Quoted 55 lines · Matt Roper
From: John Harrison <[email protected]>
Xe_HPcan have a lot of extra media engines. This patch adds the basic definitions for them.v2:
- Re-orderintel_gt_infoandintel_device_infoslightly to avoid unnecessary padding now that we've increased the size of intel_engine_mask_t. (Tvrtko)Cc Tvrtko Ursulin <[email protected]>Signed-off-by John Harrison <[email protected]>Signed-off-by Tomas Winkler <[email protected]>Signed-off-by Matt Roper <[email protected]>---
drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 ++- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 50 ++++++++++++++++++++drivers/gpu/drm/i915/gt/intel_engine_types.h| 14 ++++-- drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 +- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_device_info.h | 3 +-6 files changed, 74 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/gt/gen8_engine_cs.c +1
-1@@ -279,7 +279,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode) if (mode & EMIT_INVALIDATE) aux_inv = rq->engine->mask & ~BIT(BCS0); if (aux_inv) - cmd += 2 * hweight8(aux_inv) + 2; + cmd += 2 * hweight32(aux_inv) + 2; cs = intel_ring_begin(rq, cmd);if (
IS_ERR(cs))drivers/gpu/drm/i915/gt/gen8_engine_cs.c +2
-3@@ -313,9 +313,8 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode) struct intel_engine_cs *engine; unsigned int tmp; - *cs++ = MI_LOAD_REGISTER_IMM(hweight8(aux_inv)); - for_each_engine_masked(engine, rq->engine->gt, - aux_inv, tmp) { + *cs++ = MI_LOAD_REGISTER_IMM(hweight32(aux_inv)); + for_each_engine_masked(engine, rq->engine->gt, aux_inv, tmp) { *cs++ = i915_mmio_reg_offset(aux_inv_reg(engine)); *cs++ = AUX_INV;}
drivers/gpu/drm/i915/gt/intel_engine_cs.c +0
-0drivers/gpu/drm/i915/gt/intel_engine_cs.c static const struct engine_info intel_engines[] = { · line 108
Quoted 5 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +2
-0@@ -104,6 +104,38 @@ static const struct engine_info intel_engines[] = { { .graphics_ver = 11, .base = GEN11_BSD4_RING_BASE } }, }, + [VCS4] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */I may be misreading this, but
hw_idis only used byRING_FAULT_REG()which is not actually used since gen8... they are usingGEN8_RING_FAULT_REG().Quoted 2 lines
I'm having a hard time to understand what this comment "see
MI_SEMAPHORE_SIGNAL" actually means.
Quoted 8 lines
I vaguely recall something about being told the
hw_idfield was used in semaphore messages from one engine to another. I.e. if engine X is blocked on a semaphore that is signalled by engine Y then theMI_instruction executed on Y to do the signal needs to specify X as the target. Whereas, on newer hardware this requirement was no longer applicable becauseMI_SEMAPHORE_SIGNALuses memory mailboxes instead of directed engine messages. Maybe that information was wrong or maybe that code has since been removed or reworked?Quoted 4 lines
I'd just remove all these
.hw_id = 0, ...together with the comment since it will be zero-initiliazed.Yeah, the reason for explicitly setting it to zero was to avoid confusion over whether it had just been forgotten or not. I.e. to say 'we know semaphores used to use this field but honest guv, we didn't forget to add it, it's just that newer hardware doesn't need it'.
makes sense... I just sent a patch series and Cc'ed you all
(https://patchwork.freedesktop.org/series/92797/) actually removing hw_id. I have that feeling I'm missing something, but we can try to simplify.
thanks
Lucas De Marchi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 06/50] drm/i915/xehp: Extra media engines - Part 1 (engine definitions)
In reply to Matt RoperQuoted 53 lines · Matt Roper
From: John Harrison <[email protected]>
Xe_HPcan have a lot of extra media engines. This patch adds the basic definitions for them.v2:
- Re-orderintel_gt_infoandintel_device_infoslightly to avoid unnecessary padding now that we've increased the size ofintel_engine_mask_t. (Tvrtko)Cc Tvrtko Ursulin <[email protected]>Signed-off-by John Harrison <[email protected]>Signed-off-by Tomas Winkler <[email protected]>Signed-off-by Matt Roper <[email protected]>---
drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 7 ++- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 50 ++++++++++++++++++++ drivers/gpu/drm/i915/gt/intel_engine_types.h | 14 ++++-- drivers/gpu/drm/i915/gt/intel_gt_types.h | 5 +- drivers/gpu/drm/i915/i915_reg.h | 6 +++ drivers/gpu/drm/i915/intel_device_info.h | 3 +- 6 files changed, 74 insertions(+), 11 deletions(-)drivers/gpu/drm/i915/gt/gen8_engine_cs.c +3
-4@@ -279,7 +279,7 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode)if (mode &EMIT_INVALIDATE ) aux_inv = rq->engine->mask & ~BIT (BCS0 );if (aux_inv) - cmd +=2 *hweight8 (aux_inv) +2 ; + cmd +=2 *hweight32 (aux_inv) +2 ; cs =intel_ring_begin (rq, cmd);if (IS_ERR (cs))@@ -313,9 +313,8 @@ int gen12_emit_flush_xcs(struct i915_request *rq, u32 mode)struct intel_engine_cs *engine;unsigned int tmp; - *cs++ =MI_LOAD_REGISTER_IMM (hweight8 (aux_inv)); -for_each_engine_masked (engine, rq->engine->gt, - aux_inv, tmp) { + *cs++ =MI_LOAD_REGISTER_IMM (hweight32 (aux_inv)); +for_each_engine_masked (engine, rq->engine->gt, aux_inv, tmp) { *cs++ =i915_mmio_reg_offset (aux_inv_reg (engine)); *cs++ =AUX_INV ; }drivers/gpu/drm/i915/gt/intel_engine_cs.c +0
-0
drivers/gpu/drm/i915/gt/intel_engine_cs.c static const struct engine_info intel_engines[] = { · line 112
Quoted 9 lines
drivers/gpu/drm/i915/gt/intel_engine_cs.c +6
-0@@ -104,6 +104,38 @@ static const struct engine_info intel_engines[] = { { .graphics_ver = 11, .base = GEN11_BSD4_RING_BASE } }, }, + [VCS4] = { + .hw_id = 0, /* not used in GEN12+, see MI_SEMAPHORE_SIGNAL */ + .class = VIDEO_DECODE_CLASS, + .instance = 4, + .mmio_bases = { + { .graphics_ver = 11, .base = XEHP_BSD5_RING_BASE }
another weird thing in this... we are using XEHP_BSD5_RING_BASE, but we set .graphics_ver to 11. Was that a typo? From bspec 11754 and 3293 it seems the register is there, but it doesn't mean it can actually be used according to bspec 21137 and 20189. So I guess it was either a typo or a rebase issue and should be changed to graphics_ver = 12.
thanks
Lucas De Marchi
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 7/50 drm/i915/xehp: Extra media engines - Part 2 (interrupts)
In reply to Matt RoperFrom: John Harrison <[email protected]>
Xe_HP can have a lot of extra media engines. This patch adds the interrupt handler support for them.
--- drivers/gpu/drm/i915/gt/intel_gt_irq.c | 13 ++++++++++++- drivers/gpu/drm/i915/i915_reg.h | 3 +++ 2 files changed, 15 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_gt_irq.c +12 -1
@@ -184,7 +184,13 @@ void gen11_gt_irq_reset(struct intel_gt *gt)intel_uncore_write (uncore,GEN11_BCS_RSVD_INTR_MASK , ~0 );intel_uncore_write (uncore,GEN11_VCS0_VCS1_INTR_MASK , ~0 );intel_uncore_write (uncore,GEN11_VCS2_VCS3_INTR_MASK , ~0 ); +if (HAS_ENGINE (gt,VCS4 ) ||HAS_ENGINE (gt,VCS5 )) +intel_uncore_write (uncore,GEN12_VCS4_VCS5_INTR_MASK , ~0 ); +if (HAS_ENGINE (gt,VCS6 ) ||HAS_ENGINE (gt,VCS7 )) +intel_uncore_write (uncore,GEN12_VCS6_VCS7_INTR_MASK , ~0 );intel_uncore_write (uncore,GEN11_VECS0_VECS1_INTR_MASK , ~0 ); +if (HAS_ENGINE (gt,VECS2 ) ||HAS_ENGINE (gt,VECS3 )) +intel_uncore_write (uncore,GEN12_VECS2_VECS3_INTR_MASK , ~0 );intel_uncore_write (uncore,GEN11_GPM_WGBOXPERF_INTR_ENABLE ,0 );intel_uncore_write (uncore,GEN11_GPM_WGBOXPERF_INTR_MASK , ~0 );
@@ -218,8 +224,13 @@ void gen11_gt_irq_postinstall(struct intel_gt *gt)intel_uncore_write (uncore,GEN11_BCS_RSVD_INTR_MASK , ~smask);intel_uncore_write (uncore,GEN11_VCS0_VCS1_INTR_MASK , ~dmask);intel_uncore_write (uncore,GEN11_VCS2_VCS3_INTR_MASK , ~dmask); +if (HAS_ENGINE (gt,VCS4 ) ||HAS_ENGINE (gt,VCS5 )) +intel_uncore_write (uncore,GEN12_VCS4_VCS5_INTR_MASK , ~dmask); +if (HAS_ENGINE (gt,VCS6 ) ||HAS_ENGINE (gt,VCS7 )) +intel_uncore_write (uncore,GEN12_VCS6_VCS7_INTR_MASK , ~dmask);intel_uncore_write (uncore,GEN11_VECS0_VECS1_INTR_MASK , ~dmask); - +if (HAS_ENGINE (gt,VECS2 ) ||HAS_ENGINE (gt,VECS3 )) +intel_uncore_write (uncore,GEN12_VECS2_VECS3_INTR_MASK , ~dmask);/* * RPS interrupts will get enabled/disabled on demand when RPS itself * is enabled/disabled.
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -8076,7 +8076,10 @@ enum {#define GEN11_BCS_RSVD_INTR_MASK _MMIO(0x1900a0)#define GEN11_VCS0_VCS1_INTR_MASK _MMIO(0x1900a8)#define GEN11_VCS2_VCS3_INTR_MASK _MMIO(0x1900ac) +#define GEN12_VCS4_VCS5_INTR_MASK _MMIO(0x1900b0) +#define GEN12_VCS6_VCS7_INTR_MASK _MMIO(0x1900b4)#define GEN11_VECS0_VECS1_INTR_MASK _MMIO(0x1900d0) +#define GEN12_VECS2_VECS3_INTR_MASK _MMIO(0x1900d4)#define GEN11_GUC_SG_INTR_MASK _MMIO(0x1900e8)#define GEN11_GPM_WGBOXPERF_INTR_MASK _MMIO(0x1900ec)#define GEN11_CRYPTO_RSVD_INTR_MASK _MMIO(0x1900f0)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 8/50 drm/i915/xehp: Extra media engines - Part 3 (reset)
In reply to Matt RoperFrom: John Harrison <[email protected]>
Xe_HP can have a lot of extra media engines. This patch adds the reset support for them.
--- drivers/gpu/drm/i915/gt/intel_reset.c | 6 ++++++ drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/i915/gt/intel_reset.c +6 -0
@@ -515,8 +515,14 @@ static int gen11_reset_engines(struct intel_gt *gt, [VCS1] = GEN11_GRDOM_MEDIA2, [VCS2] = GEN11_GRDOM_MEDIA3, [VCS3] = GEN11_GRDOM_MEDIA4, + [VCS4] = GEN11_GRDOM_MEDIA5, + [VCS5] = GEN11_GRDOM_MEDIA6, + [VCS6] = GEN11_GRDOM_MEDIA7, + [VCS7] = GEN11_GRDOM_MEDIA8, [VECS0] = GEN11_GRDOM_VECS, [VECS1] = GEN11_GRDOM_VECS2, + [VECS2] = GEN11_GRDOM_VECS3, + [VECS3] = GEN11_GRDOM_VECS4, };struct intel_engine_cs *engine;intel_engine_mask_t tmp;
drivers/gpu/drm/i915/i915_reg.h +8 -0
@@ -395,10 +395,18 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_GRDOM_MEDIA2 (1 << 6)#define GEN11_GRDOM_MEDIA3 (1 << 7)#define GEN11_GRDOM_MEDIA4 (1 << 8) +#define GEN11_GRDOM_MEDIA5 (1 << 9) +#define GEN11_GRDOM_MEDIA6 (1 << 10) +#define GEN11_GRDOM_MEDIA7 (1 << 11) +#define GEN11_GRDOM_MEDIA8 (1 << 12)#define GEN11_GRDOM_VECS (1 << 13)#define GEN11_GRDOM_VECS2 (1 << 14) +#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))
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 08/50] drm/i915/xehp: Extra media engines - Part 3 (reset)
Quoted 4 lines · Matt Roper
From: John Harrison <[email protected]>
Xe_HPcan have a lot of extra media engines. This patch adds the reset support for them.
Quoted 40 lines
Signed-off-by John Harrison <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_reset.c | 6 ++++++ drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++ 2 files changed, 14 insertions(+)drivers/gpu/drm/i915/gt/intel_reset.c +6
-0@@ -515,8 +515,14 @@ static int gen11_reset_engines(struct intel_gt *gt, [VCS1] = GEN11_GRDOM_MEDIA2, [VCS2] = GEN11_GRDOM_MEDIA3, [VCS3] = GEN11_GRDOM_MEDIA4, + [VCS4] = GEN11_GRDOM_MEDIA5, + [VCS5] = GEN11_GRDOM_MEDIA6, + [VCS6] = GEN11_GRDOM_MEDIA7, + [VCS7] = GEN11_GRDOM_MEDIA8, [VECS0] = GEN11_GRDOM_VECS, [VECS1] = GEN11_GRDOM_VECS2, + [VECS2] = GEN11_GRDOM_VECS3, + [VECS3] = GEN11_GRDOM_VECS4, };struct intel_engine_cs *engine;intel_engine_mask_t tmp;drivers/gpu/drm/i915/i915_reg.h +4
-0@@ -395,10 +395,18 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_GRDOM_MEDIA2 (1 << 6)#define GEN11_GRDOM_MEDIA3 (1 << 7)#define GEN11_GRDOM_MEDIA4 (1 << 8) +#define GEN11_GRDOM_MEDIA5 (1 << 9) +#define GEN11_GRDOM_MEDIA6 (1 << 10) +#define GEN11_GRDOM_MEDIA7 (1 << 11) +#define GEN11_GRDOM_MEDIA8 (1 << 12)#define GEN11_GRDOM_VECS (1 << 13)
drivers/gpu/drm/i915/i915_reg.h static inline bool i915_mmio_reg_valid(i915_reg_t reg) · line 412
Quoted 10 lines
drivers/gpu/drm/i915/i915_reg.h +4
-0#define GEN11_GRDOM_VECS2 (1 << 14) +#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))
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 08/50] drm/i915/xehp: Extra media engines - Part 3 (reset)
In reply to Matt RoperQuoted 7 lines · Matt Roper
From: John Harrison <[email protected]>
Xe_HPcan have a lot of extra media engines. This patch adds the reset support for them.Signed-off-by John Harrison <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/i915/gt/intel_reset.c | 6 ++++++ drivers/gpu/drm/i915/i915_reg.h | 8 ++++++++ 2 files changed, 14 insertions(+)drivers/gpu/drm/i915/gt/intel_reset.c +6
-0@@ -515,8 +515,14 @@ static int gen11_reset_engines(struct intel_gt *gt, [VCS1] = GEN11_GRDOM_MEDIA2, [VCS2] = GEN11_GRDOM_MEDIA3, [VCS3] = GEN11_GRDOM_MEDIA4, + [VCS4] = GEN11_GRDOM_MEDIA5, + [VCS5] = GEN11_GRDOM_MEDIA6, + [VCS6] = GEN11_GRDOM_MEDIA7, + [VCS7] = GEN11_GRDOM_MEDIA8, [VECS0] = GEN11_GRDOM_VECS, [VECS1] = GEN11_GRDOM_VECS2, + [VECS2] = GEN11_GRDOM_VECS3, + [VECS3] = GEN11_GRDOM_VECS4, };struct intel_engine_cs *engine;intel_engine_mask_t tmp;drivers/gpu/drm/i915/i915_reg.h +8
-0@@ -395,10 +395,18 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_GRDOM_MEDIA2 (1 << 6)#define GEN11_GRDOM_MEDIA3 (1 << 7)#define GEN11_GRDOM_MEDIA4 (1 << 8) +#define GEN11_GRDOM_MEDIA5 (1 << 9) +#define GEN11_GRDOM_MEDIA6 (1 << 10) +#define GEN11_GRDOM_MEDIA7 (1 << 11) +#define GEN11_GRDOM_MEDIA8 (1 << 12)#define GEN11_GRDOM_VECS (1 << 13)#define GEN11_GRDOM_VECS2 (1 << 14) +#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))Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 9/50 drm/i915/xehp: Xe_HP forcewake support
In reply to Matt RoperImplement Xe_HP forcewake handling. While we're at it, let's reorder to the forcewake assignment if/else ladder to match our usual driver conventions.
--- .../drm/i915/gt/intel_execlists_submission.c | 4 + drivers/gpu/drm/i915/intel_uncore.c | 336 +++++++++++++++--- drivers/gpu/drm/i915/intel_uncore.h | 14 +- drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + 4 files changed, 302 insertions(+), 54 deletions(-)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +4 -0
@@ -3306,6 +3306,10 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)i915_mmio_reg_offset (RING_EXECLIST_SQ_CONTENTS (base)); execlists->ctrl_reg = uncore->regs +i915_mmio_reg_offset (RING_EXECLIST_CONTROL (base)); + + engine->fw_domain =intel_uncore_forcewake_for_reg (engine->uncore, +RING_EXECLIST_CONTROL (engine->mmio_base), +FW_REG_WRITE ); }else { execlists->submit_reg = uncore->regs +i915_mmio_reg_offset (RING_ELSP (base));
drivers/gpu/drm/i915/intel_uncore.c +283 -53
412 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.h +13 -1
@@ -52,8 +52,14 @@ enum forcewake_domain_id {FW_DOMAIN_ID_MEDIA_VDBOX1 ,FW_DOMAIN_ID_MEDIA_VDBOX2 ,FW_DOMAIN_ID_MEDIA_VDBOX3 , +FW_DOMAIN_ID_MEDIA_VDBOX4 , +FW_DOMAIN_ID_MEDIA_VDBOX5 , +FW_DOMAIN_ID_MEDIA_VDBOX6 , +FW_DOMAIN_ID_MEDIA_VDBOX7 ,FW_DOMAIN_ID_MEDIA_VEBOX0 ,FW_DOMAIN_ID_MEDIA_VEBOX1 , +FW_DOMAIN_ID_MEDIA_VEBOX2 , +FW_DOMAIN_ID_MEDIA_VEBOX3 ,FW_DOMAIN_ID_COUNT };
@@ -66,10 +72,16 @@ enum forcewake_domains {FORCEWAKE_MEDIA_VDBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX1 ),FORCEWAKE_MEDIA_VDBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX2 ),FORCEWAKE_MEDIA_VDBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX3 ), +FORCEWAKE_MEDIA_VDBOX4 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX4 ), +FORCEWAKE_MEDIA_VDBOX5 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX5 ), +FORCEWAKE_MEDIA_VDBOX6 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX6 ), +FORCEWAKE_MEDIA_VDBOX7 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX7 ),FORCEWAKE_MEDIA_VEBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX0 ),FORCEWAKE_MEDIA_VEBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX1 ), +FORCEWAKE_MEDIA_VEBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX2 ), +FORCEWAKE_MEDIA_VEBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX3 ), -FORCEWAKE_ALL =BIT (FW_DOMAIN_ID_COUNT ) -1 + FORCEWAKE_ALL = BIT(FW_DOMAIN_ID_COUNT) - 1, }; struct intel_uncore_funcs {
drivers/gpu/drm/i915/selftests/intel_uncore.c +2 -0
@@ -68,6 +68,7 @@ static int intel_shadow_table_check(void) { gen8_shadowed_regs, ARRAY_SIZE(gen8_shadowed_regs) }, { gen11_shadowed_regs, ARRAY_SIZE(gen11_shadowed_regs) }, { gen12_shadowed_regs, ARRAY_SIZE(gen12_shadowed_regs) }, + { xehp_shadowed_regs, ARRAY_SIZE(xehp_shadowed_regs) }, };const i915_reg_t *reg;unsigned int i, j;
@@ -103,6 +104,7 @@ int intel_uncore_mock_selftests(void) { __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true }, { __gen11_fw_ranges, ARRAY_SIZE(__gen11_fw_ranges), true }, { __gen12_fw_ranges, ARRAY_SIZE(__gen12_fw_ranges), true }, + { __xehp_fw_ranges, ARRAY_SIZE(__xehp_fw_ranges), true }, };int err, i;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 09/50] drm/i915/xehp: Xe_HP forcewake support
Quoted 8 lines · Matt Roper
Implement
Xe_HPforcewake handling. While we're at it, let's reorder to the forcewake assignment if/else ladder to match our usual driver conventions.Co-authored-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by Stuart Summers <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 512 lines
--- .../drm/i915/gt/intel_execlists_submission.c | 4 + drivers/gpu/drm/i915/intel_uncore.c | 336 +++++++++++++++--- drivers/gpu/drm/i915/intel_uncore.h | 14 +- drivers/gpu/drm/i915/selftests/intel_uncore.c | 2 + 4 files changed, 302 insertions(+), 54 deletions(-)drivers/gpu/drm/i915/gt/intel_execlists_submission.c +4
-0@@ -3306,6 +3306,10 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)i915_mmio_reg_offset (RING_EXECLIST_SQ_CONTENTS (base)); execlists->ctrl_reg = uncore->regs +i915_mmio_reg_offset (RING_EXECLIST_CONTROL (base)); + + engine->fw_domain =intel_uncore_forcewake_for_reg (engine->uncore, +RING_EXECLIST_CONTROL (engine->mmio_base), +FW_REG_WRITE ); }else { execlists->submit_reg = uncore->regs +i915_mmio_reg_offset (RING_ELSP (base));drivers/gpu/drm/i915/intel_uncore.c +283
-53@@ -24,6 +24,8 @@#include <linux/pm_runtime.h> #include <asm/iosf_mbi.h> +#include "gt/intel_lrc_reg.h" /* for shadow reg list */ +#include "i915_drv.h" #include "i915_trace.h" #include "i915_vgpu.h" @@ -68,8 +70,14 @@ static const char * const forcewake_domain_names[] = {"vdbox1" ,"vdbox2" ,"vdbox3" , +"vdbox4" , +"vdbox5" , +"vdbox6" , +"vdbox7" ,"vebox0" ,"vebox1" , +"vebox2" , + "vebox3", }; const char *@@ -952,30 +960,80 @@ static const i915_reg_t gen8_shadowed_regs[] = { };static const i915_reg_t gen11_shadowed_regs[] = { -RING_TAIL (RENDER_RING_BASE ),/* 0x2000 (base) */ -GEN6_RPNSWREQ ,/* 0xA008 */ -GEN6_RC_VIDEO_FREQ ,/* 0xA00C */ -RING_TAIL (BLT_RING_BASE ),/* 0x22000 (base) */ -RING_TAIL (GEN11_BSD_RING_BASE ),/* 0x1C0000 (base) */ -RING_TAIL (GEN11_BSD2_RING_BASE ),/* 0x1C4000 (base) */ -RING_TAIL (GEN11_VEBOX_RING_BASE ),/* 0x1C8000 (base) */ -RING_TAIL (GEN11_BSD3_RING_BASE ),/* 0x1D0000 (base) */ -RING_TAIL (GEN11_BSD4_RING_BASE ),/* 0x1D4000 (base) */ -RING_TAIL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8000 (base) */ +RING_TAIL (RENDER_RING_BASE ),/* 0x2000 (base) */ +RING_EXECLIST_CONTROL (RENDER_RING_BASE ),/* 0x2550 */ +GEN6_RPNSWREQ ,/* 0xA008 */ +GEN6_RC_VIDEO_FREQ ,/* 0xA00C */ +RING_TAIL (BLT_RING_BASE ),/* 0x22000 (base) */ +RING_EXECLIST_CONTROL (BLT_RING_BASE ),/* 0x22550 */ +RING_TAIL (GEN11_BSD_RING_BASE ),/* 0x1C0000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD_RING_BASE ),/* 0x1C0550 */ +RING_TAIL (GEN11_BSD2_RING_BASE ),/* 0x1C4000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD2_RING_BASE ),/* 0x1C4550 */ +RING_TAIL (GEN11_VEBOX_RING_BASE ),/* 0x1C8000 (base) */ +RING_EXECLIST_CONTROL (GEN11_VEBOX_RING_BASE ),/* 0x1C8550 */ +RING_TAIL (GEN11_BSD3_RING_BASE ),/* 0x1D0000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD3_RING_BASE ),/* 0x1D0550 */ +RING_TAIL (GEN11_BSD4_RING_BASE ),/* 0x1D4000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD4_RING_BASE ),/* 0x1D4550 */ +RING_TAIL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8000 (base) */ +RING_EXECLIST_CONTROL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8550 */ /* TODO: Other registers are not yet used */ };static const i915_reg_t gen12_shadowed_regs[] = { -RING_TAIL (RENDER_RING_BASE ),/* 0x2000 (base) */ -GEN6_RPNSWREQ ,/* 0xA008 */ -GEN6_RC_VIDEO_FREQ ,/* 0xA00C */ -RING_TAIL (BLT_RING_BASE ),/* 0x22000 (base) */ -RING_TAIL (GEN11_BSD_RING_BASE ),/* 0x1C0000 (base) */ -RING_TAIL (GEN11_BSD2_RING_BASE ),/* 0x1C4000 (base) */ -RING_TAIL (GEN11_VEBOX_RING_BASE ),/* 0x1C8000 (base) */ -RING_TAIL (GEN11_BSD3_RING_BASE ),/* 0x1D0000 (base) */ -RING_TAIL (GEN11_BSD4_RING_BASE ),/* 0x1D4000 (base) */ -RING_TAIL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8000 (base) */ +RING_TAIL (RENDER_RING_BASE ),/* 0x2000 (base) */ +RING_EXECLIST_CONTROL (RENDER_RING_BASE ),/* 0x2550 */ +GEN6_RPNSWREQ ,/* 0xA008 */ +GEN6_RC_VIDEO_FREQ ,/* 0xA00C */ +RING_TAIL (BLT_RING_BASE ),/* 0x22000 (base) */ +RING_EXECLIST_CONTROL (BLT_RING_BASE ),/* 0x22550 */ +RING_TAIL (GEN11_BSD_RING_BASE ),/* 0x1C0000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD_RING_BASE ),/* 0x1C0550 */ +RING_TAIL (GEN11_BSD2_RING_BASE ),/* 0x1C4000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD2_RING_BASE ),/* 0x1C4550 */ +RING_TAIL (GEN11_VEBOX_RING_BASE ),/* 0x1C8000 (base) */ +RING_EXECLIST_CONTROL (GEN11_VEBOX_RING_BASE ),/* 0x1C8550 */ +RING_TAIL (GEN11_BSD3_RING_BASE ),/* 0x1D0000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD3_RING_BASE ),/* 0x1D0550 */ +RING_TAIL (GEN11_BSD4_RING_BASE ),/* 0x1D4000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD4_RING_BASE ),/* 0x1D4550 */ +RING_TAIL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8000 (base) */ +RING_EXECLIST_CONTROL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8550 */ +/* TODO: Other registers are not yet used */ +}; + +static const i915_reg_t xehp_shadowed_regs[] = { +RING_TAIL (RENDER_RING_BASE ),/* 0x2000 (base) */ +RING_EXECLIST_CONTROL (RENDER_RING_BASE ),/* 0x2550 */ +GEN6_RPNSWREQ ,/* 0xA008 */ +GEN6_RC_VIDEO_FREQ ,/* 0xA00C */ +RING_TAIL (BLT_RING_BASE ),/* 0x22000 (base) */ +RING_EXECLIST_CONTROL (BLT_RING_BASE ),/* 0x22550 */ +RING_TAIL (GEN11_BSD_RING_BASE ),/* 0x1C0000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD_RING_BASE ),/* 0x1C0550 */ +RING_TAIL (GEN11_BSD2_RING_BASE ),/* 0x1C4000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD2_RING_BASE ),/* 0x1C4550 */ +RING_TAIL (GEN11_VEBOX_RING_BASE ),/* 0x1C8000 (base) */ +RING_EXECLIST_CONTROL (GEN11_VEBOX_RING_BASE ),/* 0x1C8550 */ +RING_TAIL (GEN11_BSD3_RING_BASE ),/* 0x1D0000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD3_RING_BASE ),/* 0x1D0550 */ +RING_TAIL (GEN11_BSD4_RING_BASE ),/* 0x1D4000 (base) */ +RING_EXECLIST_CONTROL (GEN11_BSD4_RING_BASE ),/* 0x1D4550 */ +RING_TAIL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8000 (base) */ +RING_EXECLIST_CONTROL (GEN11_VEBOX2_RING_BASE ),/* 0x1D8550 */ +RING_TAIL (XEHP_BSD5_RING_BASE ),/* 0x1E0000 (base) */ +RING_EXECLIST_CONTROL (XEHP_BSD5_RING_BASE ),/* 0x1E0550 */ +RING_TAIL (XEHP_BSD6_RING_BASE ),/* 0x1E4000 (base) */ +RING_EXECLIST_CONTROL (XEHP_BSD6_RING_BASE ),/* 0x1E4550 */ +RING_TAIL (XEHP_VEBOX3_RING_BASE ),/* 0x1E8000 (base) */ +RING_EXECLIST_CONTROL (XEHP_VEBOX3_RING_BASE ),/* 0x1E8550 */ +RING_TAIL (XEHP_BSD7_RING_BASE ),/* 0x1F0000 (base) */ +RING_EXECLIST_CONTROL (XEHP_BSD7_RING_BASE ),/* 0x1F0550 */ +RING_TAIL (XEHP_BSD8_RING_BASE ),/* 0x1F4000 (base) */ +RING_EXECLIST_CONTROL (XEHP_BSD8_RING_BASE ),/* 0x1F4550 */ +RING_TAIL (XEHP_VEBOX4_RING_BASE ),/* 0x1F8000 (base) */ +RING_EXECLIST_CONTROL (XEHP_VEBOX4_RING_BASE ),/* 0x1F8550 */ /* TODO: Other registers are not yet used */ };@@ -991,17 +1049,18 @@ static int mmio_reg_cmp(u32 key, const i915_reg_t *reg)return 0 ; } -#define __is_genX_shadowed (x) \ -static bool is_gen##x##_shadowed(u32 offset) \ +#define __is_X_shadowed (x) \ +static bool is_##x##_shadowed(u32 offset) \ { \ - const i915_reg_t *regs = gen##x##_shadowed_regs; \ - return BSEARCH(offset, regs, ARRAY_SIZE(gen##x##_shadowed_regs), \ + const i915_reg_t *regs = x##_shadowed_regs; \ + return BSEARCH(offset, regs, ARRAY_SIZE(x##_shadowed_regs), \ mmio_reg_cmp); \ } -__is_genX_shadowed(8) -__is_genX_shadowed(11) -__is_genX_shadowed(12) +__is_X_shadowed(gen8) +__is_X_shadowed(gen11) +__is_X_shadowed(gen12) +__is_X_shadowed(xehp) static enum forcewake_domains gen6_reg_write_fw_domains(struct intel_uncore *uncore, i915_reg_t reg)@@ -1065,6 +1124,15 @@ static const struct intel_forcewake_range __chv_fw_ranges[] = { __fwd; \ }) +#define __xehp_fwtable_reg_write_fw_domains (uncore, offset) \ +({ \ + enum forcewake_domains __fwd = 0; \ + const u32 __offset = (offset); \ + if (!is_xehp_shadowed(__offset)) \ + __fwd = find_fw_domain(uncore, __offset); \ + __fwd; \ +}) +/* *Must* be sorted by offset ranges! See intel_fw_table_check(). */ static const struct intel_forcewake_range __gen9_fw_ranges[] = {GEN_FW_RANGE (0x0 ,0xaff ,FORCEWAKE_GT ),@@ -1249,6 +1317,145 @@ static const struct intel_forcewake_range __gen12_fw_ranges[] = {0x1d3f00 - 0x1d3fff: VD2 */ }; +/* *Must* be sorted by offset ranges! See intel_fw_table_check(). */ +static const struct intel_forcewake_range __xehp_fw_ranges[] = { +GEN_FW_RANGE (0x0 ,0x1fff ,0 ),/* +0x0 - 0xaff: reserved +0xb00 - 0x1fff: always on */ +GEN_FW_RANGE (0x2000 ,0x26ff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x2700 ,0x4aff ,FORCEWAKE_GT ), +GEN_FW_RANGE (0x4b00 ,0x51ff ,0 ),/* +0x4b00 - 0x4fff: reserved +0x5000 - 0x51ff: always on */ +GEN_FW_RANGE (0x5200 ,0x7fff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x8000 ,0x813f ,FORCEWAKE_GT ), +GEN_FW_RANGE (0x8140 ,0x815f ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x8160 ,0x81ff ,0 ),/* +0x8160 - 0x817f: reserved +0x8180 - 0x81ff: always on */ +GEN_FW_RANGE (0x8200 ,0x82ff ,FORCEWAKE_GT ), +GEN_FW_RANGE (0x8300 ,0x84ff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x8500 ,0x94cf ,FORCEWAKE_GT ),/* +0x8500 - 0x87ff: gt +0x8800 - 0x8fff: reserved +0x9000 - 0x947f: gt +0x9480 - 0x94cf: reserved */ +GEN_FW_RANGE (0x94d0 ,0x955f ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0x9560 ,0x97ff ,0 ),/* +0x9560 - 0x95ff: always on +0x9600 - 0x97ff: reserved */ +GEN_FW_RANGE (0x9800 ,0xcfff ,FORCEWAKE_GT ),/* +0x9800 - 0xb4ff: gt +0xb500 - 0xbfff: reserved +0xc000 - 0xcfff: gt */ +GEN_FW_RANGE (0xd000 ,0xd7ff ,0 ), +GEN_FW_RANGE (0xd800 ,0xdbff ,FORCEWAKE_GT ), +GEN_FW_RANGE (0xdc00 ,0xdcff ,FORCEWAKE_RENDER ), +GEN_FW_RANGE (0xdd00 ,0xde7f ,FORCEWAKE_GT ),/* +0xdd00 - 0xddff: gt +0xde00 - 0xde7f: reserved */ +GEN_FW_RANGE (0xde80 ,0xe8ff ,FORCEWAKE_RENDER ),/* +0xde80 - 0xdfff: render +0xe000 - 0xe0ff: reserved +0xe100 - 0xe8ff: render */ +GEN_FW_RANGE (0xe900 ,0xffff ,FORCEWAKE_GT ),/* +0xe900 - 0xe9ff: gt +0xea00 - 0xefff: reserved +0xf000 - 0xffff: gt */ +GEN_FW_RANGE (0x10000 ,0x13fff ,0 ),/* +0x10000 - 0x11fff: reserved +0x12000 - 0x127ff: always on +0x12800 - 0x13fff: reserved */ +GEN_FW_RANGE (0x14000 ,0x141ff ,FORCEWAKE_MEDIA_VDBOX0 ), +GEN_FW_RANGE (0x14200 ,0x143ff ,FORCEWAKE_MEDIA_VDBOX2 ), +GEN_FW_RANGE (0x14400 ,0x145ff ,FORCEWAKE_MEDIA_VDBOX4 ), +GEN_FW_RANGE (0x14600 ,0x147ff ,FORCEWAKE_MEDIA_VDBOX6 ), +GEN_FW_RANGE (0x14800 ,0x1ffff ,FORCEWAKE_RENDER ),/* +0x14800 - 0x14fff: render +0x15000 - 0x16dff: reserved +0x16e00 - 0x1ffff: render */ +GEN_FW_RANGE (0x20000 ,0x21fff ,FORCEWAKE_MEDIA_VDBOX0 ),/* +0x20000 - 0x20fff: VD0 +0x21000 - 0x21fff: reserved */ +GEN_FW_RANGE (0x22000 ,0x23fff ,FORCEWAKE_GT ), +GEN_FW_RANGE (0x24000 ,0x2417f ,0 ),/* +0x24000 - 0x2407f: always on +0x24080 - 0x2417f: reserved */ +GEN_FW_RANGE (0x24180 ,0x249ff ,FORCEWAKE_GT ),/* +0x24180 - 0x241ff: gt +0x24200 - 0x249ff: reserved */ +GEN_FW_RANGE (0x24a00 ,0x251ff ,FORCEWAKE_RENDER ),/* +0x24a00 - 0x24a7f: render +0x24a80 - 0x251ff: reserved */ +GEN_FW_RANGE (0x25200 ,0x25fff ,FORCEWAKE_GT ),/* +0x25200 - 0x252ff: gt +0x25300 - 0x25fff: reserved */ +GEN_FW_RANGE (0x26000 ,0x2ffff ,FORCEWAKE_RENDER ),/* +0x26000 - 0x27fff: render +0x28000 - 0x29fff: reserved +0x2a000 - 0x2ffff: undocumented */ +GEN_FW_RANGE (0x30000 ,0x3ffff ,FORCEWAKE_GT ), +GEN_FW_RANGE (0x40000 ,0x1bffff ,0 ), +GEN_FW_RANGE (0x1c0000 ,0x1c3fff ,FORCEWAKE_MEDIA_VDBOX0 ),/* +0x1c0000 - 0x1c2bff: VD0 +0x1c2c00 - 0x1c2cff: reserved +0x1c2d00 - 0x1c2dff: VD0 +0x1c2e00 - 0x1c3eff: reserved +0x1c3f00 - 0x1c3fff: VD0 */ +GEN_FW_RANGE (0x1c4000 ,0x1c7fff ,FORCEWAKE_MEDIA_VDBOX1 ),/* +0x1c4000 - 0x1c6bff: VD1 +0x1c6c00 - 0x1c6cff: reserved +0x1c6d00 - 0x1c6dff: VD1 +0x1c6e00 - 0x1c7fff: reserved */ +GEN_FW_RANGE (0x1c8000 ,0x1cbfff ,FORCEWAKE_MEDIA_VEBOX0 ),/* +0x1c8000 - 0x1ca0ff: VE0 +0x1ca100 - 0x1cbfff: reserved */ +GEN_FW_RANGE (0x1cc000 ,0x1ccfff ,FORCEWAKE_MEDIA_VDBOX0 ), +GEN_FW_RANGE (0x1cd000 ,0x1cdfff ,FORCEWAKE_MEDIA_VDBOX2 ), +GEN_FW_RANGE (0x1ce000 ,0x1cefff ,FORCEWAKE_MEDIA_VDBOX4 ), +GEN_FW_RANGE (0x1cf000 ,0x1cffff ,FORCEWAKE_MEDIA_VDBOX6 ), +GEN_FW_RANGE (0x1d0000 ,0x1d3fff ,FORCEWAKE_MEDIA_VDBOX2 ),/* +0x1d0000 - 0x1d2bff: VD2 +0x1d2c00 - 0x1d2cff: reserved +0x1d2d00 - 0x1d2dff: VD2 +0x1d2e00 - 0x1d3eff: reserved +0x1d3f00 - 0x1d3fff: VD2 */ +GEN_FW_RANGE (0x1d4000 ,0x1d7fff ,FORCEWAKE_MEDIA_VDBOX3 ),/* +0x1d4000 - 0x1d6bff: VD3 +0x1d6c00 - 0x1d6cff: reserved +0x1d6d00 - 0x1d6dff: VD3 +0x1d6e00 - 0x1d7fff: reserved */ +GEN_FW_RANGE (0x1d8000 ,0x1dffff ,FORCEWAKE_MEDIA_VEBOX1 ),/* +0x1d8000 - 0x1da0ff: VE1 +0x1da100 - 0x1dffff: reserved */ +GEN_FW_RANGE (0x1e0000 ,0x1e3fff ,FORCEWAKE_MEDIA_VDBOX4 ),/* +0x1e0000 - 0x1e2bff: VD4 +0x1e2c00 - 0x1e2cff: reserved +0x1e2d00 - 0x1e2dff: VD4 +0x1e2e00 - 0x1e3eff: reserved +0x1e3f00 - 0x1e3fff: VD4 */ +GEN_FW_RANGE (0x1e4000 ,0x1e7fff ,FORCEWAKE_MEDIA_VDBOX5 ),/* +0x1e4000 - 0x1e6bff: VD5 +0x1e6c00 - 0x1e6cff: reserved +0x1e6d00 - 0x1e6dff: VD5 +0x1e6e00 - 0x1e7fff: reserved */ +GEN_FW_RANGE (0x1e8000 ,0x1effff ,FORCEWAKE_MEDIA_VEBOX2 ),/* +0x1e8000 - 0x1ea0ff: VE2 +0x1ea100 - 0x1effff: reserved */ +GEN_FW_RANGE (0x1f0000 ,0x1f3fff ,FORCEWAKE_MEDIA_VDBOX6 ),/* +0x1f0000 - 0x1f2bff: VD6 +0x1f2c00 - 0x1f2cff: reserved +0x1f2d00 - 0x1f2dff: VD6 +0x1f2e00 - 0x1f3eff: reserved +0x1f3f00 - 0x1f3fff: VD6 */ +GEN_FW_RANGE (0x1f4000 ,0x1f7fff ,FORCEWAKE_MEDIA_VDBOX7 ),/* +0x1f4000 - 0x1f6bff: VD7 +0x1f6c00 - 0x1f6cff: reserved +0x1f6d00 - 0x1f6dff: VD7 +0x1f6e00 - 0x1f7fff: reserved */ +GEN_FW_RANGE (0x1f8000 ,0x1fa0ff ,FORCEWAKE_MEDIA_VEBOX3 ), +}; +static void ilk_dummy_write (struct intel_uncore *uncore) {@@ -1502,6 +1709,7 @@ __gen_write(func, 8) \ __gen_write(func, 16) \ __gen_write(func, 32) +__gen_reg_write_funcs (xehp_fwtable);__gen_reg_write_funcs (gen12_fwtable);__gen_reg_write_funcs (gen11_fwtable);__gen_reg_write_funcs (fwtable);@@ -1582,8 +1790,14 @@ static int __fw_domain_init(struct intel_uncore *uncore,BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX1 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX1 ));BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX2 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX2 ));BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX3 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX3 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX4 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX4 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX5 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX5 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX6 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX6 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VDBOX7 != (1 <<FW_DOMAIN_ID_MEDIA_VDBOX7 ));BUILD_BUG_ON (FORCEWAKE_MEDIA_VEBOX0 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX0 ));BUILD_BUG_ON (FORCEWAKE_MEDIA_VEBOX1 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX1 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VEBOX2 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX2 )); +BUILD_BUG_ON (FORCEWAKE_MEDIA_VEBOX3 != (1 <<FW_DOMAIN_ID_MEDIA_VEBOX3 )); d->mask =BIT (domain_id);@@ -1870,36 +2084,36 @@ static int uncore_forcewake_init(struct intel_uncore *uncore)return ret;forcewake_early_sanitize (uncore,0 ); -if (IS_GRAPHICS_VER (i915,6 ,7 )) { -ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen6); - -if (IS_VALLEYVIEW (i915)) { -ASSIGN_FW_DOMAINS_TABLE (uncore, __vlv_fw_ranges); -ASSIGN_READ_MMIO_VFUNCS (uncore, fwtable); - }else { -ASSIGN_READ_MMIO_VFUNCS (uncore, gen6); - } - }else if (GRAPHICS_VER (i915) ==8 ) { -if (IS_CHERRYVIEW (i915)) { -ASSIGN_FW_DOMAINS_TABLE (uncore, __chv_fw_ranges); -ASSIGN_WRITE_MMIO_VFUNCS (uncore, fwtable); -ASSIGN_READ_MMIO_VFUNCS (uncore, fwtable); - }else { -ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen8); -ASSIGN_READ_MMIO_VFUNCS (uncore, gen6); - } - }else if (IS_GRAPHICS_VER (i915,9 ,10 )) { -ASSIGN_FW_DOMAINS_TABLE (uncore, __gen9_fw_ranges); -ASSIGN_WRITE_MMIO_VFUNCS (uncore, fwtable); -ASSIGN_READ_MMIO_VFUNCS (uncore, fwtable); - }else if (GRAPHICS_VER (i915) ==11 ) { -ASSIGN_FW_DOMAINS_TABLE (uncore, __gen11_fw_ranges); -ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen11_fwtable); +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) { +ASSIGN_FW_DOMAINS_TABLE (uncore, __xehp_fw_ranges); +ASSIGN_WRITE_MMIO_VFUNCS (uncore, xehp_fwtable);ASSIGN_READ_MMIO_VFUNCS (uncore, gen11_fwtable); - }else { + }else if (GRAPHICS_VER (i915) >=12 ) {ASSIGN_FW_DOMAINS_TABLE (uncore, __gen12_fw_ranges);ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen12_fwtable);ASSIGN_READ_MMIO_VFUNCS (uncore, gen12_fwtable); + }else if (GRAPHICS_VER (i915) ==11 ) { +ASSIGN_FW_DOMAINS_TABLE (uncore, __gen11_fw_ranges); +ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen11_fwtable); +ASSIGN_READ_MMIO_VFUNCS (uncore, gen11_fwtable); + }else if (IS_GRAPHICS_VER (i915,9 ,10 )) { +ASSIGN_FW_DOMAINS_TABLE (uncore, __gen9_fw_ranges); +ASSIGN_WRITE_MMIO_VFUNCS (uncore, fwtable); +ASSIGN_READ_MMIO_VFUNCS (uncore, fwtable); + }else if (IS_CHERRYVIEW (i915)) { +ASSIGN_FW_DOMAINS_TABLE (uncore, __chv_fw_ranges); +ASSIGN_WRITE_MMIO_VFUNCS (uncore, fwtable); +ASSIGN_READ_MMIO_VFUNCS (uncore, fwtable); + }else if (GRAPHICS_VER (i915) ==8 ) { +ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen8); +ASSIGN_READ_MMIO_VFUNCS (uncore, gen6); + }else if (IS_VALLEYVIEW (i915)) { +ASSIGN_FW_DOMAINS_TABLE (uncore, __vlv_fw_ranges); +ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen6); +ASSIGN_READ_MMIO_VFUNCS (uncore, fwtable); + }else if (IS_GRAPHICS_VER (i915,6 ,7 )) { +ASSIGN_WRITE_MMIO_VFUNCS (uncore, gen6); +ASSIGN_READ_MMIO_VFUNCS (uncore, gen6); } uncore->pmic_bus_access_nb.notifier_call = i915_pmic_bus_access_notifier;@@ -1988,6 +2202,22 @@ void intel_uncore_prune_engine_fw_domains(struct intel_uncore *uncore,if (HAS_ENGINE (gt,_VCS (i)))continue ; +/* +* Starting with XeHP, the power well for an even-numbered +* VDBOX is also used for shared units within the +* media slice such as SFC. So even if the engine +* itself is fused off, we still need to initialize +* the forcewake domain if any of the other engines +* in the same media slice are present. +*/ +if (GRAPHICS_VER_FULL (uncore->i915) >=IP_VER (12 ,50 ) && i %2 ==0 ) { +if ((i +1 <I915_MAX_VCS ) &&HAS_ENGINE (gt,_VCS (i +1 ))) +continue ; + +if (HAS_ENGINE (gt,_VECS (i /2 ))) +continue ; + } +if (fw_domains &BIT (domain_id))fw_domain_fini (uncore, domain_id); }drivers/gpu/drm/i915/intel_uncore.h +13
-1@@ -52,8 +52,14 @@ enum forcewake_domain_id {FW_DOMAIN_ID_MEDIA_VDBOX1 ,FW_DOMAIN_ID_MEDIA_VDBOX2 ,FW_DOMAIN_ID_MEDIA_VDBOX3 , +FW_DOMAIN_ID_MEDIA_VDBOX4 , +FW_DOMAIN_ID_MEDIA_VDBOX5 , +FW_DOMAIN_ID_MEDIA_VDBOX6 , +FW_DOMAIN_ID_MEDIA_VDBOX7 ,FW_DOMAIN_ID_MEDIA_VEBOX0 ,FW_DOMAIN_ID_MEDIA_VEBOX1 , +FW_DOMAIN_ID_MEDIA_VEBOX2 , +FW_DOMAIN_ID_MEDIA_VEBOX3 ,FW_DOMAIN_ID_COUNT };@@ -66,10 +72,16 @@ enum forcewake_domains {FORCEWAKE_MEDIA_VDBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX1 ),FORCEWAKE_MEDIA_VDBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX2 ),FORCEWAKE_MEDIA_VDBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX3 ), +FORCEWAKE_MEDIA_VDBOX4 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX4 ), +FORCEWAKE_MEDIA_VDBOX5 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX5 ), +FORCEWAKE_MEDIA_VDBOX6 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX6 ), +FORCEWAKE_MEDIA_VDBOX7 =BIT (FW_DOMAIN_ID_MEDIA_VDBOX7 ),FORCEWAKE_MEDIA_VEBOX0 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX0 ),FORCEWAKE_MEDIA_VEBOX1 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX1 ), +FORCEWAKE_MEDIA_VEBOX2 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX2 ), +FORCEWAKE_MEDIA_VEBOX3 =BIT (FW_DOMAIN_ID_MEDIA_VEBOX3 ), -FORCEWAKE_ALL =BIT (FW_DOMAIN_ID_COUNT ) -1 + FORCEWAKE_ALL = BIT(FW_DOMAIN_ID_COUNT) - 1, }; struct intel_uncore_funcs {drivers/gpu/drm/i915/selftests/intel_uncore.c +2
-0@@ -68,6 +68,7 @@ static int intel_shadow_table_check(void) { gen8_shadowed_regs, ARRAY_SIZE(gen8_shadowed_regs) }, { gen11_shadowed_regs, ARRAY_SIZE(gen11_shadowed_regs) }, { gen12_shadowed_regs, ARRAY_SIZE(gen12_shadowed_regs) }, + { xehp_shadowed_regs, ARRAY_SIZE(xehp_shadowed_regs) }, };const i915_reg_t *reg;unsigned int i, j;@@ -103,6 +104,7 @@ int intel_uncore_mock_selftests(void) { __gen9_fw_ranges, ARRAY_SIZE(__gen9_fw_ranges), true }, { __gen11_fw_ranges, ARRAY_SIZE(__gen11_fw_ranges), true }, { __gen12_fw_ranges, ARRAY_SIZE(__gen12_fw_ranges), true }, + { __xehp_fw_ranges, ARRAY_SIZE(__xehp_fw_ranges), true }, };int err, i;Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 10/50 drm/i915/xehp: Define multicast register ranges
In reply to Matt RoperSince we can't steer multicast register reads during ring-based workaround verification, we need to define the multicast ranges where failure to steer could potentially cause us to read back from a fused-off register instance.
As with gen12, we can ignore the multicast ranges that the bspec describes as 'SQIDI' since all instances of those registers will always be present and we'll always be able to read back a workaround value that was written with multicast.
Bspec: 66534
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +19 -1
@@ -2097,12 +2097,30 @@ static const struct mcr_range mcr_ranges_gen12[] = { {}, }; +static const struct mcr_range mcr_ranges_xehp[] = { + { .start =0x4000 , .end =0x4aff }, + { .start =0x5200 , .end =0x52ff }, + { .start =0x5400 , .end =0x7fff }, + { .start =0x8140 , .end =0x815f }, + { .start =0x8c80 , .end =0x8dff }, + { .start =0x94d0 , .end =0x955f }, + { .start =0x9680 , .end =0x96ff }, + { .start =0xb000 , .end =0xb3ff }, + { .start =0xc800 , .end =0xcfff }, + { .start =0xd800 , .end =0xd8ff }, + { .start =0xdc00 , .end =0xffff }, + { .start =0x17000 , .end =0x17fff }, + { .start =0x24a00 , .end =0x24a7f }, +}; +static bool mcr_range (struct drm_i915_private *i915,u32 offset) {const struct mcr_range *mcr_ranges;int i; -if (GRAPHICS_VER (i915) >=12 ) +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) + mcr_ranges = mcr_ranges_xehp; +else if (GRAPHICS_VER (i915) >=12 ) mcr_ranges = mcr_ranges_gen12;else if (GRAPHICS_VER (i915) >=8 ) mcr_ranges = mcr_ranges_gen8;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 10/50] drm/i915/xehp: Define multicast register ranges
Quoted 10 lines · Matt Roper
Since we can't steer multicast register reads during ring-based workaround verification, we need to define the multicast ranges where failure to steer could potentially cause us to read back from a fused-off register instance.
As with gen12, we can ignore the multicast ranges that the bspec describes as 'SQIDI' since all instances of those registers will always be present and we'll always be able to read back a workaround value that was written with multicast.
Quoted 33 lines
Bspec: 66534
Cc José Roberto de Souza <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/gt/intel_workarounds.c +16
-0@@ -2097,12 +2097,30 @@ static const struct mcr_range mcr_ranges_gen12[] = { {}, }; +static const struct mcr_range mcr_ranges_xehp[] = { + { .start =0x4000 , .end =0x4aff }, + { .start =0x5200 , .end =0x52ff }, + { .start =0x5400 , .end =0x7fff }, + { .start =0x8140 , .end =0x815f }, + { .start =0x8c80 , .end =0x8dff }, + { .start =0x94d0 , .end =0x955f }, + { .start =0x9680 , .end =0x96ff }, + { .start =0xb000 , .end =0xb3ff }, + { .start =0xc800 , .end =0xcfff }, + { .start =0xd800 , .end =0xd8ff }, + { .start =0xdc00 , .end =0xffff }, + { .start =0x17000 , .end =0x17fff }, + { .start =0x24a00 , .end =0x24a7f }, +}; +static bool mcr_range (struct drm_i915_private *i915,u32 offset) {
drivers/gpu/drm/i915/gt/intel_workarounds.c static const struct mcr_range mcr_ranges_gen12[] = { · line 2126
Quoted 10 lines
drivers/gpu/drm/i915/gt/intel_workarounds.c +3
-1const struct mcr_range *mcr_ranges;int i; -if (GRAPHICS_VER (i915) >=12 ) +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) + mcr_ranges = mcr_ranges_xehp; +else if (GRAPHICS_VER (i915) >=12 ) mcr_ranges = mcr_ranges_gen12;else if (GRAPHICS_VER (i915) >=8 ) mcr_ranges = mcr_ranges_gen8;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 11/50 drm/i915/xehp: Handle new device context ID format
In reply to Matt RoperFrom: Stuart Summers <[email protected]>
Xe_HP changes the format of the context ID from past platforms.
--- .../drm/i915/gt/intel_execlists_submission.c | 74 ++++++++++++++++--- drivers/gpu/drm/i915/gt/intel_lrc.c | 8 ++ drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 2 + drivers/gpu/drm/i915/i915_perf.c | 29 +++++--- drivers/gpu/drm/i915/i915_reg.h | 5 ++ 5 files changed, 97 insertions(+), 21 deletions(-)
drivers/gpu/drm/i915/gt/intel_execlists_submission.c +63 -11
@@ -153,6 +153,12 @@#define GEN12_CSB_CTX_VALID (csb_dw) \ (FIELD_GET(GEN12_CSB_SW_CTX_ID_MASK, csb_dw) != GEN12_IDLE_CTX_ID) +#define XEHP_CTX_STATUS_SWITCHED_TO_NEW_QUEUE BIT(1)/* upper csb dword */ +#define XEHP_CSB_SW_CTX_ID_MASK GENMASK(31, 10) +#define XEHP_IDLE_CTX_ID 0xFFFF +#define XEHP_CSB_CTX_VALID (csb_dw) \ + (FIELD_GET(XEHP_CSB_SW_CTX_ID_MASK, csb_dw) != XEHP_IDLE_CTX_ID) +/* Typical size of the average request (2 pipecontrols and a MI_BB) */ #define EXECLISTS_REQUEST_SIZE 64/* bytes */
@@ -478,6 +484,16 @@ __execlists_schedule_in(struct i915_request *rq)/* Use a fixed tag for OA and friends */ GEM_BUG_ON (ce->tag <=BITS_PER_LONG ); ce->lrc.ccid = ce->tag; + }else if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) { +/* We don't need a strict matching tag, just different values */ +unsigned int tag =ffs (READ_ONCE (engine->context_tag)); + +GEM_BUG_ON (tag ==0 || tag >=BITS_PER_LONG ); +clear_bit (tag -1 , &engine->context_tag); + ce->lrc.ccid = tag << (XEHP_SW_CTX_ID_SHIFT -32 ); + +BUILD_BUG_ON (BITS_PER_LONG >GEN12_MAX_CONTEXT_HW_ID ); + }else {/* We don't need a strict matching tag, just different values */ unsigned int tag =__ffs (engine->context_tag);
@@ -588,8 +604,14 @@ static void __execlists_schedule_out(struct i915_request * const rq,intel_engine_add_retire (engine, ce->timeline); ccid = ce->lrc.ccid; - ccid >>=GEN11_SW_CTX_ID_SHIFT -32 ; - ccid &=GEN12_MAX_CONTEXT_HW_ID ; +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) { + ccid >>=XEHP_SW_CTX_ID_SHIFT -32 ; + ccid &=XEHP_MAX_CONTEXT_HW_ID ; + }else { + ccid >>=GEN11_SW_CTX_ID_SHIFT -32 ; + ccid &=GEN12_MAX_CONTEXT_HW_ID ; + } +if (ccid <BITS_PER_LONG ) {GEM_BUG_ON (ccid ==0 );GEM_BUG_ON (test_bit (ccid -1 , &engine->context_tag));
@@ -1648,13 +1670,24 @@ static void invalidate_csb_entries(const u64 *first, const u64 *last)* bits 44-46: reserved * bits 47-57: sw context id of the lrc the GT switched away from * bits 58-63: sw counter of the lrc the GT switched away from +* +* Xe_HP csb shuffles things around compared to TGL: +* +* bits 0-3: context switch detail (same possible values as TGL) +* bits 4-9: engine instance +* bits 10-25: sw context id of the lrc the GT switched to +* bits 26-31: sw counter of the lrc the GT switched to +* bit 32: semaphore wait mode (poll or signal), Only valid when +* switch detail is set to "wait on semaphore" +* bit 33: switched to new queue +* bits 34-41: wait detail (for switch detail 1 to 4) +* bits 42-57: sw context id of the lrc the GT switched away from +* bits 58-63: sw counter of the lrc the GT switched away from */ -static bool gen12_csb_parse (const u64 csb) +static inline bool +__gen12_csb_parse (bool ctx_to_valid,bool ctx_away_valid,bool new_queue, +u8 switch_detail) { -bool ctx_away_valid =GEN12_CSB_CTX_VALID (upper_32_bits (csb)); -bool new_queue = -lower_32_bits (csb) &GEN12_CTX_STATUS_SWITCHED_TO_NEW_QUEUE ; -/* * The context switch detail is not guaranteed to be 5 when a preemption * occurs, so we can't just check for that. The check below works for
@@ -1663,7 +1696,7 @@ static bool gen12_csb_parse(const u64 csb)* would require some extra handling, but we don't support that. */ if (!ctx_away_valid || new_queue) { -GEM_BUG_ON (!GEN12_CSB_CTX_VALID (lower_32_bits (csb))); +GEM_BUG_ON (!ctx_to_valid);return true; }
@@ -1672,10 +1705,26 @@ static bool gen12_csb_parse(const u64 csb)* context switch on an unsuccessful wait instruction since we always * use polling mode. */ -GEM_BUG_ON (GEN12_CTX_SWITCH_DETAIL (upper_32_bits (csb))); +GEM_BUG_ON (switch_detail);return false; } +static bool xehp_csb_parse (const u64 csb) +{ +return __gen12_csb_parse (XEHP_CSB_CTX_VALID (lower_32_bits (csb)),/* cxt to */ +XEHP_CSB_CTX_VALID (upper_32_bits (csb)),/* cxt away */ +upper_32_bits (csb) &XEHP_CTX_STATUS_SWITCHED_TO_NEW_QUEUE , +GEN12_CTX_SWITCH_DETAIL (lower_32_bits (csb))); +} + +static bool gen12_csb_parse (const u64 csb) +{ +return __gen12_csb_parse (GEN12_CSB_CTX_VALID (lower_32_bits (csb)),/* cxt to */ +GEN12_CSB_CTX_VALID (upper_32_bits (csb)),/* cxt away */ +lower_32_bits (csb) &GEN12_CTX_STATUS_SWITCHED_TO_NEW_QUEUE , +GEN12_CTX_SWITCH_DETAIL (upper_32_bits (csb))); +} +static bool gen8_csb_parse (const u64 csb) {return csb & (GEN8_CTX_STATUS_IDLE_ACTIVE |GEN8_CTX_STATUS_PREEMPTED );
@@ -1840,7 +1889,9 @@ process_csb(struct intel_engine_cs *engine, struct i915_request **inactive)ENGINE_TRACE (engine,"csb[%d]: status=0x%08x:0x%08x\n" , head,upper_32_bits (csb),lower_32_bits (csb)); -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) + promote =xehp_csb_parse (csb); +else if (GRAPHICS_VER (engine->i915) >=12 ) promote =gen12_csb_parse (csb);else promote =gen8_csb_parse (csb);
@@ -3327,7 +3378,8 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine) execlists->csb_size =GEN11_CSB_ENTRIES ; engine->context_tag =GENMASK (BITS_PER_LONG -2 ,0 ); -if (GRAPHICS_VER (engine->i915) >=11 ) { +if (GRAPHICS_VER (engine->i915) >=11 && +GRAPHICS_VER_FULL (engine->i915) <IP_VER (12 ,50 )) { execlists->ccid |= engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT -32 ); execlists->ccid |= engine->class << (GEN11_ENGINE_CLASS_SHIFT -32 ); }
drivers/gpu/drm/i915/gt/intel_lrc.c +8 -0
@@ -1101,6 +1101,14 @@ setup_indirect_ctx_bb(const struct intel_context *ce,* bits 55-60: SW counter * bits 61-63: engine class * +* On Xe_HP, the upper dword of the descriptor has a new format: +* +* bits 32-37: virtual function number +* bit 38: mbz, reserved for use by hardware +* bits 39-54: SW context ID +* bits 55-57: reserved +* bits 58-63: SW counter +* * engine info, SW context ID and SW counter need to form a unique number * (Context ID) per lrc. */
drivers/gpu/drm/i915/gt/intel_lrc_reg.h +2 -0
@@ -91,5 +91,7 @@#define GEN11_MAX_CONTEXT_HW_ID (1 << 11)/* exclusive */ /* in Gen12 ID 0x7FF is reserved to indicate idle */ #define GEN12_MAX_CONTEXT_HW_ID (GEN11_MAX_CONTEXT_HW_ID - 1) +/* in Xe_HP ID 0xFFFF is reserved to indicate "invalid context" */ +#define XEHP_MAX_CONTEXT_HW_ID 0xFFFF#endif /* _INTEL_LRC_REG_H_ */
drivers/gpu/drm/i915/i915_perf.c +19 -10
@@ -1284,17 +1284,26 @@ static int oa_get_render_ctx_id(struct i915_perf_stream *stream)break ;case 11 : -case 12 : { - stream->specific_ctx_id_mask = - ((1U <<GEN11_SW_CTX_ID_WIDTH ) -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); -/* -* Pick an unused context id -* 0 - BITS_PER_LONG are used by other contexts -* GEN12_MAX_CONTEXT_HW_ID (0x7ff) is used by idle context -*/ - stream->specific_ctx_id = (GEN12_MAX_CONTEXT_HW_ID -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); +case 12 : +if (GRAPHICS_VER_FULL (ce->engine->i915) >=IP_VER (12 ,50 )) { + stream->specific_ctx_id_mask = + ((1U <<XEHP_SW_CTX_ID_WIDTH ) -1 ) << + (XEHP_SW_CTX_ID_SHIFT -32 ); + stream->specific_ctx_id = + (XEHP_MAX_CONTEXT_HW_ID -1 ) << + (XEHP_SW_CTX_ID_SHIFT -32 ); + }else { + stream->specific_ctx_id_mask = + ((1U <<GEN11_SW_CTX_ID_WIDTH ) -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); +/* +* Pick an unused context id +* 0 - BITS_PER_LONG are used by other contexts +* GEN12_MAX_CONTEXT_HW_ID (0x7ff) is used by idle context +*/ + stream->specific_ctx_id = + (GEN12_MAX_CONTEXT_HW_ID -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); + }break ; - }default :MISSING_CASE (GRAPHICS_VER (ce->engine->i915));
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -4172,6 +4172,11 @@ enum {#define GEN11_ENGINE_INSTANCE_SHIFT 48#define GEN11_ENGINE_INSTANCE_WIDTH 6 +#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
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 11/50] drm/i915/xehp: Handle new device context ID format
Quoted 7 lines · Matt Roper
From: Stuart Summers <[email protected]>
Xe_HPchanges the format of the context ID from past platforms.Signed-off-by Stuart Summers <[email protected]>Signed-off-by Umesh Nerlige Ramappa <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 242 lines
--- .../drm/i915/gt/intel_execlists_submission.c | 74 ++++++++++++++++--- drivers/gpu/drm/i915/gt/intel_lrc.c | 8 ++ drivers/gpu/drm/i915/gt/intel_lrc_reg.h | 2 + drivers/gpu/drm/i915/i915_perf.c | 29 +++++--- drivers/gpu/drm/i915/i915_reg.h | 5 ++ 5 files changed, 97 insertions(+), 21 deletions(-)drivers/gpu/drm/i915/gt/intel_execlists_submission.c +63
-11@@ -153,6 +153,12 @@#define GEN12_CSB_CTX_VALID (csb_dw) \ (FIELD_GET(GEN12_CSB_SW_CTX_ID_MASK, csb_dw) != GEN12_IDLE_CTX_ID) +#define XEHP_CTX_STATUS_SWITCHED_TO_NEW_QUEUE BIT(1)/* upper csb dword */ +#define XEHP_CSB_SW_CTX_ID_MASK GENMASK(31, 10) +#define XEHP_IDLE_CTX_ID 0xFFFF +#define XEHP_CSB_CTX_VALID (csb_dw) \ + (FIELD_GET(XEHP_CSB_SW_CTX_ID_MASK, csb_dw) != XEHP_IDLE_CTX_ID) +/* Typical size of the average request (2 pipecontrols and a MI_BB) */ #define EXECLISTS_REQUEST_SIZE 64/* bytes */ @@ -478,6 +484,16 @@ __execlists_schedule_in(struct i915_request *rq)/* Use a fixed tag for OA and friends */ GEM_BUG_ON (ce->tag <=BITS_PER_LONG ); ce->lrc.ccid = ce->tag; + }else if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) { +/* We don't need a strict matching tag, just different values */ +unsigned int tag =ffs (READ_ONCE (engine->context_tag)); + +GEM_BUG_ON (tag ==0 || tag >=BITS_PER_LONG ); +clear_bit (tag -1 , &engine->context_tag); + ce->lrc.ccid = tag << (XEHP_SW_CTX_ID_SHIFT -32 ); + +BUILD_BUG_ON (BITS_PER_LONG >GEN12_MAX_CONTEXT_HW_ID ); + }else {/* We don't need a strict matching tag, just different values */ unsigned int tag =__ffs (engine->context_tag);@@ -588,8 +604,14 @@ static void __execlists_schedule_out(struct i915_request * const rq,intel_engine_add_retire (engine, ce->timeline); ccid = ce->lrc.ccid; - ccid >>=GEN11_SW_CTX_ID_SHIFT -32 ; - ccid &=GEN12_MAX_CONTEXT_HW_ID ; +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) { + ccid >>=XEHP_SW_CTX_ID_SHIFT -32 ; + ccid &=XEHP_MAX_CONTEXT_HW_ID ; + }else { + ccid >>=GEN11_SW_CTX_ID_SHIFT -32 ; + ccid &=GEN12_MAX_CONTEXT_HW_ID ; + } +if (ccid <BITS_PER_LONG ) {GEM_BUG_ON (ccid ==0 );GEM_BUG_ON (test_bit (ccid -1 , &engine->context_tag));@@ -1648,13 +1670,24 @@ static void invalidate_csb_entries(const u64 *first, const u64 *last)* bits 44-46: reserved * bits 47-57: sw context id of the lrc the GT switched away from * bits 58-63: sw counter of the lrc the GT switched away from +* +* Xe_HP csb shuffles things around compared to TGL: +* +* bits 0-3: context switch detail (same possible values as TGL) +* bits 4-9: engine instance +* bits 10-25: sw context id of the lrc the GT switched to +* bits 26-31: sw counter of the lrc the GT switched to +* bit 32: semaphore wait mode (poll or signal), Only valid when +* switch detail is set to "wait on semaphore" +* bit 33: switched to new queue +* bits 34-41: wait detail (for switch detail 1 to 4) +* bits 42-57: sw context id of the lrc the GT switched away from +* bits 58-63: sw counter of the lrc the GT switched away from */ -static bool gen12_csb_parse (const u64 csb) +static inline bool +__gen12_csb_parse (bool ctx_to_valid,bool ctx_away_valid,bool new_queue, +u8 switch_detail) { -bool ctx_away_valid =GEN12_CSB_CTX_VALID (upper_32_bits (csb)); -bool new_queue = -lower_32_bits (csb) &GEN12_CTX_STATUS_SWITCHED_TO_NEW_QUEUE ; -/* * The context switch detail is not guaranteed to be 5 when a preemption * occurs, so we can't just check for that. The check below works for @@ -1663,7 +1696,7 @@ static bool gen12_csb_parse(const u64 csb)* would require some extra handling, but we don't support that. */ if (!ctx_away_valid || new_queue) { -GEM_BUG_ON (!GEN12_CSB_CTX_VALID (lower_32_bits (csb))); +GEM_BUG_ON (!ctx_to_valid);return true; }@@ -1672,10 +1705,26 @@ static bool gen12_csb_parse(const u64 csb)* context switch on an unsuccessful wait instruction since we always * use polling mode. */ -GEM_BUG_ON (GEN12_CTX_SWITCH_DETAIL (upper_32_bits (csb))); +GEM_BUG_ON (switch_detail);return false; } +static bool xehp_csb_parse (const u64 csb) +{ +return __gen12_csb_parse (XEHP_CSB_CTX_VALID (lower_32_bits (csb)),/* cxt to */ +XEHP_CSB_CTX_VALID (upper_32_bits (csb)),/* cxt away */ +upper_32_bits (csb) &XEHP_CTX_STATUS_SWITCHED_TO_NEW_QUEUE , +GEN12_CTX_SWITCH_DETAIL (lower_32_bits (csb))); +} + +static bool gen12_csb_parse (const u64 csb) +{ +return __gen12_csb_parse (GEN12_CSB_CTX_VALID (lower_32_bits (csb)),/* cxt to */ +GEN12_CSB_CTX_VALID (upper_32_bits (csb)),/* cxt away */ +lower_32_bits (csb) &GEN12_CTX_STATUS_SWITCHED_TO_NEW_QUEUE , +GEN12_CTX_SWITCH_DETAIL (upper_32_bits (csb))); +} +static bool gen8_csb_parse (const u64 csb) {return csb & (GEN8_CTX_STATUS_IDLE_ACTIVE |GEN8_CTX_STATUS_PREEMPTED );@@ -1840,7 +1889,9 @@ process_csb(struct intel_engine_cs *engine, struct i915_request **inactive)ENGINE_TRACE (engine,"csb[%d]: status=0x%08x:0x%08x\n" , head,upper_32_bits (csb),lower_32_bits (csb)); -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) + promote =xehp_csb_parse (csb); +else if (GRAPHICS_VER (engine->i915) >=12 ) promote =gen12_csb_parse (csb);else promote =gen8_csb_parse (csb);@@ -3327,7 +3378,8 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine) execlists->csb_size =GEN11_CSB_ENTRIES ; engine->context_tag =GENMASK (BITS_PER_LONG -2 ,0 ); -if (GRAPHICS_VER (engine->i915) >=11 ) { +if (GRAPHICS_VER (engine->i915) >=11 && +GRAPHICS_VER_FULL (engine->i915) <IP_VER (12 ,50 )) { execlists->ccid |= engine->instance << (GEN11_ENGINE_INSTANCE_SHIFT -32 ); execlists->ccid |= engine->class << (GEN11_ENGINE_CLASS_SHIFT -32 ); }drivers/gpu/drm/i915/gt/intel_lrc.c +8
-0@@ -1101,6 +1101,14 @@ setup_indirect_ctx_bb(const struct intel_context *ce,* bits 55-60: SW counter * bits 61-63: engine class * +* On Xe_HP, the upper dword of the descriptor has a new format: +* +* bits 32-37: virtual function number +* bit 38: mbz, reserved for use by hardware +* bits 39-54: SW context ID +* bits 55-57: reserved +* bits 58-63: SW counter +* * engine info, SW context ID and SW counter need to form a unique number * (Context ID) per lrc. */ drivers/gpu/drm/i915/gt/intel_lrc_reg.h +2
-0@@ -91,5 +91,7 @@#define GEN11_MAX_CONTEXT_HW_ID (1 << 11)/* exclusive */ /* in Gen12 ID 0x7FF is reserved to indicate idle */ #define GEN12_MAX_CONTEXT_HW_ID (GEN11_MAX_CONTEXT_HW_ID - 1) +/* in Xe_HP ID 0xFFFF is reserved to indicate "invalid context" */ +#define XEHP_MAX_CONTEXT_HW_ID 0xFFFF#endif /* _INTEL_LRC_REG_H_ */ drivers/gpu/drm/i915/i915_perf.c +19
-10@@ -1284,17 +1284,26 @@ static int oa_get_render_ctx_id(struct i915_perf_stream *stream)break ;case 11 : -case 12 : { - stream->specific_ctx_id_mask = - ((1U <<GEN11_SW_CTX_ID_WIDTH ) -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); -/* -* Pick an unused context id -* 0 - BITS_PER_LONG are used by other contexts -* GEN12_MAX_CONTEXT_HW_ID (0x7ff) is used by idle context -*/ - stream->specific_ctx_id = (GEN12_MAX_CONTEXT_HW_ID -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); +case 12 : +if (GRAPHICS_VER_FULL (ce->engine->i915) >=IP_VER (12 ,50 )) { + stream->specific_ctx_id_mask = + ((1U <<XEHP_SW_CTX_ID_WIDTH ) -1 ) << + (XEHP_SW_CTX_ID_SHIFT -32 ); + stream->specific_ctx_id = + (XEHP_MAX_CONTEXT_HW_ID -1 ) << + (XEHP_SW_CTX_ID_SHIFT -32 ); + }else { + stream->specific_ctx_id_mask = + ((1U <<GEN11_SW_CTX_ID_WIDTH ) -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); +/* +* Pick an unused context id +* 0 - BITS_PER_LONG are used by other contexts +* GEN12_MAX_CONTEXT_HW_ID (0x7ff) is used by idle context +*/ + stream->specific_ctx_id = + (GEN12_MAX_CONTEXT_HW_ID -1 ) << (GEN11_SW_CTX_ID_SHIFT -32 ); + }break ; - }default :MISSING_CASE (GRAPHICS_VER (ce->engine->i915));drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -4172,6 +4172,11 @@ enum {#define GEN11_ENGINE_INSTANCE_SHIFT 48#define GEN11_ENGINE_INSTANCE_WIDTH 6 +#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 28Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 12/50 drm/i915/xehp: New engine context offsets
In reply to Matt RoperFrom: Prathap Kumar Valsan <[email protected]>
The layout of some engine contexts has changed on Xe_HP. Define the new offsets.
Bspec: 45585, 46256
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 65 ++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.c +59 -6
@@ -484,6 +484,47 @@ static const u8 gen12_rcs_offsets[] = { END }; +static const u8 xehp_rcs_offsets[] = { +NOP (1 ), +LRI (13 ,POSTED ), +REG16 (0x244 ), +REG (0x034 ), +REG (0x030 ), +REG (0x038 ), +REG (0x03c ), +REG (0x168 ), +REG (0x140 ), +REG (0x110 ), +REG (0x1c0 ), +REG (0x1c4 ), +REG (0x1c8 ), +REG (0x180 ), +REG16 (0x2b4 ), + +NOP (5 ), +LRI (9 ,POSTED ), +REG16 (0x3a8 ), +REG16 (0x28c ), +REG16 (0x288 ), +REG16 (0x284 ), +REG16 (0x280 ), +REG16 (0x27c ), +REG16 (0x278 ), +REG16 (0x274 ), +REG16 (0x270 ), + +LRI (3 ,POSTED ), +REG (0x1b0 ), +REG16 (0x5a8 ), +REG16 (0x5ac ), + +NOP (6 ), +LRI (1 ,0 ), +REG (0x0c8 ), + +END +}; +#undef END#undef REG16#undef REG
@@ -502,7 +543,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine) !intel_engine_has_relative_mmio(engine));if (engine->class ==RENDER_CLASS ) { -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +return xehp_rcs_offsets; +else if (GRAPHICS_VER (engine->i915) >=12 )return gen12_rcs_offsets;else if (GRAPHICS_VER (engine->i915) >=11 )return gen11_rcs_offsets;
@@ -522,7 +565,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine)static int lrc_ring_mi_mode (const struct intel_engine_cs *engine) { -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +return 0x70 ; +else if (GRAPHICS_VER (engine->i915) >=12 )return 0x60 ;else if (GRAPHICS_VER (engine->i915) >=9 )return 0x54 ;
@@ -534,7 +579,9 @@ static int lrc_ring_mi_mode(const struct intel_engine_cs *engine)static int lrc_ring_gpr0 (const struct intel_engine_cs *engine) { -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +return 0x84 ; +else if (GRAPHICS_VER (engine->i915) >=12 )return 0x74 ;else if (GRAPHICS_VER (engine->i915) >=9 )return 0x68 ;
@@ -578,10 +625,16 @@ static int lrc_ring_indirect_offset(const struct intel_engine_cs *engine)static int lrc_ring_cmd_buf_cctl (const struct intel_engine_cs *engine) { -if (engine->class !=RENDER_CLASS ) -return -1 ; -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +/* +* Note that the CSFE context has a dummy slot for CMD_BUF_CCTL +* simply to match the RCS context image layout. +*/ +return 0xc6 ; +else if (engine->class !=RENDER_CLASS ) +return -1 ; +else if (GRAPHICS_VER (engine->i915) >=12 )return 0xb6 ;else if (GRAPHICS_VER (engine->i915) >=11 )return 0xaa ;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 12/50] drm/i915/xehp: New engine context offsets
Quoted 11 lines · Matt Roper
From: Prathap Kumar Valsan <[email protected]>
The layout of some engine contexts has changed on
Xe_HP. Define the new offsets.Bspec: 45585, 46256
Signed-off-by Prathap Kumar Valsan <[email protected]>Signed-off-by Ramalingam C <[email protected]>Signed-off-by Venkata Ramana Nayana <[email protected]>Signed-off-by Akeem G Abodunrin <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 116 lines
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 65 ++++++++++++++++++++++++++--- 1 file changed, 59 insertions(+), 6 deletions(-)drivers/gpu/drm/i915/gt/intel_lrc.c +59
-6@@ -484,6 +484,47 @@ static const u8 gen12_rcs_offsets[] = { END }; +static const u8 xehp_rcs_offsets[] = { +NOP (1 ), +LRI (13 ,POSTED ), +REG16 (0x244 ), +REG (0x034 ), +REG (0x030 ), +REG (0x038 ), +REG (0x03c ), +REG (0x168 ), +REG (0x140 ), +REG (0x110 ), +REG (0x1c0 ), +REG (0x1c4 ), +REG (0x1c8 ), +REG (0x180 ), +REG16 (0x2b4 ), + +NOP (5 ), +LRI (9 ,POSTED ), +REG16 (0x3a8 ), +REG16 (0x28c ), +REG16 (0x288 ), +REG16 (0x284 ), +REG16 (0x280 ), +REG16 (0x27c ), +REG16 (0x278 ), +REG16 (0x274 ), +REG16 (0x270 ), + +LRI (3 ,POSTED ), +REG (0x1b0 ), +REG16 (0x5a8 ), +REG16 (0x5ac ), + +NOP (6 ), +LRI (1 ,0 ), +REG (0x0c8 ), + +END +}; +#undef END#undef REG16#undef REG@@ -502,7 +543,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine) !intel_engine_has_relative_mmio(engine));if (engine->class ==RENDER_CLASS ) { -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +return xehp_rcs_offsets; +else if (GRAPHICS_VER (engine->i915) >=12 )return gen12_rcs_offsets;else if (GRAPHICS_VER (engine->i915) >=11 )return gen11_rcs_offsets;@@ -522,7 +565,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine)static int lrc_ring_mi_mode (const struct intel_engine_cs *engine) { -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +return 0x70 ; +else if (GRAPHICS_VER (engine->i915) >=12 )return 0x60 ;else if (GRAPHICS_VER (engine->i915) >=9 )return 0x54 ;@@ -534,7 +579,9 @@ static int lrc_ring_mi_mode(const struct intel_engine_cs *engine)static int lrc_ring_gpr0 (const struct intel_engine_cs *engine) { -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +return 0x84 ; +else if (GRAPHICS_VER (engine->i915) >=12 )return 0x74 ;else if (GRAPHICS_VER (engine->i915) >=9 )return 0x68 ;@@ -578,10 +625,16 @@ static int lrc_ring_indirect_offset(const struct intel_engine_cs *engine)static int lrc_ring_cmd_buf_cctl (const struct intel_engine_cs *engine) { -if (engine->class !=RENDER_CLASS ) -return -1 ; -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +/* +* Note that the CSFE context has a dummy slot for CMD_BUF_CCTL +* simply to match the RCS context image layout. +*/ +return 0xc6 ; +else if (engine->class !=RENDER_CLASS ) +return -1 ; +else if (GRAPHICS_VER (engine->i915) >=12 )return 0xb6 ;else if (GRAPHICS_VER (engine->i915) >=11 )return 0xaa ;Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 13/50 drm/i915/xehp: handle new steering options
In reply to Matt RoperFrom: Daniele Ceraolo Spurio <[email protected]>
Xe_HP is more modular then its predecessors and as a consequence it has more types of replicated registers. As with l3bank regions on previous platforms, we may need to explicitly re-steer accesses to these new types of ranges at runtime if we can't find a single default steering value that satisfies the fusing of all types.
Bspec: 66534
--- drivers/gpu/drm/i915/gt/intel_gt.c | 40 ++++++++- drivers/gpu/drm/i915/gt/intel_gt.h | 1 + drivers/gpu/drm/i915/gt/intel_gt_types.h | 7 ++ drivers/gpu/drm/i915/gt/intel_region_lmem.c | 1 + drivers/gpu/drm/i915/gt/intel_sseu.c | 18 +++++ drivers/gpu/drm/i915/gt/intel_sseu.h | 6 ++ drivers/gpu/drm/i915/gt/intel_workarounds.c | 89 +++++++++++++++++++-- drivers/gpu/drm/i915/i915_drv.h | 3 + drivers/gpu/drm/i915/i915_pci.c | 1 + drivers/gpu/drm/i915/i915_reg.h | 4 + drivers/gpu/drm/i915/intel_device_info.h | 1 + 11 files changed, 165 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +39 -1
@@ -89,6 +89,13 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { {}, }; +static u16 slicemask (struct intel_gt *gt,int count) +{ +u64 dss_mask =intel_sseu_get_subslices (>->info.sseu,0 ); + +return intel_slicemask_from_dssmask (dss_mask, count); +} +int intel_gt_init_mmio (struct intel_gt *gt) {intel_gt_init_clock_frequency (gt);
@@ -96,11 +103,24 @@ int intel_gt_init_mmio(struct intel_gt *gt)intel_uc_init_mmio (>->uc);intel_sseu_info_init (gt); -if (GRAPHICS_VER (gt->i915) >=11 ) { +/* +* An mslice is unavailable only if both the meml3 for the slice is +* disabled *and* all of the DSS in the slice (quadrant) are disabled. +*/ +if (HAS_MSLICES (gt->i915)) + gt->info.mslice_mask = +slicemask (gt,GEN_DSS_PER_MSLICE ) | + (intel_uncore_read (gt->uncore,GEN10_MIRROR_FUSE3 ) & +GEN12_MEML3_EN_MASK ); + +if (GRAPHICS_VER (gt->i915) >=11 && +GRAPHICS_VER_FULL (gt->i915) <IP_VER (12 ,50 )) { gt->steering_table[L3BANK ] = icl_l3bank_steering_table; gt->info.l3bank_mask = ~intel_uncore_read (gt->uncore,GEN10_MIRROR_FUSE3 ) &GEN10_L3BANK_MASK ; + }else if (HAS_MSLICES (gt->i915)) { +MISSING_CASE (INTEL_INFO (gt->i915)->platform); }return intel_engines_init_mmio (gt);
@@ -766,6 +786,24 @@ static void intel_gt_get_valid_steering(struct intel_gt *gt, *sliceid =0 ;/* unused */ *subsliceid =__ffs (gt->info.l3bank_mask);break ; +case MSLICE : +GEM_DEBUG_WARN_ON (!gt->info.mslice_mask);/* should be impossible! */ + + *sliceid =__ffs (gt->info.mslice_mask); + *subsliceid =0 ;/* unused */ +break ; +case LNCF : +GEM_DEBUG_WARN_ON (!gt->info.mslice_mask);/* should be impossible! */ + +/* +* 0xFDC[29:28] selects the mslice to steer to and 0xFDC[27] +* selects which LNCF within the mslice to steer to. An LNCF +* is always present if its mslice is present, so we can safely +* just steer to LNCF 0 in all cases. +*/ + *sliceid =__ffs (gt->info.mslice_mask) <<1 ; + *subsliceid =0 ;/* unused */ +break ;default :MISSING_CASE (type); *sliceid =0 ;
drivers/gpu/drm/i915/gt/intel_gt.h +1 -0
@@ -82,6 +82,7 @@ static inline bool intel_gt_needs_read_steering(struct intel_gt *gt, }u32 intel_gt_read_register_fw (struct intel_gt *gt,i915_reg_t reg); +u32 intel_gt_read_register (struct intel_gt *gt,i915_reg_t reg);void intel_gt_info_print (const struct intel_gt_info *info,struct drm_printer *p);
drivers/gpu/drm/i915/gt/intel_gt_types.h +7 -0
@@ -47,9 +47,14 @@ struct intel_mmio_range {* of multicast registers. If another type of steering does not have any * overlap in valid steering targets with 'subslice' style registers, we will * need to explicitly re-steer reads of registers of the other type. +* +* Only the replication types that may need additional non-default steering +* are listed here. */ enum intel_steering_type {L3BANK , +MSLICE , +LNCF ,NUM_STEERING_TYPES };
@@ -184,6 +189,8 @@ struct intel_gt {/* Slice/subslice/EU info */ struct sseu_dev_info sseu; + +unsigned long mslice_mask; } info; };
drivers/gpu/drm/i915/gt/intel_region_lmem.c +1 -0
@@ -10,6 +10,7 @@#include "gem/i915_gem_lmem.h" #include "gem/i915_gem_region.h" #include "gem/i915_gem_ttm.h" +#include "gt/intel_gt.h" static int init_fake_lmem_bar (struct intel_memory_region *mem) {
drivers/gpu/drm/i915/gt/intel_sseu.c +18 -0
@@ -759,3 +759,21 @@ void intel_sseu_print_topology(const struct sseu_dev_info *sseu, } } } + +u16 intel_slicemask_from_dssmask (u64 dss_mask,int dss_per_slice) +{ +u16 slice_mask =0 ; +int i; + +WARN_ON (sizeof (dss_mask) *8 / dss_per_slice >8 *sizeof (slice_mask)); + +for (i =0 ; dss_mask; i++) { +if (dss_mask &GENMASK (dss_per_slice -1 ,0 )) + slice_mask |=BIT (i); + + dss_mask >>= dss_per_slice; + } + +return slice_mask; +} +
drivers/gpu/drm/i915/gt/intel_sseu.h +6 -0
@@ -22,6 +22,10 @@ struct drm_printer;#define GEN_MAX_EUS (16)/* TGL upper bound */ #define GEN_MAX_EU_STRIDE GEN_SSEU_STRIDE(GEN_MAX_EUS) +#define GEN_DSS_PER_GSLICE 4 +#define GEN_DSS_PER_CSLICE 8 +#define GEN_DSS_PER_MSLICE 8 +struct sseu_dev_info {u8 slice_mask;u8 subslice_mask[GEN_MAX_SLICES *GEN_MAX_SUBSLICE_STRIDE ];
@@ -104,4 +108,6 @@ void intel_sseu_dump(const struct sseu_dev_info *sseu, struct drm_printer *p);void intel_sseu_print_topology (const struct sseu_dev_info *sseu,struct drm_printer *p); +u16 intel_slicemask_from_dssmask (u64 dss_mask,int dss_per_slice); +#endif /* __INTEL_SSEU_H__ */
drivers/gpu/drm/i915/gt/intel_workarounds.c +84 -5
108 lines not on this page · raw message
drivers/gpu/drm/i915/i915_drv.h +3 -0
@@ -1720,6 +1720,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define HAS_RUNTIME_PM (dev_priv) (INTEL_INFO(dev_priv)->has_runtime_pm)#define HAS_64BIT_RELOC (dev_priv) (INTEL_INFO(dev_priv)->has_64bit_reloc) +#define HAS_MSLICES (dev_priv) \ + (INTEL_INFO(dev_priv)->has_mslices) +#define HAS_IPC (dev_priv) (INTEL_INFO(dev_priv)->display.has_ipc)#define HAS_REGION (i915, i) (INTEL_INFO(i915)->memory_regions & (i))
drivers/gpu/drm/i915/i915_pci.c +1 -0
@@ -1012,6 +1012,7 @@ static const struct intel_device_info adl_p_info = { .has_llc = 1, \ .has_logical_ring_contexts = 1, \ .has_logical_ring_elsq = 1, \ + .has_mslices = 1, \ .has_rc6 = 1, \ .has_reset_engine = 1, \ .has_rps = 1, \
drivers/gpu/drm/i915/i915_reg.h +4 -0
@@ -2695,6 +2695,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_MCR_SLICE_MASK GEN11_MCR_SLICE(0xf)#define GEN11_MCR_SUBSLICE (subslice) (((subslice) & 0x7) << 24)#define GEN11_MCR_SUBSLICE_MASK GEN11_MCR_SUBSLICE(0x7) +#define GEN11_MCR_MULTICAST REG_BIT(31)#define RING_IPEIR (base) _MMIO((base) + 0x64)#define RING_IPEHR (base) _MMIO((base) + 0x68)#define RING_EIR (base) _MMIO((base) + 0xb0)
@@ -3113,6 +3114,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#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 +#define GEN12_MEML3_EN_MASK 0x0F#define GEN8_EU_DISABLE0 _MMIO(0x9134)#define GEN8_EU_DIS0_S0_MASK 0xffffff
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -127,6 +127,7 @@ enum intel_ppgtt_type {func (has_llc); \func (has_logical_ring_contexts); \func (has_logical_ring_elsq); \ +func (has_mslices); \func (has_pooled_eu); \func (has_rc6); \func (has_rc6p); \
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 14/50 drm/i915/xehp: Loop over all gslices for INSTDONE processing
In reply to Matt RoperWe no longer have traditional slices on Xe_HP platforms, but the INSTDONE registers are replicated according to gslice representation which is similar. We can mostly re-use the existing instdone code with just a few modifications:
* Create an alternate instdone loop macro that will iterate over the flat DSS space, but still provide the gslice/dss steering values for compatibility with the legacy code.
* We should allocate INSTDONE storage space according to the maximum number of gslices rather than the maximum number of legacy slices to ensure we have enough storage space to hold all of the values. XeHP design has 8 gslices, whereas older platforms never had more than 3 slices.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 48 +++++++++++--------- drivers/gpu/drm/i915/gt/intel_engine_types.h | 12 ++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 7 +++ drivers/gpu/drm/i915/i915_gpu_error.c | 32 +++++++++---- 4 files changed, 66 insertions(+), 33 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +26 -22
@@ -1182,16 +1182,16 @@ void intel_engine_get_instdone(const struct intel_engine_cs *engine,u32 mmio_base = engine->mmio_base;int slice;int subslice; +int iter;memset (instdone,0 ,sizeof (*instdone)); -switch (GRAPHICS_VER (i915)) { -default : +if (GRAPHICS_VER (i915) >=8 ) { instdone->instdone =intel_uncore_read (uncore,RING_INSTDONE (mmio_base));if (engine->id !=RCS0 ) -break ; +return ; instdone->slice_common =intel_uncore_read (uncore,GEN7_SC_INSTDONE );
@@ -1201,21 +1201,32 @@ void intel_engine_get_instdone(const struct intel_engine_cs *engine, instdone->slice_common_extra[1 ] =intel_uncore_read (uncore,GEN12_SC_INSTDONE_EXTRA2 ); } -for_each_instdone_slice_subslice (i915, sseu, slice, subslice) { - instdone->sampler[slice][subslice] = -read_subslice_reg (engine, slice, subslice, -GEN7_SAMPLER_INSTDONE ); - instdone->row[slice][subslice] = -read_subslice_reg (engine, slice, subslice, -GEN7_ROW_INSTDONE ); + +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) { +for_each_instdone_gslice_dss_xehp (i915, sseu, iter, slice, subslice) { + instdone->sampler[slice][subslice] = +read_subslice_reg (engine, slice, subslice, +GEN7_SAMPLER_INSTDONE ); + instdone->row[slice][subslice] = +read_subslice_reg (engine, slice, subslice, +GEN7_ROW_INSTDONE ); + } + }else { +for_each_instdone_slice_subslice (i915, sseu, slice, subslice) { + instdone->sampler[slice][subslice] = +read_subslice_reg (engine, slice, subslice, +GEN7_SAMPLER_INSTDONE ); + instdone->row[slice][subslice] = +read_subslice_reg (engine, slice, subslice, +GEN7_ROW_INSTDONE ); + } } -break ; -case 7 : + }else if (GRAPHICS_VER (i915) >=7 ) { instdone->instdone =intel_uncore_read (uncore,RING_INSTDONE (mmio_base));if (engine->id !=RCS0 ) -break ; +return ; instdone->slice_common =intel_uncore_read (uncore,GEN7_SC_INSTDONE );
@@ -1223,22 +1234,15 @@ void intel_engine_get_instdone(const struct intel_engine_cs *engine,intel_uncore_read (uncore,GEN7_SAMPLER_INSTDONE ); instdone->row[0 ][0 ] =intel_uncore_read (uncore,GEN7_ROW_INSTDONE ); - -break ; -case 6 : -case 5 : -case 4 : + }else if (GRAPHICS_VER (i915) >=4 ) { instdone->instdone =intel_uncore_read (uncore,RING_INSTDONE (mmio_base));if (engine->id ==RCS0 )/* HACK: Using the wrong struct member */ instdone->slice_common =intel_uncore_read (uncore,GEN4_INSTDONE1 ); -break ; -case 3 : -case 2 : + }else { instdone->instdone =intel_uncore_read (uncore,GEN2_INSTDONE ); -break ; } }
drivers/gpu/drm/i915/gt/intel_engine_types.h +10 -2
@@ -78,8 +78,8 @@ struct intel_instdone {/* The following exist only in the RCS engine */ u32 slice_common;u32 slice_common_extra[2 ]; -u32 sampler[I915_MAX_SLICES ][I915_MAX_SUBSLICES ]; -u32 row[I915_MAX_SLICES ][I915_MAX_SUBSLICES ]; +u32 sampler[GEN_MAX_GSLICES ][I915_MAX_SUBSLICES ]; +u32 row[GEN_MAX_GSLICES ][I915_MAX_SUBSLICES ]; };/*
@@ -579,4 +579,12 @@ intel_engine_has_relative_mmio(const struct intel_engine_cs * const engine)for_each_if ((instdone_has_slice (dev_priv_, sseu_, slice_)) && \ (instdone_has_subslice (dev_priv_, sseu_, slice_, \ subslice_))) + +#define for_each_instdone_gslice_dss_xehp (dev_priv_, sseu_, iter_, gslice_, dss_) \ + for ((iter_) = 0, (gslice_) = 0, (dss_) = 0; \ + (iter_) < GEN_MAX_SUBSLICES; \ + (iter_)++, (gslice_) = (iter_) / GEN_DSS_PER_GSLICE, \ + (dss_) = (iter_) % GEN_DSS_PER_GSLICE) \ + for_each_if(intel_sseu_has_subslice((sseu_), 0, (iter_))) +#endif /* __INTEL_ENGINE_TYPES_H__ */
drivers/gpu/drm/i915/gt/intel_sseu.h +7 -0
@@ -26,6 +26,9 @@ struct drm_printer;#define GEN_DSS_PER_CSLICE 8#define GEN_DSS_PER_MSLICE 8 +#define GEN_MAX_GSLICES (GEN_MAX_SUBSLICES / GEN_DSS_PER_GSLICE) +#define GEN_MAX_CSLICES (GEN_MAX_SUBSLICES / GEN_DSS_PER_CSLICE) +struct sseu_dev_info {u8 slice_mask;u8 subslice_mask[GEN_MAX_SLICES *GEN_MAX_SUBSLICE_STRIDE ];
@@ -78,6 +81,10 @@ intel_sseu_has_subslice(const struct sseu_dev_info *sseu, int slice,u8 mask;int ss_idx = subslice /BITS_PER_BYTE ; +if (slice >= sseu->max_slices || + subslice >= sseu->max_subslices) +return false; +GEM_BUG_ON (ss_idx >= sseu->ss_stride); mask = sseu->subslice_mask[slice * sseu->ss_stride + ss_idx];
drivers/gpu/drm/i915/i915_gpu_error.c +23 -9
@@ -444,15 +444,29 @@ static void error_print_instdone(struct drm_i915_error_state_buf *m,if (GRAPHICS_VER (m->i915) <=6 )return ; -for_each_instdone_slice_subslice (m->i915, sseu, slice, subslice) -err_printf (m," SAMPLER_INSTDONE[%d][%d]: 0x%08x\n" , - slice, subslice, - ee->instdone.sampler[slice][subslice]); - -for_each_instdone_slice_subslice (m->i915, sseu, slice, subslice) -err_printf (m," ROW_INSTDONE[%d][%d]: 0x%08x\n" , - slice, subslice, - ee->instdone.row[slice][subslice]); +if (GRAPHICS_VER_FULL (m->i915) >=IP_VER (12 ,50 )) { +int iter; + +for_each_instdone_gslice_dss_xehp (m->i915, sseu, iter, slice, subslice) +err_printf (m," SAMPLER_INSTDONE[%d][%d]: 0x%08x\n" , + slice, subslice, + ee->instdone.sampler[slice][subslice]); + +for_each_instdone_gslice_dss_xehp (m->i915, sseu, iter, slice, subslice) +err_printf (m," ROW_INSTDONE[%d][%d]: 0x%08x\n" , + slice, subslice, + ee->instdone.row[slice][subslice]); + }else { +for_each_instdone_slice_subslice (m->i915, sseu, slice, subslice) +err_printf (m," SAMPLER_INSTDONE[%d][%d]: 0x%08x\n" , + slice, subslice, + ee->instdone.sampler[slice][subslice]); + +for_each_instdone_slice_subslice (m->i915, sseu, slice, subslice) +err_printf (m," ROW_INSTDONE[%d][%d]: 0x%08x\n" , + slice, subslice, + ee->instdone.row[slice][subslice]); + }if (GRAPHICS_VER (m->i915) <12 )return ;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 15/50 drm/i915/xehpsdv: add initial XeHP SDV definitions
In reply to Matt RoperFrom: Lucas De Marchi <[email protected]>
XeHP SDV is a Intel® dGPU without display. This is just the definition of some basic platform macros, by large a copy of current state of Tigerlake which does not reflect the end state of this platform.
v2:
- Switch to intel_step infrastructure for stepping matches. (Jani)
Bspec: 44467, 48077
--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_step.c | 12 +++++++++++- drivers/gpu/drm/i915/intel_step.h | 1 + 6 files changed, 38 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +4 -0
@@ -1453,6 +1453,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_DG1 (dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)#define IS_ALDERLAKE_S (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_S)#define IS_ALDERLAKE_P (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_P) +#define IS_XEHPSDV (dev_priv) IS_PLATFORM(dev_priv, INTEL_XEHPSDV)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
@@ -1611,6 +1612,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, (IS_ALDERLAKE_P (__i915) && \ IS_GT_STEP(__i915, since, until)) +#define IS_XEHPSDV_GT_STEP (p, since, until) \ + (IS_XEHPSDV(p) && IS_GT_STEP(__i915, since, until)) +#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && IS_LP(dev_priv))#define IS_GEN9_BC (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && !IS_LP(dev_priv))
drivers/gpu/drm/i915/i915_pci.c +20 -0
@@ -1020,6 +1020,26 @@ static const struct intel_device_info adl_p_info = { .ppgtt_size = 48, \ .ppgtt_type = INTEL_PPGTT_FULL +#define XE_HPM_FEATURES \ + .media_ver = 12, \ + .media_rel = 50 + +__maybe_unused +static const struct intel_device_info xehpsdv_info = { +XE_HP_FEATURES , +XE_HPM_FEATURES , +DGFX_FEATURES , +PLATFORM (INTEL_XEHPSDV ), + .display = { }, + .pipe_mask =0 , + .platform_engine_mask = +BIT (RCS0 ) |BIT (BCS0 ) | +BIT (VECS0 ) |BIT (VECS1 ) |BIT (VECS2 ) |BIT (VECS3 ) | +BIT (VCS0 ) |BIT (VCS1 ) |BIT (VCS2 ) |BIT (VCS3 ) | +BIT (VCS4 ) |BIT (VCS5 ) |BIT (VCS6 ) |BIT (VCS7 ), + .require_force_probe =1 , +}; +#undef PLATFORM/*
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -68,6 +68,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (DG1 ),PLATFORM_NAME (ALDERLAKE_S ),PLATFORM_NAME (ALDERLAKE_P ), + PLATFORM_NAME(XEHPSDV), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +1 -0
@@ -88,6 +88,7 @@ enum intel_platform {INTEL_DG1 ,INTEL_ALDERLAKE_S ,INTEL_ALDERLAKE_P , +INTEL_XEHPSDV , INTEL_MAX_PLATFORMS };
drivers/gpu/drm/i915/intel_step.c +11 -1
@@ -54,6 +54,13 @@ static const struct intel_step_info adlp_revid_step_tbl[] = { [0xC] = { .gt_step = STEP_C0, .display_step = STEP_D0 }, }; +static const struct intel_step_info xehpsdv_revid_step_tbl[] = { + [0x0 ] = { .gt_step =STEP_A0 }, + [0x1 ] = { .gt_step =STEP_A1 }, + [0x4 ] = { .gt_step =STEP_B0 }, + [0x8 ] = { .gt_step =STEP_C0 }, +}; +void intel_step_init (struct drm_i915_private *i915) {const struct intel_step_info *revids =NULL ;
@@ -61,7 +68,10 @@ void intel_step_init(struct drm_i915_private *i915)int revid =INTEL_REVID (i915);struct intel_step_info step = {}; -if (IS_ALDERLAKE_P (i915)) { +if (IS_XEHPSDV (i915)) { + revids = xehpsdv_revid_step_tbl; + size =ARRAY_SIZE (xehpsdv_revid_step_tbl); + }else if (IS_ALDERLAKE_P (i915)) { revids = adlp_revid_step_tbl; size =ARRAY_SIZE (adlp_revid_step_tbl); }else if (IS_ALDERLAKE_S (i915)) {
drivers/gpu/drm/i915/intel_step.h +1 -0
@@ -22,6 +22,7 @@ struct intel_step_info {enum intel_step {STEP_NONE =0 ,STEP_A0 , +STEP_A1 ,STEP_A2 ,STEP_B0 ,STEP_B1 ,
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 15/50] drm/i915/xehpsdv: add initial XeHP SDV definitions
Quoted 8 lines · Matt Roper
From: Lucas De Marchi <[email protected]>
XeHP SDV is a Intel® dGPU without display. This is just the definition of some basic platform macros, by large a copy of current state of Tigerlake which does not reflect the end state of this platform.
v2:
- Switch tointel_stepinfrastructure for stepping matches. (Jani)
Quoted 130 lines
Bspec: 44467, 48077
Cc Rodrigo Vivi <[email protected]>Signed-off-by Lucas De Marchi <[email protected]>Signed-off-by Daniele Ceraolo Spurio <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>Signed-off-by Stuart Summers <[email protected]>Signed-off-by Tomas Winkler <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 4 ++++ drivers/gpu/drm/i915/i915_pci.c | 20 ++++++++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 1 + drivers/gpu/drm/i915/intel_step.c | 12 +++++++++++- drivers/gpu/drm/i915/intel_step.h | 1 + 6 files changed, 38 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +4
-0@@ -1453,6 +1453,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_DG1 (dev_priv) IS_PLATFORM(dev_priv, INTEL_DG1)#define IS_ALDERLAKE_S (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_S)#define IS_ALDERLAKE_P (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_P) +#define IS_XEHPSDV (dev_priv) IS_PLATFORM(dev_priv, INTEL_XEHPSDV)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \@@ -1611,6 +1612,9 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915, (IS_ALDERLAKE_P (__i915) && \ IS_GT_STEP(__i915, since, until)) +#define IS_XEHPSDV_GT_STEP (p, since, until) \ + (IS_XEHPSDV(p) && IS_GT_STEP(__i915, since, until)) +#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && IS_LP(dev_priv))#define IS_GEN9_BC (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && !IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +20
-0@@ -1020,6 +1020,26 @@ static const struct intel_device_info adl_p_info = { .ppgtt_size = 48, \ .ppgtt_type = INTEL_PPGTT_FULL +#define XE_HPM_FEATURES \ + .media_ver = 12, \ + .media_rel = 50 + +__maybe_unused +static const struct intel_device_info xehpsdv_info = { +XE_HP_FEATURES , +XE_HPM_FEATURES , +DGFX_FEATURES , +PLATFORM (INTEL_XEHPSDV ), + .display = { }, + .pipe_mask =0 , + .platform_engine_mask = +BIT (RCS0 ) |BIT (BCS0 ) | +BIT (VECS0 ) |BIT (VECS1 ) |BIT (VECS2 ) |BIT (VECS3 ) | +BIT (VCS0 ) |BIT (VCS1 ) |BIT (VCS2 ) |BIT (VCS3 ) | +BIT (VCS4 ) |BIT (VCS5 ) |BIT (VCS6 ) |BIT (VCS7 ), + .require_force_probe =1 , +}; +#undef PLATFORM/* drivers/gpu/drm/i915/intel_device_info.c +1
-0@@ -68,6 +68,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (DG1 ),PLATFORM_NAME (ALDERLAKE_S ),PLATFORM_NAME (ALDERLAKE_P ), + PLATFORM_NAME(XEHPSDV), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +1
-0@@ -88,6 +88,7 @@ enum intel_platform {INTEL_DG1 ,INTEL_ALDERLAKE_S ,INTEL_ALDERLAKE_P , +INTEL_XEHPSDV , INTEL_MAX_PLATFORMS };drivers/gpu/drm/i915/intel_step.c +11
-1@@ -54,6 +54,13 @@ static const struct intel_step_info adlp_revid_step_tbl[] = { [0xC] = { .gt_step = STEP_C0, .display_step = STEP_D0 }, }; +static const struct intel_step_info xehpsdv_revid_step_tbl[] = { + [0x0 ] = { .gt_step =STEP_A0 }, + [0x1 ] = { .gt_step =STEP_A1 }, + [0x4 ] = { .gt_step =STEP_B0 }, + [0x8 ] = { .gt_step =STEP_C0 }, +}; +void intel_step_init (struct drm_i915_private *i915) {const struct intel_step_info *revids =NULL ;@@ -61,7 +68,10 @@ void intel_step_init(struct drm_i915_private *i915)int revid =INTEL_REVID (i915);struct intel_step_info step = {}; -if (IS_ALDERLAKE_P (i915)) { +if (IS_XEHPSDV (i915)) { + revids = xehpsdv_revid_step_tbl; + size =ARRAY_SIZE (xehpsdv_revid_step_tbl); + }else if (IS_ALDERLAKE_P (i915)) { revids = adlp_revid_step_tbl; size =ARRAY_SIZE (adlp_revid_step_tbl); }else if (IS_ALDERLAKE_S (i915)) {drivers/gpu/drm/i915/intel_step.h +0
-0
drivers/gpu/drm/i915/intel_step.h struct intel_step_info { · line 28
Quoted 7 lines
drivers/gpu/drm/i915/intel_step.h +1
-0@@ -22,6 +22,7 @@ struct intel_step_info {enum intel_step {STEP_NONE =0 ,STEP_A0 , +STEP_A1 ,STEP_A2 ,STEP_B0 ,STEP_B1 ,
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 16/50 drm/i915/xehp: Changes to ss/eu definitions
In reply to Matt RoperFrom: Matthew Auld <[email protected]>
Xe_HP no longer has "slices" in the same way that old platforms did. There are new concepts (gslices, cslices, mslices) that apply in various contexts, but for the purposes of fusing slices no longer exist and we just have one large pool of dual-subslices (DSS) to work with. Furthermore, the meaning of the DSS fuse is inverted compared to past platforms --- it now specifies which DSS are enabled rather than which ones are disabled.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 24 ++++++++++++++++++++---- drivers/gpu/drm/i915/i915_getparam.c | 6 ++++-- drivers/gpu/drm/i915/i915_reg.h | 3 +++ 3 files changed, 27 insertions(+), 6 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +20 -4
@@ -139,17 +139,33 @@ static void gen12_sseu_info_init(struct intel_gt *gt)* Gen12 has Dual-Subslices, which behave similarly to 2 gen11 SS. * Instead of splitting these, provide userspace with an array * of DSS to more closely represent the hardware resource. +* +* In addition, the concept of slice has been removed in Xe_HP. +* To be compatible with prior generations, assume a single slice +* across the entire device. Then calculate out the DSS for each +* workload type within that software slice. */ intel_sseu_set_info (sseu,1 ,6 ,16 ); - s_en =intel_uncore_read (uncore,GEN11_GT_SLICE_ENABLE ) & -GEN11_GT_S_ENA_MASK ; +/* +* As mentioned above, Xe_HP does not have the concept of a slice. +* Enable one for software backwards compatibility. +*/ +if (GRAPHICS_VER_FULL (gt->i915) >=IP_VER (12 ,50 )) + s_en =0x1 ; +else + s_en =intel_uncore_read (uncore,GEN11_GT_SLICE_ENABLE ) & +GEN11_GT_S_ENA_MASK ; dss_en =intel_uncore_read (uncore,GEN12_GT_DSS_ENABLE );/* one bit per pair of EUs */ - eu_en_fuse = ~(intel_uncore_read (uncore,GEN11_EU_DISABLE ) & -GEN11_EU_DIS_MASK ); +if (GRAPHICS_VER_FULL (gt->i915) >=IP_VER (12 ,50 )) + eu_en_fuse =intel_uncore_read (uncore,XEHP_EU_ENABLE ) &XEHP_EU_ENA_MASK ; +else + eu_en_fuse = ~(intel_uncore_read (uncore,GEN11_EU_DISABLE ) & +GEN11_EU_DIS_MASK ); +for (eu =0 ; eu < sseu->max_eus_per_subslice /2 ; eu++)if (eu_en_fuse &BIT (eu)) eu_en |=BIT (eu *2 ) |BIT (eu *2 +1 );
drivers/gpu/drm/i915/i915_getparam.c +4 -2
@@ -15,7 +15,7 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,struct pci_dev *pdev =to_pci_dev (dev->dev);const struct sseu_dev_info *sseu = &i915->gt.info.sseu;drm_i915_getparam_t *param = data; -int value; +int value =0 ;switch (param->param) {case I915_PARAM_IRQ_ACTIVE :
@@ -150,7 +150,9 @@ int i915_getparam_ioctl(struct drm_device *dev, void *data,return -ENODEV ;break ;case I915_PARAM_SUBSLICE_MASK : - value = sseu->subslice_mask[0 ]; +/* Only copy bits from the first slice */ +memcpy (&value, sseu->subslice_mask, +min (sseu->ss_stride, (u8 )sizeof (value)));if (!value)return -ENODEV ;break ;
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -3151,6 +3151,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_GT_DSS_ENABLE _MMIO(0x913C) +#define XEHP_EU_ENABLE _MMIO(0x9134) +#define XEHP_EU_ENA_MASK 0xFF +#define GEN6_BSD_SLEEP_PSMI_CONTROL _MMIO(0x12050)#define GEN6_BSD_SLEEP_MSG_DISABLE (1 << 0)#define GEN6_BSD_SLEEP_FLUSH_DISABLE (1 << 2)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 17/50 drm/i915/xehpsdv: Add maximum sseu limits
In reply to Matt RoperDue to the removal of legacy slices and the transition to a gslice/cslice/mslice/etc. design, we'll internally store all DSS under "slice0."
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 5 ++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 2 +- drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +4 -1
@@ -145,7 +145,10 @@ static void gen12_sseu_info_init(struct intel_gt *gt)* across the entire device. Then calculate out the DSS for each * workload type within that software slice. */ -intel_sseu_set_info (sseu,1 ,6 ,16 ); +if (IS_XEHPSDV (gt->i915)) +intel_sseu_set_info (sseu,1 ,32 ,16 ); +else +intel_sseu_set_info (sseu,1 ,6 ,16 );/* * As mentioned above, Xe_HP does not have the concept of a slice.
drivers/gpu/drm/i915/gt/intel_sseu.h +1 -1
@@ -16,7 +16,7 @@ struct intel_gt;struct drm_printer ;#define GEN_MAX_SLICES (6)/* CNL upper bound */ -#define GEN_MAX_SUBSLICES (8)/* ICL upper bound */ +#define GEN_MAX_SUBSLICES (32)/* XEHPSDV upper bound */ #define GEN_SSEU_STRIDE (max_entries) DIV_ROUND_UP(max_entries, BITS_PER_BYTE)#define GEN_MAX_SUBSLICE_STRIDE GEN_SSEU_STRIDE(GEN_MAX_SUBSLICES)#define GEN_MAX_EUS (16)/* TGL upper bound */
drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c +1 -1
@@ -53,7 +53,7 @@ static void cherryview_sseu_device_status(struct intel_gt *gt,static void gen10_sseu_device_status (struct intel_gt *gt,struct sseu_dev_info *sseu) { -#define SS_MAX 6 +#define SS_MAX 8struct intel_uncore *uncore = gt->uncore;const struct intel_gt_info *info = >->info;u32 s_reg[SS_MAX ], eu_reg[2 *SS_MAX ], eu_mask[2 ];
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 17/50] drm/i915/xehpsdv: Add maximum sseu limits
-caz
Quoted 61 lines · Matt Roper
Due to the removal of legacy slices and the transition to a gslice/cslice/mslice/etc. design, we'll internally store all DSS under
"slice0."Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_sseu.c | 5 ++++- drivers/gpu/drm/i915/gt/intel_sseu.h | 2 +- drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0@@ -145,7 +145,10 @@ static void gen12_sseu_info_init(struct intel_gt *gt) * across the entire device. Then calculate out the DSS foreach
drivers/gpu/drm/i915/gt/intel_sseu.c +4
-1* workload type within that software slice. */ -intel_sseu_set_info (sseu,1 ,6 ,16 ); +if (IS_XEHPSDV (gt->i915)) +intel_sseu_set_info (sseu,1 ,32 ,16 ); +else +intel_sseu_set_info (sseu,1 ,6 ,16 );/* * As mentioned above, Xe_HP does not have the concept of a slice.
drivers/gpu/drm/i915/gt/intel_sseu.h +1
-1@@ -16,7 +16,7 @@ struct intel_gt;struct drm_printer ;#define GEN_MAX_SLICES (6)/* CNL upper bound */ -#define GEN_MAX_SUBSLICES (8)/* ICL upper bound */ +#define GEN_MAX_SUBSLICES (32)/* XEHPSDV upper bound */ #define GEN_SSEU_STRIDE (max_entries) DIV_ROUND_UP(max_entries, BITS_PER_BYTE)#define GEN_MAX_SUBSLICE_STRIDE GEN_SSEU_STRIDE(GEN_MAX_SUBSLICES)#define
GEN_MAX_EUS(16) /* TGL upper bound */drivers/gpu/drm/i915/gt/intel_sseu_debugfs.c +1
-1@@ -53,7 +53,7 @@ static void cherryview_sseu_device_status(structintel_gt *gt, static void gen10_sseu_device_status(struct intel_gt *gt, struct sseu_dev_info *sseu) { -#define SS_MAX 6 +#define SS_MAX 8 struct intel_uncore *uncore = gt->uncore;const struct intel_gt_info *info = >->info;
Quoted 1 line
u32 s_reg[SS_MAX], eu_reg[2 *
SS_MAX], eu_mask[2];
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 18/50 drm/i915/xehpsdv: Add compute DSS type
In reply to Matt RoperFrom: Stuart Summers <[email protected]>
Starting in XeHP, the concept of slice has been removed in favor of DSS (Dual-Subslice) masks for various workload types. These workloads have been divided into those enabled for geometry and those enabled for compute.
i915 currently maintains a single set of S/SS/EU masks for the device. The goal of this patch set is to minimize the amount of impact to prior generations while still giving the user maximum flexibility.
Bspec: 33117, 33118, 20376
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 73 ++++++++++++++++++++-------- drivers/gpu/drm/i915/gt/intel_sseu.h | 5 +- drivers/gpu/drm/i915/i915_reg.h | 3 +- include/uapi/drm/i915_drm.h | 3 -- 4 files changed, 59 insertions(+), 25 deletions(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +53 -20
@@ -46,11 +46,11 @@ u32 intel_sseu_get_subslices(const struct sseu_dev_info *sseu, u8 slice) }void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, -u32 ss_mask) +u8 *subslice_mask,u32 ss_mask) {int offset = slice * sseu->ss_stride; -memcpy (&sseu->subslice_mask[offset], &ss_mask, sseu->ss_stride); +memcpy (&subslice_mask[offset], &ss_mask, sseu->ss_stride); }unsigned int
@@ -100,14 +100,24 @@ static u16 compute_eu_total(const struct sseu_dev_info *sseu)return total; } -static void gen11_compute_sseu_info (struct sseu_dev_info *sseu, -u8 s_en,u32 ss_en,u16 eu_en) +static u32 get_ss_stride_mask (struct sseu_dev_info *sseu,u8 s,u32 ss_en) +{ +u32 ss_mask; + + ss_mask = ss_en >> (s * sseu->max_subslices); + ss_mask &=GENMASK (sseu->max_subslices -1 ,0 ); + +return ss_mask; +} + +static void gen11_compute_sseu_info (struct sseu_dev_info *sseu,u8 s_en, +u32 g_ss_en,u32 c_ss_en,u16 eu_en) {int s, ss; -/* ss_en represents entire subslice mask across all slices */ +/* g_ss_en/c_ss_en represent entire subslice mask across all slices */ GEM_BUG_ON (sseu->max_slices * sseu->max_subslices > -sizeof (ss_en) *BITS_PER_BYTE ); +sizeof (g_ss_en) *BITS_PER_BYTE );for (s =0 ; s < sseu->max_slices; s++) {if ((s_en &BIT (s)) ==0 )
@@ -115,7 +125,23 @@ static void gen11_compute_sseu_info(struct sseu_dev_info *sseu, sseu->slice_mask |=BIT (s); -intel_sseu_set_subslices (sseu, s, ss_en); +/* +* XeHP introduces the concept of compute vs +* geometry DSS. To reduce variation between GENs +* around subslice usage, store a mask for both the +* geometry and compute enabled masks, to provide +* to user space later in QUERY_TOPOLOGY_INFO, and +* compute a total enabled subslice count for the +* purposes of selecting subslices to use in a +* particular GEM context. +*/ +intel_sseu_set_subslices (sseu, s, sseu->compute_subslice_mask, +get_ss_stride_mask (sseu, s, c_ss_en)); +intel_sseu_set_subslices (sseu, s, sseu->geometry_subslice_mask, +get_ss_stride_mask (sseu, s, g_ss_en)); +intel_sseu_set_subslices (sseu, s, sseu->subslice_mask, +get_ss_stride_mask (sseu, s, + g_ss_en | c_ss_en));for (ss =0 ; ss < sseu->max_subslices; ss++)if (intel_sseu_has_subslice (sseu, s, ss))
@@ -129,7 +155,7 @@ static void gen12_sseu_info_init(struct intel_gt *gt) {struct sseu_dev_info *sseu = >->info.sseu;struct intel_uncore *uncore = gt->uncore; -u32 dss_en; +u32 g_dss_en, c_dss_en =0 ;u16 eu_en =0 ;u8 eu_en_fuse;u8 s_en;
@@ -145,10 +171,12 @@ static void gen12_sseu_info_init(struct intel_gt *gt)* across the entire device. Then calculate out the DSS for each * workload type within that software slice. */ -if (IS_XEHPSDV (gt->i915)) +if (IS_XEHPSDV (gt->i915)) {intel_sseu_set_info (sseu,1 ,32 ,16 ); -else + sseu->has_compute_dss =1 ; + }else {intel_sseu_set_info (sseu,1 ,6 ,16 ); + }/* * As mentioned above, Xe_HP does not have the concept of a slice.
@@ -160,7 +188,9 @@ static void gen12_sseu_info_init(struct intel_gt *gt) s_en =intel_uncore_read (uncore,GEN11_GT_SLICE_ENABLE ) &GEN11_GT_S_ENA_MASK ; - dss_en =intel_uncore_read (uncore,GEN12_GT_DSS_ENABLE ); + g_dss_en =intel_uncore_read (uncore,GEN12_GT_GEOMETRY_DSS_ENABLE ); +if (sseu->has_compute_dss) + c_dss_en =intel_uncore_read (uncore,GEN12_GT_COMPUTE_DSS_ENABLE );/* one bit per pair of EUs */ if (GRAPHICS_VER_FULL (gt->i915) >=IP_VER (12 ,50 ))
@@ -173,7 +203,7 @@ static void gen12_sseu_info_init(struct intel_gt *gt)if (eu_en_fuse &BIT (eu)) eu_en |=BIT (eu *2 ) |BIT (eu *2 +1 ); -gen11_compute_sseu_info (sseu, s_en, dss_en, eu_en); +gen11_compute_sseu_info (sseu, s_en, g_dss_en, c_dss_en, eu_en);/* TGL only supports slice-level power gating */ sseu->has_slice_pg =1 ;
@@ -199,7 +229,7 @@ static void gen11_sseu_info_init(struct intel_gt *gt) eu_en = ~(intel_uncore_read (uncore,GEN11_EU_DISABLE ) &GEN11_EU_DIS_MASK ); -gen11_compute_sseu_info (sseu, s_en, ss_en, eu_en); +gen11_compute_sseu_info (sseu, s_en, ss_en,0 , eu_en);/* ICL has no power gating restrictions. */ sseu->has_slice_pg =1 ;
@@ -260,9 +290,9 @@ static void gen10_sseu_info_init(struct intel_gt *gt)* Slice0 can have up to 3 subslices, but there are only 2 in * slice1/2. */ -intel_sseu_set_subslices (sseu, s, s ==0 ? - subslice_mask_with_eus : - subslice_mask_with_eus &0x3 ); +intel_sseu_set_subslices (sseu, s, sseu->subslice_mask, + s ==0 ? subslice_mask_with_eus : + subslice_mask_with_eus &0x3 ); } sseu->eu_total =compute_eu_total (sseu);
@@ -317,7 +347,7 @@ static void cherryview_sseu_info_init(struct intel_gt *gt)sseu_set_eus (sseu,0 ,1 , ~disabled_mask); } -intel_sseu_set_subslices (sseu,0 , subslice_mask); +intel_sseu_set_subslices (sseu,0 , sseu->subslice_mask, subslice_mask); sseu->eu_total =compute_eu_total (sseu);
@@ -373,7 +403,8 @@ static void gen9_sseu_info_init(struct intel_gt *gt)/* skip disabled slice */ continue ; -intel_sseu_set_subslices (sseu, s, subslice_mask); +intel_sseu_set_subslices (sseu, s, sseu->subslice_mask, + subslice_mask); eu_disable =intel_uncore_read (uncore,GEN9_EU_DISABLE (s));for (ss =0 ; ss < sseu->max_subslices; ss++) {
@@ -485,7 +516,8 @@ static void bdw_sseu_info_init(struct intel_gt *gt)/* skip disabled slice */ continue ; -intel_sseu_set_subslices (sseu, s, subslice_mask); +intel_sseu_set_subslices (sseu, s, sseu->subslice_mask, + subslice_mask);for (ss =0 ; ss < sseu->max_subslices; ss++) {u8 eu_disabled_mask;
@@ -583,7 +615,8 @@ static void hsw_sseu_info_init(struct intel_gt *gt) sseu->eu_per_subslice);for (s =0 ; s < sseu->max_slices; s++) { -intel_sseu_set_subslices (sseu, s, subslice_mask); +intel_sseu_set_subslices (sseu, s, sseu->subslice_mask, + subslice_mask);for (ss =0 ; ss < sseu->max_subslices; ss++) { sseu_set_eus(sseu, s, ss,
drivers/gpu/drm/i915/gt/intel_sseu.h +4 -1
@@ -32,6 +32,8 @@ struct drm_printer;struct sseu_dev_info {u8 slice_mask;u8 subslice_mask[GEN_MAX_SLICES *GEN_MAX_SUBSLICE_STRIDE ]; +u8 geometry_subslice_mask[GEN_MAX_SLICES *GEN_MAX_SUBSLICE_STRIDE ]; +u8 compute_subslice_mask[GEN_MAX_SLICES *GEN_MAX_SUBSLICE_STRIDE ];u8 eu_mask[GEN_MAX_SLICES *GEN_MAX_SUBSLICES *GEN_MAX_EU_STRIDE ];u16 eu_total;u8 eu_per_subslice;
@@ -41,6 +43,7 @@ struct sseu_dev_info { u8 has_slice_pg:1; u8 has_subslice_pg:1; u8 has_eu_pg:1; + u8 has_compute_dss:1;/* Topology fields */ u8 max_slices;
@@ -104,7 +107,7 @@ intel_sseu_subslices_per_slice(const struct sseu_dev_info *sseu, u8 slice);u32 intel_sseu_get_subslices (const struct sseu_dev_info *sseu,u8 slice);void intel_sseu_set_subslices (struct sseu_dev_info *sseu,int slice, -u32 ss_mask); +u8 *subslice_mask,u32 ss_mask);void intel_sseu_info_init (struct intel_gt *gt);
drivers/gpu/drm/i915/i915_reg.h +2 -1
@@ -3149,7 +3149,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN11_GT_SUBSLICE_DISABLE _MMIO(0x913C) -#define GEN12_GT_DSS_ENABLE _MMIO(0x913C) +#define GEN12_GT_GEOMETRY_DSS_ENABLE _MMIO(0x913C) +#define GEN12_GT_COMPUTE_DSS_ENABLE _MMIO(0x9144)#define XEHP_EU_ENABLE _MMIO(0x9134)#define XEHP_EU_ENA_MASK 0xFF
include/uapi/drm/i915_drm.h +0 -3
@@ -2438,9 +2438,6 @@ struct drm_i915_query {* Z / 8] >> (Z % 8)) & 1 */ struct drm_i915_query_topology_info { -/* -* Unused for now. Must be cleared to zero. -*/ __u16 flags;__u16 max_slices;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 19/50 drm/i915/xehpsdv: Define steering tables
In reply to Matt RoperDefine and initialize the MMIO ranges for which XeHP SDV requires MSLICE and LNCF steering.
Bspec: 66534
--- drivers/gpu/drm/i915/gt/intel_gt.c | 19 ++++++++++++++++++- drivers/gpu/drm/i915/gt/intel_workarounds.c | 11 +++++++++-- 2 files changed, 27 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/gt/intel_gt.c +18 -1
@@ -89,6 +89,20 @@ static const struct intel_mmio_range icl_l3bank_steering_table[] = { {}, }; +static const struct intel_mmio_range xehpsdv_mslice_steering_table[] = { + {0x004000 ,0x004AFF }, + {0x00C800 ,0x00CFFF }, + {0x00DD00 ,0x00DDFF }, + {0x00E900 ,0x00FFFF },/* 0xEA00 - OxEFFF is unused */ + {}, +}; + +static const struct intel_mmio_range xehpsdv_lncf_steering_table[] = { + {0x00B000 ,0x00B0FF }, + {0x00D800 ,0x00D8FF }, + {}, +}; +static u16 slicemask (struct intel_gt *gt,int count) {u64 dss_mask =intel_sseu_get_subslices (>->info.sseu,0 );
@@ -113,7 +127,10 @@ int intel_gt_init_mmio(struct intel_gt *gt) (intel_uncore_read (gt->uncore,GEN10_MIRROR_FUSE3 ) &GEN12_MEML3_EN_MASK ); -if (GRAPHICS_VER (gt->i915) >=11 && +if (IS_XEHPSDV (gt->i915)) { + gt->steering_table[MSLICE ] = xehpsdv_mslice_steering_table; + gt->steering_table[LNCF ] = xehpsdv_lncf_steering_table; + }else if (GRAPHICS_VER (gt->i915) >=11 &&GRAPHICS_VER_FULL (gt->i915) <IP_VER (12 ,50 )) { gt->steering_table[L3BANK ] = icl_l3bank_steering_table; gt->info.l3bank_mask =
drivers/gpu/drm/i915/gt/intel_workarounds.c +9 -2
@@ -996,7 +996,6 @@ icl_wa_init_mcr(struct drm_i915_private *i915, struct i915_wa_list *wal)__add_mcr_wa (i915, wal, slice, subslice); } -__maybe_unused static void xehp_init_mcr (struct intel_gt *gt,struct i915_wa_list *wal) {
@@ -1215,10 +1214,18 @@ dg1_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) VSUNIT_CLKGATE_DIS_TGL); } +static void +xehpsdv_gt_workarounds_init (struct drm_i915_private *i915,struct i915_wa_list *wal) +{ +xehp_init_mcr (&i915->gt, wal); +} +static void gt_init_workarounds (struct drm_i915_private *i915,struct i915_wa_list *wal) { -if (IS_DG1 (i915)) +if (IS_XEHPSDV (i915)) +xehpsdv_gt_workarounds_init (i915, wal); +else if (IS_DG1 (i915))dg1_gt_workarounds_init (i915, wal);else if (IS_TIGERLAKE (i915))tgl_gt_workarounds_init (i915, wal);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 20/50 drm/i915/xehpsdv: Define MOCS table for XeHP SDV
In reply to Matt RoperFrom: Lucas De Marchi <[email protected]>
Like DG1, XeHP SDV doesn't have LLC/eDRAM control values due to being a dgfx card. XeHP SDV adds 2 more bits: L3_GLBGO to "push the Go point to memory for L3 destined transaction" and L3_LKP to "enable Lookup for uncacheable accesses".
Bspec: 45101
--- drivers/gpu/drm/i915/gt/intel_mocs.c | 33 +++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_mocs.c +32 -1
@@ -40,6 +40,8 @@ struct drm_i915_mocs_table {#define L3_ESC (value) ((value) << 0)#define L3_SCC (value) ((value) << 1)#define _L3_CACHEABILITY (value) ((value) << 4) +#define L3_GLBGO (value) ((value) << 6) +#define L3_LKUP (value) ((value) << 7)/* Helper defines */ #define GEN9_NUM_MOCS_ENTRIES 64/* 63-64 are reserved, but configured. */
@@ -314,6 +316,31 @@ static const struct drm_i915_mocs_entry dg1_mocs_table[] = { MOCS_ENTRY(63, 0, L3_1_UC), }; +static const struct drm_i915_mocs_entry xehpsdv_mocs_table[] = { +/* wa_1608975824 */ +MOCS_ENTRY (0 ,0 ,L3_3_WB |L3_LKUP (1 )), + +/* UC - Coherent; GO:L3 */ +MOCS_ENTRY (1 ,0 ,L3_1_UC |L3_LKUP (1 )), +/* UC - Coherent; GO:Memory */ +MOCS_ENTRY (2 ,0 ,L3_1_UC |L3_GLBGO (1 ) |L3_LKUP (1 )), +/* UC - Non-Coherent; GO:Memory */ +MOCS_ENTRY (3 ,0 ,L3_1_UC |L3_GLBGO (1 )), +/* UC - Non-Coherent; GO:L3 */ +MOCS_ENTRY (4 ,0 ,L3_1_UC ), + +/* WB */ +MOCS_ENTRY (5 ,0 ,L3_3_WB |L3_LKUP (1 )), + +/* HW Reserved - SW program but never use. */ +MOCS_ENTRY (48 ,0 ,L3_3_WB |L3_LKUP (1 )), +MOCS_ENTRY (49 ,0 ,L3_1_UC |L3_LKUP (1 )), +MOCS_ENTRY (60 ,0 ,L3_1_UC ), +MOCS_ENTRY (61 ,0 ,L3_1_UC ), +MOCS_ENTRY (62 ,0 ,L3_1_UC ), +MOCS_ENTRY (63 ,0 ,L3_1_UC ), +}; +enum {HAS_GLOBAL_MOCS =BIT (0 ),HAS_ENGINE_MOCS =BIT (1 ),
@@ -340,7 +367,11 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915, {unsigned int flags; -if (IS_DG1 (i915)) { +if (IS_XEHPSDV (i915)) { + table->size =ARRAY_SIZE (xehpsdv_mocs_table); + table->table = xehpsdv_mocs_table; + table->n_entries =GEN9_NUM_MOCS_ENTRIES ; + }else if (IS_DG1 (i915)) { table->size =ARRAY_SIZE (dg1_mocs_table); table->table = dg1_mocs_table; table->n_entries =GEN9_NUM_MOCS_ENTRIES ;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 21/50 drm/i915/xehpsdv: factor out function to read RP_STATE_CAP
In reply to Matt RoperFrom: Lucas De Marchi <[email protected]>
Instead of maintaining the same if ladder in 3 different places, add a function to read RP_STATE_CAP.
--- drivers/gpu/drm/i915/gt/debugfs_gt_pm.c | 8 +++----- drivers/gpu/drm/i915/gt/intel_rps.c | 17 ++++++++++++----- drivers/gpu/drm/i915/gt/intel_rps.h | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 8 +++----- 4 files changed, 19 insertions(+), 15 deletions(-)
drivers/gpu/drm/i915/gt/debugfs_gt_pm.c +3 -5
@@ -309,13 +309,11 @@ static int frequency_show(struct seq_file *m, void *unused)int max_freq; rp_state_limits =intel_uncore_read (uncore,GEN6_RP_STATE_LIMITS ); -if (IS_GEN9_LP (i915)) { - rp_state_cap =intel_uncore_read (uncore,BXT_RP_STATE_CAP ); + rp_state_cap =intel_rps_read_state_cap (rps); +if (IS_GEN9_LP (i915)) gt_perf_status =intel_uncore_read (uncore,BXT_GT_PERF_STATUS ); - }else { - rp_state_cap =intel_uncore_read (uncore,GEN6_RP_STATE_CAP ); +else gt_perf_status =intel_uncore_read (uncore,GEN6_GT_PERF_STATUS ); - }/* RPSTAT1 is in the GT power well */ intel_uncore_forcewake_get (uncore,FORCEWAKE_ALL );
drivers/gpu/drm/i915/gt/intel_rps.c +12 -5
@@ -975,20 +975,16 @@ int intel_rps_set(struct intel_rps *rps, u8 val)static void gen6_rps_init (struct intel_rps *rps) {struct drm_i915_private *i915 =rps_to_i915 (rps); -struct intel_uncore *uncore =rps_to_uncore (rps); +u32 rp_state_cap =intel_rps_read_state_cap (rps);/* All of these values are in units of 50MHz */ /* static values from HW: RP0 > RP1 > RPn (min_freq) */ if (IS_GEN9_LP (i915)) { -u32 rp_state_cap =intel_uncore_read (uncore,BXT_RP_STATE_CAP ); - rps->rp0_freq = (rp_state_cap >>16 ) &0xff ; rps->rp1_freq = (rp_state_cap >>8 ) &0xff ; rps->min_freq = (rp_state_cap >>0 ) &0xff ; }else { -u32 rp_state_cap =intel_uncore_read (uncore,GEN6_RP_STATE_CAP ); - rps->rp0_freq = (rp_state_cap >>0 ) &0xff ; rps->rp1_freq = (rp_state_cap >>8 ) &0xff ; rps->min_freq = (rp_state_cap >>16 ) &0xff ;
@@ -1936,6 +1932,17 @@ u32 intel_rps_read_actual_frequency(struct intel_rps *rps)return freq; } +u32 intel_rps_read_state_cap (struct intel_rps *rps) +{ +struct drm_i915_private *i915 =rps_to_i915 (rps); +struct intel_uncore *uncore =rps_to_uncore (rps); + +if (IS_GEN9_LP (i915)) +return intel_uncore_read (uncore,BXT_RP_STATE_CAP ); +else +return intel_uncore_read (uncore,GEN6_RP_STATE_CAP ); +} +/* External interface for intel_ips.ko */ static struct drm_i915_private __rcu *ips_mchdev;
drivers/gpu/drm/i915/gt/intel_rps.h +1 -0
@@ -31,6 +31,7 @@ int intel_gpu_freq(struct intel_rps *rps, int val);int intel_freq_opcode (struct intel_rps *rps,int val);u32 intel_rps_get_cagf (struct intel_rps *rps,u32 rpstat1);u32 intel_rps_read_actual_frequency (struct intel_rps *rps); +u32 intel_rps_read_state_cap (struct intel_rps *rps);void gen5_rps_irq_handler (struct intel_rps *rps);void gen6_rps_irq_handler (struct intel_rps *rps,u32 pm_iir);
drivers/gpu/drm/i915/i915_debugfs.c +3 -5
@@ -420,13 +420,11 @@ static int i915_frequency_info(struct seq_file *m, void *unused)int max_freq; rp_state_limits =intel_uncore_read (&dev_priv->uncore,GEN6_RP_STATE_LIMITS ); -if (IS_GEN9_LP (dev_priv)) { - rp_state_cap =intel_uncore_read (&dev_priv->uncore,BXT_RP_STATE_CAP ); + rp_state_cap =intel_rps_read_state_cap (rps); +if (IS_GEN9_LP (dev_priv)) gt_perf_status =intel_uncore_read (&dev_priv->uncore,BXT_GT_PERF_STATUS ); - }else { - rp_state_cap =intel_uncore_read (&dev_priv->uncore,GEN6_RP_STATE_CAP ); +else gt_perf_status =intel_uncore_read (&dev_priv->uncore,GEN6_GT_PERF_STATUS ); - }/* RPSTAT1 is in the GT power well */ intel_uncore_forcewake_get (&dev_priv->uncore,FORCEWAKE_ALL );
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 22/50 drm/i915/xehpsdv: Read correct RP_STATE_CAP register
In reply to Matt RoperThe RP_STATE_CAP register is no longer part of the MCHBAR on XEHPSDV; this register is now a per-tile register at GTTMMADDR offset 0x250014.
--- drivers/gpu/drm/i915/gt/intel_rps.c | 4 +++- drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_rps.c +3 -1
@@ -1937,7 +1937,9 @@ u32 intel_rps_read_state_cap(struct intel_rps *rps)struct drm_i915_private *i915 =rps_to_i915 (rps);struct intel_uncore *uncore =rps_to_uncore (rps); -if (IS_GEN9_LP (i915)) +if (IS_XEHPSDV (i915)) +return intel_uncore_read (uncore,XEHPSDV_RP_STATE_CAP ); +else if (IS_GEN9_LP (i915))return intel_uncore_read (uncore,BXT_RP_STATE_CAP );else return intel_uncore_read (uncore,GEN6_RP_STATE_CAP );
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -4110,6 +4110,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN6_RP_STATE_CAP _MMIO(MCHBAR_MIRROR_BASE_SNB + 0x5998)#define BXT_RP_STATE_CAP _MMIO(0x138170)#define GEN9_RP_STATE_LIMITS _MMIO(0x138148) +#define XEHPSDV_RP_STATE_CAP _MMIO(0x250014)/* * Logical Context regs
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 23/50 drm/i915/dg2: add DG2 platform info
In reply to Matt RoperDG2 has Xe_LPD display (version 13) and Xe_HPG (version 12.55) graphics. There are two variants (treated as subplatforms in the code): DG2-G10 and DG2-G11 that require independent programming in some areas (e.g., workarounds).
Bspec: 44472, 44474, 46197, 48028, 48077
--- drivers/gpu/drm/i915/i915_drv.h | 27 ++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_pci.c | 16 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 5 +++++ drivers/gpu/drm/i915/intel_step.c | 20 +++++++++++++++++- 5 files changed, 68 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +27 -0
@@ -1454,6 +1454,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ALDERLAKE_S (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_S)#define IS_ALDERLAKE_P (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_P)#define IS_XEHPSDV (dev_priv) IS_PLATFORM(dev_priv, INTEL_XEHPSDV) +#define IS_DG2 (dev_priv) IS_PLATFORM(dev_priv, INTEL_DG2) +#define IS_DG2_G10 (dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10) +#define IS_DG2_G11 (dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \
@@ -1615,6 +1620,28 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_XEHPSDV_GT_STEP (p, since, until) \ (IS_XEHPSDV(p) && IS_GT_STEP(__i915, since, until)) +/* +* DG2 hardware steppings are a bit unusual. The hardware design was forked +* to create two variants (G10 and G11) which have distinct workaround sets. +* The G11 fork of the DG2 design resets the GT stepping back to "A0" for its +* first iteration, even though it's more similar to a G10 B0 stepping in terms +* of functionality and workarounds. However the display stepping does not +* reset in the same manner --- a specific stepping like "B0" has a consistent +* meaning regardless of whether it belongs to a G10 or G11 DG2. +* +* TLDR: All GT workarounds and stepping-specific logic must be applied in +* relation to a specific subplatform (G10 or G11), whereas display workarounds +* and stepping-specific logic will be applied with a general DG2-wide stepping +* number. +*/ +#define IS_DG2_GT_STEP (__i915, variant, since, until) \ + (IS_SUBPLATFORM(__i915, INTEL_DG2, INTEL_SUBPLATFORM_##variant) && \ + IS_GT_STEP(__i915, since, until)) + +#define IS_DG2_DISP_STEP (__i915, since, until) \ + (IS_DG2(__i915) && \ + IS_DISPLAY_STEP(__i915, since, until)) +#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && IS_LP(dev_priv))#define IS_GEN9_BC (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && !IS_LP(dev_priv))
drivers/gpu/drm/i915/i915_pci.c +16 -0
@@ -1040,6 +1040,22 @@ static const struct intel_device_info xehpsdv_info = { .require_force_probe = 1, }; +__maybe_unused +static const struct intel_device_info dg2_info = { +XE_HP_FEATURES , +XE_HPM_FEATURES , +XE_LPD_FEATURES , +DGFX_FEATURES , + .graphics_rel =55 , + .media_rel =55 , +PLATFORM (INTEL_DG2 ), + .platform_engine_mask = +BIT (RCS0 ) |BIT (BCS0 ) | +BIT (VECS0 ) |BIT (VECS1 ) | +BIT (VCS0 ) |BIT (VCS2 ), + .require_force_probe =1 , +}; +#undef PLATFORM/*
drivers/gpu/drm/i915/intel_device_info.c +1 -0
@@ -69,6 +69,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (ALDERLAKE_S ),PLATFORM_NAME (ALDERLAKE_P ),PLATFORM_NAME (XEHPSDV ), + PLATFORM_NAME(DG2), };#undef PLATFORM_NAME
drivers/gpu/drm/i915/intel_device_info.h +5 -0
@@ -89,6 +89,7 @@ enum intel_platform {INTEL_ALDERLAKE_S ,INTEL_ALDERLAKE_P ,INTEL_XEHPSDV , +INTEL_DG2 , INTEL_MAX_PLATFORMS };
@@ -107,6 +108,10 @@ enum intel_platform {/* CNL/ICL */ #define INTEL_SUBPLATFORM_PORTF (0) +/* DG2 */ +#define INTEL_SUBPLATFORM_G10 0 +#define INTEL_SUBPLATFORM_G11 1 +enum intel_ppgtt_type {INTEL_PPGTT_NONE =I915_GEM_PPGTT_NONE ,INTEL_PPGTT_ALIASING =I915_GEM_PPGTT_ALIASING ,
drivers/gpu/drm/i915/intel_step.c +19 -1
@@ -61,6 +61,18 @@ static const struct intel_step_info xehpsdv_revid_step_tbl[] = { [0x8] = { .gt_step = STEP_C0 }, }; +static const struct intel_step_info dg2_g10_revid_step_tbl[] = { + [0x0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, + [0x1 ] = { .gt_step =STEP_A1 , .display_step =STEP_A0 }, + [0x4 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, + [0x8 ] = { .gt_step =STEP_C0 , .display_step =STEP_C0 }, +}; + +static const struct intel_step_info dg2_g11_revid_step_tbl[] = { + [0x0 ] = { .gt_step =STEP_A0 , .display_step =STEP_B0 }, + [0x4 ] = { .gt_step =STEP_B0 , .display_step =STEP_C0 }, +}; +void intel_step_init (struct drm_i915_private *i915) {const struct intel_step_info *revids =NULL ;
@@ -68,7 +80,13 @@ void intel_step_init(struct drm_i915_private *i915)int revid =INTEL_REVID (i915);struct intel_step_info step = {}; -if (IS_XEHPSDV (i915)) { +if (IS_DG2_G10 (i915)) { + revids = dg2_g10_revid_step_tbl; + size =ARRAY_SIZE (dg2_g10_revid_step_tbl); + }else if (IS_DG2_G11 (i915)) { + revids = dg2_g11_revid_step_tbl; + size =ARRAY_SIZE (dg2_g11_revid_step_tbl); + }else if (IS_XEHPSDV (i915)) { revids = xehpsdv_revid_step_tbl; size =ARRAY_SIZE (xehpsdv_revid_step_tbl); }else if (IS_ALDERLAKE_P (i915)) {
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 23/50] drm/i915/dg2: add DG2 platform info
Quoted 4 lines · Matt Roper
DG2 has
Xe_LPDdisplay (version 13) andXe_HPG(version 12.55) graphics. There are two variants (treated as subplatforms in the code): DG2-G10 and DG2-G11 that require independent programming in some areas (e.g., workarounds).
Quoted 147 lines
Bspec: 44472, 44474, 46197, 48028, 48077
Cc Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/i915_drv.h | 27 ++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_pci.c | 16 ++++++++++++++ drivers/gpu/drm/i915/intel_device_info.c | 1 + drivers/gpu/drm/i915/intel_device_info.h | 5 +++++ drivers/gpu/drm/i915/intel_step.c | 20 +++++++++++++++++- 5 files changed, 68 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +27
-0@@ -1454,6 +1454,11 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_ALDERLAKE_S (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_S)#define IS_ALDERLAKE_P (dev_priv) IS_PLATFORM(dev_priv, INTEL_ALDERLAKE_P)#define IS_XEHPSDV (dev_priv) IS_PLATFORM(dev_priv, INTEL_XEHPSDV) +#define IS_DG2 (dev_priv) IS_PLATFORM(dev_priv, INTEL_DG2) +#define IS_DG2_G10 (dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G10) +#define IS_DG2_G11 (dev_priv) \ + IS_SUBPLATFORM(dev_priv, INTEL_DG2, INTEL_SUBPLATFORM_G11)#define IS_HSW_EARLY_SDV (dev_priv) (IS_HASWELL(dev_priv) && \ (INTEL_DEVID(dev_priv) & 0xFF00) == 0x0C00)#define IS_BDW_ULT (dev_priv) \@@ -1615,6 +1620,28 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,#define IS_XEHPSDV_GT_STEP (p, since, until) \ (IS_XEHPSDV(p) && IS_GT_STEP(__i915, since, until)) +/* +* DG2 hardware steppings are a bit unusual. The hardware design was forked +* to create two variants (G10 and G11) which have distinct workaround sets. +* The G11 fork of the DG2 design resets the GT stepping back to "A0" for its +* first iteration, even though it's more similar to a G10 B0 stepping in terms +* of functionality and workarounds. However the display stepping does not +* reset in the same manner --- a specific stepping like "B0" has a consistent +* meaning regardless of whether it belongs to a G10 or G11 DG2. +* +* TLDR: All GT workarounds and stepping-specific logic must be applied in +* relation to a specific subplatform (G10 or G11), whereas display workarounds +* and stepping-specific logic will be applied with a general DG2-wide stepping +* number. +*/ +#define IS_DG2_GT_STEP (__i915, variant, since, until) \ + (IS_SUBPLATFORM(__i915, INTEL_DG2, INTEL_SUBPLATFORM_##variant) && \ + IS_GT_STEP(__i915, since, until)) + +#define IS_DG2_DISP_STEP (__i915, since, until) \ + (IS_DG2(__i915) && \ + IS_DISPLAY_STEP(__i915, since, until)) +#define IS_LP (dev_priv) (INTEL_INFO(dev_priv)->is_lp)#define IS_GEN9_LP (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && IS_LP(dev_priv))#define IS_GEN9_BC (dev_priv) (GRAPHICS_VER(dev_priv) == 9 && !IS_LP(dev_priv))drivers/gpu/drm/i915/i915_pci.c +16
-0@@ -1040,6 +1040,22 @@ static const struct intel_device_info xehpsdv_info = { .require_force_probe = 1, }; +__maybe_unused +static const struct intel_device_info dg2_info = { +XE_HP_FEATURES , +XE_HPM_FEATURES , +XE_LPD_FEATURES , +DGFX_FEATURES , + .graphics_rel =55 , + .media_rel =55 , +PLATFORM (INTEL_DG2 ), + .platform_engine_mask = +BIT (RCS0 ) |BIT (BCS0 ) | +BIT (VECS0 ) |BIT (VECS1 ) | +BIT (VCS0 ) |BIT (VCS2 ), + .require_force_probe =1 , +}; +#undef PLATFORM/* drivers/gpu/drm/i915/intel_device_info.c +1
-0@@ -69,6 +69,7 @@ static const char * const platform_names[] = {PLATFORM_NAME (ALDERLAKE_S ),PLATFORM_NAME (ALDERLAKE_P ),PLATFORM_NAME (XEHPSDV ), + PLATFORM_NAME(DG2), };#undef PLATFORM_NAMEdrivers/gpu/drm/i915/intel_device_info.h +5
-0@@ -89,6 +89,7 @@ enum intel_platform {INTEL_ALDERLAKE_S ,INTEL_ALDERLAKE_P ,INTEL_XEHPSDV , +INTEL_DG2 , INTEL_MAX_PLATFORMS };@@ -107,6 +108,10 @@ enum intel_platform {/* CNL/ICL */ #define INTEL_SUBPLATFORM_PORTF (0) +/* DG2 */ +#define INTEL_SUBPLATFORM_G10 0 +#define INTEL_SUBPLATFORM_G11 1 +enum intel_ppgtt_type {INTEL_PPGTT_NONE =I915_GEM_PPGTT_NONE ,INTEL_PPGTT_ALIASING =I915_GEM_PPGTT_ALIASING ,drivers/gpu/drm/i915/intel_step.c +12
-1@@ -61,6 +61,18 @@ static const struct intel_step_info xehpsdv_revid_step_tbl[] = { [0x8] = { .gt_step = STEP_C0 }, }; +static const struct intel_step_info dg2_g10_revid_step_tbl[] = { + [0x0 ] = { .gt_step =STEP_A0 , .display_step =STEP_A0 }, + [0x1 ] = { .gt_step =STEP_A1 , .display_step =STEP_A0 }, + [0x4 ] = { .gt_step =STEP_B0 , .display_step =STEP_B0 }, + [0x8 ] = { .gt_step =STEP_C0 , .display_step =STEP_C0 }, +}; + +static const struct intel_step_info dg2_g11_revid_step_tbl[] = { + [0x0 ] = { .gt_step =STEP_A0 , .display_step =STEP_B0 }, + [0x4 ] = { .gt_step =STEP_B0 , .display_step =STEP_C0 }, +}; +void intel_step_init (struct drm_i915_private *i915) {const struct intel_step_info *revids =NULL ;@@ -68,7 +80,13 @@ void intel_step_init(struct drm_i915_private *i915)int revid =INTEL_REVID (i915);struct intel_step_info step = {}; -if (IS_XEHPSDV (i915)) {
drivers/gpu/drm/i915/intel_step.c void intel_step_init(struct drm_i915_private *i915) · line 92
Quoted 10 lines
drivers/gpu/drm/i915/intel_step.c +7
-0+if (IS_DG2_G10 (i915)) { + revids = dg2_g10_revid_step_tbl; + size =ARRAY_SIZE (dg2_g10_revid_step_tbl); + }else if (IS_DG2_G11 (i915)) { + revids = dg2_g11_revid_step_tbl; + size =ARRAY_SIZE (dg2_g11_revid_step_tbl); + }else if (IS_XEHPSDV (i915)) { revids = xehpsdv_revid_step_tbl; size =ARRAY_SIZE (xehpsdv_revid_step_tbl); }else if (IS_ALDERLAKE_P (i915)) {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 24/50 drm/i915/dg2: DG2 uses the same sseu limits as XeHP SDV
In reply to Matt RoperDG2 supports compute DSS and has the same maximum number of DSS and EU as XeHP SDV.
--- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_sseu.c +1 -1
@@ -171,7 +171,7 @@ static void gen12_sseu_info_init(struct intel_gt *gt)* across the entire device. Then calculate out the DSS for each * workload type within that software slice. */ -if (IS_XEHPSDV (gt->i915)) { +if (IS_DG2 (gt->i915) ||IS_XEHPSDV (gt->i915)) {intel_sseu_set_info (sseu,1 ,32 ,16 ); sseu->has_compute_dss =1 ; }else {
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 24/50] drm/i915/dg2: DG2 uses the same sseu limits as XeHP SDV
-caz
Quoted 18 lines · Matt Roper
DG2 supports compute DSS and has the same maximum number of DSS and EU
as XeHP SDV.Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0@@ -171,7 +171,7 @@ static void gen12_sseu_info_init(struct intel_gt *gt) * across the entire device. Then calculate out the DSS foreach
drivers/gpu/drm/i915/gt/intel_sseu.c static void gen12_sseu_info_init(struct intel_gt *gt) · line 177
Quoted 7 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +1
-1* workload type within that software slice. */ -if (IS_XEHPSDV (gt->i915)) { +if (IS_DG2 (gt->i915) ||IS_XEHPSDV (gt->i915)) {intel_sseu_set_info (sseu,1 ,32 ,16 ); sseu->has_compute_dss =1 ; }else {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 24/50] drm/i915/dg2: DG2 uses the same sseu limits as XeHP SDV
In reply to Matt RoperQuoted 2 lines · Matt Roper
DG2 supports compute DSS and has the same maximum number of DSS and EU as XeHP SDV.
Quoted 11 lines
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/gt/intel_sseu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/gpu/drm/i915/gt/intel_sseu.c +0
-0
drivers/gpu/drm/i915/gt/intel_sseu.c static void gen12_sseu_info_init(struct intel_gt *gt) · line 177
Quoted 8 lines
drivers/gpu/drm/i915/gt/intel_sseu.c +1
-1@@ -171,7 +171,7 @@ static void gen12_sseu_info_init(struct intel_gt *gt)* across the entire device. Then calculate out the DSS for each * workload type within that software slice. */ -if (IS_XEHPSDV (gt->i915)) { +if (IS_DG2 (gt->i915) ||IS_XEHPSDV (gt->i915)) {intel_sseu_set_info (sseu,1 ,32 ,16 ); sseu->has_compute_dss =1 ; }else {
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 25/50 drm/i915/dg2: Add forcewake table
In reply to Matt RoperThe DG2 forcewake table is very similar to the one used by XeHP SDV (and both platforms are even presented as a single table in the bspec). For the most part DG2 starts using a few additional ranges that were 'reserved' on XeHP SDV and stops using some others. However there is a single range (0xd800-0xd87f) that needs to be handled differently between the two platforms (it needs GT wake on XeHP SDV, but render wake on DG2) so unless we want to wake both domains (which could waste power) or define new types of forcewake domains for this special case we need to have separate tables for the two platforms. Let's define the ranges for both platforms with a parameterized macro so that we don't actually need to duplicate everything in the code.
It should be fine for DG2 to re-use the Xe_HP shadow register list so we can continue to use the 'xehpsdv' MMIO write functions and don't need to spin up a separate DG2 instance.
Bspec: 66534
--- drivers/gpu/drm/i915/intel_uncore.c | 305 +++++++++++++++------------- 1 file changed, 168 insertions(+), 137 deletions(-)
drivers/gpu/drm/i915/intel_uncore.c +168 -137
@@ -1317,143 +1317,170 @@ static const struct intel_forcewake_range __gen12_fw_ranges[] = {0x1d3f00 - 0x1d3fff: VD2 */ }; -/* *Must* be sorted by offset ranges! See intel_fw_table_check(). */ -static const struct intel_forcewake_range __xehp_fw_ranges[] = { -GEN_FW_RANGE (0x0 ,0x1fff ,0 ),/* -0x0 - 0xaff: reserved -0xb00 - 0x1fff: always on */ -GEN_FW_RANGE (0x2000 ,0x26ff ,FORCEWAKE_RENDER ), -GEN_FW_RANGE (0x2700 ,0x4aff ,FORCEWAKE_GT ), -GEN_FW_RANGE (0x4b00 ,0x51ff ,0 ),/* -0x4b00 - 0x4fff: reserved -0x5000 - 0x51ff: always on */ -GEN_FW_RANGE (0x5200 ,0x7fff ,FORCEWAKE_RENDER ), -GEN_FW_RANGE (0x8000 ,0x813f ,FORCEWAKE_GT ), -GEN_FW_RANGE (0x8140 ,0x815f ,FORCEWAKE_RENDER ), -GEN_FW_RANGE (0x8160 ,0x81ff ,0 ),/* -0x8160 - 0x817f: reserved -0x8180 - 0x81ff: always on */ -GEN_FW_RANGE (0x8200 ,0x82ff ,FORCEWAKE_GT ), -GEN_FW_RANGE (0x8300 ,0x84ff ,FORCEWAKE_RENDER ), -GEN_FW_RANGE (0x8500 ,0x94cf ,FORCEWAKE_GT ),/* -0x8500 - 0x87ff: gt -0x8800 - 0x8fff: reserved -0x9000 - 0x947f: gt -0x9480 - 0x94cf: reserved */ -GEN_FW_RANGE (0x94d0 ,0x955f ,FORCEWAKE_RENDER ), -GEN_FW_RANGE (0x9560 ,0x97ff ,0 ),/* -0x9560 - 0x95ff: always on -0x9600 - 0x97ff: reserved */ -GEN_FW_RANGE (0x9800 ,0xcfff ,FORCEWAKE_GT ),/* -0x9800 - 0xb4ff: gt -0xb500 - 0xbfff: reserved -0xc000 - 0xcfff: gt */ -GEN_FW_RANGE (0xd000 ,0xd7ff ,0 ), -GEN_FW_RANGE (0xd800 ,0xdbff ,FORCEWAKE_GT ), -GEN_FW_RANGE (0xdc00 ,0xdcff ,FORCEWAKE_RENDER ), -GEN_FW_RANGE (0xdd00 ,0xde7f ,FORCEWAKE_GT ),/* -0xdd00 - 0xddff: gt -0xde00 - 0xde7f: reserved */ -GEN_FW_RANGE (0xde80 ,0xe8ff ,FORCEWAKE_RENDER ),/* -0xde80 - 0xdfff: render -0xe000 - 0xe0ff: reserved -0xe100 - 0xe8ff: render */ -GEN_FW_RANGE (0xe900 ,0xffff ,FORCEWAKE_GT ),/* -0xe900 - 0xe9ff: gt -0xea00 - 0xefff: reserved -0xf000 - 0xffff: gt */ -GEN_FW_RANGE (0x10000 ,0x13fff ,0 ),/* -0x10000 - 0x11fff: reserved -0x12000 - 0x127ff: always on -0x12800 - 0x13fff: reserved */ -GEN_FW_RANGE (0x14000 ,0x141ff ,FORCEWAKE_MEDIA_VDBOX0 ), -GEN_FW_RANGE (0x14200 ,0x143ff ,FORCEWAKE_MEDIA_VDBOX2 ), -GEN_FW_RANGE (0x14400 ,0x145ff ,FORCEWAKE_MEDIA_VDBOX4 ), -GEN_FW_RANGE (0x14600 ,0x147ff ,FORCEWAKE_MEDIA_VDBOX6 ), -GEN_FW_RANGE (0x14800 ,0x1ffff ,FORCEWAKE_RENDER ),/* -0x14800 - 0x14fff: render -0x15000 - 0x16dff: reserved -0x16e00 - 0x1ffff: render */ -GEN_FW_RANGE (0x20000 ,0x21fff ,FORCEWAKE_MEDIA_VDBOX0 ),/* -0x20000 - 0x20fff: VD0 -0x21000 - 0x21fff: reserved */ -GEN_FW_RANGE (0x22000 ,0x23fff ,FORCEWAKE_GT ), -GEN_FW_RANGE (0x24000 ,0x2417f ,0 ),/* -0x24000 - 0x2407f: always on -0x24080 - 0x2417f: reserved */ -GEN_FW_RANGE (0x24180 ,0x249ff ,FORCEWAKE_GT ),/* -0x24180 - 0x241ff: gt -0x24200 - 0x249ff: reserved */ -GEN_FW_RANGE (0x24a00 ,0x251ff ,FORCEWAKE_RENDER ),/* -0x24a00 - 0x24a7f: render -0x24a80 - 0x251ff: reserved */ -GEN_FW_RANGE (0x25200 ,0x25fff ,FORCEWAKE_GT ),/* -0x25200 - 0x252ff: gt -0x25300 - 0x25fff: reserved */ -GEN_FW_RANGE (0x26000 ,0x2ffff ,FORCEWAKE_RENDER ),/* -0x26000 - 0x27fff: render -0x28000 - 0x29fff: reserved -0x2a000 - 0x2ffff: undocumented */ -GEN_FW_RANGE (0x30000 ,0x3ffff ,FORCEWAKE_GT ), -GEN_FW_RANGE (0x40000 ,0x1bffff ,0 ), -GEN_FW_RANGE (0x1c0000 ,0x1c3fff ,FORCEWAKE_MEDIA_VDBOX0 ),/* -0x1c0000 - 0x1c2bff: VD0 -0x1c2c00 - 0x1c2cff: reserved -0x1c2d00 - 0x1c2dff: VD0 -0x1c2e00 - 0x1c3eff: reserved -0x1c3f00 - 0x1c3fff: VD0 */ -GEN_FW_RANGE (0x1c4000 ,0x1c7fff ,FORCEWAKE_MEDIA_VDBOX1 ),/* -0x1c4000 - 0x1c6bff: VD1 -0x1c6c00 - 0x1c6cff: reserved -0x1c6d00 - 0x1c6dff: VD1 -0x1c6e00 - 0x1c7fff: reserved */ -GEN_FW_RANGE (0x1c8000 ,0x1cbfff ,FORCEWAKE_MEDIA_VEBOX0 ),/* -0x1c8000 - 0x1ca0ff: VE0 -0x1ca100 - 0x1cbfff: reserved */ -GEN_FW_RANGE (0x1cc000 ,0x1ccfff ,FORCEWAKE_MEDIA_VDBOX0 ), -GEN_FW_RANGE (0x1cd000 ,0x1cdfff ,FORCEWAKE_MEDIA_VDBOX2 ), -GEN_FW_RANGE (0x1ce000 ,0x1cefff ,FORCEWAKE_MEDIA_VDBOX4 ), -GEN_FW_RANGE (0x1cf000 ,0x1cffff ,FORCEWAKE_MEDIA_VDBOX6 ), -GEN_FW_RANGE (0x1d0000 ,0x1d3fff ,FORCEWAKE_MEDIA_VDBOX2 ),/* -0x1d0000 - 0x1d2bff: VD2 -0x1d2c00 - 0x1d2cff: reserved -0x1d2d00 - 0x1d2dff: VD2 -0x1d2e00 - 0x1d3eff: reserved -0x1d3f00 - 0x1d3fff: VD2 */ -GEN_FW_RANGE (0x1d4000 ,0x1d7fff ,FORCEWAKE_MEDIA_VDBOX3 ),/* -0x1d4000 - 0x1d6bff: VD3 -0x1d6c00 - 0x1d6cff: reserved -0x1d6d00 - 0x1d6dff: VD3 -0x1d6e00 - 0x1d7fff: reserved */ -GEN_FW_RANGE (0x1d8000 ,0x1dffff ,FORCEWAKE_MEDIA_VEBOX1 ),/* -0x1d8000 - 0x1da0ff: VE1 -0x1da100 - 0x1dffff: reserved */ -GEN_FW_RANGE (0x1e0000 ,0x1e3fff ,FORCEWAKE_MEDIA_VDBOX4 ),/* -0x1e0000 - 0x1e2bff: VD4 -0x1e2c00 - 0x1e2cff: reserved -0x1e2d00 - 0x1e2dff: VD4 -0x1e2e00 - 0x1e3eff: reserved -0x1e3f00 - 0x1e3fff: VD4 */ -GEN_FW_RANGE (0x1e4000 ,0x1e7fff ,FORCEWAKE_MEDIA_VDBOX5 ),/* -0x1e4000 - 0x1e6bff: VD5 -0x1e6c00 - 0x1e6cff: reserved -0x1e6d00 - 0x1e6dff: VD5 -0x1e6e00 - 0x1e7fff: reserved */ -GEN_FW_RANGE (0x1e8000 ,0x1effff ,FORCEWAKE_MEDIA_VEBOX2 ),/* -0x1e8000 - 0x1ea0ff: VE2 -0x1ea100 - 0x1effff: reserved */ -GEN_FW_RANGE (0x1f0000 ,0x1f3fff ,FORCEWAKE_MEDIA_VDBOX6 ),/* -0x1f0000 - 0x1f2bff: VD6 -0x1f2c00 - 0x1f2cff: reserved -0x1f2d00 - 0x1f2dff: VD6 -0x1f2e00 - 0x1f3eff: reserved -0x1f3f00 - 0x1f3fff: VD6 */ -GEN_FW_RANGE (0x1f4000 ,0x1f7fff ,FORCEWAKE_MEDIA_VDBOX7 ),/* -0x1f4000 - 0x1f6bff: VD7 -0x1f6c00 - 0x1f6cff: reserved -0x1f6d00 - 0x1f6dff: VD7 -0x1f6e00 - 0x1f7fff: reserved */ +/* +* Graphics IP version 12.55 brings a slight change to the 0xd800 range, +* switching it from the GT domain to the render domain. +* +* *Must* be sorted by offset ranges! See intel_fw_table_check(). +*/ +#define XEHP_FWRANGES (FW_RANGE_D800 ) \ + GEN_FW_RANGE(0x0, 0x1fff, 0),/* \ +0x0 - 0xaff: reserved \ +0xb00 - 0x1fff: always on */ \ +GEN_FW_RANGE (0x2000 ,0x26ff ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0x2700 ,0x4aff ,FORCEWAKE_GT ), \ +GEN_FW_RANGE (0x4b00 ,0x51ff ,0 ),/* \ +0x4b00 - 0x4fff: reserved \ +0x5000 - 0x51ff: always on */ \ +GEN_FW_RANGE (0x5200 ,0x7fff ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0x8000 ,0x813f ,FORCEWAKE_GT ), \ +GEN_FW_RANGE (0x8140 ,0x815f ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0x8160 ,0x81ff ,0 ),/* \ +0x8160 - 0x817f: reserved \ +0x8180 - 0x81ff: always on */ \ +GEN_FW_RANGE (0x8200 ,0x82ff ,FORCEWAKE_GT ), \ +GEN_FW_RANGE (0x8300 ,0x84ff ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0x8500 ,0x8cff ,FORCEWAKE_GT ),/* \ +0x8500 - 0x87ff: gt \ +0x8800 - 0x8c7f: reserved \ +0x8c80 - 0x8cff: gt (DG2 only) */ \ +GEN_FW_RANGE (0x8d00 ,0x8fff ,FORCEWAKE_RENDER ),/* \ +0x8d00 - 0x8dff: render (DG2 only) \ +0x8e00 - 0x8fff: reserved */ \ +GEN_FW_RANGE (0x9000 ,0x94cf ,FORCEWAKE_GT ),/* \ +0x9000 - 0x947f: gt \ +0x9480 - 0x94cf: reserved */ \ +GEN_FW_RANGE (0x94d0 ,0x955f ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0x9560 ,0x967f ,0 ),/* \ +0x9560 - 0x95ff: always on \ +0x9600 - 0x967f: reserved */ \ +GEN_FW_RANGE (0x9680 ,0x97ff ,FORCEWAKE_RENDER ),/* \ +0x9680 - 0x96ff: render (DG2 only) \ +0x9700 - 0x97ff: reserved */ \ +GEN_FW_RANGE (0x9800 ,0xcfff ,FORCEWAKE_GT ),/* \ +0x9800 - 0xb4ff: gt \ +0xb500 - 0xbfff: reserved \ +0xc000 - 0xcfff: gt */ \ +GEN_FW_RANGE (0xd000 ,0xd7ff ,0 ), \ +GEN_FW_RANGE (0xd800 ,0xd87f ,FW_RANGE_D800 ), \ +GEN_FW_RANGE (0xd880 ,0xdbff ,FORCEWAKE_GT ), \ +GEN_FW_RANGE (0xdc00 ,0xdcff ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0xdd00 ,0xde7f ,FORCEWAKE_GT ),/* \ +0xdd00 - 0xddff: gt \ +0xde00 - 0xde7f: reserved */ \ +GEN_FW_RANGE (0xde80 ,0xe8ff ,FORCEWAKE_RENDER ),/* \ +0xde80 - 0xdfff: render \ +0xe000 - 0xe0ff: reserved \ +0xe100 - 0xe8ff: render */ \ +GEN_FW_RANGE (0xe900 ,0xffff ,FORCEWAKE_GT ),/* \ +0xe900 - 0xe9ff: gt \ +0xea00 - 0xefff: reserved \ +0xf000 - 0xffff: gt */ \ +GEN_FW_RANGE (0x10000 ,0x12fff ,0 ),/* \ +0x10000 - 0x11fff: reserved \ +0x12000 - 0x127ff: always on \ +0x12800 - 0x12fff: reserved */ \ +GEN_FW_RANGE (0x13000 ,0x131ff ,FORCEWAKE_MEDIA_VDBOX0 ),/* DG2 only */ \ +GEN_FW_RANGE (0x13200 ,0x13fff ,FORCEWAKE_MEDIA_VDBOX2 ),/* \ +0x13200 - 0x133ff: VD2 (DG2 only) \ +0x13400 - 0x13fff: reserved */ \ +GEN_FW_RANGE (0x14000 ,0x141ff ,FORCEWAKE_MEDIA_VDBOX0 ),/* XEHPSDV only */ \ +GEN_FW_RANGE (0x14200 ,0x143ff ,FORCEWAKE_MEDIA_VDBOX2 ),/* XEHPSDV only */ \ +GEN_FW_RANGE (0x14400 ,0x145ff ,FORCEWAKE_MEDIA_VDBOX4 ),/* XEHPSDV only */ \ +GEN_FW_RANGE (0x14600 ,0x147ff ,FORCEWAKE_MEDIA_VDBOX6 ),/* XEHPSDV only */ \ +GEN_FW_RANGE (0x14800 ,0x14fff ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0x15000 ,0x16dff ,FORCEWAKE_GT ),/* \ +0x15000 - 0x15fff: gt (DG2 only) \ +0x16000 - 0x16dff: reserved */ \ +GEN_FW_RANGE (0x16e00 ,0x1ffff ,FORCEWAKE_RENDER ), \ +GEN_FW_RANGE (0x20000 ,0x21fff ,FORCEWAKE_MEDIA_VDBOX0 ),/* \ +0x20000 - 0x20fff: VD0 (XEHPSDV only) \ +0x21000 - 0x21fff: reserved */ \ +GEN_FW_RANGE (0x22000 ,0x23fff ,FORCEWAKE_GT ), \ +GEN_FW_RANGE (0x24000 ,0x2417f ,0 ),/* \ +0x24000 - 0x2407f: always on \ +0x24080 - 0x2417f: reserved */ \ +GEN_FW_RANGE (0x24180 ,0x249ff ,FORCEWAKE_GT ),/* \ +0x24180 - 0x241ff: gt \ +0x24200 - 0x249ff: reserved */ \ +GEN_FW_RANGE (0x24a00 ,0x251ff ,FORCEWAKE_RENDER ),/* \ +0x24a00 - 0x24a7f: render \ +0x24a80 - 0x251ff: reserved */ \ +GEN_FW_RANGE (0x25200 ,0x25fff ,FORCEWAKE_GT ),/* \ +0x25200 - 0x252ff: gt \ +0x25300 - 0x25fff: reserved */ \ +GEN_FW_RANGE (0x26000 ,0x2ffff ,FORCEWAKE_RENDER ),/* \ +0x26000 - 0x27fff: render \ +0x28000 - 0x29fff: reserved \ +0x2a000 - 0x2ffff: undocumented */ \ +GEN_FW_RANGE (0x30000 ,0x3ffff ,FORCEWAKE_GT ), \ +GEN_FW_RANGE (0x40000 ,0x1bffff ,0 ), \ +GEN_FW_RANGE (0x1c0000 ,0x1c3fff ,FORCEWAKE_MEDIA_VDBOX0 ),/* \ +0x1c0000 - 0x1c2bff: VD0 \ +0x1c2c00 - 0x1c2cff: reserved \ +0x1c2d00 - 0x1c2dff: VD0 \ +0x1c2e00 - 0x1c3eff: VD0 (DG2 only) \ +0x1c3f00 - 0x1c3fff: VD0 */ \ +GEN_FW_RANGE (0x1c4000 ,0x1c7fff ,FORCEWAKE_MEDIA_VDBOX1 ),/* \ +0x1c4000 - 0x1c6bff: VD1 \ +0x1c6c00 - 0x1c6cff: reserved \ +0x1c6d00 - 0x1c6dff: VD1 \ +0x1c6e00 - 0x1c7fff: reserved */ \ +GEN_FW_RANGE (0x1c8000 ,0x1cbfff ,FORCEWAKE_MEDIA_VEBOX0 ),/* \ +0x1c8000 - 0x1ca0ff: VE0 \ +0x1ca100 - 0x1cbfff: reserved */ \ +GEN_FW_RANGE (0x1cc000 ,0x1ccfff ,FORCEWAKE_MEDIA_VDBOX0 ), \ +GEN_FW_RANGE (0x1cd000 ,0x1cdfff ,FORCEWAKE_MEDIA_VDBOX2 ), \ +GEN_FW_RANGE (0x1ce000 ,0x1cefff ,FORCEWAKE_MEDIA_VDBOX4 ), \ +GEN_FW_RANGE (0x1cf000 ,0x1cffff ,FORCEWAKE_MEDIA_VDBOX6 ), \ +GEN_FW_RANGE (0x1d0000 ,0x1d3fff ,FORCEWAKE_MEDIA_VDBOX2 ),/* \ +0x1d0000 - 0x1d2bff: VD2 \ +0x1d2c00 - 0x1d2cff: reserved \ +0x1d2d00 - 0x1d2dff: VD2 \ +0x1d2e00 - 0x1d3dff: VD2 (DG2 only) \ +0x1d3e00 - 0x1d3eff: reserved \ +0x1d3f00 - 0x1d3fff: VD2 */ \ +GEN_FW_RANGE (0x1d4000 ,0x1d7fff ,FORCEWAKE_MEDIA_VDBOX3 ),/* \ +0x1d4000 - 0x1d6bff: VD3 \ +0x1d6c00 - 0x1d6cff: reserved \ +0x1d6d00 - 0x1d6dff: VD3 \ +0x1d6e00 - 0x1d7fff: reserved */ \ +GEN_FW_RANGE (0x1d8000 ,0x1dffff ,FORCEWAKE_MEDIA_VEBOX1 ),/* \ +0x1d8000 - 0x1da0ff: VE1 \ +0x1da100 - 0x1dffff: reserved */ \ +GEN_FW_RANGE (0x1e0000 ,0x1e3fff ,FORCEWAKE_MEDIA_VDBOX4 ),/* \ +0x1e0000 - 0x1e2bff: VD4 \ +0x1e2c00 - 0x1e2cff: reserved \ +0x1e2d00 - 0x1e2dff: VD4 \ +0x1e2e00 - 0x1e3eff: reserved \ +0x1e3f00 - 0x1e3fff: VD4 */ \ +GEN_FW_RANGE (0x1e4000 ,0x1e7fff ,FORCEWAKE_MEDIA_VDBOX5 ),/* \ +0x1e4000 - 0x1e6bff: VD5 \ +0x1e6c00 - 0x1e6cff: reserved \ +0x1e6d00 - 0x1e6dff: VD5 \ +0x1e6e00 - 0x1e7fff: reserved */ \ +GEN_FW_RANGE (0x1e8000 ,0x1effff ,FORCEWAKE_MEDIA_VEBOX2 ),/* \ +0x1e8000 - 0x1ea0ff: VE2 \ +0x1ea100 - 0x1effff: reserved */ \ +GEN_FW_RANGE (0x1f0000 ,0x1f3fff ,FORCEWAKE_MEDIA_VDBOX6 ),/* \ +0x1f0000 - 0x1f2bff: VD6 \ +0x1f2c00 - 0x1f2cff: reserved \ +0x1f2d00 - 0x1f2dff: VD6 \ +0x1f2e00 - 0x1f3eff: reserved \ +0x1f3f00 - 0x1f3fff: VD6 */ \ +GEN_FW_RANGE (0x1f4000 ,0x1f7fff ,FORCEWAKE_MEDIA_VDBOX7 ),/* \ +0x1f4000 - 0x1f6bff: VD7 \ +0x1f6c00 - 0x1f6cff: reserved \ +0x1f6d00 - 0x1f6dff: VD7 \ +0x1f6e00 - 0x1f7fff: reserved */ \GEN_FW_RANGE (0x1f8000 ,0x1fa0ff ,FORCEWAKE_MEDIA_VEBOX3 ), + +static const struct intel_forcewake_range __xehp_fw_ranges[] = { +XEHP_FWRANGES (FORCEWAKE_GT ) +}; + +static const struct intel_forcewake_range __dg2_fw_ranges[] = { +XEHP_FWRANGES (FORCEWAKE_RENDER ) }; static void
@@ -2084,7 +2111,11 @@ static int uncore_forcewake_init(struct intel_uncore *uncore)return ret;forcewake_early_sanitize (uncore,0 ); -if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) { +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,55 )) { +ASSIGN_FW_DOMAINS_TABLE (uncore, __dg2_fw_ranges); +ASSIGN_WRITE_MMIO_VFUNCS (uncore, xehp_fwtable); +ASSIGN_READ_MMIO_VFUNCS (uncore, gen11_fwtable); + }else if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,50 )) {ASSIGN_FW_DOMAINS_TABLE (uncore, __xehp_fw_ranges);ASSIGN_WRITE_MMIO_VFUNCS (uncore, xehp_fwtable);ASSIGN_READ_MMIO_VFUNCS (uncore, gen11_fwtable);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 26/50 drm/i915/dg2: Update LNCF steering ranges
In reply to Matt RoperDG2's replicated register ranges are almost the same at XeHP SDV with the exception of one LNCF sub-range that switches to gslice steering. We can re-use the XeHP SDV mslice steering table and just provide a DG2-specific LNCF steering table.
Bspec: 66534
--- drivers/gpu/drm/i915/gt/intel_gt.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_gt.c +10 -1
@@ -103,6 +103,12 @@ static const struct intel_mmio_range xehpsdv_lncf_steering_table[] = { {}, }; +static const struct intel_mmio_range dg2_lncf_steering_table[] = { + {0x00B000 ,0x00B0FF }, + {0x00D880 ,0x00D8FF }, + {}, +}; +static u16 slicemask (struct intel_gt *gt,int count) {u64 dss_mask =intel_sseu_get_subslices (>->info.sseu,0 );
@@ -127,7 +133,10 @@ int intel_gt_init_mmio(struct intel_gt *gt) (intel_uncore_read (gt->uncore,GEN10_MIRROR_FUSE3 ) &GEN12_MEML3_EN_MASK ); -if (IS_XEHPSDV (gt->i915)) { +if (IS_DG2 (gt->i915)) { + gt->steering_table[MSLICE ] = xehpsdv_mslice_steering_table; + gt->steering_table[LNCF ] = dg2_lncf_steering_table; + }else if (IS_XEHPSDV (gt->i915)) { gt->steering_table[MSLICE ] = xehpsdv_mslice_steering_table; gt->steering_table[LNCF ] = xehpsdv_lncf_steering_table; } else if (GRAPHICS_VER(gt->i915) >= 11 &&
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 27/50 drm/i915/dg2: Add SQIDI steering
In reply to Matt RoperAlthough DG2_G10 platforms will always have all SQIDI's present and don't need steering for registers in a SQIDI MMIO range, this isn't true for DG2_G11 platforms; only SQIDI's 2 and 3 can be used on those.
We handle SQIDI ranges a bit differently from other types of explicit steering. The SQIDI ranges belong to either the MCFG unit or the SF unit, both of which have their own dedicated steering registers and do not use the typical 0xFDC steering control that all other types of ranges use. Thus we only need to worry about picking a valid initial value for the MCFG and SF steering registers (0xFD0 and 0xFD8 resepectively) at driver init; they won't change after we set them up so we don't need to worry about re-steering them explicitly at runtime.
Given that any SQIDI value should work fine for DG2-G10 and XeHP SDV, while only values of 2 and 3 are valid for DG2-G11, we'll just initialize the MCFG and SF steering registers to a constant value of "2" for all XeHP-based platforms for simplicity --- that will work in all cases.
Bspec: 66534
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 28 +++++++++++++++++---- drivers/gpu/drm/i915/i915_reg.h | 2 ++ 2 files changed, 25 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +23 -5
@@ -951,17 +951,24 @@ cfl_gt_workarounds_init(struct drm_i915_private *i915, struct i915_wa_list *wal) GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS); } -static void __add_mcr_wa (struct drm_i915_private *i915,struct i915_wa_list *wal, -unsigned slice,unsigned subslice) +static void __set_mcr_steering (struct i915_wa_list *wal, +i915_reg_t steering_reg, +unsigned int slice,unsigned int subslice) {u32 mcr, mcr_mask; mcr =GEN11_MCR_SLICE (slice) |GEN11_MCR_SUBSLICE (subslice); mcr_mask =GEN11_MCR_SLICE_MASK |GEN11_MCR_SUBSLICE_MASK ; -drm_dbg (&i915->drm,"MCR slice/subslice = %x\n" , mcr); +wa_write_clr_set (wal, steering_reg, mcr_mask, mcr); +} + +static void __add_mcr_wa (struct drm_i915_private *i915,struct i915_wa_list *wal, +unsigned int slice,unsigned int subslice) +{ +drm_dbg (&i915->drm,"MCR slice=0x%x, subslice=0x%x\n" , slice, subslice); -wa_write_clr_set (wal,GEN8_MCR_SELECTOR , mcr_mask, mcr); +__set_mcr_steering (wal,GEN8_MCR_SELECTOR , slice, subslice); } static void
@@ -1015,7 +1022,6 @@ xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal)* - L3 Bank (fusable) * - MSLICE (fusable) * - LNCF (sub-unit within mslice; always present if mslice is present) -* - SQIDI (always on) * * We'll do our default/implicit steering based on GSLICE (in the * sliceid field) and DSS (in the subsliceid field). If we can
@@ -1065,6 +1071,18 @@ xehp_init_mcr(struct intel_gt *gt, struct i915_wa_list *wal)WARN_ON (dss_mask >> (slice *GEN_DSS_PER_GSLICE ) ==0 );__add_mcr_wa (i915, wal, slice, subslice); + +/* +* SQIDI ranges are special because they use different steering +* registers than everything else we work with. On XeHP SDV and +* DG2-G10, any value in the steering registers will work fine since +* all instances are present, but DG2-G11 only has SQIDI instances at +* ID's 2 and 3, so we need to steer to one of those. For simplicity +* we'll just steer to a hardcoded "2" since that value will work +* everywhere. +*/ +__set_mcr_steering (wal,MCFG_MCR_SELECTOR ,0 ,2 ); +__set_mcr_steering (wal,SF_MCR_SELECTOR ,0 ,2 ); } static void
drivers/gpu/drm/i915/i915_reg.h +2 -0
@@ -2686,6 +2686,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_SC_INSTDONE_EXTRA2 _MMIO(0x7108)#define GEN7_SAMPLER_INSTDONE _MMIO(0xe160)#define GEN7_ROW_INSTDONE _MMIO(0xe164) +#define MCFG_MCR_SELECTOR _MMIO(0xfd0) +#define SF_MCR_SELECTOR _MMIO(0xfd8)#define GEN8_MCR_SELECTOR _MMIO(0xfdc)#define GEN8_MCR_SLICE (slice) (((slice) & 3) << 26)#define GEN8_MCR_SLICE_MASK GEN8_MCR_SLICE(3)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 28/50 drm/i915/dg2: Add new LRI reg offsets
In reply to Matt RoperFrom: Akeem G Abodunrin <[email protected]>
New LRI register offsets were introduced for DG2, this patch adds those extra registers, and create new register table for setting offsets to compare with HW generated context image - especially for gt_lrc test. Also updates general purpose register with scratch offset for DG2, in order to use it for live_lrc_fixed selftest.
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 85 ++++++++++++++++++++++++++++- 1 file changed, 83 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.c +83 -2
@@ -226,6 +226,40 @@ static const u8 gen12_xcs_offsets[] = {END }; +static const u8 dg2_xcs_offsets[] = { +NOP (1 ), +LRI (15 ,POSTED ), +REG16 (0x244 ), +REG (0x034 ), +REG (0x030 ), +REG (0x038 ), +REG (0x03c ), +REG (0x168 ), +REG (0x140 ), +REG (0x110 ), +REG (0x1c0 ), +REG (0x1c4 ), +REG (0x1c8 ), +REG (0x180 ), +REG16 (0x2b4 ), +REG (0x120 ), +REG (0x124 ), + +NOP (1 ), +LRI (9 ,POSTED ), +REG16 (0x3a8 ), +REG16 (0x28c ), +REG16 (0x288 ), +REG16 (0x284 ), +REG16 (0x280 ), +REG16 (0x27c ), +REG16 (0x278 ), +REG16 (0x274 ), +REG16 (0x270 ), + +END +}; +static const u8 gen8_rcs_offsets[] = {NOP (1 ),LRI (14 ,POSTED ),
@@ -525,6 +559,49 @@ static const u8 xehp_rcs_offsets[] = { END }; +static const u8 dg2_rcs_offsets[] = { +NOP (1 ), +LRI (15 ,POSTED ), +REG16 (0x244 ), +REG (0x034 ), +REG (0x030 ), +REG (0x038 ), +REG (0x03c ), +REG (0x168 ), +REG (0x140 ), +REG (0x110 ), +REG (0x1c0 ), +REG (0x1c4 ), +REG (0x1c8 ), +REG (0x180 ), +REG16 (0x2b4 ), +REG (0x120 ), +REG (0x124 ), + +NOP (1 ), +LRI (9 ,POSTED ), +REG16 (0x3a8 ), +REG16 (0x28c ), +REG16 (0x288 ), +REG16 (0x284 ), +REG16 (0x280 ), +REG16 (0x27c ), +REG16 (0x278 ), +REG16 (0x274 ), +REG16 (0x270 ), + +LRI (3 ,POSTED ), +REG (0x1b0 ), +REG16 (0x5a8 ), +REG16 (0x5ac ), + +NOP (6 ), +LRI (1 ,0 ), +REG (0x0c8 ), + +END +}; +#undef END#undef REG16#undef REG
@@ -543,7 +620,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine) !intel_engine_has_relative_mmio(engine));if (engine->class ==RENDER_CLASS ) { -if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 )) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,55 )) +return dg2_rcs_offsets; +else if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,50 ))return xehp_rcs_offsets;else if (GRAPHICS_VER (engine->i915) >=12 )return gen12_rcs_offsets;
@@ -554,7 +633,9 @@ static const u8 *reg_offsets(const struct intel_engine_cs *engine)else return gen8_rcs_offsets; }else { -if (GRAPHICS_VER (engine->i915) >=12 ) +if (GRAPHICS_VER_FULL (engine->i915) >=IP_VER (12 ,55 )) +return dg2_xcs_offsets; +else if (GRAPHICS_VER (engine->i915) >=12 )return gen12_xcs_offsets;else if (GRAPHICS_VER (engine->i915) >=9 )return gen9_xcs_offsets;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 29/50 drm/i915/dg2: Maintain backward-compatible nested batch behavior
In reply to Matt RoperFor tgl+, the per-context setting of MI_MODE[12] determines whether the bits of a nested MI_BATCH_BUFFER_START instruction should be interpreted in the traditional manner or whether they should instead use a new tgl+ meaning that breaks backward compatibility, but allows nesting into 3rd-level batchbuffers. For previous platforms, the hardware default for this register bit is to maintain backward-compatible behavior unless a context intentionally opts into the new behavior; however Xe_HPG flips the hardware default behavior.
From a SW perspective, we want to maintain the backward-compatible behavior for userspace, so we'll apply a fake workaround to set it back to the legacy behavior on platforms where the hardware default is to break compatibility. At the moment there is no Linux userspace that utilizes third-level batchbuffers, so this will avoid userspace from needing to make any changes. using the legacy meaning is the correct thing to do. If/when we have userspace consumers that want to utilize third-level batch nesting, we can provide a context parameter to allow them to opt-in.
Bspec: 45974, 45718
--- drivers/gpu/drm/i915/gt/intel_workarounds.c | 39 +++++++++++++++++++-- drivers/gpu/drm/i915/i915_reg.h | 1 + 2 files changed, 38 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_workarounds.c +37 -2
@@ -693,6 +693,37 @@ static void dg1_ctx_workarounds_init(struct intel_engine_cs *engine, DG1_HZ_READ_SUPPRESSION_OPTIMIZATION_DISABLE); } +static void fakewa_disable_nestedbb_mode (struct intel_engine_cs *engine, +struct i915_wa_list *wal) +{ +/* +* This is a "fake" workaround defined by software to ensure we +* maintain reliable, backward-compatible behavior for userspace with +* regards to how nested MI_BATCH_BUFFER_START commands are handled. +* +* The per-context setting of MI_MODE[12] determines whether the bits +* of a nested MI_BATCH_BUFFER_START instruction should be interpreted +* in the traditional manner or whether they should instead use a new +* tgl+ meaning that breaks backward compatibility, but allows nesting +* into 3rd-level batchbuffers. When this new capability was first +* added in TGL, it remained off by default unless a context +* intentionally opted in to the new behavior. However Xe_HPG now +* flips this on by default and requires that we explicitly opt out if +* we don't want the new behavior. +* +* From a SW perspective, we want to maintain the backward-compatible +* behavior for userspace, so we'll apply a fake workaround to set it +* back to the legacy behavior on platforms where the hardware default +* is to break compatibility. At the moment there is no Linux +* userspace that utilizes third-level batchbuffers, so this will avoid +* userspace from needing to make any changes. using the legacy +* meaning is the correct thing to do. If/when we have userspace +* consumers that want to utilize third-level batch nesting, we can +* provide a context parameter to allow them to opt-in. +*/ +wa_masked_dis (wal,RING_MI_MODE (engine->mmio_base),TGL_NESTED_BB_EN ); +} + static void __intel_engine_init_ctx_wa(struct intel_engine_cs *engine, struct i915_wa_list *wal,
@@ -700,11 +731,15 @@ __intel_engine_init_ctx_wa(struct intel_engine_cs *engine, {struct drm_i915_private *i915 = engine->i915; +wa_init_start (wal, name, engine->name); + +/* Applies to all engines */ +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,55 )) +fakewa_disable_nestedbb_mode (engine, wal); +if (engine->class !=RENDER_CLASS )return ; -wa_init_start (wal, name, engine->name); -if (IS_DG1 (i915))dg1_ctx_workarounds_init (engine, wal);else if (GRAPHICS_VER (i915) ==12 )
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -2821,6 +2821,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#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)# define STOP_RING (1 << 8)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 30/50 drm/i915/dg2: Report INSTDONE_GEOM values in error state
In reply to Matt RoperXe_HPG adds some additional INSTDONE_GEOM debug registers; the Mesa team has indicated that having these reported in the error state would be useful for debugging GPU hangs. These registers are replicated per-DSS with gslice steering.
--- drivers/gpu/drm/i915/gt/intel_engine_cs.c | 7 +++++++ drivers/gpu/drm/i915/gt/intel_engine_types.h | 3 +++ drivers/gpu/drm/i915/i915_gpu_error.c | 10 ++++++++-- drivers/gpu/drm/i915/i915_reg.h | 1 + 4 files changed, 19 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/gt/intel_engine_cs.c +7 -0
@@ -1221,6 +1221,13 @@ void intel_engine_get_instdone(const struct intel_engine_cs *engine, GEN7_ROW_INSTDONE); } } + +if (GRAPHICS_VER_FULL (i915) >=IP_VER (12 ,55 )) { +for_each_instdone_gslice_dss_xehp (i915, sseu, iter, slice, subslice) + instdone->geom_svg[slice][subslice] = +read_subslice_reg (engine, slice, subslice, +XEHPG_INSTDONE_GEOM_SVG ); + } }else if (GRAPHICS_VER (i915) >=7 ) { instdone->instdone =intel_uncore_read (uncore,RING_INSTDONE (mmio_base));
drivers/gpu/drm/i915/gt/intel_engine_types.h +3 -0
@@ -80,6 +80,9 @@ struct intel_instdone {u32 slice_common_extra[2 ];u32 sampler[GEN_MAX_GSLICES ][I915_MAX_SUBSLICES ];u32 row[GEN_MAX_GSLICES ][I915_MAX_SUBSLICES ]; + +/* Added in XeHPG */ +u32 geom_svg[GEN_MAX_GSLICES ][I915_MAX_SUBSLICES ]; };/*
drivers/gpu/drm/i915/i915_gpu_error.c +8 -2
@@ -431,6 +431,7 @@ static void error_print_instdone(struct drm_i915_error_state_buf *m,const struct sseu_dev_info *sseu = &ee->engine->gt->info.sseu;int slice;int subslice; +int iter;err_printf (m," INSTDONE: 0x%08x\n" , ee->instdone.instdone);
@@ -445,8 +446,6 @@ static void error_print_instdone(struct drm_i915_error_state_buf *m,return ;if (GRAPHICS_VER_FULL (m->i915) >=IP_VER (12 ,50 )) { -int iter; -for_each_instdone_gslice_dss_xehp (m->i915, sseu, iter, slice, subslice) err_printf(m, " SAMPLER_INSTDONE[%d][%d]: 0x%08x\n", slice, subslice,
@@ -471,6 +470,13 @@ static void error_print_instdone(struct drm_i915_error_state_buf *m,if (GRAPHICS_VER (m->i915) <12 )return ; +if (GRAPHICS_VER_FULL (m->i915) >=IP_VER (12 ,55 )) { +for_each_instdone_gslice_dss_xehp (m->i915, sseu, iter, slice, subslice) +err_printf (m," GEOM_SVGUNIT_INSTDONE[%d][%d]: 0x%08x\n" , + slice, subslice, + ee->instdone.geom_svg[slice][subslice]); + } +err_printf (m," SC_INSTDONE_EXTRA: 0x%08x\n" , ee->instdone.slice_common_extra[0 ]); err_printf(m, " SC_INSTDONE_EXTRA2: 0x%08x\n",
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -2686,6 +2686,7 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define GEN12_SC_INSTDONE_EXTRA2 _MMIO(0x7108)#define GEN7_SAMPLER_INSTDONE _MMIO(0xe160)#define GEN7_ROW_INSTDONE _MMIO(0xe164) +#define XEHPG_INSTDONE_GEOM_SVG _MMIO(0x666c)#define MCFG_MCR_SELECTOR _MMIO(0xfd0)#define SF_MCR_SELECTOR _MMIO(0xfd8)#define GEN8_MCR_SELECTOR _MMIO(0xfdc)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 31/50 drm/i915/dg2: Define MOCS table for DG2
In reply to Matt RoperBspec: 45101, 45427
--- drivers/gpu/drm/i915/gt/intel_mocs.c | 35 +++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/gt/intel_mocs.c +34 -1
@@ -341,6 +341,30 @@ static const struct drm_i915_mocs_entry xehpsdv_mocs_table[] = { MOCS_ENTRY(63, 0, L3_1_UC), }; +static const struct drm_i915_mocs_entry dg2_mocs_table[] = { +/* UC - Coherent; GO:L3 */ +MOCS_ENTRY (0 ,0 ,L3_1_UC |L3_LKUP (1 )), +/* UC - Coherent; GO:Memory */ +MOCS_ENTRY (1 ,0 ,L3_1_UC |L3_GLBGO (1 ) |L3_LKUP (1 )), +/* UC - Non-Coherent; GO:Memory */ +MOCS_ENTRY (2 ,0 ,L3_1_UC |L3_GLBGO (1 )), + +/* WB - LC */ +MOCS_ENTRY (3 ,0 ,L3_3_WB |L3_LKUP (1 )), +}; + +static const struct drm_i915_mocs_entry dg2_mocs_table_g10_ax[] = { +/* Wa_14011441408: Set Go to Memory for MOCS#0 */ +MOCS_ENTRY (0 ,0 ,L3_1_UC |L3_GLBGO (1 ) |L3_LKUP (1 )), +/* UC - Coherent; GO:Memory */ +MOCS_ENTRY (1 ,0 ,L3_1_UC |L3_GLBGO (1 ) |L3_LKUP (1 )), +/* UC - Non-Coherent; GO:Memory */ +MOCS_ENTRY (2 ,0 ,L3_1_UC |L3_GLBGO (1 )), + +/* WB - LC */ +MOCS_ENTRY (3 ,0 ,L3_3_WB |L3_LKUP (1 )), +}; +enum {HAS_GLOBAL_MOCS =BIT (0 ),HAS_ENGINE_MOCS =BIT (1 ),
@@ -367,7 +391,16 @@ static unsigned int get_mocs_settings(const struct drm_i915_private *i915, {unsigned int flags; -if (IS_XEHPSDV (i915)) { +if (IS_DG2 (i915)) { +if (IS_DG2_GT_STEP (i915,G10 ,STEP_A0 , (STEP_B0 -1 ))) { + table->size =ARRAY_SIZE (dg2_mocs_table_g10_ax); + table->table = dg2_mocs_table_g10_ax; + }else { + table->size =ARRAY_SIZE (dg2_mocs_table); + table->table = dg2_mocs_table; + } + table->n_entries =GEN9_NUM_MOCS_ENTRIES ; + }else if (IS_XEHPSDV (i915)) { table->size =ARRAY_SIZE (xehpsdv_mocs_table); table->table = xehpsdv_mocs_table; table->n_entries =GEN9_NUM_MOCS_ENTRIES ;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 32/50 drm/i915/dg2: Add fake PCH
In reply to Matt RoperAs with DG1, DG2 has an ICL-style south display interface provided on the same PCI device. Add a fake PCH to ensure DG2 takes the appropriate codepaths for south display handling.
Bspec: 54871, 50062, 49961, 53673
--- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_pch.c | 3 +++ drivers/gpu/drm/i915/intel_pch.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -207,7 +207,7 @@ static void intel_hpd_init_pins(struct drm_i915_private *dev_priv) (!HAS_PCH_SPLIT(dev_priv) || HAS_PCH_NOP(dev_priv))) return; -if (HAS_PCH_DG1 (dev_priv)) +if (INTEL_PCH_TYPE (dev_priv) >=PCH_DG1 ) hpd->pch_hpd = hpd_sde_dg1;else if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP ) hpd->pch_hpd = hpd_icp;
drivers/gpu/drm/i915/intel_pch.c +3 -0
@@ -211,6 +211,9 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)if (IS_DG1 (dev_priv)) { dev_priv->pch_type =PCH_DG1 ;return ; + }else if (IS_DG2 (dev_priv)) { + dev_priv->pch_type =PCH_DG2 ; +return ; }/*
drivers/gpu/drm/i915/intel_pch.h +2 -0
@@ -30,6 +30,7 @@ enum intel_pch {/* Fake PCHs, functionality handled on the same PCI dev */ PCH_DG1 =1024 , + PCH_DG2, };#define INTEL_PCH_DEVICE_ID_MASK 0xff80
@@ -62,6 +63,7 @@ enum intel_pch {#define INTEL_PCH_TYPE (dev_priv) ((dev_priv)->pch_type)#define INTEL_PCH_ID (dev_priv) ((dev_priv)->pch_id) +#define HAS_PCH_DG2 (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_DG2)#define HAS_PCH_ADP (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_ADP)#define HAS_PCH_DG1 (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_DG1)#define HAS_PCH_JSP (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_JSP)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 32/50] drm/i915/dg2: Add fake PCH
Quoted 4 lines · Matt Roper
As with DG1, DG2 has an ICL-style south display interface provided on the same PCI device. Add a fake PCH to ensure DG2 takes the appropriate codepaths for south display handling.
Quoted 52 lines
Bspec: 54871, 50062, 49961, 53673
Cc Lucas De Marchi <[email protected]>Signed-off-by Matt Roper <[email protected]>Signed-off-by Aditya Swarup <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>Reviewed-by Lucas De Marchi <[email protected]>--- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/intel_pch.c | 3 +++ drivers/gpu/drm/i915/intel_pch.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_irq.c +1
-1@@ -207,7 +207,7 @@ static void intel_hpd_init_pins(struct drm_i915_private *dev_priv) (!HAS_PCH_SPLIT(dev_priv) || HAS_PCH_NOP(dev_priv))) return; -if (HAS_PCH_DG1 (dev_priv)) +if (INTEL_PCH_TYPE (dev_priv) >=PCH_DG1 ) hpd->pch_hpd = hpd_sde_dg1;else if (INTEL_PCH_TYPE (dev_priv) >=PCH_ICP ) hpd->pch_hpd = hpd_icp;drivers/gpu/drm/i915/intel_pch.c +3
-0@@ -211,6 +211,9 @@ void intel_detect_pch(struct drm_i915_private *dev_priv)if (IS_DG1 (dev_priv)) { dev_priv->pch_type =PCH_DG1 ;return ; + }else if (IS_DG2 (dev_priv)) { + dev_priv->pch_type =PCH_DG2 ; +return ; }/* drivers/gpu/drm/i915/intel_pch.h +1
-0@@ -30,6 +30,7 @@ enum intel_pch {/* Fake PCHs, functionality handled on the same PCI dev */ PCH_DG1 =1024 , + PCH_DG2, };#define INTEL_PCH_DEVICE_ID_MASK 0xff80
drivers/gpu/drm/i915/intel_pch.h enum intel_pch { · line 69
Quoted 7 lines
drivers/gpu/drm/i915/intel_pch.h +1
-0@@ -62,6 +63,7 @@ enum intel_pch {#define INTEL_PCH_TYPE (dev_priv) ((dev_priv)->pch_type)#define INTEL_PCH_ID (dev_priv) ((dev_priv)->pch_id) +#define HAS_PCH_DG2 (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_DG2)#define HAS_PCH_ADP (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_ADP)#define HAS_PCH_DG1 (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_DG1)#define HAS_PCH_JSP (dev_priv) (INTEL_PCH_TYPE(dev_priv) == PCH_JSP)
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 33/50 drm/i915/dg2: Add cdclk table and reference clock
In reply to Matt RoperNote that DG2 only has a single possible refclk frequency (38.4 MHz).
Bspec: 54034
--- drivers/gpu/drm/i915/display/intel_cdclk.c | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/display/intel_cdclk.c +22 -2
@@ -1290,6 +1290,18 @@ static const struct intel_cdclk_vals adlp_cdclk_table[] = { {} }; +static const struct intel_cdclk_vals dg2_cdclk_table[] = { + { .refclk =38400 , .cdclk =172800 , .divider =2 , .ratio =9 }, + { .refclk =38400 , .cdclk =179200 , .divider =3 , .ratio =14 }, + { .refclk =38400 , .cdclk =192000 , .divider =2 , .ratio =10 }, + { .refclk =38400 , .cdclk =192000 , .divider =3 , .ratio =15 }, + { .refclk =38400 , .cdclk =307200 , .divider =2 , .ratio =16 }, + { .refclk =38400 , .cdclk =326400 , .divider =4 , .ratio =34 }, + { .refclk =38400 , .cdclk =556800 , .divider =2 , .ratio =29 }, + { .refclk =38400 , .cdclk =652800 , .divider =2 , .ratio =34 }, + {} +}; +static int bxt_calc_cdclk (struct drm_i915_private *dev_priv,int min_cdclk) {const struct intel_cdclk_vals *table = dev_priv->cdclk.table;
@@ -1408,7 +1420,9 @@ static void bxt_de_pll_readout(struct drm_i915_private *dev_priv, {u32 val, ratio; -if (DISPLAY_VER (dev_priv) >=11 ) +if (IS_DG2 (dev_priv)) + cdclk_config->ref =38400 ; +else if (DISPLAY_VER (dev_priv) >=11 )icl_readout_refclk (dev_priv, cdclk_config);else if (IS_CANNONLAKE (dev_priv))cnl_readout_refclk (dev_priv, cdclk_config);
@@ -2873,7 +2887,13 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)*/ void intel_init_cdclk_hooks (struct drm_i915_private *dev_priv) { -if (IS_ALDERLAKE_P (dev_priv)) { +if (IS_DG2 (dev_priv)) { + dev_priv->display.set_cdclk = bxt_set_cdclk; + dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; + dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; + dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; + dev_priv->cdclk.table = dg2_cdclk_table; + }else if (IS_ALDERLAKE_P (dev_priv)) { dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 33/50] drm/i915/dg2: Add cdclk table and reference clock
Quoted 18 lines · Matt Roper
Note that DG2 only has a single possible refclk frequency (38.4 MHz).
Bspec: 54034
Cc Lucas De Marchi <[email protected]>Signed-off-by Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_cdclk.c | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-)drivers/gpu/drm/i915/display/intel_cdclk.c +0
-0@@ -1290,6 +1290,18 @@ static const struct intel_cdclk_vals adlp_cdclk_table[] = { {} };
drivers/gpu/drm/i915/display/intel_cdclk.c static const struct intel_cdclk_vals adlp_cdclk_table[] = { · line 1302
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +10
-0+static const struct intel_cdclk_vals dg2_cdclk_table[] = { + { .refclk =38400 , .cdclk =172800 , .divider =2 , .ratio =9 }, + { .refclk =38400 , .cdclk =179200 , .divider =3 , .ratio =14 }, + { .refclk =38400 , .cdclk =192000 , .divider =2 , .ratio =10 }, + { .refclk =38400 , .cdclk =192000 , .divider =3 , .ratio =15 }, + { .refclk =38400 , .cdclk =307200 , .divider =2 , .ratio =16 }, + { .refclk =38400 , .cdclk =326400 , .divider =4 , .ratio =34 }, + { .refclk =38400 , .cdclk =556800 , .divider =2 , .ratio =29 }, + { .refclk =38400 , .cdclk =652800 , .divider =2 , .ratio =34 }, + {}
Two cdclk entries of this table was dropped in the latest version of spec(179200 and 192000(second)), removing those LGTM.
Quoted 21 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +5
-2+}; +static int bxt_calc_cdclk (struct drm_i915_private *dev_priv,int min_cdclk) {const struct intel_cdclk_vals *table = dev_priv->cdclk.table;@@ -1408,7 +1420,9 @@ static void bxt_de_pll_readout(struct drm_i915_private *dev_priv, {u32 val, ratio; -if (DISPLAY_VER (dev_priv) >=11 ) +if (IS_DG2 (dev_priv)) + cdclk_config->ref =38400 ; +else if (DISPLAY_VER (dev_priv) >=11 )icl_readout_refclk (dev_priv, cdclk_config);else if (IS_CANNONLAKE (dev_priv))cnl_readout_refclk (dev_priv, cdclk_config);@@ -2873,7 +2887,13 @@ u32 intel_read_rawclk(struct drm_i915_private *dev_priv)*/ void intel_init_cdclk_hooks (struct drm_i915_private *dev_priv) { -if (IS_ALDERLAKE_P (dev_priv)) {
drivers/gpu/drm/i915/display/intel_cdclk.c u32 intel_read_rawclk(struct drm_i915_private *dev_priv) · line 2899
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_cdclk.c +7
-0+if (IS_DG2 (dev_priv)) { + dev_priv->display.set_cdclk = bxt_set_cdclk; + dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; + dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk; + dev_priv->display.calc_voltage_level = tgl_calc_voltage_level; + dev_priv->cdclk.table = dg2_cdclk_table; + }else if (IS_ALDERLAKE_P (dev_priv)) { dev_priv->display.set_cdclk = bxt_set_cdclk; dev_priv->display.bw_calc_min_cdclk = skl_bw_calc_min_cdclk; dev_priv->display.modeset_calc_cdclk = bxt_modeset_calc_cdclk;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 34/50 drm/i915/dg2: Skip shared DPLL handling
In reply to Matt RoperDG2 has no shared DPLL's or DDI clock muxing. The Port PLL is embedded within the PHY.
Bspec: 54032
Bspec: 54034
--- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/display/intel_display.c +7 -3
@@ -3474,7 +3474,8 @@ static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,* Enable sequence steps 1-7 on bigjoiner master */ intel_encoders_pre_pll_enable (state, master); -intel_enable_shared_dpll (master_crtc_state); +if (master_crtc_state->shared_dpll) +intel_enable_shared_dpll (master_crtc_state);intel_encoders_pre_enable (state, master);/* and DSC on slave */
@@ -8633,10 +8634,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_BOOL (double_wide); -PIPE_CONF_CHECK_P (shared_dpll); +if (dev_priv->dpll.mgr) +PIPE_CONF_CHECK_P (shared_dpll);/* FIXME do the readout properly and get rid of this quirk */ -if (!PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE )) { +if (dev_priv->dpll.mgr && !PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE )) {PIPE_CONF_CHECK_X (dpll_hw_state.dpll);PIPE_CONF_CHECK_X (dpll_hw_state.dpll_md);PIPE_CONF_CHECK_X (dpll_hw_state.fp0);
@@ -8668,7 +8670,9 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_X (dpll_hw_state.mg_pll_ssc);PIPE_CONF_CHECK_X (dpll_hw_state.mg_pll_bias);PIPE_CONF_CHECK_X (dpll_hw_state.mg_pll_tdc_coldst_bias); + } +if (!PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE )) {PIPE_CONF_CHECK_X (dsi_pll.ctrl);PIPE_CONF_CHECK_X (dsi_pll.div);
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +4 -1
@@ -4462,7 +4462,10 @@ void intel_shared_dpll_init(struct drm_device *dev)const struct dpll_info *dpll_info;int i; -if (IS_ALDERLAKE_P (dev_priv)) +if (IS_DG2 (dev_priv)) +/* No shared DPLLs on DG2; port PLLs are part of the PHY */ + dpll_mgr =NULL ; +else if (IS_ALDERLAKE_P (dev_priv)) dpll_mgr = &adlp_pll_mgr;else if (IS_ALDERLAKE_S (dev_priv)) dpll_mgr = &adls_pll_mgr;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 34/50] drm/i915/dg2: Skip shared DPLL handling
Quoted 5 lines · Matt Roper
DG2 has no shared DPLL's or DDI clock muxing. The Port PLL is embedded within the PHY.
Bspec: 54032
Bspec: 54034
Quoted 51 lines
Cc Lucas De Marchi <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 10 +++++++--- drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 5 ++++- 2 files changed, 11 insertions(+), 4 deletions(-)drivers/gpu/drm/i915/display/intel_display.c +7
-3@@ -3474,7 +3474,8 @@ static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,* Enable sequence steps 1-7 on bigjoiner master */ intel_encoders_pre_pll_enable (state, master); -intel_enable_shared_dpll (master_crtc_state); +if (master_crtc_state->shared_dpll) +intel_enable_shared_dpll (master_crtc_state);intel_encoders_pre_enable (state, master);/* and DSC on slave */ @@ -8633,10 +8634,11 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_BOOL (double_wide); -PIPE_CONF_CHECK_P (shared_dpll); +if (dev_priv->dpll.mgr) +PIPE_CONF_CHECK_P (shared_dpll);/* FIXME do the readout properly and get rid of this quirk */ -if (!PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE )) { +if (dev_priv->dpll.mgr && !PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE )) {PIPE_CONF_CHECK_X (dpll_hw_state.dpll);PIPE_CONF_CHECK_X (dpll_hw_state.dpll_md);PIPE_CONF_CHECK_X (dpll_hw_state.fp0);@@ -8668,7 +8670,9 @@ intel_pipe_config_compare(const struct intel_crtc_state *current_config,PIPE_CONF_CHECK_X (dpll_hw_state.mg_pll_ssc);PIPE_CONF_CHECK_X (dpll_hw_state.mg_pll_bias);PIPE_CONF_CHECK_X (dpll_hw_state.mg_pll_tdc_coldst_bias); + } +if (!PIPE_CONF_QUIRK (PIPE_CONFIG_QUIRK_BIGJOINER_SLAVE )) {PIPE_CONF_CHECK_X (dsi_pll.ctrl);PIPE_CONF_CHECK_X (dsi_pll.div);drivers/gpu/drm/i915/display/intel_dpll_mgr.c +0
-0@@ -4462,7 +4462,10 @@ void intel_shared_dpll_init(struct drm_device *dev)const struct dpll_info *dpll_info;
drivers/gpu/drm/i915/display/intel_dpll_mgr.c void intel_shared_dpll_init(struct drm_device *dev) · line 4471
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_dpll_mgr.c +4
-1int i; -if (IS_ALDERLAKE_P (dev_priv)) +if (IS_DG2 (dev_priv)) +/* No shared DPLLs on DG2; port PLLs are part of the PHY */ + dpll_mgr =NULL ; +else if (IS_ALDERLAKE_P (dev_priv)) dpll_mgr = &adlp_pll_mgr;else if (IS_ALDERLAKE_S (dev_priv)) dpll_mgr = &adls_pll_mgr;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 35/50 drm/i915/dg2: Don't wait for AUX power well enable ACKs
In reply to Matt RoperOn DG2 we're supposed to just wait 600us after programming the well before moving on; there won't be an ack from the hardware.
Bspec: 49296
--- .../gpu/drm/i915/display/intel_display_power.c | 16 ++++++++++++++++ .../gpu/drm/i915/display/intel_display_power.h | 6 ++++++ 2 files changed, 22 insertions(+)
drivers/gpu/drm/i915/display/intel_display_power.c +16 -0
@@ -341,6 +341,17 @@ static void hsw_wait_for_power_well_enable(struct drm_i915_private *dev_priv, {const struct i915_power_well_regs *regs = power_well->desc->hsw.regs;int pw_idx = power_well->desc->hsw.idx; +int enable_delay = power_well->desc->hsw.fixed_enable_delay; + +/* +* For some power wells we're not supposed to watch the status bit for +* an ack, but rather just wait a fixed amount of time and then +* proceed. This is only used on DG2. +*/ +if (IS_DG2 (dev_priv) && enable_delay) { +usleep_range (enable_delay,2 * enable_delay); +return ; + }/* Timeout for PW1:10 us, AUX:not specified, other PWs:20 us. */ if (intel_de_wait_for_set(dev_priv, regs->driver,
@@ -4828,6 +4839,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = ICL_PW_CTL_IDX_AUX_A, + .hsw.fixed_enable_delay = 600, }, }, {
@@ -4838,6 +4850,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = ICL_PW_CTL_IDX_AUX_B, + .hsw.fixed_enable_delay = 600, }, }, {
@@ -4848,6 +4861,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = ICL_PW_CTL_IDX_AUX_C, + .hsw.fixed_enable_delay = 600, }, }, {
@@ -4858,6 +4872,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = XELPD_PW_CTL_IDX_AUX_D, + .hsw.fixed_enable_delay = 600, }, }, {
@@ -4878,6 +4893,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, + .hsw.fixed_enable_delay = 600, }, }, {
drivers/gpu/drm/i915/display/intel_display_power.h +6 -0
@@ -223,6 +223,12 @@ struct i915_power_well_desc {u8 idx;/* Mask of pipes whose IRQ logic is backed by the pw */ u8 irq_pipe_mask; +/* +* Instead of waiting for the status bit to ack enables, +* just wait a specific amount of time and then consider +* the well enabled. +*/ +u16 fixed_enable_delay;/* The pw is backing the VGA functionality */ bool has_vga:1; bool has_fuses:1;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 35/50] drm/i915/dg2: Don't wait for AUX power well enable ACKs
Quoted 3 lines · Matt Roper
On DG2 we're supposed to just wait 600us after programming the well before moving on; there won't be an ack from the hardware.
Quoted 76 lines
Bspec: 49296
Signed-off-by Matt Roper <[email protected]>--- .../gpu/drm/i915/display/intel_display_power.c | 16 ++++++++++++++++ .../gpu/drm/i915/display/intel_display_power.h | 6 ++++++ 2 files changed, 22 insertions(+)drivers/gpu/drm/i915/display/intel_display_power.c +16
-0@@ -341,6 +341,17 @@ static void hsw_wait_for_power_well_enable(struct drm_i915_private *dev_priv, {const struct i915_power_well_regs *regs = power_well->desc->hsw.regs;int pw_idx = power_well->desc->hsw.idx; +int enable_delay = power_well->desc->hsw.fixed_enable_delay; + +/* +* For some power wells we're not supposed to watch the status bit for +* an ack, but rather just wait a fixed amount of time and then +* proceed. This is only used on DG2. +*/ +if (IS_DG2 (dev_priv) && enable_delay) { +usleep_range (enable_delay,2 * enable_delay); +return ; + }/* Timeout for PW1:10 us, AUX:not specified, other PWs:20 us. */ if (intel_de_wait_for_set(dev_priv, regs->driver,@@ -4828,6 +4839,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = ICL_PW_CTL_IDX_AUX_A, + .hsw.fixed_enable_delay = 600, }, }, {@@ -4838,6 +4850,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = ICL_PW_CTL_IDX_AUX_B, + .hsw.fixed_enable_delay = 600, }, }, {@@ -4848,6 +4861,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = ICL_PW_CTL_IDX_AUX_C, + .hsw.fixed_enable_delay = 600, }, }, {@@ -4858,6 +4872,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = XELPD_PW_CTL_IDX_AUX_D, + .hsw.fixed_enable_delay = 600, }, }, {@@ -4878,6 +4893,7 @@ static const struct i915_power_well_desc xelpd_power_wells[] = { { .hsw.regs = &icl_aux_power_well_regs, .hsw.idx = TGL_PW_CTL_IDX_AUX_TC1, + .hsw.fixed_enable_delay = 600, }, }, {drivers/gpu/drm/i915/display/intel_display_power.h +0
-0@@ -223,6 +223,12 @@ struct i915_power_well_desc {u8 idx;/* Mask of pipes whose IRQ logic is backed by the pw */
drivers/gpu/drm/i915/display/intel_display_power.h struct i915_power_well_desc { · line 234
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display_power.h +6
-0u8 irq_pipe_mask; +/* +* Instead of waiting for the status bit to ack enables, +* just wait a specific amount of time and then consider +* the well enabled. +*/ +u16 fixed_enable_delay;/* The pw is backing the VGA functionality */ bool has_vga:1; bool has_fuses:1;
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 36/50 drm/i915/dg2: Setup display outputs
In reply to Matt RoperDG2 has outputs on DDI A-D attached to what the bspec diagram shows as "Combo PHY A-D." Note that despite being labelled "combo" the PHYs on these outputs are Synopsys PHYs rather than traditional Intel combo PHY technology.
--- drivers/gpu/drm/i915/display/intel_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +6 -1
@@ -11329,7 +11329,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv))return ; -if (IS_ALDERLAKE_P (dev_priv)) { +if (IS_DG2 (dev_priv)) { +intel_ddi_init (dev_priv,PORT_A ); +intel_ddi_init (dev_priv,PORT_B ); +intel_ddi_init (dev_priv,PORT_C ); +intel_ddi_init (dev_priv,PORT_D_XELPD ); + }else if (IS_ALDERLAKE_P (dev_priv)) {intel_ddi_init (dev_priv,PORT_A );intel_ddi_init (dev_priv,PORT_B );intel_ddi_init (dev_priv,PORT_TC1 );
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 36/50] drm/i915/dg2: Setup display outputs
Quoted 4 lines · Matt Roper
DG2 has outputs on DDI A-D attached to what the bspec diagram shows as "Combo PHY A-D." Note that despite being labelled "combo" the PHYs on these outputs are Synopsys PHYs rather than traditional Intel combo PHY technology.
Quoted 15 lines
Cc Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_display.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display.c +0
-0@@ -11329,7 +11329,12 @@ static void intel_setup_outputs(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv))return ;
drivers/gpu/drm/i915/display/intel_display.c static void intel_setup_outputs(struct drm_i915_private *dev_priv) · line 11340
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display.c +6
-1-if (IS_ALDERLAKE_P (dev_priv)) { +if (IS_DG2 (dev_priv)) { +intel_ddi_init (dev_priv,PORT_A ); +intel_ddi_init (dev_priv,PORT_B ); +intel_ddi_init (dev_priv,PORT_C ); +intel_ddi_init (dev_priv,PORT_D_XELPD ); + }else if (IS_ALDERLAKE_P (dev_priv)) {intel_ddi_init (dev_priv,PORT_A );intel_ddi_init (dev_priv,PORT_B );intel_ddi_init (dev_priv,PORT_TC1 );
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 37/50 drm/i915/dg2: Add dbuf programming
In reply to Matt RoperDG2 extends our DDB to four DBuf slices; pipes A+B only have access to the first two slices, whereas pipes C+D only have access to the second two.
Confusingly, our bspec decided to switch from 1-based numbering of dbuf slices (S1, S2) to 0-based numbering (S0, S1, S2, S3) in Display13. At the moment we're using the 0-based number scheme for the DBUF_CTL_S() register addressing, but the 1-based number scheme in the actual slice assignment tables. We may want to consider switching the assignment over to 0-based numbering too at some point...
Bspec: 49255
Bspec: 50057
--- .../drm/i915/display/intel_display_power.h | 4 + drivers/gpu/drm/i915/intel_pm.c | 120 +++++++++++++++++- 2 files changed, 123 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display_power.h +4 -0
@@ -392,6 +392,10 @@ intel_display_power_put_all_in_set(struct drm_i915_private *i915,intel_display_power_put_mask_in_set (i915, power_domain_set, power_domain_set->mask); } +/* +* FIXME: We should probably switch this to a 0-based scheme to be consistent +* with how we now name/number DBUF_CTL instances. +*/ enum dbuf_slice {DBUF_S1 ,DBUF_S2 ,
drivers/gpu/drm/i915/intel_pm.c +119 -1
137 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 37/50] drm/i915/dg2: Add dbuf programming
Quoted 11 lines · Matt Roper
DG2 extends our DDB to four DBuf slices; pipes A+B only have access to the first two slices, whereas pipes C+D only have access to the second two.
Confusingly, our bspec decided to switch from 1-based numbering of dbuf slices (S1, S2) to 0-based numbering (S0, S1, S2, S3) in Display13. At the moment we're using the 0-based number scheme for the
DBUF_CTL_S()register addressing, but the 1-based number scheme in the actual slice assignment tables. We may want to consider switching the assignment over to 0-based numbering too at some point...
Quoted 157 lines
Bspec: 49255
Bspec: 50057Cc Stanislav Lisovskiy <[email protected]>Signed-off-by Matt Roper <[email protected]>--- .../drm/i915/display/intel_display_power.h | 4 + drivers/gpu/drm/i915/intel_pm.c | 120 +++++++++++++++++- 2 files changed, 123 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display_power.h +4
-0@@ -392,6 +392,10 @@ intel_display_power_put_all_in_set(struct drm_i915_private *i915,intel_display_power_put_mask_in_set (i915, power_domain_set, power_domain_set->mask); } +/* +* FIXME: We should probably switch this to a 0-based scheme to be consistent +* with how we now name/number DBUF_CTL instances. +*/ enum dbuf_slice {DBUF_S1 ,DBUF_S2 ,drivers/gpu/drm/i915/intel_pm.c +116
-0@@ -4584,6 +4584,117 @@ static const struct dbuf_slice_conf_entry tgl_allowed_dbufs[] = {} }; +static const struct dbuf_slice_conf_entry dg2_allowed_dbufs[] = { + { + .active_pipes =BIT (PIPE_A ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + }, + }, + { + .active_pipes =BIT (PIPE_B ), + .dbuf_mask = { + [PIPE_B ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + }, + }, + { + .active_pipes =BIT (PIPE_A ) |BIT (PIPE_B ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ), + [PIPE_B ] =BIT (DBUF_S2 ), + }, + }, + { + .active_pipes =BIT (PIPE_C ), + .dbuf_mask = { + [PIPE_C ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_A ) |BIT (PIPE_C ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + [PIPE_C ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_B ) |BIT (PIPE_C ), + .dbuf_mask = { + [PIPE_B ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + [PIPE_C ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_C ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ), + [PIPE_B ] =BIT (DBUF_S2 ), + [PIPE_C ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_D ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_A ) |BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + [PIPE_D ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_B ) |BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_B ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + [PIPE_D ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ), + [PIPE_B ] =BIT (DBUF_S2 ), + [PIPE_D ] =BIT (DBUF_S3 ) |BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_C ) |BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_C ] =BIT (DBUF_S3 ), + [PIPE_D ] =BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_A ) |BIT (PIPE_C ) |BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + [PIPE_C ] =BIT (DBUF_S3 ), + [PIPE_D ] =BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_B ) |BIT (PIPE_C ) |BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_B ] =BIT (DBUF_S1 ) |BIT (DBUF_S2 ), + [PIPE_C ] =BIT (DBUF_S3 ), + [PIPE_D ] =BIT (DBUF_S4 ), + }, + }, + { + .active_pipes =BIT (PIPE_A ) |BIT (PIPE_B ) |BIT (PIPE_C ) |BIT (PIPE_D ), + .dbuf_mask = { + [PIPE_A ] =BIT (DBUF_S1 ), + [PIPE_B ] =BIT (DBUF_S2 ), + [PIPE_C ] =BIT (DBUF_S3 ), + [PIPE_D ] =BIT (DBUF_S4 ), + }, + }, + {} +}; +static const struct dbuf_slice_conf_entry adlp_allowed_dbufs[] = { { .active_pipes =BIT (PIPE_A ),@@ -4759,12 +4870,19 @@ static u32 adlp_compute_dbuf_slices(enum pipe pipe, u32 active_pipes)return compute_dbuf_slices (pipe, active_pipes, adlp_allowed_dbufs); } +static u32 dg2_compute_dbuf_slices (enum pipe pipe,u32 active_pipes) +{ +return compute_dbuf_slices (pipe, active_pipes, dg2_allowed_dbufs); +} +static u8 skl_compute_dbuf_slices (struct intel_crtc *crtc,u8 active_pipes) {
drivers/gpu/drm/i915/intel_pm.c static u32 adlp_compute_dbuf_slices(enum pipe pipe, u32 active_pipes) · line 4888
Quoted 10 lines
drivers/gpu/drm/i915/intel_pm.c +3
-1struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);enum pipe pipe = crtc->pipe; -if (IS_ALDERLAKE_P (dev_priv)) +if (IS_DG2 (dev_priv)) +return dg2_compute_dbuf_slices (pipe, active_pipes); +else if (IS_ALDERLAKE_P (dev_priv))return adlp_compute_dbuf_slices (pipe, active_pipes);else if (DISPLAY_VER (dev_priv) ==12 )return tgl_compute_dbuf_slices (pipe, active_pipes);
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 38/50 drm/i915/dg2: Don't program BW_BUDDY registers
In reply to Matt RoperAlthough the BW_BUDDY registers still exist, they are not used for anything on DG2. This change is expected to hold true for future dgpu's too.
Bspec: 49218
--- drivers/gpu/drm/i915/display/intel_display_power.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/i915/display/intel_display_power.c +4 -0
@@ -5814,6 +5814,10 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)unsigned long abox_mask =INTEL_INFO (dev_priv)->abox_mask;int config, i; +/* BW_BUDDY registers are not used on dgpu's beyond DG1 */ +if (IS_DGFX (dev_priv) && !IS_DG1 (dev_priv)) +return ; +if (IS_ALDERLAKE_S (dev_priv) ||IS_DG1_REVID (dev_priv,DG1_REVID_A0 ,DG1_REVID_A0 ) ||IS_TGL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ))
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 38/50] drm/i915/dg2: Don't program BW_BUDDY registers
Quoted 3 lines · Matt Roper
Although the
BW_BUDDYregisters still exist, they are not used for anything on DG2. This change is expected to hold true for future dgpu's too.
Quoted 12 lines
Bspec: 49218
Signed-off-by Matt Roper <[email protected]>--- drivers/gpu/drm/i915/display/intel_display_power.c | 4 ++++ 1 file changed, 4 insertions(+)drivers/gpu/drm/i915/display/intel_display_power.c +0
-0
drivers/gpu/drm/i915/display/intel_display_power.c static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv) · line 5823
Quoted 10 lines
drivers/gpu/drm/i915/display/intel_display_power.c +4
-0@@ -5814,6 +5814,10 @@ static void tgl_bw_buddy_init(struct drm_i915_private *dev_priv)unsigned long abox_mask =INTEL_INFO (dev_priv)->abox_mask;int config, i; +/* BW_BUDDY registers are not used on dgpu's beyond DG1 */ +if (IS_DGFX (dev_priv) && !IS_DG1 (dev_priv)) +return ; +if (IS_ALDERLAKE_S (dev_priv) ||IS_DG1_REVID (dev_priv,DG1_REVID_A0 ,DG1_REVID_A0 ) ||IS_TGL_DISPLAY_STEP (dev_priv,STEP_A0 ,STEP_B0 ))
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 39/50 drm/i915/dg2: Don't read DRAM info
In reply to Matt RoperDG2 does not use system DRAM information for BW_BUDDY programming or watermark workarounds, so there's no need to read this out at startup.
--- drivers/gpu/drm/i915/intel_dram.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/intel_dram.c +3 -3
@@ -494,15 +494,15 @@ void intel_dram_detect(struct drm_i915_private *i915)struct dram_info *dram_info = &i915->dram_info;int ret; +if (GRAPHICS_VER (i915) <9 ||IS_DG2 (i915) || !HAS_DISPLAY (i915)) +return ; +/* * Assume level 0 watermark latency adjustment is needed until proven * otherwise, this w/a is not needed by bxt/glk. */ dram_info->wm_lv_0_adjust_needed = !IS_GEN9_LP (i915); -if (GRAPHICS_VER (i915) <9 || !HAS_DISPLAY (i915)) -return ; -if (GRAPHICS_VER (i915) >=12 ) ret =gen12_get_dram_info (i915);else if (GRAPHICS_VER (i915) >=11 )
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 39/50] drm/i915/dg2: Don't read DRAM info
Quoted 10 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Tuesday, July 13, 2021 8:15 PM
To: [email protected]
Cc: Roper, Matthew D <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH v2 39/50] drm/i915/dg2: Don't read DRAM info
Quoted 5 lines
DG2 does not use system DRAM information for
BW_BUDDYprogramming or watermark workarounds, so there's no need to read this out at startup.Cc Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 31 lines
--- drivers/gpu/drm/i915/intel_dram.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/intel_dram.c +3
-0@@ -494,15 +494,15 @@ void intel_dram_detect(struct drm_i915_private *i915)struct dram_info *dram_info = &i915->dram_info;int ret; +if (GRAPHICS_VER (i915) <9 ||IS_DG2 (i915) || !HAS_DISPLAY (i915)) +return ; +/* * Assume level 0 watermark latency adjustment is needed until proven
drivers/gpu/drm/i915/intel_dram.c +0
-4* otherwise, this w/a is not needed by bxt/glk. */ dram_info->wm_lv_0_adjust_needed = !IS_GEN9_LP (i915); -if (GRAPHICS_VER (i915) <9 || !HAS_DISPLAY (i915)) -return ; -if (GRAPHICS_VER (i915) >=12 ) ret =gen12_get_dram_info (i915);else if (GRAPHICS_VER (i915) >=11 ) --
Quoted 1 line
2.25.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 40/50 drm/i915/dg2: DG2 has fixed memory bandwidth
In reply to Matt RoperDG2 doesn't have a SAGV or QGV points that determine memory bandwidth. Instead it has a constant amount of memory bandwidth available to display that does not need to be reduced based on the number of active planes.
For simplicity, we'll just modify driver initialization to create a single dummy QGV point with the proper amount of memory bandwidth, rather than trying to query the pcode for this information.
Bspec: 64631
--- drivers/gpu/drm/i915/display/intel_bw.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_bw.c +23 -1
@@ -273,6 +273,26 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intelreturn 0 ; } +static void dg2_get_bw_info (struct drm_i915_private *i915) +{ +struct intel_bw_info *bi = &i915->max_bw[0 ]; + +/* +* DG2 doesn't have SAGV or QGV points, just a constant max bandwidth +* that doesn't depend on the number of planes enabled. Create a +* single dummy QGV point to reflect that. DG2-G10 platforms have a +* constant 50 GB/s bandwidth, whereas DG2-G11 platforms have 38 GB/s. +*/ + bi->num_planes =1 ; + bi->num_qgv_points =1 ; +if (IS_DG2_G11 (i915)) + bi->deratedbw[0 ] =38000 ; +else + bi->deratedbw[0 ] =50000 ; + + i915->sagv_status =I915_SAGV_NOT_CONTROLLED ; +} +static unsigned int icl_max_bw (struct drm_i915_private *dev_priv,int num_planes,int qgv_point) {
@@ -306,7 +326,9 @@ void intel_bw_init_hw(struct drm_i915_private *dev_priv)if (!HAS_DISPLAY (dev_priv))return ; -if (IS_ALDERLAKE_S (dev_priv) ||IS_ALDERLAKE_P (dev_priv)) +if (IS_DG2 (dev_priv)) +dg2_get_bw_info (dev_priv); +else if (IS_ALDERLAKE_S (dev_priv) ||IS_ALDERLAKE_P (dev_priv))icl_get_bw_info (dev_priv, &adls_sa_info);else if (IS_ROCKETLAKE (dev_priv))icl_get_bw_info (dev_priv, &rkl_sa_info);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 40/50] drm/i915/dg2: DG2 has fixed memory bandwidth
Quoted 14 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Tuesday, July 13, 2021 8:16 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH v2 40/50] drm/i915/dg2: DG2 has fixed memory bandwidthDG2 doesn't have a SAGV or QGV points that determine memory bandwidth. Instead it has a constant amount of memory bandwidth available to display that does not need to be reduced based on the number of active planes.
Quoted 6 lines
For simplicity, we'll just modify driver initialization to create a single dummy QGV point with the proper amount of memory bandwidth, rather than trying to query the pcode for this information.
Bspec: 64631
Signed-off-by Matt Roper <[email protected]>
Quoted 52 lines
--- drivers/gpu/drm/i915/display/intel_bw.c | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_bw.c +5
-0@@ -273,6 +273,26 @@ static int icl_get_bw_info(struct drm_i915_private *dev_priv, const struct intel return 0; } +static void dg2_get_bw_info (struct drm_i915_private *i915) { +struct intel_bw_info *bi = &i915->max_bw[0 ]; + +/* +* DG2 doesn't have SAGV or QGV points, just a constant max bandwidth
drivers/gpu/drm/i915/display/intel_bw.c +2
-0+* that doesn't depend on the number of planes enabled. Create a +* single dummy QGV point to reflect that. DG2-G10 platforms have a
drivers/gpu/drm/i915/display/intel_bw.c +1
-0+* constant 50 GB/s bandwidth, whereas DG2-G11 platforms have 38 GB/s.
drivers/gpu/drm/i915/display/intel_bw.c +14
-2+*/ + bi->num_planes =1 ; + bi->num_qgv_points =1 ; +if (IS_DG2_G11 (i915)) + bi->deratedbw[0 ] =38000 ; +else + bi->deratedbw[0 ] =50000 ; + + i915->sagv_status =I915_SAGV_NOT_CONTROLLED ; } +static unsigned int icl_max_bw (struct drm_i915_private *dev_priv, int num_planes, int qgv_point) { @@ -306,7 +326,9 @@ void intel_bw_init_hw(struct drm_i915_private *dev_priv) if (!HAS_DISPLAY(dev_priv)) return; -if (IS_ALDERLAKE_S (dev_priv) ||IS_ALDERLAKE_P (dev_priv)) +if (IS_DG2 (dev_priv)) +dg2_get_bw_info (dev_priv); +else if (IS_ALDERLAKE_S (dev_priv) ||IS_ALDERLAKE_P (dev_priv))icl_get_bw_info (dev_priv, &adls_sa_info);else if (IS_ROCKETLAKE (dev_priv))icl_get_bw_info (dev_priv, &rkl_sa_info); --2.25.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 41/50 drm/i915/dg2: Add MPLLB programming for SNPS PHY
In reply to Matt RoperDG2's SNPS PHYs incorporate a dedicated port PLL called MPLLB which takes the place of the shared DPLLs we've used on past platforms. Let's add the MPLLB programming sequences; they'll be plugged into the rest of the code in future patches.
Bspec: 54032
Bspec: 53881
--- drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/display/intel_display.c | 1 + .../drm/i915/display/intel_display_types.h | 17 +- drivers/gpu/drm/i915/display/intel_dpll.c | 12 +- drivers/gpu/drm/i915/display/intel_snps_phy.c | 517 ++++++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 18 + drivers/gpu/drm/i915/i915_reg.h | 56 ++ 7 files changed, 616 insertions(+), 6 deletions(-) create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.c create mode 100644 drivers/gpu/drm/i915/display/intel_snps_phy.h
drivers/gpu/drm/i915/Makefile +1 -0
@@ -267,6 +267,7 @@ i915-y += \ display/intel_pps.o \ display/intel_qp_tables.o \ display/intel_sdvo.o \ + display/intel_snps_phy.o \ display/intel_tv.o \ display/intel_vdsc.o \ display/intel_vrr.o \
drivers/gpu/drm/i915/display/intel_display.c +1 -0
@@ -59,6 +59,7 @@#include "display/intel_hdmi.h" #include "display/intel_lvds.h" #include "display/intel_sdvo.h" +#include "display/intel_snps_phy.h" #include "display/intel_tv.h" #include "display/intel_vdsc.h" #include "display/intel_vrr.h"
drivers/gpu/drm/i915/display/intel_display_types.h +16 -1
@@ -884,6 +884,18 @@ enum intel_output_format { INTEL_OUTPUT_FORMAT_YCBCR444, }; +struct intel_mpllb_state { +u32 clock;/* in KHz */ +u32 ref_control; +u32 mpllb_cp; +u32 mpllb_div; +u32 mpllb_div2; +u32 mpllb_fracn1; +u32 mpllb_fracn2; +u32 mpllb_sscen; +u32 mpllb_sscstep; +}; +struct intel_crtc_state {/* * uapi (drm) state. This is the software state shown to userspace.
@@ -1018,7 +1030,10 @@ struct intel_crtc_state {struct intel_shared_dpll *shared_dpll;/* Actual register state of the dpll, for shared dpll cross-checking. */ -struct intel_dpll_hw_state dpll_hw_state; +union { +struct intel_dpll_hw_state dpll_hw_state; +struct intel_mpllb_state mpllb_state; + };/* * ICL reserved DPLLs for the CRTC/port. The active PLL is selected by
drivers/gpu/drm/i915/display/intel_dpll.c +7 -5
@@ -11,6 +11,7 @@#include "intel_lvds.h" #include "intel_panel.h" #include "intel_sideband.h" +#include "display/intel_snps_phy.h" struct intel_limit { struct {
@@ -923,12 +924,13 @@ static int hsw_crtc_compute_clock(struct intel_crtc *crtc,struct drm_i915_private *dev_priv =to_i915 (crtc->base.dev);struct intel_atomic_state *state =to_intel_atomic_state (crtc_state->uapi.state); +struct intel_encoder *encoder = +intel_get_crtc_new_encoder (state, crtc_state); -if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ) || -DISPLAY_VER (dev_priv) >=11 ) { -struct intel_encoder *encoder = -intel_get_crtc_new_encoder (state, crtc_state); - +if (IS_DG2 (dev_priv)) { +return intel_mpllb_calc_state (crtc_state, encoder); + }else if (!intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DSI ) || +DISPLAY_VER (dev_priv) >=11 ) {if (!intel_reserve_shared_dplls (state, crtc, encoder)) { drm_dbg_kms(&dev_priv->drm, "failed to find PLL for pipe %c\n",
drivers/gpu/drm/i915/display/intel_snps_phy.c new file +517 -0
517 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_snps_phy.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: MIT */ +/* +* Copyright © 2019 Intel Corporation +*/ + +#ifndef __INTEL_SNPS_PHY_H__ +#define __INTEL_SNPS_PHY_H__ + +struct intel_encoder ; +struct intel_crtc_state ; + +int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state, +struct intel_encoder *encoder); +void intel_mpllb_enable (struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state); +void intel_mpllb_disable (struct intel_encoder *encoder); + +#endif /* __INTEL_SNPS_PHY_H__ */
drivers/gpu/drm/i915/i915_reg.h +56 -0
68 lines not on this page · raw message
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 42/50 drm/i915/dg2: Add MPLLB programming for HDMI
In reply to Matt RoperAt the moment we don't have a proper algorithm that can be used to calculate PHY settings for arbitrary HDMI link rates. The PHY tables here should support the regular modes of real-world HDMI monitors.
Bspec: 54032
--- drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 47 +++ drivers/gpu/drm/i915/display/intel_hdmi.c | 11 + drivers/gpu/drm/i915/display/intel_snps_phy.c | 286 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_snps_phy.h | 7 + drivers/gpu/drm/i915/i915_reg.h | 3 + 6 files changed, 355 insertions(+), 13 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +13 -1
@@ -51,6 +51,7 @@#include "intel_panel.h" #include "intel_pps.h" #include "intel_psr.h" +#include "intel_snps_phy.h" #include "intel_sprite.h" #include "intel_tc.h" #include "intel_vdsc.h"
@@ -3745,6 +3746,15 @@ void intel_ddi_get_clock(struct intel_encoder *encoder, &crtc_state->dpll_hw_state); } +static void dg2_ddi_get_config (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state) +{ +intel_mpllb_readout_hw_state (encoder, &crtc_state->mpllb_state); + crtc_state->port_clock =intel_mpllb_calc_port_clock (encoder, &crtc_state->mpllb_state); + +intel_ddi_get_config (encoder, crtc_state); +} +static void adls_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) {
@@ -4606,7 +4616,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->cloneable =0 ; encoder->pipe_mask = ~0 ; -if (IS_ALDERLAKE_S (dev_priv)) { +if (IS_DG2 (dev_priv)) { + encoder->get_config = dg2_ddi_get_config; + }else if (IS_ALDERLAKE_S (dev_priv)) { encoder->enable_clock = adls_ddi_enable_clock; encoder->disable_clock = adls_ddi_disable_clock; encoder->is_clock_enabled = adls_ddi_is_clock_enabled;
drivers/gpu/drm/i915/display/intel_display.c +47 -0
59 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_hdmi.c +11 -0
@@ -51,6 +51,7 @@#include "intel_hdmi.h" #include "intel_lspcon.h" #include "intel_panel.h" +#include "intel_snps_phy.h" static struct drm_device *intel_hdmi_to_dev (struct intel_hdmi *intel_hdmi) {
@@ -1850,6 +1851,16 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi,if (IS_CHERRYVIEW (dev_priv) && clock >216000 && clock <240000 )return MODE_CLOCK_RANGE ; +/* +* SNPS PHYs' MPLLB table-based programming can only handle a fixed +* set of link rates. +* +* FIXME: We will hopefully get an algorithmic way of programming +* the MPLLB for HDMI in the future. +*/ +if (IS_DG2 (dev_priv)) +return intel_snps_phy_check_hdmi_link_rate (clock); +return MODE_OK ; }
drivers/gpu/drm/i915/display/intel_snps_phy.c +274 -12
312 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_snps_phy.h +7 -0
@@ -8,11 +8,18 @@struct intel_encoder ;struct intel_crtc_state ; +struct intel_mpllb_state ;int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder);void intel_mpllb_enable (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state);void intel_mpllb_disable (struct intel_encoder *encoder); +void intel_mpllb_readout_hw_state (struct intel_encoder *encoder, +struct intel_mpllb_state *pll_state); +int intel_mpllb_calc_port_clock (struct intel_encoder *encoder, +const struct intel_mpllb_state *pll_state); + +int intel_snps_phy_check_hdmi_link_rate (int clock);#endif /* __INTEL_SNPS_PHY_H__ */
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -2325,12 +2325,15 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SNPS_PHY_MPLLB_SSCEN (phy) _MMIO_SNPS(phy, 0x168014)#define SNPS_PHY_MPLLB_SSC_EN REG_BIT(31) +#define SNPS_PHY_MPLLB_SSC_UP_SPREAD REG_BIT(30)#define SNPS_PHY_MPLLB_SSC_PEAK REG_GENMASK(29, 10)#define SNPS_PHY_MPLLB_SSCSTEP (phy) _MMIO_SNPS(phy, 0x168018)#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)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 42/50] drm/i915/dg2: Add MPLLB programming for HDMI
Quoted 8 lines · Matt Roper
At the moment we don't have a proper algorithm that can be used to calculate PHY settings for arbitrary HDMI link rates. The PHY tables here should support the regular modes of real-world HDMI monitors.
Bspec: 54032
Cc Matt Atwood <[email protected]>Signed-off-by Matt Roper <[email protected]>Signed-off-by Vandita Kulkarni <[email protected]>
Quoted 508 lines
--- drivers/gpu/drm/i915/display/intel_ddi.c | 14 +- drivers/gpu/drm/i915/display/intel_display.c | 47 +++ drivers/gpu/drm/i915/display/intel_hdmi.c | 11 + drivers/gpu/drm/i915/display/intel_snps_phy.c | 286 +++++++++++++++++- drivers/gpu/drm/i915/display/intel_snps_phy.h | 7 + drivers/gpu/drm/i915/i915_reg.h | 3 + 6 files changed, 355 insertions(+), 13 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +13
-1@@ -51,6 +51,7 @@#include "intel_panel.h" #include "intel_pps.h" #include "intel_psr.h" +#include "intel_snps_phy.h" #include "intel_sprite.h" #include "intel_tc.h" #include "intel_vdsc.h" @@ -3745,6 +3746,15 @@ void intel_ddi_get_clock(struct intel_encoder *encoder, &crtc_state->dpll_hw_state); } +static void dg2_ddi_get_config (struct intel_encoder *encoder, +struct intel_crtc_state *crtc_state) +{ +intel_mpllb_readout_hw_state (encoder, &crtc_state->mpllb_state); + crtc_state->port_clock =intel_mpllb_calc_port_clock (encoder, &crtc_state->mpllb_state); + +intel_ddi_get_config (encoder, crtc_state); +} +static void adls_ddi_get_config (struct intel_encoder *encoder,struct intel_crtc_state *crtc_state) {@@ -4606,7 +4616,9 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->cloneable =0 ; encoder->pipe_mask = ~0 ; -if (IS_ALDERLAKE_S (dev_priv)) { +if (IS_DG2 (dev_priv)) { + encoder->get_config = dg2_ddi_get_config; + }else if (IS_ALDERLAKE_S (dev_priv)) { encoder->enable_clock = adls_ddi_enable_clock; encoder->disable_clock = adls_ddi_disable_clock; encoder->is_clock_enabled = adls_ddi_is_clock_enabled;drivers/gpu/drm/i915/display/intel_display.c +47
-0@@ -9113,6 +9113,52 @@ verify_shared_dpll_state(struct intel_crtc *crtc, } } +static void +verify_mpllb_state (struct intel_atomic_state *state, +struct intel_crtc_state *new_crtc_state) +{ +struct drm_i915_private *i915 =to_i915 (state->base.dev); +struct intel_mpllb_state mpllb_hw_state = {0 }; +struct intel_mpllb_state *mpllb_sw_state = &new_crtc_state->mpllb_state; +struct intel_crtc *crtc =to_intel_crtc (new_crtc_state->uapi.crtc); +struct intel_encoder *encoder; + +if (!IS_DG2 (i915)) +return ; + +if (!new_crtc_state->hw.active) +return ; + + encoder =intel_get_crtc_new_encoder (state, new_crtc_state); +intel_mpllb_readout_hw_state (encoder, &mpllb_hw_state); + +#define MPLLB_CHECK (name) do { \ + if (mpllb_sw_state->name != mpllb_hw_state.name) { \ + pipe_config_mismatch(false, crtc, "MPLLB:" __stringify(name), \ + "(expected 0x%08x, found 0x%08x)", \ + mpllb_sw_state->name, \ + mpllb_hw_state.name); \ + } \ +} while (0) + +MPLLB_CHECK (mpllb_cp); +MPLLB_CHECK (mpllb_div); +MPLLB_CHECK (mpllb_div2); +MPLLB_CHECK (mpllb_fracn1); +MPLLB_CHECK (mpllb_fracn2); +MPLLB_CHECK (mpllb_sscen); +MPLLB_CHECK (mpllb_sscstep); + +/* +* ref_control is handled by the hardware/firemware and never +* programmed by the software, but the proper values are supplied +* in the bspec for verification purposes. +*/ +MPLLB_CHECK (ref_control); + +#undef MPLLB_CHECK +} + static void intel_modeset_verify_crtc(struct intel_crtc *crtc, struct intel_atomic_state *state,@@ -9126,6 +9172,7 @@ intel_modeset_verify_crtc(struct intel_crtc *crtc,verify_connector_state (state, crtc);verify_crtc_state (crtc, old_crtc_state, new_crtc_state);verify_shared_dpll_state (crtc, old_crtc_state, new_crtc_state); +verify_mpllb_state (state, new_crtc_state); } static voiddrivers/gpu/drm/i915/display/intel_hdmi.c +11
-0@@ -51,6 +51,7 @@#include "intel_hdmi.h" #include "intel_lspcon.h" #include "intel_panel.h" +#include "intel_snps_phy.h" static struct drm_device *intel_hdmi_to_dev (struct intel_hdmi *intel_hdmi) {@@ -1850,6 +1851,16 @@ hdmi_port_clock_valid(struct intel_hdmi *hdmi,if (IS_CHERRYVIEW (dev_priv) && clock >216000 && clock <240000 )return MODE_CLOCK_RANGE ; +/* +* SNPS PHYs' MPLLB table-based programming can only handle a fixed +* set of link rates. +* +* FIXME: We will hopefully get an algorithmic way of programming +* the MPLLB for HDMI in the future. +*/ +if (IS_DG2 (dev_priv)) +return intel_snps_phy_check_hdmi_link_rate (clock); +return MODE_OK ; }drivers/gpu/drm/i915/display/intel_snps_phy.c +274
-12@@ -3,6 +3,8 @@* Copyright © 2019 Intel Corporation */ +#include <linux/util_macros.h> +#include "intel_de.h" #include "intel_display_types.h" #include "intel_snps_phy.h" @@ -375,14 +377,172 @@ static const struct intel_mpllb_state *dg2_edp_tables[] = { NULL, }; -int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state, -struct intel_encoder *encoder) -{ -const struct intel_mpllb_state **tables; -int i; +/* +* HDMI link rates with 100 MHz reference clock. +*/ + +static const struct intel_mpllb_state dg2_hdmi_25_175 = { + .clock =25175 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,128 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,143 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,36663 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,71 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_27_0 = { + .clock =27000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,5 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,140 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,5 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,2 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_74_25 = { + .clock =74250 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,3 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,5 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,2 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_148_5 = { + .clock =148500 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_TX_CLK_DIV ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,5 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,2 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; + +static const struct intel_mpllb_state dg2_hdmi_594 = { + .clock =594000 , + .ref_control = +REG_FIELD_PREP (SNPS_PHY_REF_CONTROL_REF_RANGE ,3 ), + .mpllb_cp = +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT ,4 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP ,15 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_INT_GS ,64 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_CP_PROP_GS ,124 ), + .mpllb_div = +REG_FIELD_PREP (SNPS_PHY_MPLLB_DIV5_CLK_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_PMIX_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_V2I ,2 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FREQ_VCO ,3 ), + .mpllb_div2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_REF_CLK_DIV ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_MULTIPLIER ,86 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_HDMI_DIV ,1 ), + .mpllb_fracn1 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_CGG_UPDATE_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_EN ,1 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_DEN ,5 ), + .mpllb_fracn2 = +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_QUOT ,26214 ) | +REG_FIELD_PREP (SNPS_PHY_MPLLB_FRACN_REM ,2 ), + .mpllb_sscen = +REG_FIELD_PREP (SNPS_PHY_MPLLB_SSC_UP_SPREAD ,1 ), +}; +static const struct intel_mpllb_state *dg2_hdmi_tables[] = { + &dg2_hdmi_25_175, + &dg2_hdmi_27_0, + &dg2_hdmi_74_25, + &dg2_hdmi_148_5, + &dg2_hdmi_594, +NULL , +}; + +static const struct intel_mpllb_state ** +intel_mpllb_tables_get (struct intel_crtc_state *crtc_state, +struct intel_encoder *encoder) +{if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_EDP )) { - tables = dg2_edp_tables; +return dg2_edp_tables; }else if (intel_crtc_has_dp_encoder (crtc_state)) {/* * FIXME: Initially we're just enabling the "combo" outputs on @@ -397,15 +557,41 @@ int intel_mpllb_calc_state(struct intel_crtc_state *crtc_state,* that to determine which table to use. */ if (0 ) - tables = dg2_dp_38_4_tables; +return dg2_dp_38_4_tables;else - tables = dg2_dp_100_tables; - }else { -/* TODO: Add HDMI support */ -MISSING_CASE (encoder->type); -return -EINVAL ; +return dg2_dp_100_tables; + }else if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +return dg2_hdmi_tables; } +MISSING_CASE (encoder->type); +return NULL ; +} + +int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state, +struct intel_encoder *encoder) +{ +const struct intel_mpllb_state **tables; +int i; + +if (intel_crtc_has_type (crtc_state,INTEL_OUTPUT_HDMI )) { +if (intel_snps_phy_check_hdmi_link_rate (crtc_state->port_clock) + !=MODE_OK ) { +/* +* FIXME: Can only support fixed HDMI frequencies +* until we have a proper algorithm under a valid +* license. +*/ +DRM_DEBUG_KMS ("Can't support HDMI link rate %d\n" , + crtc_state->port_clock); +return -EINVAL ; + } + } + + tables =intel_mpllb_tables_get (crtc_state, encoder); +if (!tables) +return -EINVAL ; +for (i =0 ; tables[i]; i++) {if (crtc_state->port_clock <= tables[i]->clock) { crtc_state->mpllb_state = *tables[i];@@ -515,3 +701,79 @@ void intel_mpllb_disable(struct intel_encoder *encoder)* We handle this step in bxt_set_cdclk(). */ } + +int intel_mpllb_calc_port_clock (struct intel_encoder *encoder, +const struct intel_mpllb_state *pll_state) +{ +unsigned int frac_quot =0 , frac_rem =0 , frac_den =1 ; +unsigned int multiplier, tx_clk_div, refclk; +bool frac_en; + +if (0 ) + refclk =38400 ; +else + refclk =100000 ; + + refclk >>=REG_FIELD_GET (SNPS_PHY_MPLLB_REF_CLK_DIV , pll_state->mpllb_div2) -1 ; + + frac_en =REG_FIELD_GET (SNPS_PHY_MPLLB_FRACN_EN , pll_state->mpllb_fracn1); + +if (frac_en) { + frac_quot =REG_FIELD_GET (SNPS_PHY_MPLLB_FRACN_QUOT , pll_state->mpllb_fracn2); + frac_rem =REG_FIELD_GET (SNPS_PHY_MPLLB_FRACN_REM , pll_state->mpllb_fracn2); + frac_den =REG_FIELD_GET (SNPS_PHY_MPLLB_FRACN_DEN , pll_state->mpllb_fracn1); + } + + multiplier =REG_FIELD_GET (SNPS_PHY_MPLLB_MULTIPLIER , pll_state->mpllb_div2) /2 +16 ; + + tx_clk_div =REG_FIELD_GET (SNPS_PHY_MPLLB_TX_CLK_DIV , pll_state->mpllb_div); + +return DIV_ROUND_CLOSEST_ULL (mul_u32_u32 (refclk, (multiplier <<16 ) + frac_quot) + +DIV_ROUND_CLOSEST (refclk * frac_rem, frac_den), +10 << (tx_clk_div +16 )); +} + +void intel_mpllb_readout_hw_state (struct intel_encoder *encoder, +struct intel_mpllb_state *pll_state) +{ +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum phy phy =intel_port_to_phy (dev_priv, encoder->port); + + pll_state->mpllb_cp =intel_de_read (dev_priv,SNPS_PHY_MPLLB_CP (phy)); + pll_state->mpllb_div =intel_de_read (dev_priv,SNPS_PHY_MPLLB_DIV (phy)); + pll_state->mpllb_div2 =intel_de_read (dev_priv,SNPS_PHY_MPLLB_DIV2 (phy)); + pll_state->mpllb_sscen =intel_de_read (dev_priv,SNPS_PHY_MPLLB_SSCEN (phy)); + pll_state->mpllb_sscstep =intel_de_read (dev_priv,SNPS_PHY_MPLLB_SSCSTEP (phy)); + pll_state->mpllb_fracn1 =intel_de_read (dev_priv,SNPS_PHY_MPLLB_FRACN1 (phy)); + pll_state->mpllb_fracn2 =intel_de_read (dev_priv,SNPS_PHY_MPLLB_FRACN2 (phy)); + +/* +* REF_CONTROL is under firmware control and never programmed by the +* driver; we read it only for sanity checking purposes. The bspec +* only tells us the expected value for one field in this register, +* so we'll only read out those specific bits here. +*/ + pll_state->ref_control =intel_de_read (dev_priv,SNPS_PHY_REF_CONTROL (phy)) & +SNPS_PHY_REF_CONTROL_REF_RANGE ; + +/* +* MPLLB_DIV is programmed twice, once with the software-computed +* state, then again with the MPLLB_FORCE_EN bit added. Drop that +* extra bit during readout so that we return the actual expected +* software state. +*/ + pll_state->mpllb_div &= ~SNPS_PHY_MPLLB_FORCE_EN ; +} + +int intel_snps_phy_check_hdmi_link_rate (int clock) +{ +const struct intel_mpllb_state **tables = dg2_hdmi_tables; +int i; + +for (i =0 ; tables[i]; i++) { +if (clock == tables[i]->clock) +return MODE_OK ; + } + +return MODE_CLOCK_RANGE ; +}drivers/gpu/drm/i915/display/intel_snps_phy.h +7
-0@@ -8,11 +8,18 @@struct intel_encoder ;struct intel_crtc_state ; +struct intel_mpllb_state ;int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder);void intel_mpllb_enable (struct intel_encoder *encoder,const struct intel_crtc_state *crtc_state);void intel_mpllb_disable (struct intel_encoder *encoder); +void intel_mpllb_readout_hw_state (struct intel_encoder *encoder, +struct intel_mpllb_state *pll_state); +int intel_mpllb_calc_port_clock (struct intel_encoder *encoder, +const struct intel_mpllb_state *pll_state); + +int intel_snps_phy_check_hdmi_link_rate (int clock);#endif /* __INTEL_SNPS_PHY_H__ */ drivers/gpu/drm/i915/i915_reg.h +3
-0@@ -2325,12 +2325,15 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SNPS_PHY_MPLLB_SSCEN (phy) _MMIO_SNPS(phy, 0x168014)#define SNPS_PHY_MPLLB_SSC_EN REG_BIT(31) +#define SNPS_PHY_MPLLB_SSC_UP_SPREAD REG_BIT(30)#define SNPS_PHY_MPLLB_SSC_PEAK REG_GENMASK(29, 10)#define SNPS_PHY_MPLLB_SSCSTEP (phy) _MMIO_SNPS(phy, 0x168018)#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)Signature · 1 line
2.25.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 43/50 drm/i915/dg2: Add vswing programming for SNPS phys
In reply to Matt RoperVswing programming for SNPS PHYs is just a single step -- look up the value that corresponds to the voltage level from a table and program it into the SNPS_PHY_TX_EQ register.
Bspec: 53920
--- drivers/gpu/drm/i915/display/intel_ddi.c | 23 ++++++-- drivers/gpu/drm/i915/display/intel_snps_phy.c | 54 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 4 ++ drivers/gpu/drm/i915/i915_reg.h | 5 ++ 4 files changed, 83 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +20 -3
@@ -1496,6 +1496,16 @@ static int intel_ddi_dp_level(struct intel_dp *intel_dp)return translate_signal_level (intel_dp, signal_levels); } +static void +dg2_set_signal_levels (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state) +{ +struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base; +int level =intel_ddi_dp_level (intel_dp); + +intel_snps_phy_ddi_vswing_sequence (encoder, level); +} +static void tgl_set_signal_levels (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state)
@@ -2563,7 +2573,10 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,*/ /* 7.e Configure voltage swing and related IO settings */ -tgl_ddi_vswing_sequence (encoder, crtc_state, level); +if (IS_DG2 (dev_priv)) +intel_snps_phy_ddi_vswing_sequence (encoder, level); +else +tgl_ddi_vswing_sequence (encoder, crtc_state, level);/* * 7.f Combo PHY: Configure PORT_CL_DW10 Static Power Down to power up
@@ -3102,7 +3115,9 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,"[CONNECTOR:%d:%s] Failed to configure sink scrambling/TMDS bit clock ratio\n" , connector->base.id, connector->name); -if (DISPLAY_VER (dev_priv) >=12 ) +if (IS_DG2 (dev_priv)) +intel_snps_phy_ddi_vswing_sequence (encoder,U32_MAX ); +else if (DISPLAY_VER (dev_priv) >=12 )tgl_ddi_vswing_sequence (encoder, crtc_state, level);else if (DISPLAY_VER (dev_priv) ==11 )icl_ddi_vswing_sequence (encoder, crtc_state, level);
@@ -4075,7 +4090,9 @@ intel_ddi_init_dp_connector(struct intel_digital_port *dig_port) dig_port->dp.set_link_train = intel_ddi_set_link_train; dig_port->dp.set_idle_link_train = intel_ddi_set_idle_link_train; -if (DISPLAY_VER (dev_priv) >=12 ) +if (IS_DG2 (dev_priv)) + dig_port->dp.set_signal_levels = dg2_set_signal_levels; +else if (DISPLAY_VER (dev_priv) >=12 ) dig_port->dp.set_signal_levels = tgl_set_signal_levels;else if (DISPLAY_VER (dev_priv) >=11 ) dig_port->dp.set_signal_levels = icl_set_signal_levels;
drivers/gpu/drm/i915/display/intel_snps_phy.c +54 -0
60 lines not on this page · raw message
drivers/gpu/drm/i915/display/intel_snps_phy.h +4 -0
@@ -6,6 +6,8 @@#ifndef __INTEL_SNPS_PHY_H__#define __INTEL_SNPS_PHY_H__ +#include <linux/types.h> +struct intel_encoder ;struct intel_crtc_state ;struct intel_mpllb_state ;
@@ -21,5 +23,7 @@ int intel_mpllb_calc_port_clock(struct intel_encoder *encoder, const struct intel_mpllb_state *pll_state);int intel_snps_phy_check_hdmi_link_rate (int clock); +void intel_snps_phy_ddi_vswing_sequence (struct intel_encoder *encoder, +u32 level);#endif /* __INTEL_SNPS_PHY_H__ */
drivers/gpu/drm/i915/i915_reg.h +5 -0
@@ -2340,6 +2340,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SNPS_PHY_REF_CONTROL (phy) _MMIO_SNPS(phy, 0x168188)#define SNPS_PHY_REF_CONTROL_REF_RANGE REG_GENMASK(31, 27) +#define SNPS_PHY_TX_EQ (ln, phy) _MMIO_SNPS_LN(ln, phy, 0x168300) +#define SNPS_PHY_TX_EQ_MAIN REG_GENMASK(23, 18) +#define SNPS_PHY_TX_EQ_POST REG_GENMASK(15, 10) +#define SNPS_PHY_TX_EQ_PRE REG_GENMASK(7, 2) +/* The spec defines this only for BXT PHY0, but lets assume that this * would exist for PHY1 too if it had a second channel. */
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 43/50] drm/i915/dg2: Add vswing programming for SNPS phys
Quoted 8 lines · Matt Roper
Vswing programming for SNPS PHYs is just a single step -- look up the value that corresponds to the voltage level from a table and program it into the
SNPS_PHY_TX_EQregister.Bspec: 53920
Cc Matt Atwood <[email protected]>Signed-off-by Matt Roper <[email protected]>Signed-off-by Jani Nikula <[email protected]>
Quoted 167 lines
--- drivers/gpu/drm/i915/display/intel_ddi.c | 23 ++++++-- drivers/gpu/drm/i915/display/intel_snps_phy.c | 54 +++++++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 4 ++ drivers/gpu/drm/i915/i915_reg.h | 5 ++ 4 files changed, 83 insertions(+), 3 deletions(-)drivers/gpu/drm/i915/display/intel_ddi.c +20
-3@@ -1496,6 +1496,16 @@ static int intel_ddi_dp_level(struct intel_dp *intel_dp)return translate_signal_level (intel_dp, signal_levels); } +static void +dg2_set_signal_levels (struct intel_dp *intel_dp, +const struct intel_crtc_state *crtc_state) +{ +struct intel_encoder *encoder = &dp_to_dig_port (intel_dp)->base; +int level =intel_ddi_dp_level (intel_dp); + +intel_snps_phy_ddi_vswing_sequence (encoder, level); +} +static void tgl_set_signal_levels (struct intel_dp *intel_dp,const struct intel_crtc_state *crtc_state)@@ -2563,7 +2573,10 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,*/ /* 7.e Configure voltage swing and related IO settings */ -tgl_ddi_vswing_sequence (encoder, crtc_state, level); +if (IS_DG2 (dev_priv)) +intel_snps_phy_ddi_vswing_sequence (encoder, level); +else +tgl_ddi_vswing_sequence (encoder, crtc_state, level);/* * 7.f Combo PHY: Configure PORT_CL_DW10 Static Power Down to power up @@ -3102,7 +3115,9 @@ static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,"[CONNECTOR:%d:%s] Failed to configure sink scrambling/TMDS bit clock ratio\n" , connector->base.id, connector->name); -if (DISPLAY_VER (dev_priv) >=12 ) +if (IS_DG2 (dev_priv)) +intel_snps_phy_ddi_vswing_sequence (encoder,U32_MAX ); +else if (DISPLAY_VER (dev_priv) >=12 )tgl_ddi_vswing_sequence (encoder, crtc_state, level);else if (DISPLAY_VER (dev_priv) ==11 )icl_ddi_vswing_sequence (encoder, crtc_state, level);@@ -4075,7 +4090,9 @@ intel_ddi_init_dp_connector(struct intel_digital_port *dig_port) dig_port->dp.set_link_train = intel_ddi_set_link_train; dig_port->dp.set_idle_link_train = intel_ddi_set_idle_link_train; -if (DISPLAY_VER (dev_priv) >=12 ) +if (IS_DG2 (dev_priv)) + dig_port->dp.set_signal_levels = dg2_set_signal_levels; +else if (DISPLAY_VER (dev_priv) >=12 ) dig_port->dp.set_signal_levels = tgl_set_signal_levels;else if (DISPLAY_VER (dev_priv) >=11 ) dig_port->dp.set_signal_levels = icl_set_signal_levels;drivers/gpu/drm/i915/display/intel_snps_phy.c +54
-0@@ -21,6 +21,60 @@* since it is not handled by the shared DPLL framework as on other platforms. */ +static const u32 dg2_ddi_translations[] = { +/* VS 0, pre-emph 0 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,26 ), + +/* VS 0, pre-emph 1 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,33 ) | +REG_FIELD_PREP (SNPS_PHY_TX_EQ_POST ,6 ), + +/* VS 0, pre-emph 2 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,38 ) | +REG_FIELD_PREP (SNPS_PHY_TX_EQ_POST ,12 ), + +/* VS 0, pre-emph 3 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,43 ) | +REG_FIELD_PREP (SNPS_PHY_TX_EQ_POST ,19 ), + +/* VS 1, pre-emph 0 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,39 ), + +/* VS 1, pre-emph 1 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,44 ) | +REG_FIELD_PREP (SNPS_PHY_TX_EQ_POST ,8 ), + +/* VS 1, pre-emph 2 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,47 ) | +REG_FIELD_PREP (SNPS_PHY_TX_EQ_POST ,15 ), + +/* VS 2, pre-emph 0 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,52 ), + +/* VS 2, pre-emph 1 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,51 ) | +REG_FIELD_PREP (SNPS_PHY_TX_EQ_POST ,10 ), + +/* VS 3, pre-emph 0 */ +REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,62 ), +}; + +void intel_snps_phy_ddi_vswing_sequence (struct intel_encoder *encoder, +u32 level) +{ +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum phy phy =intel_port_to_phy (dev_priv, encoder->port); +int n_entries, ln; + + n_entries =ARRAY_SIZE (dg2_ddi_translations); +if (level >= n_entries) + level = n_entries -1 ; + +for (ln =0 ; ln <4 ; ln++) +intel_de_write (dev_priv,SNPS_PHY_TX_EQ (ln, phy), + dg2_ddi_translations[level]); +} +/* * Basic DP link rates with 100 MHz reference clock. */ drivers/gpu/drm/i915/display/intel_snps_phy.h +4
-0@@ -6,6 +6,8 @@#ifndef __INTEL_SNPS_PHY_H__#define __INTEL_SNPS_PHY_H__ +#include <linux/types.h> +struct intel_encoder ;struct intel_crtc_state ;struct intel_mpllb_state ;@@ -21,5 +23,7 @@ int intel_mpllb_calc_port_clock(struct intel_encoder *encoder, const struct intel_mpllb_state *pll_state);int intel_snps_phy_check_hdmi_link_rate (int clock); +void intel_snps_phy_ddi_vswing_sequence (struct intel_encoder *encoder, +u32 level);#endif /* __INTEL_SNPS_PHY_H__ */ drivers/gpu/drm/i915/i915_reg.h +5
-0@@ -2340,6 +2340,11 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SNPS_PHY_REF_CONTROL (phy) _MMIO_SNPS(phy, 0x168188)#define SNPS_PHY_REF_CONTROL_REF_RANGE REG_GENMASK(31, 27) +#define SNPS_PHY_TX_EQ (ln, phy) _MMIO_SNPS_LN(ln, phy, 0x168300) +#define SNPS_PHY_TX_EQ_MAIN REG_GENMASK(23, 18) +#define SNPS_PHY_TX_EQ_POST REG_GENMASK(15, 10) +#define SNPS_PHY_TX_EQ_PRE REG_GENMASK(7, 2) +/* The spec defines this only for BXT PHY0, but lets assume that this * would exist for PHY1 too if it had a second channel. */ Signature · 1 line
2.25.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 44/50 drm/i915/dg2: Update modeset sequences
In reply to Matt RoperDG2 has some changes to the expected modesetting sequences when compared to gen12. Adjust our driver logic accordingly. Although the DP sequence is pretty similar to TGL's, there are some steps that change, so let's split the handling for that out into a separate function.
v2:
- Switch wait_for_us() -> _wait_for() so that we can parameterize the timeout rather than duplicating the macro call. (Jani)
Bspec: 54128
--- drivers/gpu/drm/i915/display/intel_ddi.c | 131 +++++++++++++++++++++-- 1 file changed, 123 insertions(+), 8 deletions(-)
drivers/gpu/drm/i915/display/intel_ddi.c +123 -8
@@ -172,14 +172,18 @@ void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,static void intel_wait_ddi_buf_active (struct drm_i915_private *dev_priv,enum port port) { +int ret; +/* Wait > 518 usecs for DDI_BUF_CTL to be non idle */ if (DISPLAY_VER (dev_priv) <10 ) {usleep_range (518 ,1000 );return ; } -if (wait_for_us (!(intel_de_read (dev_priv,DDI_BUF_CTL (port)) & -DDI_BUF_IS_IDLE ),500 )) + ret =_wait_for (!(intel_de_read (dev_priv,DDI_BUF_CTL (port)) & +DDI_BUF_IS_IDLE ),IS_DG2 (dev_priv) ?1200 :500 ,10 ,10 ); + +if (ret)drm_err (&dev_priv->drm,"Timeout waiting for DDI BUF %c to get active\n" ,port_name (port)); }
@@ -2207,7 +2211,7 @@ void intel_ddi_sanitize_encoder_pll_mapping(struct intel_encoder *encoder) ddi_clk_needed = false; } -if (ddi_clk_needed || !encoder->disable_clock || +if (ddi_clk_needed || !encoder->is_clock_enabled || !encoder->is_clock_enabled (encoder))return ;
@@ -2488,6 +2492,116 @@ static void intel_ddi_mso_configure(const struct intel_crtc_state *crtc_state) OVERLAP_PIXELS_MASK, dss1); } +static void dg2_ddi_pre_enable_dp (struct intel_atomic_state *state, +struct intel_encoder *encoder, +const struct intel_crtc_state *crtc_state, +const struct drm_connector_state *conn_state) +{ +struct intel_dp *intel_dp =enc_to_intel_dp (encoder); +struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); +enum phy phy =intel_port_to_phy (dev_priv, encoder->port); +struct intel_digital_port *dig_port =enc_to_dig_port (encoder); +bool is_mst =intel_crtc_has_type (crtc_state,INTEL_OUTPUT_DP_MST ); +int level =intel_ddi_dp_level (intel_dp); + +intel_dp_set_link_params (intel_dp, crtc_state->port_clock, + crtc_state->lane_count); + +/* +* 1. Enable Power Wells +* +* This was handled at the beginning of intel_atomic_commit_tail(), +* before we called down into this function. +*/ + +/* 2. Enable Panel Power if PPS is required */ +intel_pps_on (intel_dp); + +/* +* 3. Enable the port PLL. +*/ +intel_ddi_enable_clock (encoder, crtc_state); + +/* 4. Enable IO power */ +if (!intel_phy_is_tc (dev_priv, phy) || + dig_port->tc_mode !=TC_PORT_TBT_ALT ) + dig_port->ddi_io_wakeref =intel_display_power_get (dev_priv, + dig_port->ddi_io_power_domain); + +/* +* 5. The rest of the below are substeps under the bspec's "Enable and +* Train Display Port" step. Note that steps that are specific to +* MST will be handled by intel_mst_pre_enable_dp() before/after it +* calls into this function. Also intel_mst_pre_enable_dp() only calls +* us when active_mst_links==0, so any steps designated for "single +* stream or multi-stream master transcoder" can just be performed +* unconditionally here. +*/ + +/* +* 5.a Configure Transcoder Clock Select to direct the Port clock to the +* Transcoder. +*/ +intel_ddi_enable_pipe_clock (encoder, crtc_state); + +/* 5.b Not relevant to i915 for now */ + +/* +* 5.c Configure TRANS_DDI_FUNC_CTL DDI Select, DDI Mode Select & MST +* Transport Select +*/ +intel_ddi_config_transcoder_func (encoder, crtc_state); + +/* +* 5.d Configure & enable DP_TP_CTL with link training pattern 1 +* selected +* +* This will be handled by the intel_dp_start_link_train() farther +* down this function. +*/ + +/* 5.e Configure voltage swing and related IO settings */ +intel_snps_phy_ddi_vswing_sequence (encoder, level); + +/* +* 5.f Configure and enable DDI_BUF_CTL +* 5.g Wait for DDI_BUF_CTL DDI Idle Status = 0b (Not Idle), timeout +* after 1200 us. +* +* We only configure what the register value will be here. Actual +* enabling happens during link training farther down. +*/ +intel_ddi_init_dp_buf_reg (encoder, crtc_state); + +if (!is_mst) +intel_dp_set_power (intel_dp,DP_SET_POWER_D0 ); + +intel_dp_sink_set_decompression_state (intel_dp, crtc_state, true); +/* +* DDI FEC: "anticipates enabling FEC encoding sets the FEC_READY bit +* in the FEC_CONFIGURATION register to 1 before initiating link +* training +*/ +intel_dp_sink_set_fec_ready (intel_dp, crtc_state); + +/* +* 5.h Follow DisplayPort specification training sequence (see notes for +* failure handling) +* 5.i If DisplayPort multi-stream - Set DP_TP_CTL link training to Idle +* Pattern, wait for 5 idle patterns (DP_TP_STATUS Min_Idles_Sent) +* (timeout after 800 us) +*/ +intel_dp_start_link_train (intel_dp, crtc_state); + +/* 5.j Set DP_TP_CTL link training to Normal */ +if (!is_trans_port_sync_mode (crtc_state)) +intel_dp_stop_link_train (intel_dp, crtc_state); + +/* 5.k Configure and enable FEC if needed */ +intel_ddi_enable_fec (encoder, crtc_state); +intel_dsc_enable (encoder, crtc_state); +} + static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state, struct intel_encoder *encoder, const struct intel_crtc_state *crtc_state,
@@ -2573,10 +2687,7 @@ static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,*/ /* 7.e Configure voltage swing and related IO settings */ -if (IS_DG2 (dev_priv)) -intel_snps_phy_ddi_vswing_sequence (encoder, level); -else -tgl_ddi_vswing_sequence (encoder, crtc_state, level); +tgl_ddi_vswing_sequence (encoder, crtc_state, level);/* * 7.f Combo PHY: Configure PORT_CL_DW10 Static Power Down to power up
@@ -2708,7 +2819,9 @@ static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state, {struct drm_i915_private *dev_priv =to_i915 (encoder->base.dev); -if (DISPLAY_VER (dev_priv) >=12 ) +if (IS_DG2 (dev_priv)) +dg2_ddi_pre_enable_dp (state, encoder, crtc_state, conn_state); +else if (DISPLAY_VER (dev_priv) >=12 )tgl_ddi_pre_enable_dp (state, encoder, crtc_state, conn_state);else hsw_ddi_pre_enable_dp (state, encoder, crtc_state, conn_state);
@@ -4634,6 +4747,8 @@ void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port) encoder->pipe_mask = ~0 ;if (IS_DG2 (dev_priv)) { + encoder->enable_clock = intel_mpllb_enable; + encoder->disable_clock = intel_mpllb_disable; encoder->get_config = dg2_ddi_get_config; }else if (IS_ALDERLAKE_S (dev_priv)) { encoder->enable_clock = adls_ddi_enable_clock;
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 45/50 drm/i915/dg2: Classify DG2 PHY types
In reply to Matt RoperAlthough the bspec labels four of DG2's outputs as "combo PHY," the underlying PHYs in both cases are actually Synopsys PHYs that are programmed completely differently than the traditional Intel "combo" PHY units. As such, we don't want intel_phy_is_combo to take us down legacy programming paths, so just return false from it on DG2. Instead add a new intel_phy_is_snps() that will return true for all DG2 PHYs.
--- drivers/gpu/drm/i915/display/intel_display.c | 26 +++++++++++++++++++- drivers/gpu/drm/i915/display/intel_display.h | 1 + 2 files changed, 26 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_display.c +25 -1
@@ -3698,6 +3698,13 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy) {if (phy ==PHY_NONE )return false; +else if (IS_DG2 (dev_priv)) +/* +* DG2 outputs labelled as "combo PHY" in the bspec use +* SNPS PHYs with completely different programming, +* hence we always return false here. +*/ +return false;else if (IS_ALDERLAKE_S (dev_priv))return phy <=PHY_E ;else if (IS_DG1 (dev_priv) ||IS_ROCKETLAKE (dev_priv))
@@ -3712,7 +3719,10 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)bool intel_phy_is_tc (struct drm_i915_private *dev_priv,enum phy phy) { -if (IS_ALDERLAKE_P (dev_priv)) +if (IS_DG2 (dev_priv)) +/* DG2's "TC1" output uses a SNPS PHY */ +return false; +else if (IS_ALDERLAKE_P (dev_priv))return phy >=PHY_F && phy <=PHY_I ;else if (IS_TIGERLAKE (dev_priv))return phy >=PHY_D && phy <=PHY_I ;
@@ -3722,6 +3732,20 @@ bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy)return false; } +bool intel_phy_is_snps (struct drm_i915_private *dev_priv,enum phy phy) +{ +if (phy ==PHY_NONE ) +return false; +else if (IS_DG2 (dev_priv)) +/* +* All four "combo" ports and the TC1 port (PHY E) use +* Synopsis PHYs. +*/ +return phy <=PHY_E ; + +return false; +} +enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port) {if (DISPLAY_VER (i915) >=13 && port >=PORT_D_XELPD )
drivers/gpu/drm/i915/display/intel_display.h +1 -0
@@ -561,6 +561,7 @@ struct drm_display_mode * intel_encoder_current_mode(struct intel_encoder *encoder);bool intel_phy_is_combo (struct drm_i915_private *dev_priv,enum phy phy);bool intel_phy_is_tc (struct drm_i915_private *dev_priv,enum phy phy); +bool intel_phy_is_snps (struct drm_i915_private *dev_priv,enum phy phy);enum tc_port intel_port_to_tc (struct drm_i915_private *dev_priv,enum port port); int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 45/50] drm/i915/dg2: Classify DG2 PHY types
Quoted 10 lines · Matt Roper
Although the bspec labels four of DG2's outputs as "combo PHY," the underlying PHYs in both cases are actually Synopsys PHYs that are programmed completely differently than the traditional Intel "combo" PHY units. As such, we don't want
intel_phy_is_comboto take us down legacy programming paths, so just return false from it on DG2. Instead add a newintel_phy_is_snps()that will return true for all DG2 PHYs.Cc Anusha Srivatsa <[email protected]>Cc Matt Atwood <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 71 lines
--- drivers/gpu/drm/i915/display/intel_display.c | 26 +++++++++++++++++++- drivers/gpu/drm/i915/display/intel_display.h | 1 + 2 files changed, 26 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_display.c +25
-1@@ -3698,6 +3698,13 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy) {if (phy ==PHY_NONE )return false; +else if (IS_DG2 (dev_priv)) +/* +* DG2 outputs labelled as "combo PHY" in the bspec use +* SNPS PHYs with completely different programming, +* hence we always return false here. +*/ +return false;else if (IS_ALDERLAKE_S (dev_priv))return phy <=PHY_E ;else if (IS_DG1 (dev_priv) ||IS_ROCKETLAKE (dev_priv))@@ -3712,7 +3719,10 @@ bool intel_phy_is_combo(struct drm_i915_private *dev_priv, enum phy phy)bool intel_phy_is_tc (struct drm_i915_private *dev_priv,enum phy phy) { -if (IS_ALDERLAKE_P (dev_priv)) +if (IS_DG2 (dev_priv)) +/* DG2's "TC1" output uses a SNPS PHY */ +return false; +else if (IS_ALDERLAKE_P (dev_priv))return phy >=PHY_F && phy <=PHY_I ;else if (IS_TIGERLAKE (dev_priv))return phy >=PHY_D && phy <=PHY_I ;@@ -3722,6 +3732,20 @@ bool intel_phy_is_tc(struct drm_i915_private *dev_priv, enum phy phy)return false; } +bool intel_phy_is_snps (struct drm_i915_private *dev_priv,enum phy phy) +{ +if (phy ==PHY_NONE ) +return false; +else if (IS_DG2 (dev_priv)) +/* +* All four "combo" ports and the TC1 port (PHY E) use +* Synopsis PHYs. +*/ +return phy <=PHY_E ; + +return false; +} +enum phy intel_port_to_phy (struct drm_i915_private *i915,enum port port) {if (DISPLAY_VER (i915) >=13 && port >=PORT_D_XELPD )drivers/gpu/drm/i915/display/intel_display.h +1
-0@@ -561,6 +561,7 @@ struct drm_display_mode * intel_encoder_current_mode(struct intel_encoder *encoder);bool intel_phy_is_combo (struct drm_i915_private *dev_priv,enum phy phy);bool intel_phy_is_tc (struct drm_i915_private *dev_priv,enum phy phy); +bool intel_phy_is_snps (struct drm_i915_private *dev_priv,enum phy phy);enum tc_port intel_port_to_tc (struct drm_i915_private *dev_priv,enum port port); int intel_get_pipe_from_crtc_id_ioctl(struct drm_device *dev, void *data,Signature · 1 line
2.25.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 46/50 drm/i915/dg2: Wait for SNPS PHY calibration during display init
In reply to Matt RoperInitialization of the PHY is handled by the hardware/firmware, but the driver should wait up to 25ms for the PHY to report that its calibration has completed.
Bspec: 49189
Bspec: 50107
--- .../gpu/drm/i915/display/intel_display_power.c | 5 +++++ drivers/gpu/drm/i915/display/intel_snps_phy.c | 15 +++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 3 +++ drivers/gpu/drm/i915/i915_reg.h | 1 + 4 files changed, 24 insertions(+)
drivers/gpu/drm/i915/display/intel_display_power.c +5 -0
@@ -18,6 +18,7 @@#include "intel_pm.h" #include "intel_pps.h" #include "intel_sideband.h" +#include "intel_snps_phy.h" #include "intel_tc.h" #include "intel_vga.h"
@@ -5900,6 +5901,10 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,if (DISPLAY_VER (dev_priv) >=12 )tgl_bw_buddy_init (dev_priv); +/* 8. Ensure PHYs have completed calibration and adaptation */ +if (IS_DG2 (dev_priv)) +intel_snps_phy_wait_for_calibration (dev_priv); +if (resume &&intel_dmc_has_payload (dev_priv))intel_dmc_load_program (dev_priv);
drivers/gpu/drm/i915/display/intel_snps_phy.c +15 -0
@@ -21,6 +21,21 @@* since it is not handled by the shared DPLL framework as on other platforms. */ +void intel_snps_phy_wait_for_calibration (struct drm_i915_private *dev_priv) +{ +enum phy phy; + +for_each_phy_masked (phy, ~0 ) { +if (!intel_phy_is_snps (dev_priv, phy)) +continue ; + +if (intel_de_wait_for_clear (dev_priv,ICL_PHY_MISC (phy), +DG2_PHY_DP_TX_ACK_MASK ,25 )) +DRM_ERROR ("SNPS PHY %c failed to calibrate after 25ms.\n" , + phy); + } +} +static const u32 dg2_ddi_translations[] = {/* VS 0, pre-emph 0 */ REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,26 ),
drivers/gpu/drm/i915/display/intel_snps_phy.h +3 -0
@@ -8,10 +8,13 @@#include <linux/types.h> +struct drm_i915_private ;struct intel_encoder ;struct intel_crtc_state ;struct intel_mpllb_state ; +void intel_snps_phy_wait_for_calibration (struct drm_i915_private *dev_priv); +int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder); void intel_mpllb_enable(struct intel_encoder *encoder,
drivers/gpu/drm/i915/i915_reg.h +1 -0
@@ -12454,6 +12454,7 @@ enum skl_power_gate { _ICL_PHY_MISC_B)#define ICL_PHY_MISC_MUX_DDID (1 << 28)#define ICL_PHY_MISC_DE_IO_COMP_PWR_DOWN (1 << 23) +#define DG2_PHY_DP_TX_ACK_MASK REG_GENMASK(23, 20)/* Icelake Display Stream Compression Registers */ #define DSCA_PICTURE_PARAMETER_SET_0 _MMIO(0x6B200)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 46/50] drm/i915/dg2: Wait for SNPS PHY calibration during display init
Quoted 8 lines · Matt Roper
Initialization of the PHY is handled by the hardware/firmware, but the driver should wait up to 25ms for the PHY to report that its calibration has completed.
Bspec: 49189
Bspec: 50107Cc Matt Atwood <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 89 lines
--- .../gpu/drm/i915/display/intel_display_power.c | 5 +++++ drivers/gpu/drm/i915/display/intel_snps_phy.c | 15 +++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 3 +++ drivers/gpu/drm/i915/i915_reg.h | 1 + 4 files changed, 24 insertions(+)drivers/gpu/drm/i915/display/intel_display_power.c +5
-0@@ -18,6 +18,7 @@#include "intel_pm.h" #include "intel_pps.h" #include "intel_sideband.h" +#include "intel_snps_phy.h" #include "intel_tc.h" #include "intel_vga.h" @@ -5900,6 +5901,10 @@ static void icl_display_core_init(struct drm_i915_private *dev_priv,if (DISPLAY_VER (dev_priv) >=12 )tgl_bw_buddy_init (dev_priv); +/* 8. Ensure PHYs have completed calibration and adaptation */ +if (IS_DG2 (dev_priv)) +intel_snps_phy_wait_for_calibration (dev_priv); +if (resume &&intel_dmc_has_payload (dev_priv))intel_dmc_load_program (dev_priv);drivers/gpu/drm/i915/display/intel_snps_phy.c +15
-0@@ -21,6 +21,21 @@* since it is not handled by the shared DPLL framework as on other platforms. */ +void intel_snps_phy_wait_for_calibration (struct drm_i915_private *dev_priv) +{ +enum phy phy; + +for_each_phy_masked (phy, ~0 ) { +if (!intel_phy_is_snps (dev_priv, phy)) +continue ; + +if (intel_de_wait_for_clear (dev_priv,ICL_PHY_MISC (phy), +DG2_PHY_DP_TX_ACK_MASK ,25 )) +DRM_ERROR ("SNPS PHY %c failed to calibrate after 25ms.\n" , + phy); + } +} +static const u32 dg2_ddi_translations[] = {/* VS 0, pre-emph 0 */ REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,26 ),drivers/gpu/drm/i915/display/intel_snps_phy.h +3
-0@@ -8,10 +8,13 @@#include <linux/types.h> +struct drm_i915_private ;struct intel_encoder ;struct intel_crtc_state ;struct intel_mpllb_state ; +void intel_snps_phy_wait_for_calibration (struct drm_i915_private *dev_priv); +int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder); void intel_mpllb_enable(struct intel_encoder *encoder,drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -12454,6 +12454,7 @@ enum skl_power_gate { _ICL_PHY_MISC_B)#define ICL_PHY_MISC_MUX_DDID (1 << 28)#define ICL_PHY_MISC_DE_IO_COMP_PWR_DOWN (1 << 23) +#define DG2_PHY_DP_TX_ACK_MASK REG_GENMASK(23, 20)/* Icelake Display Stream Compression Registers */ #define DSCA_PICTURE_PARAMETER_SET_0 _MMIO(0x6B200)Signature · 1 line
2.25.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 47/50 drm/i915/dg2: Update lane disable power state during PSR
In reply to Matt RoperFrom: Gwan-gyeong Mun <[email protected]>
The PSR enable/disable sequences now require that we program an extra register in the PHY to adjust the lane disable power setting.
Bspec: 49274
Bspec: 53885
--- drivers/gpu/drm/i915/display/intel_psr.c | 7 +++++++ drivers/gpu/drm/i915/display/intel_snps_phy.c | 14 ++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 3 +++ drivers/gpu/drm/i915/i915_reg.h | 3 +++ 4 files changed, 27 insertions(+)
drivers/gpu/drm/i915/display/intel_psr.c +7 -0
@@ -32,6 +32,7 @@#include "intel_dp_aux.h" #include "intel_hdmi.h" #include "intel_psr.h" +#include "intel_snps_phy.h" #include "intel_sprite.h" #include "skl_universal_plane.h"
@@ -1206,6 +1207,7 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp, {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); +enum phy phy =intel_port_to_phy (dev_priv, dig_port->base.port);struct intel_encoder *encoder = &dig_port->base;u32 val;
@@ -1231,6 +1233,7 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp,intel_dp_compute_psr_vsc_sdp (intel_dp, crtc_state, conn_state, &intel_dp->psr.vsc);intel_write_dp_vsc_sdp (encoder, crtc_state, &intel_dp->psr.vsc); +intel_snps_phy_update_psr_power_state (dev_priv, phy, true);intel_psr_enable_sink (intel_dp);intel_psr_enable_source (intel_dp); intel_dp->psr.enabled = true;
@@ -1327,6 +1330,8 @@ static void intel_psr_wait_exit_locked(struct intel_dp *intel_dp)static void intel_psr_disable_locked (struct intel_dp *intel_dp) {struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); +enum phy phy =intel_port_to_phy (dev_priv, +dp_to_dig_port (intel_dp)->base.port);lockdep_assert_held (&intel_dp->psr.lock);
@@ -1353,6 +1358,8 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)TRANS_SET_CONTEXT_LATENCY (intel_dp->psr.transcoder), TRANS_SET_CONTEXT_LATENCY_MASK, 0); +intel_snps_phy_update_psr_power_state (dev_priv, phy, false); +/* Disable PSR on Sink */ drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,0 );
drivers/gpu/drm/i915/display/intel_snps_phy.c +14 -0
@@ -36,6 +36,20 @@ void intel_snps_phy_wait_for_calibration(struct drm_i915_private *dev_priv) } } +void intel_snps_phy_update_psr_power_state (struct drm_i915_private *dev_priv, +enum phy phy,bool enable) +{ +u32 val; + +if (!intel_phy_is_snps (dev_priv, phy)) +return ; + + val =REG_FIELD_PREP (SNPS_PHY_TX_REQ_LN_DIS_PWR_STATE_PSR , + enable ?2 :3 ); +intel_uncore_rmw (&dev_priv->uncore,SNPS_PHY_TX_REQ (phy), +SNPS_PHY_TX_REQ_LN_DIS_PWR_STATE_PSR , val); +} +static const u32 dg2_ddi_translations[] = {/* VS 0, pre-emph 0 */ REG_FIELD_PREP (SNPS_PHY_TX_EQ_MAIN ,26 ),
drivers/gpu/drm/i915/display/intel_snps_phy.h +3 -0
@@ -12,8 +12,11 @@ struct drm_i915_private;struct intel_encoder ;struct intel_crtc_state ;struct intel_mpllb_state ; +enum phy ;void intel_snps_phy_wait_for_calibration (struct drm_i915_private *dev_priv); +void intel_snps_phy_update_psr_power_state (struct drm_i915_private *dev_priv, +enum phy phy,bool enable);int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder);
drivers/gpu/drm/i915/i915_reg.h +3 -0
@@ -2340,6 +2340,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SNPS_PHY_REF_CONTROL (phy) _MMIO_SNPS(phy, 0x168188)#define SNPS_PHY_REF_CONTROL_REF_RANGE REG_GENMASK(31, 27) +#define SNPS_PHY_TX_REQ (phy) _MMIO_SNPS(phy, 0x168200) +#define SNPS_PHY_TX_REQ_LN_DIS_PWR_STATE_PSR REG_GENMASK(31, 30) +#define SNPS_PHY_TX_EQ (ln, phy) _MMIO_SNPS_LN(ln, phy, 0x168300)#define SNPS_PHY_TX_EQ_MAIN REG_GENMASK(23, 18)#define SNPS_PHY_TX_EQ_POST REG_GENMASK(15, 10)
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 47/50] drm/i915/dg2: Update lane disable power state during PSR
Quoted 14 lines
-----Original Message-----
From: Roper, Matthew D <[email protected]>
Sent: Tuesday, July 13, 2021 8:16 PM
To: [email protected]
Cc: Roper, Matthew D <[email protected]>; Mun, Gwan-gyeong <[email protected]>; Srivatsa, Anusha <[email protected]>
Subject: [PATCH v2 47/50] drm/i915/dg2: Update lane disable power state during PSRFrom: Gwan-gyeong Mun <[email protected]>
Quoted 8 lines
The PSR enable/disable sequences now require that we program an extra register in the PHY to adjust the lane disable power setting.
Bspec: 49274
Bspec: 53885Cc Anusha Srivatsa <[email protected]>Signed-off-by Matt Roper <[email protected]>Signed-off-by Gwan-gyeong Mun <[email protected]>
Quoted 120 lines
--- drivers/gpu/drm/i915/display/intel_psr.c | 7 +++++++ drivers/gpu/drm/i915/display/intel_snps_phy.c | 14 ++++++++++++++ drivers/gpu/drm/i915/display/intel_snps_phy.h | 3 +++ drivers/gpu/drm/i915/i915_reg.h | 3 +++ 4 files changed, 27 insertions(+)drivers/gpu/drm/i915/display/intel_psr.c +3
-0@@ -32,6 +32,7 @@#include "intel_dp_aux.h" #include "intel_hdmi.h" #include "intel_psr.h" +#include "intel_snps_phy.h" #include "intel_sprite.h" #include "skl_universal_plane.h" @@ -1206,6 +1207,7 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp, {struct intel_digital_port *dig_port =dp_to_dig_port (intel_dp);struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); +enum phy phy =intel_port_to_phy (dev_priv, dig_port->base.port);struct intel_encoder *encoder = &dig_port->base;u32 val;@@ -1231,6 +1233,7 @@ static void intel_psr_enable_locked(struct intel_dp *intel_dp,intel_dp_compute_psr_vsc_sdp (intel_dp, crtc_state, conn_state, &intel_dp->psr.vsc);intel_write_dp_vsc_sdp (encoder, crtc_state, &intel_dp->psr.vsc); +intel_snps_phy_update_psr_power_state (dev_priv, phy, true);intel_psr_enable_sink (intel_dp);intel_psr_enable_source (intel_dp);drivers/gpu/drm/i915/display/intel_psr.c +0
-0intel_dp->psr.enabled = true;@@ -1327,6 +1330,8 @@ static void intel_psr_wait_exit_locked(struct
intel_dp*intel_dp) static voidintel_psr_disable_locked(struct intel_dp *intel_dp){drivers/gpu/drm/i915/display/intel_psr.c +2
-0struct drm_i915_private *dev_priv =dp_to_i915 (intel_dp); + enum phy phy = intel_port_to_phy(dev_priv, + dp_to_dig_port(intel_dp)-Quoted 1 line
base.port);
drivers/gpu/drm/i915/display/intel_psr.c +2
-0lockdep_assert_held (&intel_dp->psr.lock);@@ -1353,6 +1358,8 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)TRANS_SET_CONTEXT_LATENCY (intel_dp- >psr.transcoder), TRANS_SET_CONTEXT_LATENCY_MASK, 0); +intel_snps_phy_update_psr_power_state (dev_priv, phy, false); +/* Disable PSR on Sink */ drivers/gpu/drm/i915/display/intel_psr.c +0
-0drm_dp_dpcd_writeb (&intel_dp->aux,DP_PSR_EN_CFG ,0 );drivers/gpu/drm/i915/display/intel_snps_phy.c +12
-0@@ -36,6 +36,20 @@ void intel_snps_phy_wait_for_calibration(struct drm_i915_private *dev_priv) } } +void intel_snps_phy_update_psr_power_state (struct drm_i915_private *dev_priv, +enum phy phy,bool enable) +{ +u32 val; + +if (!intel_phy_is_snps (dev_priv, phy)) +return ; + + val =REG_FIELD_PREP (SNPS_PHY_TX_REQ_LN_DIS_PWR_STATE_PSR , + enable ?2 :3 ); +intel_uncore_rmw (&dev_priv->uncore,SNPS_PHY_TX_REQ (phy), +SNPS_PHY_TX_REQ_LN_DIS_PWR_STATE_PSR , val);}
drivers/gpu/drm/i915/display/intel_snps_phy.c +1
-0+static const u32 dg2_ddi_translations[] = {/* VS 0, pre-emph 0 */ REG_FIELD_PREP(SNPS_PHY_TX_EQ_MAIN, 26), diff --git
a/drivers/gpu/drm/i915/display/intel_snps_phy.hb/drivers/gpu/drm/i915/display/intel_snps_phy.h
index6aa33ff729ec..6261ff88ef5c100644drivers/gpu/drm/i915/display/intel_snps_phy.h +3
-0@@ -12,8 +12,11 @@ struct drm_i915_private; struct intel_encoder; struct intel_crtc_state;struct intel_mpllb_state ; +enum phy ;void intel_snps_phy_wait_for_calibration (struct drm_i915_private *dev_priv); +void intel_snps_phy_update_psr_power_state (struct drm_i915_private *dev_priv, +enum phy phy,bool enable);int intel_mpllb_calc_state (struct intel_crtc_state *crtc_state,struct intel_encoder *encoder);(quoted diff) +0
-0
b/drivers/gpu/drm/i915/i915_reg.hindex9c7dc812317e..34d3806568e4100644drivers/gpu/drm/i915/i915_reg.h +1
-0@@ -2340,6 +2340,9 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg)#define SNPS_PHY_REF_CONTROL (phy) _MMIO_SNPS(phy, 0x168188)#define SNPS_PHY_REF_CONTROL_REF_RANGE REG_GENMASK(31, 27) +#define SNPS_PHY_TX_REQ (phy) _MMIO_SNPS(phy,
0x168200)
+#defineSNPS_PHY_TX_REQ_LN_DIS_PWR_STATE_PSRREG_GENMASK(31, 30)
Quoted 9 lines
+
#defineSNPS_PHY_TX_EQ(ln, phy)_MMIO_SNPS_LN(ln,
phy,0x168300)
#defineSNPS_PHY_TX_EQ_MAINREG_GENMASK(23,
18)
#defineSNPS_PHY_TX_EQ_POSTREG_GENMASK(15,
10)
--
2.25.4
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 48/50 drm/i915/dg2: Add DG2 to the PSR2 defeature list
In reply to Matt RoperFrom: José Roberto de Souza <[email protected]>
PSR2 is not supported on DG2.
--- drivers/gpu/drm/i915/display/intel_psr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/display/intel_psr.c +2 -1
@@ -866,7 +866,8 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, }/* Wa_16011181250 */ -if (IS_ROCKETLAKE (dev_priv) ||IS_ALDERLAKE_S (dev_priv)) { +if (IS_ROCKETLAKE (dev_priv) ||IS_ALDERLAKE_S (dev_priv) || +IS_DG2 (dev_priv)) {drm_dbg_kms (&dev_priv->drm,"PSR2 is defeatured for this platform\n" );return false; }
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [Intel-gfx] [PATCH v2 48/50] drm/i915/dg2: Add DG2 to the PSR2 defeature list
Quoted 10 lines
-----Original Message-----
From: Intel-gfx <[email protected]> On Behalf Of Matt Roper
Sent: Tuesday, July 13, 2021 8:16 PM
To: [email protected]
Subject: [Intel-gfx] [PATCH v2 48/50] drm/i915/dg2: Add DG2 to the PSR2 defeature list
Quoted 8 lines
From: José Roberto de Souza <[email protected]>
PSR2 is not supported on DG2.
Cc Caz Yokoyama <[email protected]>Cc Gwan-gyeong Mun <[email protected]>Signed-off-by José Roberto de Souza <[email protected]>Signed-off-by Matt Roper <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/i915/display/intel_psr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/display/intel_psr.c +2
-1@@ -866,7 +866,8 @@ static bool intel_psr2_config_valid(struct intel_dp *intel_dp, }/* Wa_16011181250 */ -if (IS_ROCKETLAKE (dev_priv) ||IS_ALDERLAKE_S (dev_priv)) { +if (IS_ROCKETLAKE (dev_priv) ||IS_ALDERLAKE_S (dev_priv) || +IS_DG2 (dev_priv)) {drm_dbg_kms (&dev_priv->drm,"PSR2 is defeatured for this platform\n");drivers/gpu/drm/i915/display/intel_psr.c +0
-1return false; } --2.25.4
Quoted 4 lines
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 49/50 drm/i915/dg2: Update to bigjoiner path
In reply to Matt RoperFrom: Animesh Manna <[email protected]>
In verify_mpllb_state() encoder is retrieved from best_encoder of connector_state. As there will be only one connector_state for bigjoiner and checking encoder may not be needed for bigjoiner-slave. This code path related to mpll is done on dg2 and need this fix to avoid null pointer dereference issue.
--- drivers/gpu/drm/i915/display/intel_display.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/display/intel_display.c +3 -0
@@ -9153,6 +9153,9 @@ verify_mpllb_state(struct intel_atomic_state *state,if (!new_crtc_state->hw.active)return ; +if (new_crtc_state->bigjoiner_slave) +return ; + encoder =intel_get_crtc_new_encoder (state, new_crtc_state);intel_mpllb_readout_hw_state (encoder, &mpllb_hw_state);
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 50/50 drm/i915/dg2: Configure PCON in DP pre-enable path
In reply to Matt RoperFrom: Ankit Nautiyal <[email protected]>
Add the functions to configure HDMI2.1 pcon for DG2, before DP link training.
--- drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/i915/display/intel_ddi.c +3 -0
@@ -2576,6 +2576,7 @@ static void dg2_ddi_pre_enable_dp(struct intel_atomic_state *state,if (!is_mst)intel_dp_set_power (intel_dp,DP_SET_POWER_D0 ); +intel_dp_configure_protocol_converter (intel_dp, crtc_state);intel_dp_sink_set_decompression_state (intel_dp, crtc_state, true);/* * DDI FEC: "anticipates enabling FEC encoding sets the FEC_READY bit
@@ -2583,6 +2584,8 @@ static void dg2_ddi_pre_enable_dp(struct intel_atomic_state *state,* training */ intel_dp_sink_set_fec_ready (intel_dp, crtc_state); +intel_dp_check_frl_training (intel_dp); +intel_dp_pcon_dsc_configure (intel_dp, crtc_state);/* * 5.h Follow DisplayPort specification training sequence (see notes for
Signature · 6 lines
2.25.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for Begin enabling Xe_HP SDV and DG2 platforms (rev5)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Begin enabling Xe_HP SDV and DG2 platforms (rev5)
URL : https://patchwork.freedesktop.org/series/92135/
State : warning
== Summary ==
$ dim checkpatch origin/drm-tip 7a5fbcb1f150 drm/i915: Add XE_HP initial definitions 8bb98dab1d23 drm/i915: Fork DG1 interrupt handler 371d21e168c4 drm/i915/xehp: VDBOX/VEBOX fusing registers are enable-based 00fe5bfd2f5b drm/i915/gen12: Use fuse info to enable SFC 25d8fcda069c drm/i915/selftests: Allow for larger engine counts 75088f6dd8c2 drm/i915/xehp: Extra media engines - Part 1 (engine definitions) 6f3c6efb8015 drm/i915/xehp: Extra media engines - Part 2 (interrupts) 99c452861f03 drm/i915/xehp: Extra media engines - Part 3 (reset) 04721d135106 drm/i915/xehp: Xe_HP forcewake support -:10: WARNING:BAD_SIGN_OFF: Non-standard signature: Co-authored-by: #10: Co-authored-by: Daniele Ceraolo Spurio <[email protected]>
-:25: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #25: FILE: drivers/gpu/drm/i915/gt/intel_execlists_submission.c:3311:
+ engine->fw_domain = intel_uncore_forcewake_for_reg(engine->uncore,
+ RING_EXECLIST_CONTROL(engine->mmio_base),
-:208: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #208: FILE: drivers/gpu/drm/i915/intel_uncore.c:1323:
+ GEN_FW_RANGE(0x0, 0x1fff, 0), /*
+ 0x0 - 0xaff: reserved
-:209: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #209: FILE: drivers/gpu/drm/i915/intel_uncore.c:1324:
+ 0xb00 - 0x1fff: always on */
-:213: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #213: FILE: drivers/gpu/drm/i915/intel_uncore.c:1328:
+ GEN_FW_RANGE(0x4b00, 0x51ff, 0), /*
+ 0x4b00 - 0x4fff: reserved
-:214: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #214: FILE: drivers/gpu/drm/i915/intel_uncore.c:1329:
+ 0x5000 - 0x51ff: always on */
-:219: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #219: FILE: drivers/gpu/drm/i915/intel_uncore.c:1334:
+ GEN_FW_RANGE(0x8160, 0x81ff, 0), /*
+ 0x8160 - 0x817f: reserved
-:220: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #220: FILE: drivers/gpu/drm/i915/intel_uncore.c:1335:
+ 0x8180 - 0x81ff: always on */
-:224: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #224: FILE: drivers/gpu/drm/i915/intel_uncore.c:1339:
+ GEN_FW_RANGE(0x8500, 0x94cf, FORCEWAKE_GT), /*
+ 0x8500 - 0x87ff: gt
-:227: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #227: FILE: drivers/gpu/drm/i915/intel_uncore.c:1342:
+ 0x9480 - 0x94cf: reserved */
-:230: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #230: FILE: drivers/gpu/drm/i915/intel_uncore.c:1345:
+ GEN_FW_RANGE(0x9560, 0x97ff, 0), /*
+ 0x9560 - 0x95ff: always on
-:231: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #231: FILE: drivers/gpu/drm/i915/intel_uncore.c:1346:
+ 0x9600 - 0x97ff: reserved */
-:233: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #233: FILE: drivers/gpu/drm/i915/intel_uncore.c:1348:
+ GEN_FW_RANGE(0x9800, 0xcfff, FORCEWAKE_GT), /*
+ 0x9800 - 0xb4ff: gt
-:235: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #235: FILE: drivers/gpu/drm/i915/intel_uncore.c:1350:
+ 0xc000 - 0xcfff: gt */
-:240: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #240: FILE: drivers/gpu/drm/i915/intel_uncore.c:1355:
+ GEN_FW_RANGE(0xdd00, 0xde7f, FORCEWAKE_GT), /*
+ 0xdd00 - 0xddff: gt
-:241: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #241: FILE: drivers/gpu/drm/i915/intel_uncore.c:1356:
+ 0xde00 - 0xde7f: reserved */
-:243: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #243: FILE: drivers/gpu/drm/i915/intel_uncore.c:1358:
+ GEN_FW_RANGE(0xde80, 0xe8ff, FORCEWAKE_RENDER), /*
+ 0xde80 - 0xdfff: render
-:245: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #245: FILE: drivers/gpu/drm/i915/intel_uncore.c:1360:
+ 0xe100 - 0xe8ff: render */
-:247: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #247: FILE: drivers/gpu/drm/i915/intel_uncore.c:1362:
+ GEN_FW_RANGE(0xe900, 0xffff, FORCEWAKE_GT), /*
+ 0xe900 - 0xe9ff: gt
-:249: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #249: FILE: drivers/gpu/drm/i915/intel_uncore.c:1364:
+ 0xf000 - 0xffff: gt */
-:251: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #251: FILE: drivers/gpu/drm/i915/intel_uncore.c:1366:
+ GEN_FW_RANGE(0x10000, 0x13fff, 0), /*
+ 0x10000 - 0x11fff: reserved
-:253: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #253: FILE: drivers/gpu/drm/i915/intel_uncore.c:1368:
+ 0x12800 - 0x13fff: reserved */
-:259: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #259: FILE: drivers/gpu/drm/i915/intel_uncore.c:1374:
+ GEN_FW_RANGE(0x14800, 0x1ffff, FORCEWAKE_RENDER), /*
+ 0x14800 - 0x14fff: render
-:261: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #261: FILE: drivers/gpu/drm/i915/intel_uncore.c:1376:
+ 0x16e00 - 0x1ffff: render */
-:263: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #263: FILE: drivers/gpu/drm/i915/intel_uncore.c:1378:
+ GEN_FW_RANGE(0x20000, 0x21fff, FORCEWAKE_MEDIA_VDBOX0), /*
+ 0x20000 - 0x20fff: VD0
-:264: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #264: FILE: drivers/gpu/drm/i915/intel_uncore.c:1379:
+ 0x21000 - 0x21fff: reserved */
-:267: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #267: FILE: drivers/gpu/drm/i915/intel_uncore.c:1382:
+ GEN_FW_RANGE(0x24000, 0x2417f, 0), /*
+ 0x24000 - 0x2407f: always on
-:268: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #268: FILE: drivers/gpu/drm/i915/intel_uncore.c:1383:
+ 0x24080 - 0x2417f: reserved */
-:270: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #270: FILE: drivers/gpu/drm/i915/intel_uncore.c:1385:
+ GEN_FW_RANGE(0x24180, 0x249ff, FORCEWAKE_GT), /*
+ 0x24180 - 0x241ff: gt
-:271: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #271: FILE: drivers/gpu/drm/i915/intel_uncore.c:1386:
+ 0x24200 - 0x249ff: reserved */
-:273: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #273: FILE: drivers/gpu/drm/i915/intel_uncore.c:1388:
+ GEN_FW_RANGE(0x24a00, 0x251ff, FORCEWAKE_RENDER), /*
+ 0x24a00 - 0x24a7f: render
-:274: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #274: FILE: drivers/gpu/drm/i915/intel_uncore.c:1389:
+ 0x24a80 - 0x251ff: reserved */
-:276: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #276: FILE: drivers/gpu/drm/i915/intel_uncore.c:1391:
+ GEN_FW_RANGE(0x25200, 0x25fff, FORCEWAKE_GT), /*
+ 0x25200 - 0x252ff: gt
-:277: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #277: FILE: drivers/gpu/drm/i915/intel_uncore.c:1392:
+ 0x25300 - 0x25fff: reserved */
-:279: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #279: FILE: drivers/gpu/drm/i915/intel_uncore.c:1394:
+ GEN_FW_RANGE(0x26000, 0x2ffff, FORCEWAKE_RENDER), /*
+ 0x26000 - 0x27fff: render
-:281: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #281: FILE: drivers/gpu/drm/i915/intel_uncore.c:1396:
+ 0x2a000 - 0x2ffff: undocumented */
-:285: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #285: FILE: drivers/gpu/drm/i915/intel_uncore.c:1400:
+ GEN_FW_RANGE(0x1c0000, 0x1c3fff, FORCEWAKE_MEDIA_VDBOX0), /*
+ 0x1c0000 - 0x1c2bff: VD0
-:289: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #289: FILE: drivers/gpu/drm/i915/intel_uncore.c:1404:
+ 0x1c3f00 - 0x1c3fff: VD0 */
-:291: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #291: FILE: drivers/gpu/drm/i915/intel_uncore.c:1406:
+ GEN_FW_RANGE(0x1c4000, 0x1c7fff, FORCEWAKE_MEDIA_VDBOX1), /*
+ 0x1c4000 - 0x1c6bff: VD1
-:294: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #294: FILE: drivers/gpu/drm/i915/intel_uncore.c:1409:
+ 0x1c6e00 - 0x1c7fff: reserved */
-:296: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #296: FILE: drivers/gpu/drm/i915/intel_uncore.c:1411:
+ GEN_FW_RANGE(0x1c8000, 0x1cbfff, FORCEWAKE_MEDIA_VEBOX0), /*
+ 0x1c8000 - 0x1ca0ff: VE0
-:297: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #297: FILE: drivers/gpu/drm/i915/intel_uncore.c:1412:
+ 0x1ca100 - 0x1cbfff: reserved */
-:303: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #303: FILE: drivers/gpu/drm/i915/intel_uncore.c:1418:
+ GEN_FW_RANGE(0x1d0000, 0x1d3fff, FORCEWAKE_MEDIA_VDBOX2), /*
+ 0x1d0000 - 0x1d2bff: VD2
-:307: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #307: FILE: drivers/gpu/drm/i915/intel_uncore.c:1422:
+ 0x1d3f00 - 0x1d3fff: VD2 */
-:309: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #309: FILE: drivers/gpu/drm/i915/intel_uncore.c:1424:
+ GEN_FW_RANGE(0x1d4000, 0x1d7fff, FORCEWAKE_MEDIA_VDBOX3), /*
+ 0x1d4000 - 0x1d6bff: VD3
-:312: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #312: FILE: drivers/gpu/drm/i915/intel_uncore.c:1427:
+ 0x1d6e00 - 0x1d7fff: reserved */
-:314: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #314: FILE: drivers/gpu/drm/i915/intel_uncore.c:1429:
+ GEN_FW_RANGE(0x1d8000, 0x1dffff, FORCEWAKE_MEDIA_VEBOX1), /*
+ 0x1d8000 - 0x1da0ff: VE1
-:315: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #315: FILE: drivers/gpu/drm/i915/intel_uncore.c:1430:
+ 0x1da100 - 0x1dffff: reserved */
-:317: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #317: FILE: drivers/gpu/drm/i915/intel_uncore.c:1432:
+ GEN_FW_RANGE(0x1e0000, 0x1e3fff, FORCEWAKE_MEDIA_VDBOX4), /*
+ 0x1e0000 - 0x1e2bff: VD4
-:321: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #321: FILE: drivers/gpu/drm/i915/intel_uncore.c:1436:
+ 0x1e3f00 - 0x1e3fff: VD4 */
-:323: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #323: FILE: drivers/gpu/drm/i915/intel_uncore.c:1438:
+ GEN_FW_RANGE(0x1e4000, 0x1e7fff, FORCEWAKE_MEDIA_VDBOX5), /*
+ 0x1e4000 - 0x1e6bff: VD5
-:326: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #326: FILE: drivers/gpu/drm/i915/intel_uncore.c:1441:
+ 0x1e6e00 - 0x1e7fff: reserved */
-:328: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #328: FILE: drivers/gpu/drm/i915/intel_uncore.c:1443:
+ GEN_FW_RANGE(0x1e8000, 0x1effff, FORCEWAKE_MEDIA_VEBOX2), /*
+ 0x1e8000 - 0x1ea0ff: VE2
-:329: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #329: FILE: drivers/gpu/drm/i915/intel_uncore.c:1444:
+ 0x1ea100 - 0x1effff: reserved */
-:331: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #331: FILE: drivers/gpu/drm/i915/intel_uncore.c:1446:
+ GEN_FW_RANGE(0x1f0000, 0x1f3fff, FORCEWAKE_MEDIA_VDBOX6), /*
+ 0x1f0000 - 0x1f2bff: VD6
-:335: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #335: FILE: drivers/gpu/drm/i915/intel_uncore.c:1450:
+ 0x1f3f00 - 0x1f3fff: VD6 */
-:337: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #337: FILE: drivers/gpu/drm/i915/intel_uncore.c:1452:
+ GEN_FW_RANGE(0x1f4000, 0x1f7fff, FORCEWAKE_MEDIA_VDBOX7), /*
+ 0x1f4000 - 0x1f6bff: VD7
-:340: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #340: FILE: drivers/gpu/drm/i915/intel_uncore.c:1455:
+ 0x1f6e00 - 0x1f7fff: reserved */
total: 0 errors, 57 warnings, 1 checks, 467 lines checked 12a2020fa1fc drm/i915/xehp: Define multicast register ranges f5a167391d70 drm/i915/xehp: Handle new device context ID format e6c034ba7a58 drm/i915/xehp: New engine context offsets 733505aa0488 drm/i915/xehp: handle new steering options
-:51: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #51: FILE: drivers/gpu/drm/i915/gt/intel_gt.c:117:
+ if (GRAPHICS_VER(gt->i915) >= 11 &&
+ GRAPHICS_VER_FULL(gt->i915) < IP_VER(12, 50)) {
-:195: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #195: FILE: drivers/gpu/drm/i915/gt/intel_workarounds.c:955:
+ unsigned slice, unsigned subslice)
-:195: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #195: FILE: drivers/gpu/drm/i915/gt/intel_workarounds.c:955:
+ unsigned slice, unsigned subslice)
total: 0 errors, 2 warnings, 1 checks, 282 lines checkedf983b1241a0f drm/i915/xehp: Loop over all gslices for INSTDONE processing -:135: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'iter_' - possible side-effects? #135: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:583:
+#define for_each_instdone_gslice_dss_xehp(dev_priv_, sseu_, iter_, gslice_, dss_) \
+ for ((iter_) = 0, (gslice_) = 0, (dss_) = 0; \
+ (iter_) < GEN_MAX_SUBSLICES; \ + (iter_)++, (gslice_) = (iter_) / GEN_DSS_PER_GSLICE, \ + (dss_) = (iter_) % GEN_DSS_PER_GSLICE) \
+ for_each_if(intel_sseu_has_subslice((sseu_), 0, (iter_)))
-:135: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'gslice_' - possible side-effects? #135: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:583:
+#define for_each_instdone_gslice_dss_xehp(dev_priv_, sseu_, iter_, gslice_, dss_) \
+ for ((iter_) = 0, (gslice_) = 0, (dss_) = 0; \
+ (iter_) < GEN_MAX_SUBSLICES; \ + (iter_)++, (gslice_) = (iter_) / GEN_DSS_PER_GSLICE, \ + (dss_) = (iter_) % GEN_DSS_PER_GSLICE) \
+ for_each_if(intel_sseu_has_subslice((sseu_), 0, (iter_)))
-:135: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'dss_' - possible side-effects? #135: FILE: drivers/gpu/drm/i915/gt/intel_engine_types.h:583:
+#define for_each_instdone_gslice_dss_xehp(dev_priv_, sseu_, iter_, gslice_, dss_) \
+ for ((iter_) = 0, (gslice_) = 0, (dss_) = 0; \
+ (iter_) < GEN_MAX_SUBSLICES; \ + (iter_)++, (gslice_) = (iter_) / GEN_DSS_PER_GSLICE, \ + (dss_) = (iter_) % GEN_DSS_PER_GSLICE) \
+ for_each_if(intel_sseu_has_subslice((sseu_), 0, (iter_)))
total: 0 errors, 0 warnings, 3 checks, 164 lines checked559ec30fa734 drm/i915/xehpsdv: add initial XeHP SDV definitions b359a5197220 drm/i915/xehp: Changes to ss/eu definitions
381532783086 drm/i915/xehpsdv: Add maximum sseu limits9beeacbb8d15 drm/i915/xehpsdv: Add compute DSS type70410e269067 drm/i915/xehpsdv: Define steering tables5cd632524fbb drm/i915/xehpsdv: Define MOCS table for XeHP SDV 638ddf4e9d14 drm/i915/xehpsdv: factor out function to read RP_STATE_CAP edd8638b9ce9 drm/i915/xehpsdv: Read correct RP_STATE_CAP register 8d231c0c99c3 drm/i915/dg2: add DG2 platform info
-:49: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__i915' - possible side-effects? #49: FILE: drivers/gpu/drm/i915/i915_drv.h:1637:
+#define IS_DG2_GT_STEP(__i915, variant, since, until) \
+ (IS_SUBPLATFORM(__i915, INTEL_DG2, INTEL_SUBPLATFORM_##variant) && \
+ IS_GT_STEP(__i915, since, until))
-:53: CHECK:MACRO_ARG_REUSE: Macro argument reuse '__i915' - possible side-effects? #53: FILE: drivers/gpu/drm/i915/i915_drv.h:1641:
+#define IS_DG2_DISP_STEP(__i915, since, until) \
+ (IS_DG2(__i915) && \
+ IS_DISPLAY_STEP(__i915, since, until))
total: 0 errors, 0 warnings, 2 checks, 117 lines checked 8527f182dc41 drm/i915/dg2: DG2 uses the same sseu limits as XeHP SDV 462ae54b609e drm/i915/dg2: Add forcewake table
-:178: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #178: FILE: drivers/gpu/drm/i915/intel_uncore.c:1328:
+ GEN_FW_RANGE(0x0, 0x1fff, 0), /* \
+ 0x0 - 0xaff: reserved \
-:179: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #179: FILE: drivers/gpu/drm/i915/intel_uncore.c:1329:
+ 0xb00 - 0x1fff: always on */ \
-:183: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #183: FILE: drivers/gpu/drm/i915/intel_uncore.c:1333:
+ GEN_FW_RANGE(0x4b00, 0x51ff, 0), /* \
+ 0x4b00 - 0x4fff: reserved \
-:184: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #184: FILE: drivers/gpu/drm/i915/intel_uncore.c:1334:
+ 0x5000 - 0x51ff: always on */ \
-:189: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #189: FILE: drivers/gpu/drm/i915/intel_uncore.c:1339:
+ GEN_FW_RANGE(0x8160, 0x81ff, 0), /* \
+ 0x8160 - 0x817f: reserved \
-:190: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #190: FILE: drivers/gpu/drm/i915/intel_uncore.c:1340:
+ 0x8180 - 0x81ff: always on */ \
-:194: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #194: FILE: drivers/gpu/drm/i915/intel_uncore.c:1344:
+ GEN_FW_RANGE(0x8500, 0x8cff, FORCEWAKE_GT), /* \
+ 0x8500 - 0x87ff: gt \
-:196: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #196: FILE: drivers/gpu/drm/i915/intel_uncore.c:1346:
+ 0x8c80 - 0x8cff: gt (DG2 only) */ \
-:198: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #198: FILE: drivers/gpu/drm/i915/intel_uncore.c:1348:
+ GEN_FW_RANGE(0x8d00, 0x8fff, FORCEWAKE_RENDER), /* \
+ 0x8d00 - 0x8dff: render (DG2 only) \
-:199: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #199: FILE: drivers/gpu/drm/i915/intel_uncore.c:1349:
+ 0x8e00 - 0x8fff: reserved */ \
-:201: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #201: FILE: drivers/gpu/drm/i915/intel_uncore.c:1351:
+ GEN_FW_RANGE(0x9000, 0x94cf, FORCEWAKE_GT), /* \
+ 0x9000 - 0x947f: gt \
-:202: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #202: FILE: drivers/gpu/drm/i915/intel_uncore.c:1352:
+ 0x9480 - 0x94cf: reserved */ \
-:205: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #205: FILE: drivers/gpu/drm/i915/intel_uncore.c:1355:
+ GEN_FW_RANGE(0x9560, 0x967f, 0), /* \
+ 0x9560 - 0x95ff: always on \
-:206: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #206: FILE: drivers/gpu/drm/i915/intel_uncore.c:1356:
+ 0x9600 - 0x967f: reserved */ \
-:208: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #208: FILE: drivers/gpu/drm/i915/intel_uncore.c:1358:
+ GEN_FW_RANGE(0x9680, 0x97ff, FORCEWAKE_RENDER), /* \
+ 0x9680 - 0x96ff: render (DG2 only) \
-:209: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #209: FILE: drivers/gpu/drm/i915/intel_uncore.c:1359:
+ 0x9700 - 0x97ff: reserved */ \
-:211: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #211: FILE: drivers/gpu/drm/i915/intel_uncore.c:1361:
+ GEN_FW_RANGE(0x9800, 0xcfff, FORCEWAKE_GT), /* \
+ 0x9800 - 0xb4ff: gt \
-:213: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #213: FILE: drivers/gpu/drm/i915/intel_uncore.c:1363:
+ 0xc000 - 0xcfff: gt */ \
-:219: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #219: FILE: drivers/gpu/drm/i915/intel_uncore.c:1369:
+ GEN_FW_RANGE(0xdd00, 0xde7f, FORCEWAKE_GT), /* \
+ 0xdd00 - 0xddff: gt \
-:220: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #220: FILE: drivers/gpu/drm/i915/intel_uncore.c:1370:
+ 0xde00 - 0xde7f: reserved */ \
-:222: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #222: FILE: drivers/gpu/drm/i915/intel_uncore.c:1372:
+ GEN_FW_RANGE(0xde80, 0xe8ff, FORCEWAKE_RENDER), /* \
+ 0xde80 - 0xdfff: render \
-:224: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #224: FILE: drivers/gpu/drm/i915/intel_uncore.c:1374:
+ 0xe100 - 0xe8ff: render */ \
-:226: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #226: FILE: drivers/gpu/drm/i915/intel_uncore.c:1376:
+ GEN_FW_RANGE(0xe900, 0xffff, FORCEWAKE_GT), /* \
+ 0xe900 - 0xe9ff: gt \
-:228: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #228: FILE: drivers/gpu/drm/i915/intel_uncore.c:1378:
+ 0xf000 - 0xffff: gt */ \
-:230: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #230: FILE: drivers/gpu/drm/i915/intel_uncore.c:1380:
+ GEN_FW_RANGE(0x10000, 0x12fff, 0), /* \
+ 0x10000 - 0x11fff: reserved \
-:232: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #232: FILE: drivers/gpu/drm/i915/intel_uncore.c:1382:
+ 0x12800 - 0x12fff: reserved */ \
-:235: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #235: FILE: drivers/gpu/drm/i915/intel_uncore.c:1385:
+ GEN_FW_RANGE(0x13200, 0x13fff, FORCEWAKE_MEDIA_VDBOX2), /* \
+ 0x13200 - 0x133ff: VD2 (DG2 only) \
-:236: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #236: FILE: drivers/gpu/drm/i915/intel_uncore.c:1386:
+ 0x13400 - 0x13fff: reserved */ \
-:243: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #243: FILE: drivers/gpu/drm/i915/intel_uncore.c:1393:
+ GEN_FW_RANGE(0x15000, 0x16dff, FORCEWAKE_GT), /* \
+ 0x15000 - 0x15fff: gt (DG2 only) \
-:244: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #244: FILE: drivers/gpu/drm/i915/intel_uncore.c:1394:
+ 0x16000 - 0x16dff: reserved */ \
-:247: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #247: FILE: drivers/gpu/drm/i915/intel_uncore.c:1397:
+ GEN_FW_RANGE(0x20000, 0x21fff, FORCEWAKE_MEDIA_VDBOX0), /* \
+ 0x20000 - 0x20fff: VD0 (XEHPSDV only) \
-:248: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #248: FILE: drivers/gpu/drm/i915/intel_uncore.c:1398:
+ 0x21000 - 0x21fff: reserved */ \
-:251: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #251: FILE: drivers/gpu/drm/i915/intel_uncore.c:1401:
+ GEN_FW_RANGE(0x24000, 0x2417f, 0), /* \
+ 0x24000 - 0x2407f: always on \
-:252: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #252: FILE: drivers/gpu/drm/i915/intel_uncore.c:1402:
+ 0x24080 - 0x2417f: reserved */ \
-:254: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #254: FILE: drivers/gpu/drm/i915/intel_uncore.c:1404:
+ GEN_FW_RANGE(0x24180, 0x249ff, FORCEWAKE_GT), /* \
+ 0x24180 - 0x241ff: gt \
-:255: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #255: FILE: drivers/gpu/drm/i915/intel_uncore.c:1405:
+ 0x24200 - 0x249ff: reserved */ \
-:257: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #257: FILE: drivers/gpu/drm/i915/intel_uncore.c:1407:
+ GEN_FW_RANGE(0x24a00, 0x251ff, FORCEWAKE_RENDER), /* \
+ 0x24a00 - 0x24a7f: render \
-:258: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #258: FILE: drivers/gpu/drm/i915/intel_uncore.c:1408:
+ 0x24a80 - 0x251ff: reserved */ \
-:260: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #260: FILE: drivers/gpu/drm/i915/intel_uncore.c:1410:
+ GEN_FW_RANGE(0x25200, 0x25fff, FORCEWAKE_GT), /* \
+ 0x25200 - 0x252ff: gt \
-:261: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #261: FILE: drivers/gpu/drm/i915/intel_uncore.c:1411:
+ 0x25300 - 0x25fff: reserved */ \
-:263: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #263: FILE: drivers/gpu/drm/i915/intel_uncore.c:1413:
+ GEN_FW_RANGE(0x26000, 0x2ffff, FORCEWAKE_RENDER), /* \
+ 0x26000 - 0x27fff: render \
-:265: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #265: FILE: drivers/gpu/drm/i915/intel_uncore.c:1415:
+ 0x2a000 - 0x2ffff: undocumented */ \
-:269: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #269: FILE: drivers/gpu/drm/i915/intel_uncore.c:1419:
+ GEN_FW_RANGE(0x1c0000, 0x1c3fff, FORCEWAKE_MEDIA_VDBOX0), /* \
+ 0x1c0000 - 0x1c2bff: VD0 \
-:273: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #273: FILE: drivers/gpu/drm/i915/intel_uncore.c:1423:
+ 0x1c3f00 - 0x1c3fff: VD0 */ \
-:275: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #275: FILE: drivers/gpu/drm/i915/intel_uncore.c:1425:
+ GEN_FW_RANGE(0x1c4000, 0x1c7fff, FORCEWAKE_MEDIA_VDBOX1), /* \
+ 0x1c4000 - 0x1c6bff: VD1 \
-:278: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #278: FILE: drivers/gpu/drm/i915/intel_uncore.c:1428:
+ 0x1c6e00 - 0x1c7fff: reserved */ \
-:280: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #280: FILE: drivers/gpu/drm/i915/intel_uncore.c:1430:
+ GEN_FW_RANGE(0x1c8000, 0x1cbfff, FORCEWAKE_MEDIA_VEBOX0), /* \
+ 0x1c8000 - 0x1ca0ff: VE0 \
-:281: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #281: FILE: drivers/gpu/drm/i915/intel_uncore.c:1431:
+ 0x1ca100 - 0x1cbfff: reserved */ \
-:287: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #287: FILE: drivers/gpu/drm/i915/intel_uncore.c:1437:
+ GEN_FW_RANGE(0x1d0000, 0x1d3fff, FORCEWAKE_MEDIA_VDBOX2), /* \
+ 0x1d0000 - 0x1d2bff: VD2 \
-:292: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #292: FILE: drivers/gpu/drm/i915/intel_uncore.c:1442:
+ 0x1d3f00 - 0x1d3fff: VD2 */ \
-:294: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #294: FILE: drivers/gpu/drm/i915/intel_uncore.c:1444:
+ GEN_FW_RANGE(0x1d4000, 0x1d7fff, FORCEWAKE_MEDIA_VDBOX3), /* \
+ 0x1d4000 - 0x1d6bff: VD3 \
-:297: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #297: FILE: drivers/gpu/drm/i915/intel_uncore.c:1447:
+ 0x1d6e00 - 0x1d7fff: reserved */ \
-:299: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #299: FILE: drivers/gpu/drm/i915/intel_uncore.c:1449:
+ GEN_FW_RANGE(0x1d8000, 0x1dffff, FORCEWAKE_MEDIA_VEBOX1), /* \
+ 0x1d8000 - 0x1da0ff: VE1 \
-:300: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #300: FILE: drivers/gpu/drm/i915/intel_uncore.c:1450:
+ 0x1da100 - 0x1dffff: reserved */ \
-:302: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #302: FILE: drivers/gpu/drm/i915/intel_uncore.c:1452:
+ GEN_FW_RANGE(0x1e0000, 0x1e3fff, FORCEWAKE_MEDIA_VDBOX4), /* \
+ 0x1e0000 - 0x1e2bff: VD4 \
-:306: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #306: FILE: drivers/gpu/drm/i915/intel_uncore.c:1456:
+ 0x1e3f00 - 0x1e3fff: VD4 */ \
-:308: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #308: FILE: drivers/gpu/drm/i915/intel_uncore.c:1458:
+ GEN_FW_RANGE(0x1e4000, 0x1e7fff, FORCEWAKE_MEDIA_VDBOX5), /* \
+ 0x1e4000 - 0x1e6bff: VD5 \
-:311: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #311: FILE: drivers/gpu/drm/i915/intel_uncore.c:1461:
+ 0x1e6e00 - 0x1e7fff: reserved */ \
-:313: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #313: FILE: drivers/gpu/drm/i915/intel_uncore.c:1463:
+ GEN_FW_RANGE(0x1e8000, 0x1effff, FORCEWAKE_MEDIA_VEBOX2), /* \
+ 0x1e8000 - 0x1ea0ff: VE2 \
-:314: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #314: FILE: drivers/gpu/drm/i915/intel_uncore.c:1464:
+ 0x1ea100 - 0x1effff: reserved */ \
-:316: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #316: FILE: drivers/gpu/drm/i915/intel_uncore.c:1466:
+ GEN_FW_RANGE(0x1f0000, 0x1f3fff, FORCEWAKE_MEDIA_VDBOX6), /* \
+ 0x1f0000 - 0x1f2bff: VD6 \
-:320: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #320: FILE: drivers/gpu/drm/i915/intel_uncore.c:1470:
+ 0x1f3f00 - 0x1f3fff: VD6 */ \
-:322: WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #322: FILE: drivers/gpu/drm/i915/intel_uncore.c:1472:
+ GEN_FW_RANGE(0x1f4000, 0x1f7fff, FORCEWAKE_MEDIA_VDBOX7), /* \
+ 0x1f4000 - 0x1f6bff: VD7 \
-:325: WARNING:LINE_CONTINUATIONS: Avoid unnecessary line continuations #325: FILE: drivers/gpu/drm/i915/intel_uncore.c:1475:
+ 0x1f6e00 - 0x1f7fff: reserved */ \
total: 0 errors, 64 warnings, 0 checks, 318 lines checked1232841b09bc drm/i915/dg2: Update LNCF steering rangesed945621c3f2 drm/i915/dg2: Add SQIDI steering56c13089d010 drm/i915/dg2: Add new LRI reg offsetsc6bfb5cac52e drm/i915/dg2: Maintain backward-compatible nested batch behavior c4f3a58eb9b9 drm/i915/dg2: Report INSTDONE_GEOM values in error state1ae2606f06f9 drm/i915/dg2: Define MOCS table for DG2dd67eb915449 drm/i915/dg2: Add fake PCHdfa122ad3f15 drm/i915/dg2: Add cdclk table and reference clock76524872d616 drm/i915/dg2: Skip shared DPLL handling8119ad7f31ee drm/i915/dg2: Don't wait for AUX power well enable ACKsf3d519fa8374 drm/i915/dg2: Setup display outputs3a7526efaf70 drm/i915/dg2: Add dbuf programmingcc08e720e5ae drm/i915/dg2: Don't program BW_BUDDY registers60aa12c033cf drm/i915/dg2: Don't read DRAM info118fc85a94ad drm/i915/dg2: DG2 has fixed memory bandwidth689792bb94d6 drm/i915/dg2: Add MPLLB programming for SNPS PHY
-:110: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #110:
new file mode 100644
total: 0 errors, 1 warnings, 0 checks, 671 lines checked 89d6432d3673 drm/i915/dg2: Add MPLLB programming for HDMI -:32: CHECK:PARENTHESIS_ALIGNMENT: Alignment should match open parenthesis #32: FILE: drivers/gpu/drm/i915/display/intel_ddi.c:3750:
+static void dg2_ddi_get_config(struct intel_encoder *encoder,
+ struct intel_crtc_state *crtc_state)
-:81: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'name' - possible side-effects? #81: FILE: drivers/gpu/drm/i915/display/intel_display.c:9135:
+#define MPLLB_CHECK(name) do { \
+ if (mpllb_sw_state->name != mpllb_hw_state.name) { \
+ pipe_config_mismatch(false, crtc, "MPLLB:" __stringify(name), \
+ "(expected 0x%08x, found 0x%08x)", \
+ mpllb_s
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for Begin enabling Xe_HP SDV and DG2 platforms (rev5)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Begin enabling Xe_HP SDV and DG2 platforms (rev5)
URL : https://patchwork.freedesktop.org/series/92135/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately. - +drivers/gpu/drm/i915/display/intel_display.c:1897:21: expected struct i915_vma *[assigned] vma +drivers/gpu/drm/i915/display/intel_display.c:1897:21: got void [noderef] __iomem *[assigned] iomem +drivers/gpu/drm/i915/display/intel_display.c:1897:21: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gem/i915_gem_context.c:1412:34: expected struct i915_address_space *vm +drivers/gpu/drm/i915/gem/i915_gem_context.c:1412:34: got struct i915_address_space [noderef] __rcu *vm +drivers/gpu/drm/i915/gem/i915_gem_context.c:1412:34: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/i915/gem/selftests/mock_context.c:43:25: expected struct i915_address_space [noderef] __rcu *vm +drivers/gpu/drm/i915/gem/selftests/mock_context.c:43:25: got struct i915_address_space * +drivers/gpu/drm/i915/gem/selftests/mock_context.c:43:25: warning: incorrect type in assignment (different address spaces) +drivers/gpu/drm/i915/gem/selftests/mock_context.c:60:34: expected struct i915_address_space *vm +drivers/gpu/drm/i915/gem/selftests/mock_context.c:60:34: got struct i915_address_space [noderef] __rcu *vm +drivers/gpu/drm/i915/gem/selftests/mock_context.c:60:34: warning: incorrect type in argument 1 (different address spaces) +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:27:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:32:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:49:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_engine_stats.h:56:9: warning: trying to copy expression type 31 +drivers/gpu/drm/i915/gt/intel_reset.c:1402:5: warning: context imbalance in 'intel_gt_reset_trylock' - different lock contexts for basic block +drivers/gpu/drm/i915/gt/intel_ring_submission.c:1210:24: warning: Using plain integer as NULL pointer +drivers/gpu/drm/i915/i915_perf.c:1443:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/i915_perf.c:1497:15: warning: memset with byte count of 16777216 +drivers/gpu/drm/i915/intel_wakeref.c:137:19: warning: context imbalance in 'wakeref_auto_timeout' - unexpected unlock +./include/asm-generic/bitops/find.h:112:45: warning: shift count is negative (-262080) +./include/asm-generic/bitops/find.h:32:31: warning: shift count is negative (-262080) +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen11_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen12_fwtable_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read64' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_read8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen6_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'gen8_write8' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'xehp_fwtable_write16' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'xehp_fwtable_write32' - different lock contexts for basic block +./include/linux/spinlock.h:409:9: warning: context imbalance in 'xehp_fwtable_write8' - different lock contexts for basic block
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for Begin enabling Xe_HP SDV and DG2 platforms (rev5)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Begin enabling Xe_HP SDV and DG2 platforms (rev5)
URL : https://patchwork.freedesktop.org/series/92135/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10344 -> Patchwork_20594
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/index.html
Known issues
------------
Here are the changes found in Patchwork_20594 that come from known issues:
### IGT changes ###
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[i915#1759]: https://gitlab.freedesktop.org/drm/intel/issues/1759
[i915#2373]: https://gitlab.freedesktop.org/drm/intel/issues/2373
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
Participating hosts (39 -> 35)
------------------------------
Missing (4): fi-ilk-m540 fi-hsw-4200u fi-bdw-samus fi-bsw-n3050
Build changes
-------------
* Linux: CI_DRM_10344 -> Patchwork_20594
CI-20190529: 20190529
CI_DRM_10344: ea6974acd4fe82ca98cc1390b21af67d63c22471 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6138: 92bf2c7865037e18946d4c3d705587c8e8c3d1b8 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_20594: f6a30552f5db556b888f087a8c82d96fed6345ad @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f6a30552f5db drm/i915/dg2: Configure PCON in DP pre-enable path e55707db0df5 drm/i915/dg2: Update to bigjoiner pathd63a6e0c0ca0 drm/i915/dg2: Add DG2 to the PSR2 defeature list e35083bdfa80 drm/i915/dg2: Update lane disable power state during PSR 182f9e301051 drm/i915/dg2: Wait for SNPS PHY calibration during display init 9982d7730067 drm/i915/dg2: Classify DG2 PHY typesb46c8d88fd33 drm/i915/dg2: Update modeset sequencesfd3f99d8c087 drm/i915/dg2: Add vswing programming for SNPS phys 89d6432d3673 drm/i915/dg2: Add MPLLB programming for HDMI 689792bb94d6 drm/i915/dg2: Add MPLLB programming for SNPS PHY 118fc85a94ad drm/i915/dg2: DG2 has fixed memory bandwidth 60aa12c033cf drm/i915/dg2: Don't read DRAM infocc08e720e5ae drm/i915/dg2: Don't program BW_BUDDY registers 3a7526efaf70 drm/i915/dg2: Add dbuf programmingf3d519fa8374 drm/i915/dg2: Setup display outputs8119ad7f31ee drm/i915/dg2: Don't wait for AUX power well enable ACKs 76524872d616 drm/i915/dg2: Skip shared DPLL handlingdfa122ad3f15 drm/i915/dg2: Add cdclk table and reference clock dd67eb915449 drm/i915/dg2: Add fake PCH1ae2606f06f9 drm/i915/dg2: Define MOCS table for DG2c4f3a58eb9b9 drm/i915/dg2: Report INSTDONE_GEOM values in error state c6bfb5cac52e drm/i915/dg2: Maintain backward-compatible nested batch behavior 56c13089d010 drm/i915/dg2: Add new LRI reg offsetsed945621c3f2 drm/i915/dg2: Add SQIDI steering1232841b09bc drm/i915/dg2: Update LNCF steering ranges 462ae54b609e drm/i915/dg2: Add forcewake table8527f182dc41 drm/i915/dg2: DG2 uses the same sseu limits as XeHP SDV 8d231c0c99c3 drm/i915/dg2: add DG2 platform infoedd8638b9ce9 drm/i915/xehpsdv: Read correct RP_STATE_CAP register 638ddf4e9d14 drm/i915/xehpsdv: factor out function to read RP_STATE_CAP 5cd632524fbb drm/i915/xehpsdv: Define MOCS table for XeHP SDV 70410e269067 drm/i915/xehpsdv: Define steering tables 9beeacbb8d15 drm/i915/xehpsdv: Add compute DSS type
381532783086 drm/i915/xehpsdv: Add maximum sseu limits b359a5197220 drm/i915/xehp: Changes to ss/eu definitions 559ec30fa734 drm/i915/xehpsdv: add initial XeHP SDV definitions f983b1241a0f drm/i915/xehp: Loop over all gslices for INSTDONE processing 733505aa0488 drm/i915/xehp: handle new steering options e6c034ba7a58 drm/i915/xehp: New engine context offsets f5a167391d70 drm/i915/xehp: Handle new device context ID format 12a2020fa1fc drm/i915/xehp: Define multicast register ranges 04721d135106 drm/i915/xehp: Xe_HP forcewake support99c452861f03 drm/i915/xehp: Extra media engines - Part 3 (reset) 6f3c6efb8015 drm/i915/xehp: Extra media engines - Part 2 (interrupts) 75088f6dd8c2 drm/i915/xehp: Extra media engines - Part 1 (engine definitions) 25d8fcda069c drm/i915/selftests: Allow for larger engine counts 00fe5bfd2f5b drm/i915/gen12: Use fuse info to enable SFC 371d21e168c4 drm/i915/xehp: VDBOX/VEBOX fusing registers are enable-based 8bb98dab1d23 drm/i915: Fork DG1 interrupt handler7a5fbcb1f150 drm/i915: Add XE_HP initial definitions
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI[Intel-gfx] ✓ Fi.CI.IGT: success for Begin enabling Xe_HP SDV and DG2 platforms (rev5)
In reply to Matt Roper== Series Details ==
== Series Details ==
Series: Begin enabling Xe_HP SDV and DG2 platforms (rev5)
URL : https://patchwork.freedesktop.org/series/92135/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_10344_full -> Patchwork_20594_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_20594_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_mmap_gtt@basic-wc:
- {shard-rkl}: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-1/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-2/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-rotation-90-yf_tiled_ccs:
- {shard-rkl}: [FAIL][3] ([i915#3678]) -> [SKIP][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-2/igt@kms_ccs@pipe-a-bad-rotation-90-yf_tiled_ccs.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-6/igt@kms_ccs@pipe-a-bad-rotation-90-yf_tiled_ccs.html
* igt@kms_dither@fb-8bpc-vs-panel-8bpc:
- {shard-rkl}: NOTRUN -> [SKIP][5]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-1/igt@[email protected]
* igt@runner@aborted:
- {shard-rkl}: ([FAIL][6], [FAIL][7], [FAIL][8], [FAIL][9]) ([i915#3002]) -> ([FAIL][10], [FAIL][11], [FAIL][12], [FAIL][13]) ([i915#2029] / [i915#3002])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-5/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-6/igt@[email protected]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-2/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-1/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-6/igt@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-5/igt@[email protected]
Known issues
------------
Here are the changes found in Patchwork_20594_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_persistence@idempotent:
- shard-snb: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#1099]) +4 similar issues
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-snb6/igt@[email protected]
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-tglb: [PASS][15] -> [FAIL][16] ([i915#2842]) +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-tglb5/igt@gem_exec_fair@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-iclb: NOTRUN -> [FAIL][17] ([i915#2842])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_reloc@basic-write-read-noreloc:
- shard-tglb: [PASS][18] -> [DMESG-WARN][19] ([i915#2868])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-tglb2/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb5/igt@[email protected]
* igt@gem_exec_whisper@basic-queues-forked-all:
- shard-glk: [PASS][20] -> [DMESG-WARN][21] ([i915#118] / [i915#95]) +2 similar issues
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-glk8/igt@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-glk3/igt@[email protected]
* igt@gem_mmap_gtt@cpuset-big-copy-xy:
- shard-iclb: [PASS][22] -> [FAIL][23] ([i915#307])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-iclb4/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb8/igt@[email protected]
* igt@gem_pread@exhaustion:
- shard-tglb: NOTRUN -> [WARN][24] ([i915#2658])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb7/igt@[email protected]
- shard-iclb: NOTRUN -> [WARN][25] ([i915#2658])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb6/igt@[email protected]
- shard-snb: NOTRUN -> [WARN][26] ([i915#2658])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-snb5/igt@[email protected]
* igt@gem_pwrite@basic-exhaustion:
- shard-kbl: NOTRUN -> [WARN][27] ([i915#2658]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl6/igt@[email protected]
* igt@gem_userptr_blits@dmabuf-sync:
- shard-kbl: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#3323])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl4/igt@[email protected]
- shard-iclb: NOTRUN -> [SKIP][29] ([i915#3323])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb6/igt@[email protected]
- shard-skl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#3323])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl6/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][31] ([i915#3323])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb7/igt@[email protected]
* igt@gen3_render_mixed_blits:
- shard-iclb: NOTRUN -> [SKIP][32] ([fdo#109289]) +1 similar issue
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@gen3_render_mixed_blits.html
* igt@gen9_exec_parse@cmd-crossing-page:
- shard-iclb: NOTRUN -> [SKIP][33] ([fdo#112306])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-dp:
- shard-apl: NOTRUN -> [SKIP][34] ([fdo#109271] / [i915#1937])
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@i915_pm_lpsp@[email protected]
* igt@kms_big_fb@x-tiled-64bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][35] ([fdo#110725] / [fdo#111614]) +1 similar issue
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb4/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][36] ([fdo#111614])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb5/igt@[email protected]
* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-skl: NOTRUN -> [SKIP][37] ([fdo#109271] / [i915#3777])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl8/igt@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3777])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl8/igt@[email protected]
* igt@kms_big_fb@yf-tiled-32bpp-rotate-0:
- shard-tglb: NOTRUN -> [SKIP][39] ([fdo#111615])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb7/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0:
- shard-apl: NOTRUN -> [SKIP][40] ([fdo#109271]) +157 similar issues
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl8/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0-async-flip:
- shard-iclb: NOTRUN -> [SKIP][41] ([fdo#110723])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][42] ([i915#3689]) +3 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb5/igt@kms_ccs@pipe-b-bad-rotation-90-y_tiled_ccs.html
* igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs:
- shard-snb: NOTRUN -> [SKIP][43] ([fdo#109271]) +287 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-snb6/igt@kms_ccs@pipe-d-bad-pixel-format-y_tiled_ccs.html
* igt@kms_ccs@pipe-d-crc-primary-rotation-180-y_tiled_ccs:
- shard-glk: NOTRUN -> [SKIP][44] ([fdo#109271]) +4 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-glk2/igt@kms_ccs@pipe-d-crc-primary-rotation-180-y_tiled_ccs.html
* igt@kms_chamelium@vga-hpd-without-ddc:
- shard-kbl: NOTRUN -> [SKIP][45] ([fdo#109271] / [fdo#111827]) +5 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl7/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-0-25:
- shard-snb: NOTRUN -> [SKIP][46] ([fdo#109271] / [fdo#111827]) +15 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-snb6/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-blue-to-red:
- shard-iclb: NOTRUN -> [SKIP][47] ([fdo#109284] / [fdo#111827])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-gamma:
- shard-apl: NOTRUN -> [SKIP][48] ([fdo#109271] / [fdo#111827]) +13 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl8/igt@[email protected]
* igt@kms_color_chamelium@pipe-d-ctm-0-25:
- shard-iclb: NOTRUN -> [SKIP][49] ([fdo#109278] / [fdo#109284] / [fdo#111827])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_color_chamelium@pipe-invalid-ctm-matrix-sizes:
- shard-skl: NOTRUN -> [SKIP][50] ([fdo#109271] / [fdo#111827]) +7 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl8/igt@[email protected]
* igt@kms_content_protection@atomic:
- shard-apl: NOTRUN -> [TIMEOUT][51] ([i915#1319])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl6/igt@[email protected]
* igt@kms_content_protection@dp-mst-lic-type-1:
- shard-iclb: NOTRUN -> [SKIP][52] ([i915#3116])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-64x64-random:
- shard-apl: NOTRUN -> [FAIL][53] ([i915#3444])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-alpha-opaque:
- shard-skl: [PASS][54] -> [FAIL][55] ([i915#3444])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl4/igt@[email protected]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl5/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-512x512-rapid-movement:
- shard-iclb: NOTRUN -> [SKIP][56] ([fdo#109278] / [fdo#109279])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_cursor_crc@pipe-c-cursor-max-size-sliding:
- shard-tglb: NOTRUN -> [SKIP][57] ([i915#3359]) +1 similar issue
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb5/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-max-size-onscreen:
- shard-iclb: NOTRUN -> [SKIP][58] ([fdo#109278]) +14 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_cursor_legacy@cursorb-vs-flipb-atomic-transitions:
- shard-iclb: NOTRUN -> [SKIP][59] ([fdo#109274] / [fdo#109278])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][60] -> [FAIL][61] ([i915#2346] / [i915#533])
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl5/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl3/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@pipe-d-single-bo:
- shard-apl: NOTRUN -> [SKIP][62] ([fdo#109271] / [i915#533])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl6/igt@[email protected]
* igt@kms_dp_tiled_display@basic-test-pattern:
- shard-iclb: NOTRUN -> [SKIP][63] ([i915#426])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb4/igt@[email protected]
- shard-tglb: NOTRUN -> [SKIP][64] ([i915#426])
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb5/igt@[email protected]
* igt@kms_flip@2x-flip-vs-wf_vblank-interruptible:
- shard-iclb: NOTRUN -> [SKIP][65] ([fdo#109274]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb4/igt@kms_flip@2x-flip-vs-wf_vblank-interruptible.html
* igt@kms_flip@flip-vs-expired-vblank-interruptible@a-edp1:
- shard-skl: [PASS][66] -> [FAIL][67] ([i915#2122])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl1/igt@kms_flip@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl5/igt@kms_flip@[email protected]
* igt@kms_flip@plain-flip-fb-recreate-interruptible@a-hdmi-a1:
- shard-glk: [PASS][68] -> [FAIL][69] ([i915#2122])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-glk3/igt@kms_flip@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-glk9/igt@kms_flip@[email protected]
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytilercccs:
- shard-kbl: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#2672])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl6/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-2p-shrfb-fliptrack-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][71] ([fdo#109280]) +7 similar issues
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite:
- shard-skl: NOTRUN -> [SKIP][72] ([fdo#109271]) +108 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-spr-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-cur-indfb-onoff:
- shard-tglb: NOTRUN -> [SKIP][73] ([fdo#111825]) +3 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb6/igt@[email protected]
* igt@kms_hdr@bpc-switch-suspend:
- shard-skl: [PASS][74] -> [INCOMPLETE][75] ([i915#198] / [i915#2828])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl1/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl5/igt@[email protected]
* igt@kms_pipe_b_c_ivb@disable-pipe-b-enable-pipe-c:
- shard-tglb: NOTRUN -> [SKIP][76] ([fdo#109289])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb5/igt@[email protected]
* igt@kms_pipe_crc_basic@nonblocking-crc-pipe-d-frame-sequence:
- shard-skl: NOTRUN -> [SKIP][77] ([fdo#109271] / [i915#533])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl8/igt@[email protected]
* igt@kms_plane@plane-panning-bottom-right-suspend@pipe-b-planes:
- shard-kbl: [PASS][78] -> [DMESG-WARN][79] ([i915#180])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-kbl3/igt@kms_plane@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl4/igt@kms_plane@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-apl: NOTRUN -> [FAIL][80] ([fdo#108145] / [i915#265])
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-apl: NOTRUN -> [FAIL][81] ([i915#265])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
- shard-skl: [PASS][82] -> [FAIL][83] ([fdo#108145] / [i915#265])
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl4/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl5/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: NOTRUN -> [FAIL][84] ([fdo#108145] / [i915#265]) +3 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl10/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-alpha-basic:
- shard-kbl: NOTRUN -> [FAIL][85] ([fdo#108145] / [i915#265])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl4/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb:
- shard-kbl: NOTRUN -> [FAIL][86] ([i915#265])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl7/igt@[email protected]
* igt@kms_plane_lowres@pipe-d-tiling-yf:
- shard-tglb: NOTRUN -> [SKIP][87] ([fdo#112054])
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb5/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-update-sf-dmg-area-1:
- shard-tglb: NOTRUN -> [SKIP][88] ([i915#2920])
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb7/igt@[email protected]
- shard-skl: NOTRUN -> [SKIP][89] ([fdo#109271] / [i915#658]) +2 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl6/igt@[email protected]
* igt@kms_psr2_sf@overlay-primary-update-sf-dmg-area-3:
- shard-kbl: NOTRUN -> [SKIP][90] ([fdo#109271] / [i915#658]) +3 similar issues
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl6/igt@[email protected]
* igt@kms_psr2_sf@plane-move-sf-dmg-area-0:
- shard-iclb: NOTRUN -> [SKIP][91] ([i915#658])
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@kms_psr2_sf@plane-move-sf-dmg-area-1:
- shard-glk: NOTRUN -> [SKIP][92] ([fdo#109271] / [i915#658])
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-glk2/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area-5:
- shard-apl: NOTRUN -> [SKIP][93] ([fdo#109271] / [i915#658]) +1 similar issue
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@[email protected]
* igt@kms_psr@psr2_cursor_plane_onoff:
- shard-iclb: NOTRUN -> [SKIP][94] ([fdo#109441])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@kms_psr@psr2_cursor_plane_onoff.html
* igt@kms_psr@psr2_no_drrs:
- shard-iclb: [PASS][95] -> [SKIP][96] ([fdo#109441]) +3 similar issues
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-iclb2/igt@kms_psr@psr2_no_drrs.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb5/igt@kms_psr@psr2_no_drrs.html
* igt@kms_setmode@basic:
- shard-snb: NOTRUN -> [FAIL][97] ([i915#31])
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-snb5/igt@[email protected]
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][98] ([IGT#2])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@kms_sysfs_edid_timing.html
* igt@kms_universal_plane@disable-primary-vs-flip-pipe-d:
- shard-kbl: NOTRUN -> [SKIP][99] ([fdo#109271]) +96 similar issues
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl7/igt@[email protected]
* igt@kms_vblank@pipe-a-accuracy-idle:
- shard-skl: [PASS][100] -> [FAIL][101] ([i915#43])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl8/igt@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl4/igt@[email protected]
* igt@kms_writeback@writeback-fb-id:
- shard-apl: NOTRUN -> [SKIP][102] ([fdo#109271] / [i915#2437])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@[email protected]
* igt@nouveau_crc@pipe-b-ctx-flip-detection:
- shard-iclb: NOTRUN -> [SKIP][103] ([i915#2530])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@nouveau_crc@pipe-d-source-outp-complete:
- shard-tglb: NOTRUN -> [SKIP][104] ([i915#2530])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb7/igt@[email protected]
* igt@perf@polling-small-buf:
- shard-skl: [PASS][105] -> [FAIL][106] ([i915#1722])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl8/igt@[email protected]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl4/igt@[email protected]
* igt@perf_pmu@module-unload:
- shard-skl: [PASS][107] -> [DMESG-WARN][108] ([i915#1982] / [i915#262])
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-skl5/igt@[email protected]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-skl3/igt@[email protected]
* igt@prime_nv_pcopy@test_semaphore:
- shard-iclb: NOTRUN -> [SKIP][109] ([fdo#109291]) +2 similar issues
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@prime_nv_pcopy@test_semaphore.html
* igt@prime_nv_test@i915_import_gtt_mmap:
- shard-tglb: NOTRUN -> [SKIP][110] ([fdo#109291])
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb7/igt@prime_nv_test@i915_import_gtt_mmap.html
* igt@sysfs_clients@sema-10:
- shard-apl: NOTRUN -> [SKIP][111] ([fdo#109271] / [i915#2994]) +2 similar issues
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl7/igt@[email protected]
* igt@sysfs_clients@sema-25:
- shard-kbl: NOTRUN -> [SKIP][112] ([fdo#109271] / [i915#2994])
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl7/igt@[email protected]
#### Possible fixes ####
* igt@feature_discovery@psr2:
- shard-iclb: [SKIP][113] ([i915#658]) -> [PASS][114]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-iclb5/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb2/igt@[email protected]
- {shard-rkl}: [SKIP][115] ([i915#658]) -> [PASS][116]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-2/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-6/igt@[email protected]
* igt@gem_ctx_isolation@preservation-s3@rcs0:
- shard-apl: [DMESG-WARN][117] ([i915#180]) -> [PASS][118]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-apl8/igt@gem_ctx_isolation@[email protected]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-apl6/igt@gem_ctx_isolation@[email protected]
* igt@gem_ctx_persistence@many-contexts:
- shard-tglb: [FAIL][119] ([i915#2410]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-tglb5/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb6/igt@[email protected]
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][121] ([i915#2842]) -> [PASS][122] +3 similar issues
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-kbl2/igt@gem_exec_fair@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-kbl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace@vcs1:
- shard-tglb: [FAIL][123] ([i915#2842]) -> [PASS][124] +1 similar issue
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-tglb6/igt@gem_exec_fair@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- {shard-rkl}: [FAIL][125] ([i915#2842]) -> [PASS][126]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-6/igt@gem_exec_fair@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-2/igt@gem_exec_fair@[email protected]
- shard-iclb: [FAIL][127] ([i915#2849]) -> [PASS][128]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-iclb2/igt@gem_exec_fair@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_schedule@u-independent@vecs0:
- shard-tglb: [FAIL][129] -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-tglb3/igt@gem_exec_schedule@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-tglb2/igt@gem_exec_schedule@[email protected]
* igt@gem_exec_suspend@basic-s4-devices:
- {shard-rkl}: [INCOMPLETE][131] -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-6/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-1/igt@[email protected]
* igt@gem_exec_whisper@basic-contexts-priority:
- shard-iclb: [INCOMPLETE][133] ([i915#1895]) -> [PASS][134]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-iclb7/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
* igt@gem_mmap_gtt@cpuset-big-copy-odd:
- shard-iclb: [FAIL][135] ([i915#307]) -> [PASS][136]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-iclb5/igt@[email protected]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-iclb3/igt@[email protected]
- {shard-rkl}: [FAIL][137] ([i915#2428]) -> [PASS][138]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-rkl-1/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-rkl-6/igt@[email protected]
* igt@i915_module_load@reload-with-fault-injection:
- shard-snb: [DMESG-WARN][139] ([i915#3389]) -> [PASS][140]
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_10344/shard-snb7/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/shard-snb2/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- {shard-rkl}: [DMESG-FAIL][141] ([i915#1021]) -> [PASS][142]
[141]: https://intel-gfx-ci.01.org/t
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_20594/index.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx