| Message ID | 20220217175634.4128754-1-lucas.demarchi@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/i915: Kill the fake lmem support | expand |
On Thu, 17 Feb 2022 at 17:55, Lucas De Marchi <lucas.demarchi@intel.com> wrote: > > This was useful for early development of lmem, but it's not used > anymore, so remove it. > > v2: Remove unneeded fields from struct intel_memory_region > > Cc: Chris Wilson <chris@chris-wilson.co.uk> > Cc: Matthew Auld <matthew.auld@intel.com> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
On Fri, Feb 18, 2022 at 01:08:36PM +0000, Patchwork wrote: >== Series Details == > >Series: drm/i915: Kill the fake lmem support (rev2) >URL : https://patchwork.freedesktop.org/series/100276/ >State : failure > >== Summary == > >CI Bug Log - changes from CI_DRM_11244_full -> Patchwork_22319_full >==================================================== > >Summary >------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_22319_full absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_22319_full, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > > >Participating hosts (11 -> 11) >------------------------------ > > No changes in participating hosts > >Possible new issues >------------------- > > Here are the unknown changes that may have been introduced in Patchwork_22319_full: > >### IGT changes ### > >#### Possible regressions #### > > * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-blt: > - shard-tglb: [PASS][1] -> [DMESG-WARN][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-tglb1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-blt.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-tglb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-pri-indfb-draw-blt.html this display issue can't be caused by the dead code removal in this series. And the warning doesn't come from our driver, but rather from acpi/thermal. Lucas De Marchi > > >Known issues >------------ > > Here are the changes found in Patchwork_22319_full that come from known issues: > >### IGT changes ### > >#### Issues hit #### > > * igt@gem_create@create-massive: > - shard-apl: NOTRUN -> [DMESG-WARN][3] ([i915#4991]) > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl2/igt@gem_create@create-massive.html > > * igt@gem_exec_balancer@parallel-balancer: > - shard-iclb: [PASS][4] -> [SKIP][5] ([i915#4525]) > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb2/igt@gem_exec_balancer@parallel-balancer.html > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb8/igt@gem_exec_balancer@parallel-balancer.html > > * igt@gem_exec_balancer@parallel-bb-first: > - shard-kbl: NOTRUN -> [DMESG-WARN][6] ([i915#5076]) > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl1/igt@gem_exec_balancer@parallel-bb-first.html > > * igt@gem_exec_fair@basic-pace-share@rcs0: > - shard-tglb: [PASS][7] -> [FAIL][8] ([i915#2842]) > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-tglb7/igt@gem_exec_fair@basic-pace-share@rcs0.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-tglb5/igt@gem_exec_fair@basic-pace-share@rcs0.html > > * igt@gem_exec_fair@basic-throttle@rcs0: > - shard-iclb: [PASS][9] -> [FAIL][10] ([i915#2849]) > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb8/igt@gem_exec_fair@basic-throttle@rcs0.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb6/igt@gem_exec_fair@basic-throttle@rcs0.html > > * igt@gem_exec_params@secure-non-root: > - shard-iclb: NOTRUN -> [SKIP][11] ([fdo#112283]) > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@gem_exec_params@secure-non-root.html > > * igt@gem_huc_copy@huc-copy: > - shard-tglb: [PASS][12] -> [SKIP][13] ([i915#2190]) > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-tglb3/igt@gem_huc_copy@huc-copy.html > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-tglb7/igt@gem_huc_copy@huc-copy.html > > * igt@gem_lmem_swapping@heavy-verify-random: > - shard-skl: NOTRUN -> [SKIP][14] ([fdo#109271] / [i915#4613]) +1 similar issue > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl10/igt@gem_lmem_swapping@heavy-verify-random.html > > * igt@gem_render_copy@y-tiled-to-vebox-yf-tiled: > - shard-iclb: NOTRUN -> [SKIP][15] ([i915#768]) > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@gem_render_copy@y-tiled-to-vebox-yf-tiled.html > > * igt@gem_softpin@allocator-evict-all-engines: > - shard-glk: [PASS][16] -> [FAIL][17] ([i915#4171]) > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk4/igt@gem_softpin@allocator-evict-all-engines.html > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk3/igt@gem_softpin@allocator-evict-all-engines.html > > * igt@gem_userptr_blits@dmabuf-sync: > - shard-skl: NOTRUN -> [SKIP][18] ([fdo#109271] / [i915#3323]) > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl4/igt@gem_userptr_blits@dmabuf-sync.html > > * igt@gen9_exec_parse@allowed-all: > - shard-iclb: NOTRUN -> [SKIP][19] ([i915#2856]) +1 similar issue > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@gen9_exec_parse@allowed-all.html > > * igt@kms_big_fb@x-tiled-32bpp-rotate-180: > - shard-glk: [PASS][20] -> [DMESG-WARN][21] ([i915#118]) > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk2/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk5/igt@kms_big_fb@x-tiled-32bpp-rotate-180.html > > * igt@kms_big_fb@x-tiled-32bpp-rotate-90: > - shard-iclb: NOTRUN -> [SKIP][22] ([fdo#110725] / [fdo#111614]) +2 similar issues > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_big_fb@x-tiled-32bpp-rotate-90.html > > * igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-async-flip: > - shard-skl: NOTRUN -> [FAIL][23] ([i915#3743]) > [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl10/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-async-flip.html > > * igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip: > - shard-skl: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#3777]) > [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl4/igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-0-hflip-async-flip.html > > * igt@kms_big_fb@yf-tiled-16bpp-rotate-270: > - shard-tglb: NOTRUN -> [SKIP][25] ([fdo#111615]) > [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-tglb2/igt@kms_big_fb@yf-tiled-16bpp-rotate-270.html > > * igt@kms_big_fb@yf-tiled-8bpp-rotate-90: > - shard-iclb: NOTRUN -> [SKIP][26] ([fdo#110723]) +1 similar issue > [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@kms_big_fb@yf-tiled-8bpp-rotate-90.html > > * igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip: > - shard-apl: NOTRUN -> [SKIP][27] ([fdo#109271] / [i915#3777]) > [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl1/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip.html > > * igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs_cc: > - shard-kbl: NOTRUN -> [SKIP][28] ([fdo#109271] / [i915#3886]) +1 similar issue > [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl6/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_rc_ccs_cc.html > > * igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs: > - shard-skl: NOTRUN -> [SKIP][29] ([fdo#109271] / [i915#3886]) +7 similar issues > [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl1/igt@kms_ccs@pipe-b-ccs-on-another-bo-y_tiled_gen12_mc_ccs.html > > * igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs: > - shard-iclb: NOTRUN -> [SKIP][30] ([fdo#109278] / [i915#3886]) +4 similar issues > [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_ccs@pipe-c-bad-pixel-format-y_tiled_gen12_mc_ccs.html > > * igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_mc_ccs: > - shard-apl: NOTRUN -> [SKIP][31] ([fdo#109271] / [i915#3886]) +3 similar issues > [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl1/igt@kms_ccs@pipe-c-bad-rotation-90-y_tiled_gen12_mc_ccs.html > > * igt@kms_chamelium@dp-crc-multiple: > - shard-apl: NOTRUN -> [SKIP][32] ([fdo#109271] / [fdo#111827]) +4 similar issues > [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl1/igt@kms_chamelium@dp-crc-multiple.html > > * igt@kms_chamelium@hdmi-crc-fast: > - shard-iclb: NOTRUN -> [SKIP][33] ([fdo#109284] / [fdo#111827]) +3 similar issues > [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_chamelium@hdmi-crc-fast.html > > * igt@kms_chamelium@hdmi-hpd-storm-disable: > - shard-kbl: NOTRUN -> [SKIP][34] ([fdo#109271] / [fdo#111827]) +2 similar issues > [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl6/igt@kms_chamelium@hdmi-hpd-storm-disable.html > > * igt@kms_color@pipe-d-ctm-0-5: > - shard-skl: NOTRUN -> [SKIP][35] ([fdo#109271]) +113 similar issues > [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl4/igt@kms_color@pipe-d-ctm-0-5.html > > * igt@kms_color@pipe-d-ctm-red-to-blue: > - shard-iclb: NOTRUN -> [SKIP][36] ([fdo#109278] / [i915#1149]) > [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_color@pipe-d-ctm-red-to-blue.html > > * igt@kms_color_chamelium@pipe-c-ctm-negative: > - shard-skl: NOTRUN -> [SKIP][37] ([fdo#109271] / [fdo#111827]) +7 similar issues > [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl1/igt@kms_color_chamelium@pipe-c-ctm-negative.html > > * igt@kms_cursor_crc@pipe-b-cursor-suspend: > - shard-kbl: NOTRUN -> [DMESG-WARN][38] ([i915#180]) > [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl1/igt@kms_cursor_crc@pipe-b-cursor-suspend.html > > * igt@kms_cursor_crc@pipe-c-cursor-32x10-onscreen: > - shard-tglb: NOTRUN -> [SKIP][39] ([i915#3359]) > [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-tglb2/igt@kms_cursor_crc@pipe-c-cursor-32x10-onscreen.html > > * igt@kms_cursor_crc@pipe-c-cursor-512x512-sliding: > - shard-iclb: NOTRUN -> [SKIP][40] ([fdo#109278] / [fdo#109279]) > [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@kms_cursor_crc@pipe-c-cursor-512x512-sliding.html > > * igt@kms_cursor_crc@pipe-d-cursor-64x64-random: > - shard-iclb: NOTRUN -> [SKIP][41] ([fdo#109278]) +14 similar issues > [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_cursor_crc@pipe-d-cursor-64x64-random.html > > * igt@kms_cursor_crc@pipe-d-cursor-suspend: > - shard-kbl: NOTRUN -> [SKIP][42] ([fdo#109271]) +54 similar issues > [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl6/igt@kms_cursor_crc@pipe-d-cursor-suspend.html > > * igt@kms_cursor_legacy@cursorb-vs-flipa-toggle: > - shard-iclb: NOTRUN -> [SKIP][43] ([fdo#109274] / [fdo#109278]) +1 similar issue > [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_cursor_legacy@cursorb-vs-flipa-toggle.html > > * igt@kms_dsc@basic-dsc-enable: > - shard-iclb: NOTRUN -> [SKIP][44] ([i915#3840]) > [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_dsc@basic-dsc-enable.html > > * igt@kms_flip@plain-flip-ts-check@c-edp1: > - shard-skl: [PASS][45] -> [FAIL][46] ([i915#2122]) > [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-skl9/igt@kms_flip@plain-flip-ts-check@c-edp1.html > [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl9/igt@kms_flip@plain-flip-ts-check@c-edp1.html > > * igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-upscaling: > - shard-glk: [PASS][47] -> [FAIL][48] ([i915#4911]) > [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk3/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-upscaling.html > [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk8/igt@kms_flip_scaled_crc@flip-32bpp-ytileccs-to-64bpp-ytile-upscaling.html > > * igt@kms_frontbuffer_tracking@fbc-suspend: > - shard-kbl: [PASS][49] -> [DMESG-WARN][50] ([i915#180]) +4 similar issues > [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl1/igt@kms_frontbuffer_tracking@fbc-suspend.html > [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl7/igt@kms_frontbuffer_tracking@fbc-suspend.html > > * igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-shrfb-draw-mmap-gtt: > - shard-iclb: NOTRUN -> [SKIP][51] ([fdo#109280]) +10 similar issues > [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-2p-primscrn-pri-shrfb-draw-mmap-gtt.html > > * igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-gtt: > - shard-tglb: NOTRUN -> [SKIP][52] ([fdo#109280] / [fdo#111825]) > [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-tglb2/igt@kms_frontbuffer_tracking@psr-2p-scndscrn-pri-indfb-draw-mmap-gtt.html > > * igt@kms_frontbuffer_tracking@psr-rgb565-draw-render: > - shard-apl: NOTRUN -> [SKIP][53] ([fdo#109271]) +40 similar issues > [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl1/igt@kms_frontbuffer_tracking@psr-rgb565-draw-render.html > > * igt@kms_hdr@static-toggle: > - shard-iclb: NOTRUN -> [SKIP][54] ([i915#1187]) > [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_hdr@static-toggle.html > > * igt@kms_multipipe_modeset@basic-max-pipe-crc-check: > - shard-iclb: NOTRUN -> [SKIP][55] ([i915#1839]) > [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@kms_multipipe_modeset@basic-max-pipe-crc-check.html > > * igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b: > - shard-apl: [PASS][56] -> [DMESG-WARN][57] ([i915#180]) > [56]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-apl7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html > [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl4/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-b.html > > * igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb: > - shard-skl: NOTRUN -> [FAIL][58] ([fdo#108145] / [i915#265]) +1 similar issue > [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl4/igt@kms_plane_alpha_blend@pipe-b-alpha-opaque-fb.html > > * igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb: > - shard-kbl: NOTRUN -> [FAIL][59] ([i915#265]) > [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl6/igt@kms_plane_alpha_blend@pipe-c-alpha-transparent-fb.html > > * igt@kms_plane_lowres@pipe-b-tiling-x: > - shard-iclb: NOTRUN -> [SKIP][60] ([i915#3536]) > [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_plane_lowres@pipe-b-tiling-x.html > > * igt@kms_plane_scaling@2x-scaler-multi-pipe: > - shard-iclb: NOTRUN -> [SKIP][61] ([fdo#109274]) +2 similar issues > [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_plane_scaling@2x-scaler-multi-pipe.html > > * igt@kms_psr2_sf@cursor-plane-update-sf: > - shard-skl: NOTRUN -> [SKIP][62] ([fdo#109271] / [i915#658]) > [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl10/igt@kms_psr2_sf@cursor-plane-update-sf.html > > * igt@kms_psr2_sf@overlay-plane-update-continuous-sf: > - shard-apl: NOTRUN -> [SKIP][63] ([fdo#109271] / [i915#658]) > [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl1/igt@kms_psr2_sf@overlay-plane-update-continuous-sf.html > > * igt@kms_psr@psr2_cursor_plane_onoff: > - shard-iclb: NOTRUN -> [SKIP][64] ([fdo#109441]) +1 similar issue > [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@kms_psr@psr2_cursor_plane_onoff.html > > * igt@kms_psr@psr2_primary_mmap_cpu: > - shard-iclb: [PASS][65] -> [SKIP][66] ([fdo#109441]) +2 similar issues > [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html > [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb8/igt@kms_psr@psr2_primary_mmap_cpu.html > > * igt@kms_setmode@basic: > - shard-glk: [PASS][67] -> [FAIL][68] ([i915#31]) > [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk3/igt@kms_setmode@basic.html > [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk8/igt@kms_setmode@basic.html > > * igt@kms_vrr@flip-dpms: > - shard-iclb: NOTRUN -> [SKIP][69] ([fdo#109502]) > [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@kms_vrr@flip-dpms.html > > * igt@kms_writeback@writeback-fb-id: > - shard-apl: NOTRUN -> [SKIP][70] ([fdo#109271] / [i915#2437]) > [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl2/igt@kms_writeback@writeback-fb-id.html > > * igt@nouveau_crc@pipe-c-source-outp-inactive: > - shard-iclb: NOTRUN -> [SKIP][71] ([i915#2530]) > [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@nouveau_crc@pipe-c-source-outp-inactive.html > > * igt@nouveau_crc@pipe-d-ctx-flip-skip-current-frame: > - shard-iclb: NOTRUN -> [SKIP][72] ([fdo#109278] / [i915#2530]) > [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@nouveau_crc@pipe-d-ctx-flip-skip-current-frame.html > > * igt@perf_pmu@module-unload: > - shard-skl: NOTRUN -> [FAIL][73] ([i915#5136]) > [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl4/igt@perf_pmu@module-unload.html > > * igt@sysfs_clients@create: > - shard-skl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#2994]) +1 similar issue > [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl4/igt@sysfs_clients@create.html > > * igt@sysfs_clients@sema-50: > - shard-kbl: NOTRUN -> [SKIP][75] ([fdo#109271] / [i915#2994]) > [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl6/igt@sysfs_clients@sema-50.html > > * igt@sysfs_clients@split-10: > - shard-iclb: NOTRUN -> [SKIP][76] ([i915#2994]) +1 similar issue > [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@sysfs_clients@split-10.html > > >#### Possible fixes #### > > * igt@gem_exec_capture@pi@bcs0: > - shard-iclb: [INCOMPLETE][77] ([i915#3371]) -> [PASS][78] > [77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb6/igt@gem_exec_capture@pi@bcs0.html > [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb3/igt@gem_exec_capture@pi@bcs0.html > > * igt@gem_exec_fair@basic-none-share@rcs0: > - shard-iclb: [FAIL][79] ([i915#2842]) -> [PASS][80] > [79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb7/igt@gem_exec_fair@basic-none-share@rcs0.html > [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb5/igt@gem_exec_fair@basic-none-share@rcs0.html > > * igt@i915_pm_dc@dc6-dpms: > - shard-iclb: [FAIL][81] ([i915#454]) -> [PASS][82] > [81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb3/igt@i915_pm_dc@dc6-dpms.html > [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb1/igt@i915_pm_dc@dc6-dpms.html > > * igt@kms_cursor_legacy@cursor-vs-flip-atomic: > - shard-iclb: [FAIL][83] -> [PASS][84] > [83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb7/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html > [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb8/igt@kms_cursor_legacy@cursor-vs-flip-atomic.html > > * igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2: > - shard-glk: [FAIL][85] ([i915#79]) -> [PASS][86] +1 similar issue > [85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk7/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2.html > [86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2.html > > * igt@kms_flip@flip-vs-suspend-interruptible@a-dp1: > - shard-kbl: [DMESG-WARN][87] ([i915#180]) -> [PASS][88] +5 similar issues > [87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html > [88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html > - shard-apl: [DMESG-WARN][89] ([i915#180]) -> [PASS][90] +1 similar issue > [89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-apl4/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html > [90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html > > * igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1: > - shard-skl: [FAIL][91] ([i915#2122]) -> [PASS][92] > [91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-skl7/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html > [92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl4/igt@kms_flip@plain-flip-ts-check-interruptible@c-edp1.html > > * igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling: > - shard-glk: [FAIL][93] ([i915#4911]) -> [PASS][94] > [93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk8/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html > [94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-upscaling.html > > * igt@kms_psr@psr2_cursor_plane_move: > - shard-iclb: [SKIP][95] ([fdo#109441]) -> [PASS][96] +2 similar issues > [95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb4/igt@kms_psr@psr2_cursor_plane_move.html > [96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html > > * igt@kms_setmode@basic: > - shard-apl: [FAIL][97] ([i915#31]) -> [PASS][98] > [97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-apl2/igt@kms_setmode@basic.html > [98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-apl8/igt@kms_setmode@basic.html > > * igt@kms_vblank@pipe-a-ts-continuation-modeset-hang: > - shard-glk: [TIMEOUT][99] ([i915#5140]) -> [PASS][100] > [99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk1/igt@kms_vblank@pipe-a-ts-continuation-modeset-hang.html > [100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk7/igt@kms_vblank@pipe-a-ts-continuation-modeset-hang.html > > * igt@sysfs_heartbeat_interval@mixed@bcs0: > - shard-skl: [WARN][101] ([i915#4055]) -> [PASS][102] > [101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-skl2/igt@sysfs_heartbeat_interval@mixed@bcs0.html > [102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl1/igt@sysfs_heartbeat_interval@mixed@bcs0.html > > * igt@sysfs_heartbeat_interval@mixed@vcs0: > - shard-skl: [FAIL][103] ([i915#1731]) -> [PASS][104] > [103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-skl2/igt@sysfs_heartbeat_interval@mixed@vcs0.html > [104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-skl1/igt@sysfs_heartbeat_interval@mixed@vcs0.html > > >#### Warnings #### > > * igt@gem_exec_balancer@parallel-keep-submit-fence: > - shard-iclb: [DMESG-WARN][105] ([i915#5076]) -> [SKIP][106] ([i915#4525]) +1 similar issue > [105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb1/igt@gem_exec_balancer@parallel-keep-submit-fence.html > [106]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb7/igt@gem_exec_balancer@parallel-keep-submit-fence.html > > * igt@gem_exec_balancer@parallel-ordering: > - shard-iclb: [SKIP][107] ([i915#4525]) -> [DMESG-FAIL][108] ([i915#5076]) > [107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb8/igt@gem_exec_balancer@parallel-ordering.html > [108]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb4/igt@gem_exec_balancer@parallel-ordering.html > > * igt@gem_exec_balancer@parallel-out-fence: > - shard-iclb: [SKIP][109] ([i915#4525]) -> [DMESG-WARN][110] ([i915#5076]) > [109]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb5/igt@gem_exec_balancer@parallel-out-fence.html > [110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb1/igt@gem_exec_balancer@parallel-out-fence.html > > * igt@i915_pm_rc6_residency@rc6-idle: > - shard-iclb: [WARN][111] ([i915#1804] / [i915#2684]) -> [WARN][112] ([i915#2684]) > [111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-iclb4/igt@i915_pm_rc6_residency@rc6-idle.html > [112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-iclb2/igt@i915_pm_rc6_residency@rc6-idle.html > > * igt@kms_cursor_crc@pipe-a-cursor-128x128-offscreen: > - shard-glk: [DMESG-FAIL][113] ([i915#118] / [i915#1888]) -> [FAIL][114] ([i915#1888] / [i915#3444]) > [113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-glk1/igt@kms_cursor_crc@pipe-a-cursor-128x128-offscreen.html > [114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-glk7/igt@kms_cursor_crc@pipe-a-cursor-128x128-offscreen.html > > * igt@kms_flip@flip-vs-suspend-interruptible@c-dp1: > - shard-kbl: [DMESG-WARN][115] ([i915#180]) -> [INCOMPLETE][116] ([i915#636]) > [115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html > [116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html > > * igt@runner@aborted: > - shard-kbl: ([FAIL][117], [FAIL][118], [FAIL][119], [FAIL][120], [FAIL][121], [FAIL][122], [FAIL][123], [FAIL][124], [FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128], [FAIL][129], [FAIL][130], [FAIL][131]) ([i915#1436] / [i915#180] / [i915#1814] / [i915#2426] / [i915#3002] / [i915#4312]) -> ([FAIL][132], [FAIL][133], [FAIL][134], [FAIL][135], [FAIL][136], [FAIL][137], [FAIL][138], [FAIL][139], [FAIL][140], [FAIL][141], [FAIL][142], [FAIL][143], [FAIL][144], [FAIL][145]) ([fdo#109271] / [i915#1436] / [i915#180] / [i915#1814] / [i915#2426] / [i915#4312]) > [117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl1/igt@runner@aborted.html > [118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl1/igt@runner@aborted.html > [119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl4/igt@runner@aborted.html > [120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl3/igt@runner@aborted.html > [121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl1/igt@runner@aborted.html > [122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl1/igt@runner@aborted.html > [123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl3/igt@runner@aborted.html > [124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl4/igt@runner@aborted.html > [125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@runner@aborted.html > [126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@runner@aborted.html > [127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@runner@aborted.html > [128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@runner@aborted.html > [129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@runner@aborted.html > [130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@runner@aborted.html > [131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-kbl7/igt@runner@aborted.html > [132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl7/igt@runner@aborted.html > [133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl4/igt@runner@aborted.html > [134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl3/igt@runner@aborted.html > [135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl7/igt@runner@aborted.html > [136]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl4/igt@runner@aborted.html > [137]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl3/igt@runner@aborted.html > [138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl6/igt@runner@aborted.html > [139]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl1/igt@runner@aborted.html > [140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl4/igt@runner@aborted.html > [141]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl1/igt@runner@aborted.html > [142]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl7/igt@runner@aborted.html > [143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl4/igt@runner@aborted.html > [144]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl6/igt@runner@aborted.html > [145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/shard-kbl3/igt@runner@aborted.html > - shard-apl: ([FAIL][146], [FAIL][147], [FAIL][148], [FAIL][149], [FAIL][150], [FAIL][151]) ([i915#180] / [i915#2426] / [i915#3002] / [i915#4312]) -> ([FAIL][152], [FAIL][153], [FAIL][154], [FAIL][155], [FAIL][156], [FAIL][157]) ([fdo#109271] / [i915#1814] / [i915#2426] / [i915#3002] / [i915#4312]) > [146]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-apl8/igt@runner@aborted.html > [147]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-apl1/igt@runner@aborted.html > [148]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-apl4/igt@runner@aborted.html > [149]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11244/shard-apl8/igt@runner@abo > >== Logs == > >For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22319/index.html
On Thu, Feb 17, 2022 at 06:09:53PM +0000, Matthew Auld wrote: >On Thu, 17 Feb 2022 at 17:55, Lucas De Marchi <lucas.demarchi@intel.com> wrote: >> >> This was useful for early development of lmem, but it's not used >> anymore, so remove it. >> >> v2: Remove unneeded fields from struct intel_memory_region >> >> Cc: Chris Wilson <chris@chris-wilson.co.uk> >> Cc: Matthew Auld <matthew.auld@intel.com> >> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> >Reviewed-by: Matthew Auld <matthew.auld@intel.com> Thanks, applied. Lucas De Marchi
diff --git a/drivers/gpu/drm/i915/Kconfig.unstable b/drivers/gpu/drm/i915/Kconfig.unstable index 0c2276155c2b..cf151a297ed7 100644 --- a/drivers/gpu/drm/i915/Kconfig.unstable +++ b/drivers/gpu/drm/i915/Kconfig.unstable @@ -19,11 +19,3 @@ config DRM_I915_UNSTABLE Recommended for driver developers _only_. If in the slightest bit of doubt, say "N". - -config DRM_I915_UNSTABLE_FAKE_LMEM - bool "Enable the experimental fake lmem" - depends on DRM_I915_UNSTABLE - default n - help - Convert some system memory into a fake local memory region for - testing. diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index e8403fa53909..325ac15439eb 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c @@ -65,8 +65,6 @@ int intel_gt_probe_lmem(struct intel_gt *gt) int err; mem = intel_gt_setup_lmem(gt); - if (mem == ERR_PTR(-ENODEV)) - mem = intel_gt_setup_fake_lmem(gt); if (IS_ERR(mem)) { err = PTR_ERR(mem); if (err == -ENODEV) diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.c b/drivers/gpu/drm/i915/gt/intel_region_lmem.c index cb3f66707b21..df3856e09598 100644 --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.c +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.c @@ -13,60 +13,6 @@ #include "gem/i915_gem_ttm.h" #include "gt/intel_gt.h" -static int init_fake_lmem_bar(struct intel_memory_region *mem) -{ - struct drm_i915_private *i915 = mem->i915; - struct i915_ggtt *ggtt = to_gt(i915)->ggtt; - unsigned long n; - int ret; - - /* We want to 1:1 map the mappable aperture to our reserved region */ - - mem->fake_mappable.start = 0; - mem->fake_mappable.size = resource_size(&mem->region); - mem->fake_mappable.color = I915_COLOR_UNEVICTABLE; - - ret = drm_mm_reserve_node(&ggtt->vm.mm, &mem->fake_mappable); - if (ret) - return ret; - - mem->remap_addr = dma_map_resource(i915->drm.dev, - mem->region.start, - mem->fake_mappable.size, - DMA_BIDIRECTIONAL, - DMA_ATTR_FORCE_CONTIGUOUS); - if (dma_mapping_error(i915->drm.dev, mem->remap_addr)) { - drm_mm_remove_node(&mem->fake_mappable); - return -EINVAL; - } - - for (n = 0; n < mem->fake_mappable.size >> PAGE_SHIFT; ++n) { - ggtt->vm.insert_page(&ggtt->vm, - mem->remap_addr + (n << PAGE_SHIFT), - n << PAGE_SHIFT, - I915_CACHE_NONE, 0); - } - - mem->region = (struct resource)DEFINE_RES_MEM(mem->remap_addr, - mem->fake_mappable.size); - - return 0; -} - -static void release_fake_lmem_bar(struct intel_memory_region *mem) -{ - if (!drm_mm_node_allocated(&mem->fake_mappable)) - return; - - drm_mm_remove_node(&mem->fake_mappable); - - dma_unmap_resource(mem->i915->drm.dev, - mem->remap_addr, - mem->fake_mappable.size, - DMA_BIDIRECTIONAL, - DMA_ATTR_FORCE_CONTIGUOUS); -} - static int region_lmem_release(struct intel_memory_region *mem) { @@ -74,7 +20,6 @@ region_lmem_release(struct intel_memory_region *mem) ret = intel_region_ttm_fini(mem); io_mapping_fini(&mem->iomap); - release_fake_lmem_bar(mem); return ret; } @@ -84,17 +29,10 @@ region_lmem_init(struct intel_memory_region *mem) { int ret; - if (mem->i915->params.fake_lmem_start) { - ret = init_fake_lmem_bar(mem); - GEM_BUG_ON(ret); - } - if (!io_mapping_init_wc(&mem->iomap, mem->io_start, - resource_size(&mem->region))) { - ret = -EIO; - goto out_no_io; - } + resource_size(&mem->region))) + return -EIO; ret = intel_region_ttm_init(mem); if (ret) @@ -104,8 +42,6 @@ region_lmem_init(struct intel_memory_region *mem) out_no_buddy: io_mapping_fini(&mem->iomap); -out_no_io: - release_fake_lmem_bar(mem); return ret; } @@ -116,50 +52,6 @@ static const struct intel_memory_region_ops intel_region_lmem_ops = { .init_object = __i915_gem_ttm_object_init, }; -struct intel_memory_region * -intel_gt_setup_fake_lmem(struct intel_gt *gt) -{ - struct drm_i915_private *i915 = gt->i915; - struct pci_dev *pdev = to_pci_dev(i915->drm.dev); - struct intel_memory_region *mem; - resource_size_t mappable_end; - resource_size_t io_start; - resource_size_t start; - - if (!HAS_LMEM(i915)) - return ERR_PTR(-ENODEV); - - if (!i915->params.fake_lmem_start) - return ERR_PTR(-ENODEV); - - GEM_BUG_ON(i915_ggtt_has_aperture(to_gt(i915)->ggtt)); - - /* Your mappable aperture belongs to me now! */ - mappable_end = pci_resource_len(pdev, 2); - io_start = pci_resource_start(pdev, 2); - start = i915->params.fake_lmem_start; - - mem = intel_memory_region_create(i915, - start, - mappable_end, - PAGE_SIZE, - io_start, - INTEL_MEMORY_LOCAL, - 0, - &intel_region_lmem_ops); - if (!IS_ERR(mem)) { - drm_info(&i915->drm, "Intel graphics fake LMEM: %pR\n", - &mem->region); - drm_info(&i915->drm, - "Intel graphics fake LMEM IO start: %llx\n", - (u64)mem->io_start); - drm_info(&i915->drm, "Intel graphics fake LMEM size: %llx\n", - (u64)resource_size(&mem->region)); - } - - return mem; -} - static bool get_legacy_lowmem_region(struct intel_uncore *uncore, u64 *start, u32 *size) { diff --git a/drivers/gpu/drm/i915/gt/intel_region_lmem.h b/drivers/gpu/drm/i915/gt/intel_region_lmem.h index 062d0542ae34..1438576b527a 100644 --- a/drivers/gpu/drm/i915/gt/intel_region_lmem.h +++ b/drivers/gpu/drm/i915/gt/intel_region_lmem.h @@ -10,7 +10,4 @@ struct intel_gt; struct intel_memory_region *intel_gt_setup_lmem(struct intel_gt *gt); -struct intel_memory_region * -intel_gt_setup_fake_lmem(struct intel_gt *gt); - #endif /* !__INTEL_REGION_LMEM_H */ diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 1c67ff735f18..62b3f332bbf5 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -835,21 +835,6 @@ int i915_driver_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (!i915->params.nuclear_pageflip && match_info->graphics.ver < 5) i915->drm.driver_features &= ~DRIVER_ATOMIC; - /* - * Check if we support fake LMEM -- for now we only unleash this for - * the live selftests(test-and-exit). - */ -#if IS_ENABLED(CONFIG_DRM_I915_SELFTEST) - if (IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM)) { - if (GRAPHICS_VER(i915) >= 9 && i915_selftest.live < 0 && - i915->params.fake_lmem_start) { - mkwrite_device_info(i915)->memory_regions = - REGION_SMEM | REGION_LMEM | REGION_STOLEN_SMEM; - GEM_BUG_ON(!HAS_LMEM(i915)); - } - } -#endif - ret = pci_enable_device(pdev); if (ret) goto out_fini; diff --git a/drivers/gpu/drm/i915/i915_params.c b/drivers/gpu/drm/i915/i915_params.c index 525ae832aa9a..eea355c2fc28 100644 --- a/drivers/gpu/drm/i915/i915_params.c +++ b/drivers/gpu/drm/i915/i915_params.c @@ -195,11 +195,6 @@ i915_param_named(enable_gvt, bool, 0400, "Enable support for Intel GVT-g graphics virtualization host support(default:false)"); #endif -#if IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM) -i915_param_named_unsafe(fake_lmem_start, ulong, 0400, - "Fake LMEM start offset (default: 0)"); -#endif - #if CONFIG_DRM_I915_REQUEST_TIMEOUT i915_param_named_unsafe(request_timeout_ms, uint, 0600, "Default request/fence/batch buffer expiration timeout."); diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h index c9d53ff910a0..c779a6f85c7e 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h @@ -72,7 +72,6 @@ struct drm_printer; param(int, fastboot, -1, 0600) \ param(int, enable_dpcd_backlight, -1, 0600) \ param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \ - param(unsigned long, fake_lmem_start, 0, IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM) ? 0400 : 0) \ param(unsigned int, request_timeout_ms, CONFIG_DRM_I915_REQUEST_TIMEOUT, CONFIG_DRM_I915_REQUEST_TIMEOUT ? 0600 : 0) \ /* leave bools at the end to not create holes */ \ param(bool, enable_hangcheck, true, 0600) \ diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h index 5625c9c38993..06464b8865fc 100644 --- a/drivers/gpu/drm/i915/intel_memory_region.h +++ b/drivers/gpu/drm/i915/intel_memory_region.h @@ -67,9 +67,6 @@ struct intel_memory_region { struct io_mapping iomap; struct resource region; - /* For fake LMEM */ - struct drm_mm_node fake_mappable; - resource_size_t io_start; resource_size_t min_page_size; resource_size_t total; @@ -81,8 +78,6 @@ struct intel_memory_region { char name[16]; bool private; /* not for userspace */ - dma_addr_t remap_addr; - struct { struct mutex lock; /* Protects access to objects */ struct list_head list;
This was useful for early development of lmem, but it's not used anymore, so remove it. v2: Remove unneeded fields from struct intel_memory_region Cc: Chris Wilson <chris@chris-wilson.co.uk> Cc: Matthew Auld <matthew.auld@intel.com> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> --- drivers/gpu/drm/i915/Kconfig.unstable | 8 -- drivers/gpu/drm/i915/gt/intel_gt.c | 2 - drivers/gpu/drm/i915/gt/intel_region_lmem.c | 112 +------------------- drivers/gpu/drm/i915/gt/intel_region_lmem.h | 3 - drivers/gpu/drm/i915/i915_driver.c | 15 --- drivers/gpu/drm/i915/i915_params.c | 5 - drivers/gpu/drm/i915/i915_params.h | 1 - drivers/gpu/drm/i915/intel_memory_region.h | 5 - 8 files changed, 2 insertions(+), 149 deletions(-)