drm/i915: Convert some more bits to use engine mmio accessors
Subsystems (2)
PATCH 1/2 drm/i915: Convert some more bits to use engine mmio accessors
From: Tvrtko Ursulin <[email protected]>
Remove a couple dev_priv locals as a consequence.
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 27 ++++++++++----------- drivers/gpu/drm/i915/i915_gem_gtt.c | 5 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_reg.h | 2 +- drivers/gpu/drm/i915/intel_guc_submission.c | 4 +-- 5 files changed, 20 insertions(+), 20 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.c +13 -14
@@ -2021,31 +2021,30 @@ static int intel_init_workaround_bb(struct intel_engine_cs *engine)static void enable_execlists (struct intel_engine_cs *engine) { -struct drm_i915_private *dev_priv = engine->i915; -intel_engine_set_hwsp_writemask (engine, ~0u );/* HWSTAM */ -if (INTEL_GEN (dev_priv) >=11 ) -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GEN11_GFX_DISABLE_LEGACY_MODE )); +if (INTEL_GEN (engine->i915) >=11 ) +ENGINE_WRITE (engine, +RING_MODE_GEN7 , +_MASKED_BIT_ENABLE (GEN11_GFX_DISABLE_LEGACY_MODE ));else -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); +ENGINE_WRITE (engine, +RING_MODE_GEN7 , +_MASKED_BIT_ENABLE (GFX_RUN_LIST_ENABLE )); -I915_WRITE (RING_MI_MODE (engine->mmio_base), -_MASKED_BIT_DISABLE (STOP_RING )); +ENGINE_WRITE (engine,RING_MI_MODE ,_MASKED_BIT_DISABLE (STOP_RING )); -I915_WRITE (RING_HWS_PGA (engine->mmio_base), -i915_ggtt_offset (engine->status_page.vma)); -POSTING_READ (RING_HWS_PGA (engine->mmio_base)); +ENGINE_WRITE (engine, +RING_HWS_PGA , +i915_ggtt_offset (engine->status_page.vma)); +ENGINE_POSTING_READ (engine,RING_HWS_PGA ); }static bool unexpected_starting_state (struct intel_engine_cs *engine) { -struct drm_i915_private *dev_priv = engine->i915;bool unexpected = false; -if (I915_READ (RING_MI_MODE (engine->mmio_base)) &STOP_RING ) { +if (ENGINE_READ (engine,RING_MI_MODE ) &STOP_RING ) {DRM_DEBUG_DRIVER ("STOP_RING still set in RING_MI_MODE\n" ); unexpected = true; }
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -2
@@ -1713,8 +1713,9 @@ static void gen7_ppgtt_enable(struct drm_i915_private *dev_priv)for_each_engine (engine, dev_priv, id) {/* GFX_MODE is per-ring on gen7+ */ -I915_WRITE (RING_MODE_GEN7 (engine), -_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE )); +ENGINE_WRITE (engine, +RING_MODE_GEN7 , +_MASKED_BIT_ENABLE (GFX_PPGTT_ENABLE )); } }
drivers/gpu/drm/i915/i915_gpu_error.c +1 -1
@@ -1219,7 +1219,7 @@ static void error_record_engine_registers(struct i915_gpu_state *error,if (HAS_PPGTT (dev_priv)) {int i; - ee->vm_info.gfx_mode =I915_READ (RING_MODE_GEN7 (engine)); + ee->vm_info.gfx_mode =ENGINE_READ (engine,RING_MODE_GEN7 );if (IS_GEN (dev_priv,6 )) { ee->vm_info.pp_dir_base =
drivers/gpu/drm/i915/i915_reg.h +1 -1
@@ -2698,7 +2698,7 @@ enum i915_power_well_id {#define GFX_MODE _MMIO(0x2520)#define GFX_MODE_GEN7 _MMIO(0x229c) -#define RING_MODE_GEN7 (engine) _MMIO((engine)->mmio_base + 0x29c) +#define RING_MODE_GEN7 (base) _MMIO((base) + 0x29c)#define GFX_RUN_LIST_ENABLE (1 << 15)#define GFX_INTERRUPT_STEERING (1 << 14)#define GFX_TLB_INVALIDATE_EXPLICIT (1 << 13)
drivers/gpu/drm/i915/intel_guc_submission.c +2 -2
@@ -1306,7 +1306,7 @@ static void guc_interrupts_capture(struct drm_i915_private *dev_priv)*/ irqs =_MASKED_BIT_ENABLE (GFX_INTERRUPT_STEERING );for_each_engine (engine, dev_priv, id) -I915_WRITE (RING_MODE_GEN7 (engine), irqs); +ENGINE_WRITE (engine,RING_MODE_GEN7 , irqs);/* route USER_INTERRUPT to Host, all others are sent to GuC. */ irqs = GT_RENDER_USER_INTERRUPT << GEN8_RCS_IRQ_SHIFT |
@@ -1353,7 +1353,7 @@ static void guc_interrupts_release(struct drm_i915_private *dev_priv) irqs =_MASKED_FIELD (GFX_FORWARD_VBLANK_MASK ,GFX_FORWARD_VBLANK_NEVER ); irqs |=_MASKED_BIT_DISABLE (GFX_INTERRUPT_STEERING );for_each_engine (engine, dev_priv, id) -I915_WRITE (RING_MODE_GEN7 (engine), irqs); +ENGINE_WRITE (engine,RING_MODE_GEN7 , irqs);/* route all GT interrupts to the host */ I915_WRITE (GUC_BCS_RCS_IER ,0 );
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 drm/i915: Tidy intel_execlists_submission_init
From: Tvrtko Ursulin <[email protected]>
Get to uncore from the engine for better logic organization and use already available i915 everywhere.
--- drivers/gpu/drm/i915/gt/intel_lrc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/gt/intel_lrc.c +6 -5
@@ -2738,8 +2738,9 @@ int intel_execlists_submission_setup(struct intel_engine_cs *engine)int intel_execlists_submission_init (struct intel_engine_cs *engine) { -struct drm_i915_private *i915 = engine->i915;struct intel_engine_execlists *const execlists = &engine->execlists; +struct drm_i915_private *i915 = engine->i915; +struct intel_uncore *uncore = engine->uncore;u32 base = engine->mmio_base;int ret;
@@ -2759,12 +2760,12 @@ int intel_execlists_submission_init(struct intel_engine_cs *engine)DRM_ERROR ("WA batch buffer initialization failed\n" );if (HAS_LOGICAL_RING_ELSQ (i915)) { - execlists->submit_reg = i915->uncore.regs + + execlists->submit_reg = uncore->regs +i915_mmio_reg_offset (RING_EXECLIST_SQ_CONTENTS (base)); - execlists->ctrl_reg = i915->uncore.regs + + execlists->ctrl_reg = uncore->regs +i915_mmio_reg_offset (RING_EXECLIST_CONTROL (base)); }else { - execlists->submit_reg = i915->uncore.regs + + execlists->submit_reg = uncore->regs +i915_mmio_reg_offset (RING_ELSP (base)); }
@@ -2779,7 +2780,7 @@ int intel_execlists_submission_init(struct intel_engine_cs *engine) execlists->csb_write = &engine->status_page.addr[intel_hws_csb_write_index (i915)]; -if (INTEL_GEN (engine->i915) <11 ) +if (INTEL_GEN (i915) <11 ) execlists->csb_size =GEN8_CSB_ENTRIES ;else execlists->csb_size =GEN11_CSB_ENTRIES ;
Signature · 6 lines
2.20.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for series starting with [CI,1/2] drm/i915: Convert some more bits to use engine mmio accessors
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [CI,1/2] drm/i915: Convert some more bits to use engine mmio accessors
URL : https://patchwork.freedesktop.org/series/61759/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6216 -> Patchwork_13200
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/
Known issues
------------
Here are the changes found in Patchwork_13200 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_switch@basic-default:
- fi-cml-u: [PASS][1] -> [INCOMPLETE][2] ([fdo#110566])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/fi-cml-u/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/fi-cml-u/igt@[email protected]
* igt@vgem_basic@mmap:
- fi-icl-u3: [PASS][3] -> [DMESG-WARN][4] ([fdo#107724])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/fi-icl-u3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/fi-icl-u3/igt@[email protected]
#### Possible fixes ####
* igt@gem_close_race@basic-process:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/fi-icl-u3/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/fi-icl-u3/igt@[email protected]
* igt@gem_ctx_create@basic-files:
- fi-icl-u2: [INCOMPLETE][7] ([fdo#107713] / [fdo#109100]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/fi-icl-u2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/fi-icl-u2/igt@[email protected]
* igt@kms_frontbuffer_tracking@basic:
- fi-hsw-peppy: [DMESG-WARN][9] ([fdo#102614]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/fi-hsw-peppy/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/fi-hsw-peppy/igt@[email protected]
[fdo#102614]: https://bugs.freedesktop.org/show_bug.cgi?id=102614
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#110566]: https://bugs.freedesktop.org/show_bug.cgi?id=110566
Participating hosts (54 -> 47)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-byt-clapper fi-bdw-samus fi-snb-2600
Build changes
-------------
* Linux: CI_DRM_6216 -> Patchwork_13200
CI_DRM_6216: e58a2b1f565ec5d77c69724d2f43a7de6f7953b3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5047: 3f4b1a49ed5e1c77ea42970d4d3156c997f66050 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13200: e44e64da6e93b78c72a66f7324c6b2d1b6f11544 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
e44e64da6e93 drm/i915: Tidy intel_execlists_submission_init e0c2c9993238 drm/i915: Convert some more bits to use engine mmio accessors
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for series starting with [CI,1/2] drm/i915: Convert some more bits to use engine mmio accessors
In reply to Tvrtko Ursulin== Series Details ==
== Series Details ==
Series: series starting with [CI,1/2] drm/i915: Convert some more bits to use engine mmio accessors
URL : https://patchwork.freedesktop.org/series/61759/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6216_full -> Patchwork_13200_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
Known issues
------------
Here are the changes found in Patchwork_13200_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_isolation@vecs0-s3:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +1 similar issue
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-apl6/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-apl6/igt@[email protected]
* igt@gem_mmap_gtt@forked-medium-copy:
- shard-iclb: [PASS][3] -> [INCOMPLETE][4] ([fdo#107713])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-iclb2/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-iclb2/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-256x85-onscreen:
- shard-apl: [PASS][5] -> [INCOMPLETE][6] ([fdo#103927])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-apl4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-apl7/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([fdo#110741])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-skl1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-skl4/igt@[email protected]
* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][9] -> [FAIL][10] ([fdo#105363])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-skl4/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-skl5/igt@[email protected]
* igt@kms_flip@flip-vs-suspend:
- shard-kbl: [PASS][11] -> [DMESG-WARN][12] ([fdo#108566])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-kbl4/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-kbl2/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [PASS][13] -> [INCOMPLETE][14] ([fdo#103665])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-kbl3/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-kbl3/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbcpsr-1p-pri-indfb-multidraw:
- shard-iclb: [PASS][15] -> [FAIL][16] ([fdo#103167])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-iclb5/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-iclb5/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][17] -> [FAIL][18] ([fdo#108145] / [fdo#110403])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-skl2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-skl9/igt@[email protected]
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [PASS][19] -> [SKIP][20] ([fdo#109441])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-iclb6/igt@kms_psr@psr2_sprite_blt.html
* igt@perf@blocking:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#110728])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-skl8/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-skl7/igt@[email protected]
#### Possible fixes ####
* igt@gem_ctx_isolation@rcs0-s3:
- shard-iclb: [INCOMPLETE][23] ([fdo#107713] / [fdo#109100]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-iclb7/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-iclb5/igt@[email protected]
* igt@gem_workarounds@suspend-resume-fd:
- shard-skl: [INCOMPLETE][25] ([fdo#104108]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-skl1/igt@[email protected]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-skl7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-blt:
- shard-iclb: [FAIL][27] ([fdo#103167]) -> [PASS][28] +5 similar issues
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-iclb8/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-iclb7/igt@[email protected]
* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-apl: [DMESG-WARN][29] ([fdo#108566]) -> [PASS][30] +3 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-apl1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-apl3/igt@[email protected]
* igt@kms_psr@psr2_suspend:
- shard-iclb: [SKIP][31] ([fdo#109441]) -> [PASS][32] +2 similar issues
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-iclb4/igt@kms_psr@psr2_suspend.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-iclb2/igt@kms_psr@psr2_suspend.html
* igt@kms_setmode@basic:
- shard-apl: [FAIL][33] ([fdo#99912]) -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-apl4/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-apl4/igt@[email protected]
* igt@kms_vblank@pipe-c-query-idle-hang:
- shard-iclb: [INCOMPLETE][35] ([fdo#107713]) -> [PASS][36]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6216/shard-iclb1/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/shard-iclb7/igt@[email protected]
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#103927]: https://bugs.freedesktop.org/show_bug.cgi?id=103927
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110741]: https://bugs.freedesktop.org/show_bug.cgi?id=110741
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (9 -> 9)
------------------------------
No changes in participating hosts
Build changes
-------------
* Linux: CI_DRM_6216 -> Patchwork_13200
CI_DRM_6216: e58a2b1f565ec5d77c69724d2f43a7de6f7953b3 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5047: 3f4b1a49ed5e1c77ea42970d4d3156c997f66050 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13200: e44e64da6e93b78c72a66f7324c6b2d1b6f11544 @ git://anongit.freedesktop.org/gfx-ci/linux
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13200/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx