| Message ID | 20190913183548.8447-1-anusha.srivatsa@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [CI,1/2] drm/i915/uc: Update HuC firmware naming convention and load latest HuC | expand |
On 9/14/19 4:06 PM, Patchwork wrote: > == Series Details == > > Series: series starting with [CI,1/2] drm/i915/uc: Update HuC firmware naming convention and load latest HuC > URL : https://patchwork.freedesktop.org/series/66685/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_6891_full -> Patchwork_14407_full > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_14407_full absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_14407_full, please notify your bug team to allow them > to document this new failure mode, which will reduce false positives in CI. > > > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_14407_full: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@i915_suspend@debugfs-reader: > - shard-kbl: [PASS][1] -> [DMESG-WARN][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-kbl1/igt@i915_suspend@debugfs-reader.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-kbl6/igt@i915_suspend@debugfs-reader.html this is https://bugs.freedesktop.org/show_bug.cgi?id=111165 the 2 below seem unrelated (with submission disabled guc should have no impact on rc6), but I'm going to resubmit the series to run again and confirm. Daniele > > * igt@perf_pmu@enable-race-rcs0: > - shard-skl: [PASS][3] -> [INCOMPLETE][4] > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl2/igt@perf_pmu@enable-race-rcs0.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl8/igt@perf_pmu@enable-race-rcs0.html > > > #### Warnings #### > > * igt@i915_pm_rc6_residency@media-rc6-accuracy: > - shard-iclb: [SKIP][5] ([fdo#109289]) -> [SKIP][6] > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb3/igt@i915_pm_rc6_residency@media-rc6-accuracy.html > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb5/igt@i915_pm_rc6_residency@media-rc6-accuracy.html > > > Known issues > ------------ > > Here are the changes found in Patchwork_14407_full that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@gem_exec_schedule@preempt-other-chain-bsd: > - shard-iclb: [PASS][7] -> [SKIP][8] ([fdo#111325]) +6 similar issues > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb5/igt@gem_exec_schedule@preempt-other-chain-bsd.html > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb1/igt@gem_exec_schedule@preempt-other-chain-bsd.html > > * igt@i915_pm_rc6_residency@rc6-accuracy: > - shard-glk: [PASS][9] -> [SKIP][10] ([fdo#109271]) > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-glk8/igt@i915_pm_rc6_residency@rc6-accuracy.html > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-glk6/igt@i915_pm_rc6_residency@rc6-accuracy.html > - shard-kbl: [PASS][11] -> [SKIP][12] ([fdo#109271]) > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-kbl6/igt@i915_pm_rc6_residency@rc6-accuracy.html > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-kbl1/igt@i915_pm_rc6_residency@rc6-accuracy.html > - shard-skl: [PASS][13] -> [SKIP][14] ([fdo#109271]) > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl9/igt@i915_pm_rc6_residency@rc6-accuracy.html > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl10/igt@i915_pm_rc6_residency@rc6-accuracy.html > > * igt@i915_pm_rpm@system-suspend-modeset: > - shard-apl: [PASS][15] -> [INCOMPLETE][16] ([fdo#103927]) +2 similar issues > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-apl8/igt@i915_pm_rpm@system-suspend-modeset.html > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-apl5/igt@i915_pm_rpm@system-suspend-modeset.html > > * igt@i915_suspend@fence-restore-tiled2untiled: > - shard-apl: [PASS][17] -> [DMESG-WARN][18] ([fdo#108566]) +4 similar issues > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-apl5/igt@i915_suspend@fence-restore-tiled2untiled.html > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-apl6/igt@i915_suspend@fence-restore-tiled2untiled.html > > * igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled: > - shard-skl: [PASS][19] -> [FAIL][20] ([fdo#103184] / [fdo#103232]) > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl3/igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled.html > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl7/igt@kms_draw_crc@draw-method-rgb565-mmap-cpu-xtiled.html > > * igt@kms_flip_tiling@flip-to-yf-tiled: > - shard-skl: [PASS][21] -> [FAIL][22] ([fdo#107931] / [fdo#108134]) > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl3/igt@kms_flip_tiling@flip-to-yf-tiled.html > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl7/igt@kms_flip_tiling@flip-to-yf-tiled.html > > * igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render: > - shard-iclb: [PASS][23] -> [FAIL][24] ([fdo#103167]) +1 similar issue > [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html > [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-cur-indfb-draw-render.html > > * igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-wc: > - shard-skl: [PASS][25] -> [FAIL][26] ([fdo#103167]) +1 similar issue > [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl3/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-wc.html > [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl7/igt@kms_frontbuffer_tracking@psr-1p-offscren-pri-indfb-draw-mmap-wc.html > > * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes: > - shard-skl: [PASS][27] -> [FAIL][28] ([fdo#103166]) > [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html > [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl7/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-a-planes.html > > * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes: > - shard-kbl: [PASS][29] -> [DMESG-WARN][30] ([fdo#108566]) +5 similar issues > [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-kbl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html > [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-kbl1/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html > > * igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min: > - shard-skl: [PASS][31] -> [FAIL][32] ([fdo#108145]) > [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl3/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html > [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min.html > > * igt@kms_psr@psr2_cursor_mmap_cpu: > - shard-iclb: [PASS][33] -> [SKIP][34] ([fdo#109441]) +3 similar issues > [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html > [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb8/igt@kms_psr@psr2_cursor_mmap_cpu.html > > * igt@kms_setmode@basic: > - shard-apl: [PASS][35] -> [FAIL][36] ([fdo#99912]) > [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-apl6/igt@kms_setmode@basic.html > [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-apl4/igt@kms_setmode@basic.html > - shard-hsw: [PASS][37] -> [FAIL][38] ([fdo#99912]) > [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-hsw1/igt@kms_setmode@basic.html > [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-hsw1/igt@kms_setmode@basic.html > > * igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend: > - shard-skl: [PASS][39] -> [INCOMPLETE][40] ([fdo#104108]) > [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl1/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html > [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl4/igt@kms_vblank@pipe-a-ts-continuation-dpms-suspend.html > > * igt@prime_busy@hang-bsd2: > - shard-iclb: [PASS][41] -> [SKIP][42] ([fdo#109276]) +21 similar issues > [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb1/igt@prime_busy@hang-bsd2.html > [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb5/igt@prime_busy@hang-bsd2.html > > > #### Possible fixes #### > > * igt@gem_ctx_isolation@bcs0-s3: > - shard-kbl: [DMESG-WARN][43] ([fdo#108566]) -> [PASS][44] +1 similar issue > [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-kbl3/igt@gem_ctx_isolation@bcs0-s3.html > [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-kbl3/igt@gem_ctx_isolation@bcs0-s3.html > > * igt@gem_ctx_shared@exec-single-timeline-bsd: > - shard-iclb: [SKIP][45] ([fdo#110841]) -> [PASS][46] > [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb2/igt@gem_ctx_shared@exec-single-timeline-bsd.html > [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb6/igt@gem_ctx_shared@exec-single-timeline-bsd.html > > * igt@gem_ctx_shared@exec-single-timeline-bsd1: > - shard-iclb: [SKIP][47] ([fdo#109276]) -> [PASS][48] +18 similar issues > [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb7/igt@gem_ctx_shared@exec-single-timeline-bsd1.html > [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb1/igt@gem_ctx_shared@exec-single-timeline-bsd1.html > > * igt@gem_exec_balancer@smoke: > - shard-iclb: [SKIP][49] ([fdo#110854]) -> [PASS][50] > [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb5/igt@gem_exec_balancer@smoke.html > [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb1/igt@gem_exec_balancer@smoke.html > > * igt@gem_exec_schedule@in-order-bsd: > - shard-iclb: [SKIP][51] ([fdo#111325]) -> [PASS][52] +6 similar issues > [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb2/igt@gem_exec_schedule@in-order-bsd.html > [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb7/igt@gem_exec_schedule@in-order-bsd.html > > * igt@gem_workarounds@suspend-resume-fd: > - shard-apl: [DMESG-WARN][53] ([fdo#108566]) -> [PASS][54] > [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-apl3/igt@gem_workarounds@suspend-resume-fd.html > [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-apl2/igt@gem_workarounds@suspend-resume-fd.html > > * igt@kms_cursor_legacy@basic-flip-before-cursor-legacy: > - shard-snb: [SKIP][55] ([fdo#109271]) -> [PASS][56] > [55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-snb5/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html > [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-snb5/igt@kms_cursor_legacy@basic-flip-before-cursor-legacy.html > > * igt@kms_flip@flip-vs-expired-vblank-interruptible: > - shard-skl: [FAIL][57] ([fdo#105363]) -> [PASS][58] > [57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl4/igt@kms_flip@flip-vs-expired-vblank-interruptible.html > [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl9/igt@kms_flip@flip-vs-expired-vblank-interruptible.html > > * igt@kms_flip@flip-vs-suspend-interruptible: > - shard-hsw: [INCOMPLETE][59] ([fdo#103540]) -> [PASS][60] > [59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-hsw8/igt@kms_flip@flip-vs-suspend-interruptible.html > [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-hsw1/igt@kms_flip@flip-vs-suspend-interruptible.html > > * igt@kms_flip@plain-flip-ts-check: > - shard-iclb: [INCOMPLETE][61] ([fdo#107713]) -> [PASS][62] > [61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb1/igt@kms_flip@plain-flip-ts-check.html > [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb4/igt@kms_flip@plain-flip-ts-check.html > > * igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite: > - shard-iclb: [FAIL][63] ([fdo#103167]) -> [PASS][64] +5 similar issues > [63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb6/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html > [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb2/igt@kms_frontbuffer_tracking@fbc-1p-offscren-pri-shrfb-draw-pwrite.html > > * igt@kms_plane_multiple@atomic-pipe-c-tiling-yf: > - shard-skl: [DMESG-WARN][65] ([fdo#106885]) -> [PASS][66] > [65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-skl3/igt@kms_plane_multiple@atomic-pipe-c-tiling-yf.html > [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-skl3/igt@kms_plane_multiple@atomic-pipe-c-tiling-yf.html > > * igt@kms_psr@psr2_primary_mmap_cpu: > - shard-iclb: [SKIP][67] ([fdo#109441]) -> [PASS][68] +1 similar issue > [67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb3/igt@kms_psr@psr2_primary_mmap_cpu.html > [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb2/igt@kms_psr@psr2_primary_mmap_cpu.html > > * igt@kms_setmode@basic: > - shard-kbl: [FAIL][69] ([fdo#99912]) -> [PASS][70] > [69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-kbl6/igt@kms_setmode@basic.html > [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-kbl2/igt@kms_setmode@basic.html > > > #### Warnings #### > > * igt@gem_mocs_settings@mocs-reset-bsd2: > - shard-iclb: [FAIL][71] ([fdo#111330]) -> [SKIP][72] ([fdo#109276]) +1 similar issue > [71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb4/igt@gem_mocs_settings@mocs-reset-bsd2.html > [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb5/igt@gem_mocs_settings@mocs-reset-bsd2.html > > * igt@gem_mocs_settings@mocs-settings-bsd2: > - shard-iclb: [SKIP][73] ([fdo#109276]) -> [FAIL][74] ([fdo#111330]) > [73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb3/igt@gem_mocs_settings@mocs-settings-bsd2.html > [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb2/igt@gem_mocs_settings@mocs-settings-bsd2.html > > * igt@kms_dp_dsc@basic-dsc-enable-edp: > - shard-iclb: [DMESG-WARN][75] ([fdo#107724]) -> [SKIP][76] ([fdo#109349]) > [75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6891/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html > [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_14407/shard-iclb8/igt@kms_dp_dsc@basic-dsc-enable-edp.html > > > [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166 > [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167 > [fdo#103184]: https://bugs.freedesktop.org/show_bug.cgi?id=103184 > [fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232 > [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540 > [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#106885]: https://bugs.freedesktop.org/show_bug.cgi?id=106885 > [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713 > [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724 > [fdo#107931]: https://bugs.freedesktop.org/show_bug.cgi?id=107931 > [fdo#108134]: https://bugs.freedesktop.org/show_bug.cgi?id=108134 > [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145 > [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566 > [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271 > [fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276 > [fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289 > [fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349 > [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441 > [fdo#110841]: https://bugs.freedesktop.org/show_bug.cgi?id=110841 > [fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854 > [fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325 > [fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330 > [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912 > > > Participating hosts (10 -> 10) > ------------------------------ > > No changes in participating hosts > > > Build changes > ------------- > > * CI: CI-20190529 -> None > * Linux: CI_DRM_6891 -> Patchwork_14407 > > CI-20190529: 20190529 > CI_DRM_6891: 77f0ebb91e6a0dfd22223e2531479f28e9738b83 @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_5180: 811b10e2bd7fd2cd8ced9bbb55361c178886bbbd @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools > Patchwork_14407: 6562c3a2f0b7644e81e824b54802d371421c3918 @ 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_14407/ > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/intel-gfx >
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c index 296a82603be0..ea9a807abd4f 100644 --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c @@ -39,26 +39,27 @@ void intel_uc_fw_change_status(struct intel_uc_fw *uc_fw, * Must be ordered based on platform + revid, from newer to older. */ #define INTEL_UC_FIRMWARE_DEFS(fw_def, guc_def, huc_def) \ - fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \ - fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 8, 4, 3238)) \ - fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \ - fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 03, 01, 2893)) \ - fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 02, 00, 1810)) \ - fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 01, 8, 2893)) \ - fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 01, 07, 1398)) - -#define __MAKE_UC_FW_PATH(prefix_, name_, separator_, major_, minor_, patch_) \ + fw_def(ELKHARTLAKE, 0, guc_def(ehl, 33, 0, 4), huc_def(ehl, 9, 0, 0)) \ + fw_def(ICELAKE, 0, guc_def(icl, 33, 0, 0), huc_def(icl, 9, 0, 0)) \ + fw_def(COFFEELAKE, 5, guc_def(cml, 33, 0, 0), huc_def(cml, 4, 0, 0)) \ + fw_def(COFFEELAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \ + fw_def(GEMINILAKE, 0, guc_def(glk, 33, 0, 0), huc_def(glk, 4, 0, 0)) \ + fw_def(KABYLAKE, 0, guc_def(kbl, 33, 0, 0), huc_def(kbl, 4, 0, 0)) \ + fw_def(BROXTON, 0, guc_def(bxt, 33, 0, 0), huc_def(bxt, 2, 0, 0)) \ + fw_def(SKYLAKE, 0, guc_def(skl, 33, 0, 0), huc_def(skl, 2, 0, 0)) + +#define __MAKE_UC_FW_PATH(prefix_, name_, major_, minor_, patch_) \ "i915/" \ __stringify(prefix_) name_ \ - __stringify(major_) separator_ \ - __stringify(minor_) separator_ \ + __stringify(major_) "." \ + __stringify(minor_) "." \ __stringify(patch_) ".bin" #define MAKE_GUC_FW_PATH(prefix_, major_, minor_, patch_) \ - __MAKE_UC_FW_PATH(prefix_, "_guc_", ".", major_, minor_, patch_) + __MAKE_UC_FW_PATH(prefix_, "_guc_", major_, minor_, patch_) #define MAKE_HUC_FW_PATH(prefix_, major_, minor_, bld_num_) \ - __MAKE_UC_FW_PATH(prefix_, "_huc_ver", "_", major_, minor_, bld_num_) + __MAKE_UC_FW_PATH(prefix_, "_huc_", major_, minor_, bld_num_) /* All blobs need to be declared via MODULE_FIRMWARE() */ #define INTEL_UC_MODULE_FW(platform_, revid_, guc_, huc_) \