* [PATCH] drm/i915: Delete stray .rej file
@ 2024-03-25 14:47 Lucas De Marchi
2024-03-25 15:11 ` Jani Nikula
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Lucas De Marchi @ 2024-03-25 14:47 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel, Lucas De Marchi, Stephen Rothwell, Jani Nikula
drivers/gpu/drm/i915/gt/intel_workarounds.c.rej was incorrectly added to
the tree after solving a conflict. Remove it.
Fixes: 326e30e4624c ("drm/i915: Drop dead code for pvc")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Closes: https://lore.kernel.org/r/20240325083435.4f970eec@canb.auug.org.au
Cc: Jani Nikula <jani.nikula@linux.intel.com>
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
---
.../gpu/drm/i915/gt/intel_workarounds.c.rej | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 drivers/gpu/drm/i915/gt/intel_workarounds.c.rej
diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej b/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej
deleted file mode 100644
index 91463b1d684a..000000000000
--- a/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej
+++ /dev/null
@@ -1,18 +0,0 @@
-diff a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c (rejected hunks)
-@@ -2844,14 +2767,13 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li
-
- if (IS_GFX_GT_IP_STEP(gt, IP_VER(12, 70), STEP_A0, STEP_B0) ||
- IS_GFX_GT_IP_STEP(gt, IP_VER(12, 71), STEP_A0, STEP_B0) ||
-- IS_PONTEVECCHIO(i915) ||
- IS_DG2(i915)) {
- /* Wa_22014226127 */
- wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0, DISABLE_D8_D16_COASLESCE);
- }
-
-- if (IS_PONTEVECCHIO(i915) || IS_DG2(i915))
-- /* Wa_14015227452:dg2,pvc */
-+ if (IS_DG2(i915))
-+ /* Wa_14015227452 */
- wa_mcr_masked_en(wal, GEN9_ROW_CHICKEN4, XEHP_DIS_BBL_SYSPIPE);
-
- if (IS_DG2(i915)) {
--
2.43.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] drm/i915: Delete stray .rej file 2024-03-25 14:47 [PATCH] drm/i915: Delete stray .rej file Lucas De Marchi @ 2024-03-25 15:11 ` Jani Nikula 2024-03-26 1:35 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2024-03-26 1:49 ` ✗ Fi.CI.BAT: failure " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Jani Nikula @ 2024-03-25 15:11 UTC (permalink / raw) To: Lucas De Marchi, intel-gfx; +Cc: dri-devel, Lucas De Marchi, Stephen Rothwell On Mon, 25 Mar 2024, Lucas De Marchi <lucas.demarchi@intel.com> wrote: > drivers/gpu/drm/i915/gt/intel_workarounds.c.rej was incorrectly added to > the tree after solving a conflict. Remove it. > > Fixes: 326e30e4624c ("drm/i915: Drop dead code for pvc") > Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> > Closes: https://lore.kernel.org/r/20240325083435.4f970eec@canb.auug.org.au > Cc: Jani Nikula <jani.nikula@linux.intel.com> > Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Reviewed-by: Jani Nikula <jani.nikula@intel.com> > --- > .../gpu/drm/i915/gt/intel_workarounds.c.rej | 18 ------------------ > 1 file changed, 18 deletions(-) > delete mode 100644 drivers/gpu/drm/i915/gt/intel_workarounds.c.rej > > diff --git a/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej b/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej > deleted file mode 100644 > index 91463b1d684a..000000000000 > --- a/drivers/gpu/drm/i915/gt/intel_workarounds.c.rej > +++ /dev/null > @@ -1,18 +0,0 @@ > -diff a/drivers/gpu/drm/i915/gt/intel_workarounds.c b/drivers/gpu/drm/i915/gt/intel_workarounds.c (rejected hunks) > -@@ -2844,14 +2767,13 @@ general_render_compute_wa_init(struct intel_engine_cs *engine, struct i915_wa_li > - > - if (IS_GFX_GT_IP_STEP(gt, IP_VER(12, 70), STEP_A0, STEP_B0) || > - IS_GFX_GT_IP_STEP(gt, IP_VER(12, 71), STEP_A0, STEP_B0) || > -- IS_PONTEVECCHIO(i915) || > - IS_DG2(i915)) { > - /* Wa_22014226127 */ > - wa_mcr_write_or(wal, LSC_CHICKEN_BIT_0, DISABLE_D8_D16_COASLESCE); > - } > - > -- if (IS_PONTEVECCHIO(i915) || IS_DG2(i915)) > -- /* Wa_14015227452:dg2,pvc */ > -+ if (IS_DG2(i915)) > -+ /* Wa_14015227452 */ > - wa_mcr_masked_en(wal, GEN9_ROW_CHICKEN4, XEHP_DIS_BBL_SYSPIPE); > - > - if (IS_DG2(i915)) { -- Jani Nikula, Intel ^ permalink raw reply [flat|nested] 4+ messages in thread
* ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Delete stray .rej file 2024-03-25 14:47 [PATCH] drm/i915: Delete stray .rej file Lucas De Marchi 2024-03-25 15:11 ` Jani Nikula @ 2024-03-26 1:35 ` Patchwork 2024-03-26 1:49 ` ✗ Fi.CI.BAT: failure " Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2024-03-26 1:35 UTC (permalink / raw) To: Lucas De Marchi; +Cc: intel-gfx == Series Details == Series: drm/i915: Delete stray .rej file URL : https://patchwork.freedesktop.org/series/131587/ State : warning == Summary == Error: dim checkpatch failed eac6c895807a drm/i915: Delete stray .rej file -:17: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #17: deleted file mode 100644 total: 0 errors, 1 warnings, 0 checks, 0 lines checked ^ permalink raw reply [flat|nested] 4+ messages in thread
* ✗ Fi.CI.BAT: failure for drm/i915: Delete stray .rej file 2024-03-25 14:47 [PATCH] drm/i915: Delete stray .rej file Lucas De Marchi 2024-03-25 15:11 ` Jani Nikula 2024-03-26 1:35 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork @ 2024-03-26 1:49 ` Patchwork 2 siblings, 0 replies; 4+ messages in thread From: Patchwork @ 2024-03-26 1:49 UTC (permalink / raw) To: Lucas De Marchi; +Cc: intel-gfx [-- Attachment #1: Type: text/plain, Size: 9180 bytes --] == Series Details == Series: drm/i915: Delete stray .rej file URL : https://patchwork.freedesktop.org/series/131587/ State : failure == Summary == CI Bug Log - changes from CI_DRM_14482 -> Patchwork_131587v1 ==================================================== Summary ------- **FAILURE** Serious unknown changes coming with Patchwork_131587v1 absolutely need to be verified manually. If you think the reported changes have nothing to do with the changes introduced in Patchwork_131587v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them to document this new failure mode, which will reduce false positives in CI. External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/index.html Participating hosts (37 -> 36) ------------------------------ Additional (2): bat-arls-4 fi-glk-j4005 Missing (3): bat-mtlp-8 bat-kbl-2 fi-snb-2520m Possible new issues ------------------- Here are the unknown changes that may have been introduced in Patchwork_131587v1: ### IGT changes ### #### Possible regressions #### * igt@kms_force_connector_basic@force-edid: - bat-dg2-9: [PASS][1] -> [INCOMPLETE][2] [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/bat-dg2-9/igt@kms_force_connector_basic@force-edid.html [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-dg2-9/igt@kms_force_connector_basic@force-edid.html Known issues ------------ Here are the changes found in Patchwork_131587v1 that come from known issues: ### CI changes ### #### Issues hit #### * boot: - bat-jsl-1: [PASS][3] -> [FAIL][4] ([i915#8293]) [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/bat-jsl-1/boot.html [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-jsl-1/boot.html #### Possible fixes #### * boot: - fi-cfl-8109u: [FAIL][5] ([i915#8293]) -> [PASS][6] [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/fi-cfl-8109u/boot.html [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-cfl-8109u/boot.html ### IGT changes ### #### Issues hit #### * igt@gem_huc_copy@huc-copy: - fi-cfl-8109u: NOTRUN -> [SKIP][7] ([i915#2190]) [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-cfl-8109u/igt@gem_huc_copy@huc-copy.html - fi-glk-j4005: NOTRUN -> [SKIP][8] ([i915#2190]) [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-glk-j4005/igt@gem_huc_copy@huc-copy.html * igt@gem_lmem_swapping@basic: - fi-glk-j4005: NOTRUN -> [SKIP][9] ([i915#4613]) +3 other tests skip [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-glk-j4005/igt@gem_lmem_swapping@basic.html * igt@gem_lmem_swapping@basic@lmem0: - bat-dg2-11: [PASS][10] -> [FAIL][11] ([i915#10378]) [10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/bat-dg2-11/igt@gem_lmem_swapping@basic@lmem0.html [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-dg2-11/igt@gem_lmem_swapping@basic@lmem0.html * igt@gem_lmem_swapping@verify-random: - fi-cfl-8109u: NOTRUN -> [SKIP][12] ([i915#4613]) +3 other tests skip [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-cfl-8109u/igt@gem_lmem_swapping@verify-random.html * igt@i915_selftest@live@execlists: - bat-dg2-8: NOTRUN -> [ABORT][13] ([i915#10366]) [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-dg2-8/igt@i915_selftest@live@execlists.html * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic: - fi-glk-j4005: NOTRUN -> [SKIP][14] +10 other tests skip [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-glk-j4005/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-atomic.html * igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence: - bat-dg2-11: NOTRUN -> [SKIP][15] ([i915#9197]) +3 other tests skip [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-dg2-11/igt@kms_pipe_crc_basic@nonblocking-crc-frame-sequence.html * igt@kms_pm_backlight@basic-brightness: - fi-cfl-8109u: NOTRUN -> [SKIP][16] +11 other tests skip [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-cfl-8109u/igt@kms_pm_backlight@basic-brightness.html #### Possible fixes #### * igt@gem_lmem_swapping@basic@lmem0: - bat-dg2-14: [FAIL][17] ([i915#10378]) -> [PASS][18] [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/bat-dg2-14/igt@gem_lmem_swapping@basic@lmem0.html [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-dg2-14/igt@gem_lmem_swapping@basic@lmem0.html * igt@i915_selftest@live@execlists: - bat-dg2-14: [ABORT][19] ([i915#10366]) -> [PASS][20] [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/bat-dg2-14/igt@i915_selftest@live@execlists.html [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-dg2-14/igt@i915_selftest@live@execlists.html * igt@i915_selftest@live@mman: - bat-dg2-8: [ABORT][21] ([i915#10366]) -> [PASS][22] [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/bat-dg2-8/igt@i915_selftest@live@mman.html [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/bat-dg2-8/igt@i915_selftest@live@mman.html #### Warnings #### * igt@i915_module_load@load: - fi-kbl-7567u: [DMESG-WARN][23] ([i915#180] / [i915#1982] / [i915#8585]) -> [DMESG-WARN][24] ([i915#180] / [i915#8585]) [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/fi-kbl-7567u/igt@i915_module_load@load.html [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-kbl-7567u/igt@i915_module_load@load.html * igt@kms_flip@basic-flip-vs-wf_vblank@a-dp1: - fi-kbl-7567u: [DMESG-WARN][25] ([i915#180] / [i915#8585]) -> [DMESG-WARN][26] ([i915#180] / [i915#1982] / [i915#8585]) [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14482/fi-kbl-7567u/igt@kms_flip@basic-flip-vs-wf_vblank@a-dp1.html [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/fi-kbl-7567u/igt@kms_flip@basic-flip-vs-wf_vblank@a-dp1.html {name}: This element is suppressed. This means it is ignored when computing the status of the difference (SUCCESS, WARNING, or FAILURE). [i915#10196]: https://gitlab.freedesktop.org/drm/intel/issues/10196 [i915#10197]: https://gitlab.freedesktop.org/drm/intel/issues/10197 [i915#10200]: https://gitlab.freedesktop.org/drm/intel/issues/10200 [i915#10202]: https://gitlab.freedesktop.org/drm/intel/issues/10202 [i915#10206]: https://gitlab.freedesktop.org/drm/intel/issues/10206 [i915#10207]: https://gitlab.freedesktop.org/drm/intel/issues/10207 [i915#10208]: https://gitlab.freedesktop.org/drm/intel/issues/10208 [i915#10209]: https://gitlab.freedesktop.org/drm/intel/issues/10209 [i915#10211]: https://gitlab.freedesktop.org/drm/intel/issues/10211 [i915#10212]: https://gitlab.freedesktop.org/drm/intel/issues/10212 [i915#10213]: https://gitlab.freedesktop.org/drm/intel/issues/10213 [i915#10214]: https://gitlab.freedesktop.org/drm/intel/issues/10214 [i915#10216]: https://gitlab.freedesktop.org/drm/intel/issues/10216 [i915#10366]: https://gitlab.freedesktop.org/drm/intel/issues/10366 [i915#10378]: https://gitlab.freedesktop.org/drm/intel/issues/10378 [i915#10436]: https://gitlab.freedesktop.org/drm/intel/issues/10436 [i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180 [i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982 [i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190 [i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708 [i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077 [i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079 [i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083 [i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613 [i915#8293]: https://gitlab.freedesktop.org/drm/intel/issues/8293 [i915#8585]: https://gitlab.freedesktop.org/drm/intel/issues/8585 [i915#8809]: https://gitlab.freedesktop.org/drm/intel/issues/8809 [i915#9197]: https://gitlab.freedesktop.org/drm/intel/issues/9197 [i915#9318]: https://gitlab.freedesktop.org/drm/intel/issues/9318 [i915#9732]: https://gitlab.freedesktop.org/drm/intel/issues/9732 [i915#9812]: https://gitlab.freedesktop.org/drm/intel/issues/9812 [i915#9886]: https://gitlab.freedesktop.org/drm/intel/issues/9886 Build changes ------------- * Linux: CI_DRM_14482 -> Patchwork_131587v1 CI-20190529: 20190529 CI_DRM_14482: 4a8fabcf2f1aadbbb777a94edd01549c2aa95caf @ git://anongit.freedesktop.org/gfx-ci/linux IGT_7782: a404f73182948e843640d00cc279883391cf6ef4 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git Patchwork_131587v1: 4a8fabcf2f1aadbbb777a94edd01549c2aa95caf @ git://anongit.freedesktop.org/gfx-ci/linux ### Linux commits 83bf2f4f4637 drm/i915: Delete stray .rej file == Logs == For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_131587v1/index.html [-- Attachment #2: Type: text/html, Size: 9488 bytes --] ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-03-26 1:49 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-03-25 14:47 [PATCH] drm/i915: Delete stray .rej file Lucas De Marchi 2024-03-25 15:11 ` Jani Nikula 2024-03-26 1:35 ` ✗ Fi.CI.CHECKPATCH: warning for " Patchwork 2024-03-26 1:49 ` ✗ Fi.CI.BAT: failure " Patchwork
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.