drm/i915: Sanitize engine context sizes
Joonas Lahtinen
maintainerPATCH 1/4 drm/i915: Sanitize engine context sizes
Pre-calculate engine context size based on engine class and device generation and store it in the engine instance.
v2:
- Squash and get rid of hw_context_size (Chris)
v3:
- Move after MMIO init for probing on Gen7 and 8 (Chris)
- Retained rounding (Tvrtko)
v4:
- Rebase for deferred legacy context allocation
--- drivers/gpu/drm/i915/gvt/scheduler.c | 6 +- drivers/gpu/drm/i915/i915_drv.c | 15 +++-- drivers/gpu/drm/i915/i915_drv.h | 3 +- drivers/gpu/drm/i915/i915_gem_context.c | 56 ++----------------- drivers/gpu/drm/i915/i915_guc_submission.c | 3 +- drivers/gpu/drm/i915/i915_reg.h | 10 ---- drivers/gpu/drm/i915/intel_engine_cs.c | 90 +++++++++++++++++++++++++++++- drivers/gpu/drm/i915/intel_lrc.c | 54 +----------------- drivers/gpu/drm/i915/intel_lrc.h | 2 - drivers/gpu/drm/i915/intel_ringbuffer.c | 4 +- drivers/gpu/drm/i915/intel_ringbuffer.h | 7 ++- 11 files changed, 112 insertions(+), 138 deletions(-)
drivers/gpu/drm/i915/gvt/scheduler.c +2 -4
@@ -69,8 +69,7 @@ static int populate_shadow_context(struct intel_vgpu_workload *workload)gvt_dbg_sched ("ring id %d workload lrca %x" , ring_id, workload->ctx_desc.lrca); - context_page_num =intel_lr_context_size ( - gvt->dev_priv->engine[ring_id]); + context_page_num = gvt->dev_priv->engine[ring_id]->context_size; context_page_num = context_page_num >>PAGE_SHIFT ;
@@ -330,8 +329,7 @@ static void update_guest_context(struct intel_vgpu_workload *workload)gvt_dbg_sched ("ring id %d workload lrca %x\n" , ring_id, workload->ctx_desc.lrca); - context_page_num =intel_lr_context_size ( - gvt->dev_priv->engine[ring_id]); + context_page_num = gvt->dev_priv->engine[ring_id]->context_size; context_page_num = context_page_num >>PAGE_SHIFT ;
drivers/gpu/drm/i915/i915_drv.c +9 -6
@@ -835,10 +835,6 @@ static int i915_driver_init_early(struct drm_i915_private *dev_priv,intel_uc_init_early (dev_priv);i915_memcpy_init_early (dev_priv); - ret =intel_engines_init_early (dev_priv); -if (ret) -return ret; - ret =i915_workqueues_init (dev_priv);if (ret <0 ) goto err_engines;
@@ -948,14 +944,21 @@ static int i915_driver_init_mmio(struct drm_i915_private *dev_priv) ret =i915_mmio_setup (dev_priv);if (ret <0 ) - goto put_bridge; + goto err_bridge;intel_uncore_init (dev_priv); + + ret =intel_engines_init_mmio (dev_priv); +if (ret) + goto err_uncore; +i915_gem_init_mmio (dev_priv);return 0 ; -put_bridge: +err_uncore: +intel_uncore_fini (dev_priv); +err_bridge:pci_dev_put (dev_priv->bridge_dev);return ret;
drivers/gpu/drm/i915/i915_drv.h +1 -2
@@ -2359,7 +2359,6 @@ struct drm_i915_private {*/ struct mutex av_mutex; -uint32_t hw_context_size;struct list_head context_list;u32 fdi_rx_config;
@@ -3023,7 +3022,7 @@ extern unsigned long i915_gfx_val(struct drm_i915_private *dev_priv);extern void i915_update_gfx_val (struct drm_i915_private *dev_priv);int vlv_force_gfx_clock (struct drm_i915_private *dev_priv,bool on); -int intel_engines_init_early (struct drm_i915_private *dev_priv); +int intel_engines_init_mmio (struct drm_i915_private *dev_priv);int intel_engines_init (struct drm_i915_private *dev_priv);/* intel_hotplug.c */
drivers/gpu/drm/i915/i915_gem_context.c +5 -51
97 lines not on this page · raw message
drivers/gpu/drm/i915/i915_guc_submission.c +1 -2
@@ -1051,8 +1051,7 @@ static int guc_ads_create(struct intel_guc *guc) dev_priv->engine[RCS ]->status_page.ggtt_offset;for_each_engine (engine, dev_priv, id) - blob->ads.eng_state_size[engine->guc_id] = -intel_lr_context_size (engine); + blob->ads.eng_state_size[engine->guc_id] = engine->context_size; base =guc_ggtt_offset (vma); blob->ads.scheduler_policies = base +ptr_offset (blob, policies);
drivers/gpu/drm/i915/i915_reg.h +0 -10
@@ -3370,16 +3370,6 @@ enum skl_disp_power_wells {#define GEN7_CXT_VFSTATE_SIZE (ctx_reg) (((ctx_reg) >> 0) & 0x3f)#define GEN7_CXT_TOTAL_SIZE (ctx_reg) (GEN7_CXT_EXTENDED_SIZE(ctx_reg) + \ GEN7_CXT_VFSTATE_SIZE(ctx_reg)) -/* Haswell does have the CXT_SIZE register however it does not appear to be -* valid. Now, docs explain in dwords what is in the context object. The full -* size is 70720 bytes, however, the power context and execlist context will -* never be saved (power context is stored elsewhere, and execlists don't work -* on HSW) - so the final size, including the extra state required for the -* Resource Streamer, is 66944 bytes, which rounds to 17 pages. -*/ -#define HSW_CXT_TOTAL_SIZE (17 * PAGE_SIZE) -/* Same as Haswell, but 72064 bytes now. */ -#define GEN8_CXT_TOTAL_SIZE (18 * PAGE_SIZE)enum {INTEL_ADVANCED_CONTEXT =0 ,
drivers/gpu/drm/i915/intel_engine_cs.c +87 -3
124 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.c +1 -53
72 lines not on this page · raw message
drivers/gpu/drm/i915/intel_lrc.h +0 -2
@@ -78,8 +78,6 @@ int logical_xcs_ring_init(struct intel_engine_cs *engine);struct drm_i915_private ;struct i915_gem_context ; -uint32_t intel_lr_context_size (struct intel_engine_cs *engine); -void intel_lr_context_resume (struct drm_i915_private *dev_priv);uint64_t intel_lr_context_descriptor (struct i915_gem_context *ctx,struct intel_engine_cs *engine);
drivers/gpu/drm/i915/intel_ringbuffer.c +2 -2
@@ -1444,7 +1444,7 @@ alloc_context_vma(struct intel_engine_cs *engine)struct drm_i915_gem_object *obj;struct i915_vma *vma; - obj =i915_gem_object_create (i915, i915->hw_context_size); + obj =i915_gem_object_create (i915, engine->context_size);if (IS_ERR (obj))return ERR_CAST (obj);
@@ -1487,7 +1487,7 @@ static int intel_ring_context_pin(struct intel_engine_cs *engine,return 0 ;GEM_BUG_ON (!ce->pin_count);/* no overflow please! */ -if (engine->id ==RCS && !ce->state && engine->i915->hw_context_size) { +if (!ce->state && engine->context_size) {struct i915_vma *vma; vma =alloc_context_vma (engine);
drivers/gpu/drm/i915/intel_ringbuffer.h +4 -3
@@ -196,13 +196,14 @@ struct intel_engine_cs {enum intel_engine_id id;unsigned int uabi_id;unsigned int hw_id; +unsigned int guc_id;u8 class;u8 instance; - -unsigned int guc_id; -u32 mmio_base; +u32 context_size; +u32 mmio_base;unsigned int irq_shift; +struct intel_ring *buffer;struct intel_timeline *timeline;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerPATCH 2/4 drm/i915: Eliminate HAS_HW_CONTEXTS
HAS_HW_CONTEXTS is misleading condition for GPU reset and CCID, replace it with Gen specific (to be updated in next patches).
HAS_HW_CONTEXTS in i915_l3_write is bogus because each HAS_L3_DPF match also has .has_hw_contexts = 1 set.
This leads to us being able to get rid of the property completely.
v2:
- Keep the checks at Gen6 for no functional change (Ville)
--- drivers/gpu/drm/i915/i915_drv.h | 2 -- drivers/gpu/drm/i915/i915_gem.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +++--- drivers/gpu/drm/i915/i915_pci.c | 5 ----- drivers/gpu/drm/i915/i915_sysfs.c | 3 --- 5 files changed, 4 insertions(+), 14 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -2
@@ -822,7 +822,6 @@ struct intel_csr {func (has_gmch_display); \func (has_guc); \func (has_hotplug); \ -func (has_hw_contexts); \func (has_l3_dpf); \func (has_llc); \func (has_logical_ring_contexts); \
@@ -2866,7 +2865,6 @@ intel_info(const struct drm_i915_private *dev_priv)#define HWS_NEEDS_PHYSICAL (dev_priv) ((dev_priv)->info.hws_needs_physical) -#define HAS_HW_CONTEXTS (dev_priv) ((dev_priv)->info.has_hw_contexts)#define HAS_LOGICAL_RING_CONTEXTS (dev_priv) \ ((dev_priv)->info.has_logical_ring_contexts)#define USES_PPGTT (dev_priv) (i915.enable_ppgtt)
drivers/gpu/drm/i915/i915_gem.c +1 -1
@@ -4488,7 +4488,7 @@ void i915_gem_sanitize(struct drm_i915_private *i915)* of the reset, so we only reset recent machines with logical * context support (that must be reset to remove any stray contexts). */ -if (HAS_HW_CONTEXTS (i915)) { +if (INTEL_GEN (i915) >=6 ) {int reset =intel_gpu_reset (i915,ALL_ENGINES );WARN_ON (reset && reset != -ENODEV ); }
drivers/gpu/drm/i915/i915_gpu_error.c +3 -3
@@ -1598,6 +1598,9 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, error->done_reg =I915_READ (DONE_REG ); } +if (INTEL_GEN (dev_priv) >=6 ) + error->ccid =I915_READ (CCID ); +/* 3: Feature specific registers */ if (IS_GEN6 (dev_priv) ||IS_GEN7 (dev_priv)) { error->gam_ecochk =I915_READ (GAM_ECOCHK );
@@ -1605,9 +1608,6 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, }/* 4: Everything else */ -if (HAS_HW_CONTEXTS (dev_priv)) - error->ccid =I915_READ (CCID ); -if (INTEL_GEN (dev_priv) >=8 ) { error->ier =I915_READ (GEN8_DE_MISC_IER );for (i =0 ; i <4 ; i++)
drivers/gpu/drm/i915/i915_pci.c +0 -5
@@ -220,7 +220,6 @@ static const struct intel_device_info intel_ironlake_m_info = { .has_rc6 = 1, \ .has_rc6p = 1, \ .has_gmbus_irq = 1, \ - .has_hw_contexts = 1, \ .has_aliasing_ppgtt =1 , \GEN_DEFAULT_PIPEOFFSETS , \CURSOR_OFFSETS
@@ -245,7 +244,6 @@ static const struct intel_device_info intel_sandybridge_m_info = { .has_rc6 = 1, \ .has_rc6p = 1, \ .has_gmbus_irq = 1, \ - .has_hw_contexts = 1, \ .has_aliasing_ppgtt = 1, \ .has_full_ppgtt =1 , \ GEN_DEFAULT_PIPEOFFSETS, \
@@ -280,7 +278,6 @@ static const struct intel_device_info intel_valleyview_info = { .has_runtime_pm = 1, .has_rc6 = 1, .has_gmbus_irq = 1, - .has_hw_contexts = 1, .has_gmch_display = 1, .has_hotplug = 1, .has_aliasing_ppgtt = 1,
@@ -340,7 +337,6 @@ static const struct intel_device_info intel_cherryview_info = { .has_resource_streamer = 1, .has_rc6 = 1, .has_gmbus_irq = 1, - .has_hw_contexts = 1, .has_logical_ring_contexts = 1, .has_gmch_display = 1, .has_aliasing_ppgtt = 1,
@@ -387,7 +383,6 @@ static const struct intel_device_info intel_skylake_gt3_info = { .has_rc6 = 1, \ .has_dp_mst = 1, \ .has_gmbus_irq = 1, \ - .has_hw_contexts = 1, \ .has_logical_ring_contexts = 1, \ .has_guc = 1, \ .has_decoupled_mmio = 1, \
drivers/gpu/drm/i915/i915_sysfs.c +0 -3
@@ -185,9 +185,6 @@ i915_l3_write(struct file *filp, struct kobject *kobj,int slice = (int )(uintptr_t )attr->private;int ret; -if (!HAS_HW_CONTEXTS (dev_priv)) -return -ENXIO ; - ret =l3_access_valid (dev_priv, offset);if (ret)return ret;
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerPATCH 3/4 drm/i915: Reset ILK during GEM sanitization
In reply to Joonas LahtinenILK should survive a reset without display corruption.
--- drivers/gpu/drm/i915/i915_gem.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/gpu/drm/i915/i915_gem.c +2 -3
@@ -4485,10 +4485,9 @@ void i915_gem_sanitize(struct drm_i915_private *i915)* try to take over. The only way to remove the earlier state * is by resetting. However, resetting on earlier gen is tricky as * it may impact the display and we are uncertain about the stability -* of the reset, so we only reset recent machines with logical -* context support (that must be reset to remove any stray contexts). +* of the reset, so this could be applied to even earlier gen. */ -if (INTEL_GEN (i915) >=6 ) { +if (INTEL_GEN (i915) >=5 ) {int reset =intel_gpu_reset (i915,ALL_ENGINES );WARN_ON (reset && reset != -ENODEV ); }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerPATCH 4/4 drm/i915: Capture CCID on ILK
In reply to Joonas LahtinenCCID register existed already on ILK according to the PRM (Chris verified the address to match too).
--- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_gpu_error.c +1 -1
@@ -1598,7 +1598,7 @@ static void i915_capture_reg_state(struct drm_i915_private *dev_priv, error->done_reg =I915_READ (DONE_REG ); } -if (INTEL_GEN (dev_priv) >=6 ) +if (INTEL_GEN (dev_priv) >=5 ) error->ccid =I915_READ (CCID );/* 3: Feature specific registers */
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915: Sanitize engine context sizes
In reply to Joonas Lahtinen== Series Details ==
== Series Details ==
Series: series starting with [1/4] drm/i915: Sanitize engine context sizes
URL : https://patchwork.freedesktop.org/series/23678/
State : success
== Summary ==
Series 23678v1 Series without cover letter
https://patchwork.freedesktop.org/api/1.0/series/23678/revisions/1/mbox/
Test gem_exec_suspend:
Subgroup basic-s4-devices:
dmesg-warn -> PASS (fi-kbl-7560u) fdo#100125
Test kms_flip:
Subgroup basic-flip-vs-modeset:
incomplete -> PASS (fi-skl-6700hq)
Test kms_pipe_crc_basic:
Subgroup suspend-read-crc-pipe-c:
incomplete -> PASS (fi-skl-6260u) fdo#100461fdo#100125 https://bugs.freedesktop.org/show_bug.cgi?id=100125
fdo#100461 https://bugs.freedesktop.org/show_bug.cgi?id=100461
fi-bdw-5557u total:278 pass:267 dwarn:0 dfail:0 fail:0 skip:11 time:432s fi-bdw-gvtdvm total:278 pass:256 dwarn:8 dfail:0 fail:0 skip:14 time:432s fi-bsw-n3050 total:278 pass:242 dwarn:0 dfail:0 fail:0 skip:36 time:566s fi-bxt-j4205 total:278 pass:259 dwarn:0 dfail:0 fail:0 skip:19 time:510s fi-bxt-t5700 total:278 pass:258 dwarn:0 dfail:0 fail:0 skip:20 time:539s fi-byt-j1900 total:278 pass:254 dwarn:0 dfail:0 fail:0 skip:24 time:484s fi-byt-n2820 total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:476s fi-hsw-4770 total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:415s fi-hsw-4770r total:278 pass:262 dwarn:0 dfail:0 fail:0 skip:16 time:403s fi-ilk-650 total:278 pass:228 dwarn:0 dfail:0 fail:0 skip:50 time:421s fi-ivb-3520m total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:487s fi-ivb-3770 total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:487s fi-kbl-7500u total:278 pass:260 dwarn:0 dfail:0 fail:0 skip:18 time:455s fi-kbl-7560u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:564s fi-skl-6260u total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:455s fi-skl-6700hq total:278 pass:261 dwarn:0 dfail:0 fail:0 skip:17 time:570s fi-skl-6700k total:278 pass:256 dwarn:4 dfail:0 fail:0 skip:18 time:461s fi-skl-6770hq total:278 pass:268 dwarn:0 dfail:0 fail:0 skip:10 time:487s fi-skl-gvtdvm total:278 pass:265 dwarn:0 dfail:0 fail:0 skip:13 time:428s fi-snb-2520m total:278 pass:250 dwarn:0 dfail:0 fail:0 skip:28 time:529s fi-snb-2600 total:278 pass:249 dwarn:0 dfail:0 fail:0 skip:29 time:401s
ef1bc2e0d9b4a6342b300ccd25332f7cc4fc360b drm-tip: 2017y-04m-28d-07h-58m-50s UTC integration manifest 960ec0a drm/i915: Capture CCID on ILK
738bc88 drm/i915: Reset ILK during GEM sanitization
d258bf5 drm/i915: Eliminate HAS_HW_CONTEXTS
ca23d96 drm/i915: Sanitize engine context sizes
== Logs ==
For more details see: https://intel-gfx-ci.01.org/CI/Patchwork_4573/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Joonas Lahtinen
maintainerRe: ✓ Fi.CI.BAT: success for series starting with [1/4] drm/i915: Sanitize engine context sizes
Quoted 5 lines · Patchwork
== Series Details ==
Series: series starting with [1/4] drm/i915: Sanitize engine context sizes URL : https://patchwork.freedesktop.org/series/23678/
State : success
Pushed the series, thanks for the review.
Regards, Joonas
--
Joonas Lahtinen
Open Source Technology Center
Intel Corporation
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx