* [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
@ 2022-03-11 10:06 Jani Nikula
2022-03-11 10:06 ` [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
` (4 more replies)
0 siblings, 5 replies; 8+ messages in thread
From: Jani Nikula @ 2022-03-11 10:06 UTC (permalink / raw)
To: intel-gfx; +Cc: Bjorn Helgaas, linux-pci, jani.nikula, x86
early-quirks.c is the only user of drm/i915_drm.h that also needs
drm/i915_pciids.h. Include the masses of PCI ID macros only where
needed.
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Cc: x86@kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
I'm hoping to merge this via drm-intel with the other patch.
---
arch/x86/kernel/early-quirks.c | 1 +
include/drm/i915_drm.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index bd6dad83c65b..805596736e20 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -18,6 +18,7 @@
#include <linux/bcma/bcma_regs.h>
#include <linux/platform_data/x86/apple.h>
#include <drm/i915_drm.h>
+#include <drm/i915_pciids.h>
#include <asm/pci-direct.h>
#include <asm/dma.h>
#include <asm/io_apic.h>
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index 6722005884db..afbf3ef5643e 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -26,7 +26,6 @@
#ifndef _I915_DRM_H_
#define _I915_DRM_H_
-#include <drm/i915_pciids.h>
#include <uapi/drm/i915_drm.h>
/* For use by IPS driver */
--
2.30.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed
2022-03-11 10:06 [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
@ 2022-03-11 10:06 ` Jani Nikula
2022-03-17 17:50 ` Ville Syrjälä
2022-03-11 10:27 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Patchwork
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Jani Nikula @ 2022-03-11 10:06 UTC (permalink / raw)
To: intel-gfx; +Cc: Bjorn Helgaas, linux-pci, jani.nikula, x86
Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
drm/i915_drm.h only where needed.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 ++
drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 ++
drivers/gpu/drm/i915/intel_memory_region.c | 2 ++
drivers/gpu/drm/i915/intel_memory_region.h | 2 +-
drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
include/drm/i915_drm.h | 2 +-
6 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
index 444f8268b9c5..ede084f36ca9 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
@@ -3,6 +3,8 @@
* Copyright © 2019 Intel Corporation
*/
+#include <uapi/drm/i915_drm.h>
+
#include "intel_memory_region.h"
#include "gem/i915_gem_region.h"
#include "gem/i915_gem_lmem.h"
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
index c9b2e8b91053..f4fbae2f9dcc 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
@@ -3,6 +3,8 @@
* Copyright © 2019 Intel Corporation
*/
+#include <uapi/drm/i915_drm.h>
+
#include "intel_memory_region.h"
#include "i915_gem_region.h"
#include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
index 1c841f68169a..ded78b83e0b5 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.c
+++ b/drivers/gpu/drm/i915/intel_memory_region.c
@@ -5,6 +5,8 @@
#include <linux/prandom.h>
+#include <uapi/drm/i915_drm.h>
+
#include "intel_memory_region.h"
#include "i915_drv.h"
#include "i915_ttm_buddy_manager.h"
diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
index 21dcbd620758..bbc35ec5c090 100644
--- a/drivers/gpu/drm/i915/intel_memory_region.h
+++ b/drivers/gpu/drm/i915/intel_memory_region.h
@@ -10,7 +10,7 @@
#include <linux/mutex.h>
#include <linux/io-mapping.h>
#include <drm/drm_mm.h>
-#include <drm/i915_drm.h>
+#include <uapi/drm/i915_drm.h>
struct drm_i915_private;
struct drm_i915_gem_object;
diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
index 598840b73dfa..92b00b4de240 100644
--- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
+++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
@@ -3,8 +3,6 @@
* Copyright(c) 2020, Intel Corporation. All rights reserved.
*/
-#include <drm/i915_drm.h>
-
#include "i915_drv.h"
#include "intel_pxp.h"
diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
index afbf3ef5643e..7adce327c1c2 100644
--- a/include/drm/i915_drm.h
+++ b/include/drm/i915_drm.h
@@ -26,7 +26,7 @@
#ifndef _I915_DRM_H_
#define _I915_DRM_H_
-#include <uapi/drm/i915_drm.h>
+#include <linux/types.h>
/* For use by IPS driver */
unsigned long i915_read_mch_val(void);
--
2.30.2
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
2022-03-11 10:06 [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
2022-03-11 10:06 ` [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
@ 2022-03-11 10:27 ` Patchwork
2022-03-11 10:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2022-03-11 10:27 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
URL : https://patchwork.freedesktop.org/series/101279/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
2022-03-11 10:06 [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
2022-03-11 10:06 ` [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
2022-03-11 10:27 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Patchwork
@ 2022-03-11 10:56 ` Patchwork
2022-03-11 12:28 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-03-11 16:21 ` [Intel-gfx] [PATCH 1/2] " Bjorn Helgaas
4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2022-03-11 10:56 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 11921 bytes --]
== Series Details ==
Series: series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
URL : https://patchwork.freedesktop.org/series/101279/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11350 -> Patchwork_22541
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/index.html
Participating hosts (48 -> 39)
------------------------------
Missing (9): shard-tglu bat-dg1-6 bat-dg1-5 fi-hsw-4200u fi-bsw-cyan fi-ctg-p8600 shard-rkl shard-dg1 fi-bdw-samus
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22541:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@i915_pm_rpm@module-reload:
- {bat-rpls-2}: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@i915_pm_rpm@module-reload.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@i915_pm_rpm@module-reload.html
Known issues
------------
Here are the changes found in Patchwork_22541 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> [SKIP][3] ([fdo#109315]) +17 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-icl-u2/igt@amdgpu/amd_cs_nop@fork-gfx0.html
* igt@i915_selftest@live@execlists:
- fi-glk-j4005: [PASS][4] -> [INCOMPLETE][5] ([i915#5294])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-glk-j4005/igt@i915_selftest@live@execlists.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-glk-j4005/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@gt_heartbeat:
- fi-cfl-8700k: [PASS][6] -> [DMESG-FAIL][7] ([i915#541])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-cfl-8700k/igt@i915_selftest@live@gt_heartbeat.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-cfl-8700k/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][8] -> [INCOMPLETE][9] ([i915#3921])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
* igt@kms_pipe_crc_basic@read-crc-pipe-b:
- fi-cfl-8109u: [PASS][10] -> [DMESG-WARN][11] ([i915#295]) +11 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-cfl-8109u/igt@kms_pipe_crc_basic@read-crc-pipe-b.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-cfl-8109u/igt@kms_pipe_crc_basic@read-crc-pipe-b.html
* igt@runner@aborted:
- fi-glk-j4005: NOTRUN -> [FAIL][12] ([i915#2722] / [i915#4312] / [k.org#202321])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-glk-j4005/igt@runner@aborted.html
- fi-bdw-5557u: NOTRUN -> [FAIL][13] ([i915#2426] / [i915#4312])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-bdw-5557u/igt@runner@aborted.html
#### Possible fixes ####
* igt@core_hotunplug@unbind-rebind:
- fi-bwr-2160: [FAIL][14] ([i915#3194]) -> [PASS][15]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-bwr-2160/igt@core_hotunplug@unbind-rebind.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-bwr-2160/igt@core_hotunplug@unbind-rebind.html
* igt@fbdev@info:
- {bat-rpls-2}: [SKIP][16] ([i915#2582]) -> [PASS][17] +4 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@fbdev@info.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@fbdev@info.html
* igt@gem_exec_suspend@basic-s3@smem:
- fi-bdw-5557u: [INCOMPLETE][18] ([i915#146]) -> [PASS][19]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-bdw-5557u/igt@gem_exec_suspend@basic-s3@smem.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-bdw-5557u/igt@gem_exec_suspend@basic-s3@smem.html
- {fi-rkl-11600}: [INCOMPLETE][20] ([i915#5127]) -> [PASS][21]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-rkl-11600/igt@gem_exec_suspend@basic-s3@smem.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-rkl-11600/igt@gem_exec_suspend@basic-s3@smem.html
* igt@i915_pm_rpm@basic-pci-d3-state:
- {bat-rpls-2}: [SKIP][22] ([fdo#109308]) -> [PASS][23] +1 similar issue
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@i915_pm_rpm@basic-pci-d3-state.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@i915_pm_rpm@basic-pci-d3-state.html
* igt@i915_selftest@live@execlists:
- fi-icl-u2: [INCOMPLETE][24] ([i915#5060]) -> [PASS][25]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-icl-u2/igt@i915_selftest@live@execlists.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-icl-u2/igt@i915_selftest@live@execlists.html
* igt@i915_selftest@live@gt_heartbeat:
- {bat-rpls-2}: [DMESG-WARN][26] ([i915#4391]) -> [PASS][27]
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@i915_selftest@live@gt_heartbeat.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@i915_selftest@live@gt_heartbeat.html
* igt@i915_selftest@live@hugepages:
- {bat-rpls-2}: [DMESG-WARN][28] ([i915#5278]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@i915_selftest@live@hugepages.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@i915_selftest@live@hugepages.html
* igt@i915_selftest@live@reset:
- {bat-rpls-2}: [INCOMPLETE][30] ([i915#4983]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@i915_selftest@live@reset.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@i915_selftest@live@reset.html
* igt@i915_selftest@live@workarounds:
- {bat-adlp-6}: [DMESG-WARN][32] ([i915#5068]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-adlp-6/igt@i915_selftest@live@workarounds.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-adlp-6/igt@i915_selftest@live@workarounds.html
* igt@kms_cursor_legacy@basic-flip-after-cursor-legacy:
- {bat-rpls-2}: [SKIP][34] ([fdo#111825]) -> [PASS][35] +5 similar issues
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@kms_cursor_legacy@basic-flip-after-cursor-legacy.html
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- {bat-rpls-2}: [SKIP][36] ([i915#1849]) -> [PASS][37] +12 similar issues
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d.html
* igt@prime_vgem@basic-fence-flip:
- {bat-rpls-2}: [SKIP][38] ([i915#1845] / [i915#3708]) -> [PASS][39]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/bat-rpls-2/igt@prime_vgem@basic-fence-flip.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/bat-rpls-2/igt@prime_vgem@basic-fence-flip.html
#### Warnings ####
* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [INCOMPLETE][40] ([i915#3303]) -> [INCOMPLETE][41] ([i915#4785])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/fi-hsw-4770/igt@i915_selftest@live@hangcheck.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109308]: https://bugs.freedesktop.org/show_bug.cgi?id=109308
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#146]: https://gitlab.freedesktop.org/drm/intel/issues/146
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2426]: https://gitlab.freedesktop.org/drm/intel/issues/2426
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#3194]: https://gitlab.freedesktop.org/drm/intel/issues/3194
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3921]: https://gitlab.freedesktop.org/drm/intel/issues/3921
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4391]: https://gitlab.freedesktop.org/drm/intel/issues/4391
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5060]: https://gitlab.freedesktop.org/drm/intel/issues/5060
[i915#5068]: https://gitlab.freedesktop.org/drm/intel/issues/5068
[i915#5127]: https://gitlab.freedesktop.org/drm/intel/issues/5127
[i915#5195]: https://gitlab.freedesktop.org/drm/intel/issues/5195
[i915#5276]: https://gitlab.freedesktop.org/drm/intel/issues/5276
[i915#5278]: https://gitlab.freedesktop.org/drm/intel/issues/5278
[i915#5294]: https://gitlab.freedesktop.org/drm/intel/issues/5294
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#541]: https://gitlab.freedesktop.org/drm/intel/issues/541
[k.org#202321]: https://bugzilla.kernel.org/show_bug.cgi?id=202321
Build changes
-------------
* Linux: CI_DRM_11350 -> Patchwork_22541
CI-20190529: 20190529
CI_DRM_11350: 925314164278701a48bb63b89a95d6c7e179a02e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6375: aa6eb64bac510b7d617436997171bfe388943d89 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22541: 09911f598f4a0603d4e7e89a15ecdad5ce23ae30 @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
09911f598f4a drm/i915: include uapi/drm/i915_drm.h directly where needed
a8d20d2d189c x86/gpu: include drm/i915_pciids.h directly in early quirks
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/index.html
[-- Attachment #2: Type: text/html, Size: 12039 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
2022-03-11 10:06 [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
` (2 preceding siblings ...)
2022-03-11 10:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2022-03-11 12:28 ` Patchwork
2022-03-11 16:21 ` [Intel-gfx] [PATCH 1/2] " Bjorn Helgaas
4 siblings, 0 replies; 8+ messages in thread
From: Patchwork @ 2022-03-11 12:28 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 30310 bytes --]
== Series Details ==
Series: series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
URL : https://patchwork.freedesktop.org/series/101279/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11350_full -> Patchwork_22541_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_22541_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_22541_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (13 -> 12)
------------------------------
Missing (1): shard-dg1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_22541_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_big_fb@y-tiled-32bpp-rotate-0:
- shard-skl: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-skl3/igt@kms_big_fb@y-tiled-32bpp-rotate-0.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl4/igt@kms_big_fb@y-tiled-32bpp-rotate-0.html
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@gem_exec_whisper@basic-forked-all:
- {shard-rkl}: [PASS][3] -> [INCOMPLETE][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-rkl-5/igt@gem_exec_whisper@basic-forked-all.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-rkl-5/igt@gem_exec_whisper@basic-forked-all.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- {shard-rkl}: [PASS][5] -> [DMESG-WARN][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-rkl-1/igt@i915_suspend@fence-restore-tiled2untiled.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-rkl-5/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@kms_plane_lowres@pipe-b-tiling-4:
- {shard-rkl}: [SKIP][7] ([i915#4098]) -> [SKIP][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-rkl-5/igt@kms_plane_lowres@pipe-b-tiling-4.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-rkl-1/igt@kms_plane_lowres@pipe-b-tiling-4.html
* {igt@kms_psr2_sf@cursor-plane-move-continuous-sf}:
- {shard-tglu}: NOTRUN -> [SKIP][9] +1 similar issue
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglu-2/igt@kms_psr2_sf@cursor-plane-move-continuous-sf.html
- shard-iclb: NOTRUN -> [SKIP][10]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@kms_psr2_sf@cursor-plane-move-continuous-sf.html
Known issues
------------
Here are the changes found in Patchwork_22541_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@feature_discovery@psr2:
- shard-iclb: NOTRUN -> [SKIP][11] ([i915#658])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@feature_discovery@psr2.html
* igt@gem_create@create-massive:
- shard-apl: NOTRUN -> [DMESG-WARN][12] ([i915#4991])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl4/igt@gem_create@create-massive.html
* igt@gem_exec_balancer@parallel-keep-submit-fence:
- shard-iclb: NOTRUN -> [SKIP][13] ([i915#4525])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@gem_exec_balancer@parallel-keep-submit-fence.html
* igt@gem_exec_endless@dispatch@rcs0:
- shard-iclb: [PASS][14] -> [INCOMPLETE][15] ([i915#3778])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-iclb4/igt@gem_exec_endless@dispatch@rcs0.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb4/igt@gem_exec_endless@dispatch@rcs0.html
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-iclb: NOTRUN -> [FAIL][16] ([i915#2842]) +2 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_params@no-vebox:
- shard-iclb: NOTRUN -> [SKIP][17] ([fdo#109283])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@gem_exec_params@no-vebox.html
* igt@gem_lmem_swapping@heavy-random:
- shard-iclb: NOTRUN -> [SKIP][18] ([i915#4613])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@gem_lmem_swapping@heavy-random.html
* igt@gem_lmem_swapping@parallel-random-engines:
- shard-glk: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#4613])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@gem_lmem_swapping@parallel-random-engines.html
* igt@gem_lmem_swapping@random:
- shard-skl: NOTRUN -> [SKIP][20] ([fdo#109271] / [i915#4613])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@gem_lmem_swapping@random.html
* igt@gem_ppgtt@flink-and-close-vma-leak:
- shard-skl: [PASS][21] -> [FAIL][22] ([i915#644])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-skl8/igt@gem_ppgtt@flink-and-close-vma-leak.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl1/igt@gem_ppgtt@flink-and-close-vma-leak.html
* igt@gem_pxp@create-regular-buffer:
- shard-iclb: NOTRUN -> [SKIP][23] ([i915#4270]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb8/igt@gem_pxp@create-regular-buffer.html
* igt@gem_pxp@verify-pxp-key-change-after-suspend-resume:
- shard-tglb: NOTRUN -> [SKIP][24] ([i915#4270])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb6/igt@gem_pxp@verify-pxp-key-change-after-suspend-resume.html
* igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-y-tiled:
- shard-iclb: NOTRUN -> [SKIP][25] ([i915#768]) +3 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@gem_render_copy@y-tiled-mc-ccs-to-vebox-y-tiled.html
* igt@gem_render_copy@yf-tiled-mc-ccs-to-vebox-y-tiled:
- shard-glk: NOTRUN -> [SKIP][26] ([fdo#109271]) +35 similar issues
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@gem_render_copy@yf-tiled-mc-ccs-to-vebox-y-tiled.html
* igt@gen3_render_linear_blits:
- shard-tglb: NOTRUN -> [SKIP][27] ([fdo#109289])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb6/igt@gen3_render_linear_blits.html
* igt@gen7_exec_parse@basic-allowed:
- shard-iclb: NOTRUN -> [SKIP][28] ([fdo#109289]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@gen7_exec_parse@basic-allowed.html
* igt@gen9_exec_parse@allowed-all:
- shard-iclb: NOTRUN -> [SKIP][29] ([i915#2856]) +1 similar issue
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@gen9_exec_parse@allowed-all.html
* igt@i915_pm_lpsp@screens-disabled:
- shard-iclb: NOTRUN -> [SKIP][30] ([i915#1902])
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@i915_pm_lpsp@screens-disabled.html
* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: NOTRUN -> [WARN][31] ([i915#1804] / [i915#2684])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@i915_pm_rc6_residency@rc6-idle.html
* igt@i915_pm_rpm@modeset-non-lpsp:
- shard-iclb: NOTRUN -> [SKIP][32] ([fdo#110892])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@i915_pm_rpm@modeset-non-lpsp.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [PASS][33] -> [DMESG-WARN][34] ([i915#180] / [i915#1982])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-apl6/igt@i915_suspend@fence-restore-tiled2untiled.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl6/igt@i915_suspend@fence-restore-tiled2untiled.html
* igt@kms_big_fb@4-tiled-32bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][35] ([i915#5286]) +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@kms_big_fb@4-tiled-32bpp-rotate-270.html
* igt@kms_big_fb@x-tiled-64bpp-rotate-270:
- shard-iclb: NOTRUN -> [SKIP][36] ([fdo#110725] / [fdo#111614])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb8/igt@kms_big_fb@x-tiled-64bpp-rotate-270.html
* igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][37] ([i915#3743]) +2 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_big_fb@x-tiled-max-hw-stride-32bpp-rotate-0-async-flip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip:
- shard-skl: NOTRUN -> [SKIP][38] ([fdo#109271] / [i915#3777])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl8/igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip-async-flip.html
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][39] ([i915#3763])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip.html
* igt@kms_big_fb@yf-tiled-8bpp-rotate-180:
- shard-iclb: NOTRUN -> [SKIP][40] ([fdo#110723]) +1 similar issue
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@kms_big_fb@yf-tiled-8bpp-rotate-180.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-glk: NOTRUN -> [SKIP][41] ([fdo#109271] / [i915#3777]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0:
- shard-apl: NOTRUN -> [SKIP][42] ([fdo#109271]) +76 similar issues
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl4/igt@kms_big_fb@yf-tiled-max-hw-stride-64bpp-rotate-0.html
* igt@kms_big_joiner@2x-modeset:
- shard-iclb: NOTRUN -> [SKIP][43] ([i915#2705])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb8/igt@kms_big_joiner@2x-modeset.html
* igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-iclb: NOTRUN -> [SKIP][44] ([fdo#109278] / [i915#3886]) +4 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_ccs@pipe-a-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-a-random-ccs-data-yf_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][45] ([fdo#111615] / [i915#3689])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb6/igt@kms_ccs@pipe-a-random-ccs-data-yf_tiled_ccs.html
* igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][46] ([fdo#109271] / [i915#3886]) +7 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_ccs@pipe-b-crc-primary-basic-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][47] ([fdo#109271] / [i915#3886]) +3 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl6/igt@kms_ccs@pipe-b-crc-sprite-planes-basic-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_rc_ccs_cc:
- shard-glk: NOTRUN -> [SKIP][48] ([fdo#109271] / [i915#3886]) +1 similar issue
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][49] ([i915#3689])
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb6/igt@kms_ccs@pipe-d-missing-ccs-buffer-y_tiled_gen12_mc_ccs.html
* igt@kms_chamelium@dp-crc-multiple:
- shard-apl: NOTRUN -> [SKIP][50] ([fdo#109271] / [fdo#111827]) +5 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl6/igt@kms_chamelium@dp-crc-multiple.html
* igt@kms_chamelium@hdmi-aspect-ratio:
- shard-glk: NOTRUN -> [SKIP][51] ([fdo#109271] / [fdo#111827]) +3 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@kms_chamelium@hdmi-aspect-ratio.html
* igt@kms_chamelium@hdmi-audio:
- shard-iclb: NOTRUN -> [SKIP][52] ([fdo#109284] / [fdo#111827]) +14 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@kms_chamelium@hdmi-audio.html
* igt@kms_color@pipe-d-ctm-0-5:
- shard-iclb: NOTRUN -> [SKIP][53] ([fdo#109278] / [i915#1149])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb8/igt@kms_color@pipe-d-ctm-0-5.html
* igt@kms_color_chamelium@pipe-b-ctm-max:
- shard-skl: NOTRUN -> [SKIP][54] ([fdo#109271] / [fdo#111827]) +11 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_color_chamelium@pipe-b-ctm-max.html
* igt@kms_color_chamelium@pipe-d-ctm-blue-to-red:
- shard-iclb: NOTRUN -> [SKIP][55] ([fdo#109278] / [fdo#109284] / [fdo#111827])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@kms_color_chamelium@pipe-d-ctm-blue-to-red.html
* igt@kms_cursor_crc@pipe-a-cursor-512x512-onscreen:
- shard-skl: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#1888])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl8/igt@kms_cursor_crc@pipe-a-cursor-512x512-onscreen.html
* igt@kms_cursor_crc@pipe-b-cursor-suspend:
- shard-apl: NOTRUN -> [DMESG-WARN][57] ([i915#180])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl4/igt@kms_cursor_crc@pipe-b-cursor-suspend.html
* igt@kms_cursor_crc@pipe-c-cursor-512x170-sliding:
- shard-iclb: NOTRUN -> [SKIP][58] ([fdo#109278] / [fdo#109279]) +2 similar issues
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_cursor_crc@pipe-c-cursor-512x170-sliding.html
* igt@kms_cursor_crc@pipe-d-cursor-256x256-rapid-movement:
- shard-iclb: NOTRUN -> [SKIP][59] ([fdo#109278]) +28 similar issues
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_cursor_crc@pipe-d-cursor-256x256-rapid-movement.html
* igt@kms_cursor_legacy@2x-flip-vs-cursor-atomic:
- shard-iclb: NOTRUN -> [SKIP][60] ([fdo#109274] / [fdo#109278]) +3 similar issues
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@kms_cursor_legacy@2x-flip-vs-cursor-atomic.html
* igt@kms_cursor_legacy@cursorb-vs-flipa-legacy:
- shard-tglb: NOTRUN -> [SKIP][61] ([fdo#109274] / [fdo#111825]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb6/igt@kms_cursor_legacy@cursorb-vs-flipa-legacy.html
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-skl: [PASS][62] -> [FAIL][63] ([i915#2346] / [i915#533])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl6/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_cursor_legacy@pipe-d-torture-bo:
- shard-apl: NOTRUN -> [SKIP][64] ([fdo#109271] / [i915#533]) +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl1/igt@kms_cursor_legacy@pipe-d-torture-bo.html
* igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-4tiled:
- shard-iclb: NOTRUN -> [SKIP][65] ([i915#5287]) +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@kms_draw_crc@draw-method-rgb565-mmap-gtt-4tiled.html
* igt@kms_fbcon_fbt@fbc-suspend:
- shard-kbl: [PASS][66] -> [INCOMPLETE][67] ([i915#180] / [i915#636])
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-kbl7/igt@kms_fbcon_fbt@fbc-suspend.html
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-kbl7/igt@kms_fbcon_fbt@fbc-suspend.html
* igt@kms_flip@2x-flip-vs-dpms:
- shard-iclb: NOTRUN -> [SKIP][68] ([fdo#109274]) +4 similar issues
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_flip@2x-flip-vs-dpms.html
* igt@kms_flip@flip-vs-expired-vblank@a-edp1:
- shard-skl: NOTRUN -> [FAIL][69] ([i915#79]) +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl9/igt@kms_flip@flip-vs-expired-vblank@a-edp1.html
* igt@kms_flip@flip-vs-suspend-interruptible@a-dp1:
- shard-kbl: [PASS][70] -> [DMESG-WARN][71] ([i915#180]) +4 similar issues
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-kbl3/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-kbl1/igt@kms_flip@flip-vs-suspend-interruptible@a-dp1.html
* igt@kms_flip@flip-vs-suspend-interruptible@c-dp1:
- shard-apl: [PASS][72] -> [DMESG-WARN][73] ([i915#180]) +6 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-apl2/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl1/igt@kms_flip@flip-vs-suspend-interruptible@c-dp1.html
* igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1:
- shard-skl: [PASS][74] -> [FAIL][75] ([i915#2122]) +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-skl3/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl10/igt@kms_flip@plain-flip-fb-recreate-interruptible@c-edp1.html
* igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt:
- shard-skl: NOTRUN -> [SKIP][76] ([fdo#109271]) +166 similar issues
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_frontbuffer_tracking@fbc-1p-shrfb-fliptrack-mmap-gtt.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-pwrite:
- shard-tglb: NOTRUN -> [SKIP][77] ([fdo#109280] / [fdo#111825]) +4 similar issues
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb6/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbc-2p-shrfb-fliptrack-mmap-gtt:
- shard-iclb: NOTRUN -> [SKIP][78] ([fdo#109280]) +27 similar issues
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-2p-shrfb-fliptrack-mmap-gtt.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d:
- shard-skl: NOTRUN -> [SKIP][79] ([fdo#109271] / [i915#533]) +2 similar issues
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d.html
* igt@kms_plane_alpha_blend@pipe-a-alpha-basic:
- shard-skl: NOTRUN -> [FAIL][80] ([fdo#108145] / [i915#265]) +1 similar issue
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_plane_alpha_blend@pipe-a-alpha-basic.html
* igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb:
- shard-glk: NOTRUN -> [FAIL][81] ([fdo#108145] / [i915#265])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@kms_plane_alpha_blend@pipe-c-alpha-opaque-fb.html
* igt@kms_plane_lowres@pipe-a-tiling-4:
- shard-iclb: NOTRUN -> [SKIP][82] ([i915#5288]) +1 similar issue
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_plane_lowres@pipe-a-tiling-4.html
* igt@kms_plane_lowres@pipe-c-tiling-yf:
- shard-iclb: NOTRUN -> [SKIP][83] ([i915#3536])
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_plane_lowres@pipe-c-tiling-yf.html
* igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-b-edp-1-scaler-with-clipping-clamping:
- shard-iclb: NOTRUN -> [SKIP][84] ([i915#5176]) +1 similar issue
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_plane_scaling@scaler-with-clipping-clamping@pipe-b-edp-1-scaler-with-clipping-clamping.html
* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
- shard-apl: NOTRUN -> [SKIP][85] ([fdo#109271] / [i915#658])
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl1/igt@kms_psr2_sf@overlay-plane-update-continuous-sf.html
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-glk: NOTRUN -> [SKIP][86] ([fdo#109271] / [i915#658])
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@kms_psr2_sf@primary-plane-update-sf-dmg-area.html
* igt@kms_psr2_su@page_flip-xrgb8888:
- shard-skl: NOTRUN -> [SKIP][87] ([fdo#109271] / [i915#658]) +3 similar issues
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_psr2_su@page_flip-xrgb8888.html
* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: NOTRUN -> [SKIP][88] ([fdo#109441]) +2 similar issues
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@kms_psr@psr2_cursor_mmap_cpu.html
* igt@kms_psr@psr2_cursor_plane_move:
- shard-iclb: [PASS][89] -> [SKIP][90] ([fdo#109441]) +2 similar issues
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-iclb2/igt@kms_psr@psr2_cursor_plane_move.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@kms_psr@psr2_cursor_plane_move.html
* igt@kms_rotation_crc@sprite-rotation-90:
- shard-skl: [PASS][91] -> [DMESG-WARN][92] ([i915#1982]) +1 similar issue
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-skl6/igt@kms_rotation_crc@sprite-rotation-90.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@kms_rotation_crc@sprite-rotation-90.html
* igt@kms_sysfs_edid_timing:
- shard-apl: NOTRUN -> [FAIL][93] ([IGT#2])
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl4/igt@kms_sysfs_edid_timing.html
* igt@kms_vrr@flipline:
- shard-iclb: NOTRUN -> [SKIP][94] ([fdo#109502])
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@kms_vrr@flipline.html
* igt@kms_writeback@writeback-check-output:
- shard-apl: NOTRUN -> [SKIP][95] ([fdo#109271] / [i915#2437])
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl4/igt@kms_writeback@writeback-check-output.html
* igt@nouveau_crc@pipe-b-source-outp-inactive:
- shard-iclb: NOTRUN -> [SKIP][96] ([i915#2530]) +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@nouveau_crc@pipe-b-source-outp-inactive.html
* igt@prime_nv_pcopy@test3_2:
- shard-iclb: NOTRUN -> [SKIP][97] ([fdo#109291]) +2 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@prime_nv_pcopy@test3_2.html
* igt@prime_udl:
- shard-tglb: NOTRUN -> [SKIP][98] ([fdo#109291])
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb6/igt@prime_udl.html
* igt@prime_vgem@fence-flip-hang:
- shard-iclb: NOTRUN -> [SKIP][99] ([fdo#109295])
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb7/igt@prime_vgem@fence-flip-hang.html
* igt@sysfs_clients@busy:
- shard-skl: NOTRUN -> [SKIP][100] ([fdo#109271] / [i915#2994]) +2 similar issues
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl7/igt@sysfs_clients@busy.html
* igt@sysfs_clients@fair-1:
- shard-glk: NOTRUN -> [SKIP][101] ([fdo#109271] / [i915#2994])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@sysfs_clients@fair-1.html
* igt@sysfs_clients@pidname:
- shard-iclb: NOTRUN -> [SKIP][102] ([i915#2994]) +1 similar issue
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb6/igt@sysfs_clients@pidname.html
* igt@sysfs_clients@recycle-many:
- shard-apl: NOTRUN -> [SKIP][103] ([fdo#109271] / [i915#2994]) +1 similar issue
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl6/igt@sysfs_clients@recycle-many.html
#### Possible fixes ####
* igt@fbdev@unaligned-read:
- {shard-rkl}: [SKIP][104] ([i915#2582]) -> [PASS][105]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-rkl-2/igt@fbdev@unaligned-read.html
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-rkl-6/igt@fbdev@unaligned-read.html
* igt@gem_eio@unwedge-stress:
- {shard-rkl}: [TIMEOUT][106] ([i915#3063]) -> [PASS][107]
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-rkl-5/igt@gem_eio@unwedge-stress.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-rkl-2/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_capture@pi@bcs0:
- shard-iclb: [INCOMPLETE][108] ([i915#3371]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-iclb4/igt@gem_exec_capture@pi@bcs0.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb3/igt@gem_exec_capture@pi@bcs0.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [FAIL][110] ([i915#2842]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-iclb1/igt@gem_exec_fair@basic-none-share@rcs0.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-iclb8/igt@gem_exec_fair@basic-none-share@rcs0.html
- {shard-tglu}: [FAIL][112] ([i915#2842]) -> ([PASS][113], [PASS][114])
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-tglu-4/igt@gem_exec_fair@basic-none-share@rcs0.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglu-2/igt@gem_exec_fair@basic-none-share@rcs0.html
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglu-5/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-kbl: [FAIL][115] ([i915#2842]) -> [PASS][116] +6 similar issues
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-kbl1/igt@gem_exec_fair@basic-none@vcs0.html
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-kbl4/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-none@vecs0:
- shard-apl: [FAIL][117] ([i915#2842]) -> [PASS][118]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-apl1/igt@gem_exec_fair@basic-none@vecs0.html
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl4/igt@gem_exec_fair@basic-none@vecs0.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][119] ([i915#2842]) -> [PASS][120]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-tglb3/igt@gem_exec_fair@basic-pace-share@rcs0.html
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-tglb5/igt@gem_exec_fair@basic-pace-share@rcs0.html
- shard-glk: [FAIL][121] ([i915#2842]) -> [PASS][122]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-glk2/igt@gem_exec_fair@basic-pace-share@rcs0.html
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk1/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_exec_schedule@smoketest-all:
- {shard-rkl}: [INCOMPLETE][123] ([i915#5080]) -> [PASS][124]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-rkl-5/igt@gem_exec_schedule@smoketest-all.html
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-rkl-1/igt@gem_exec_schedule@smoketest-all.html
* igt@gem_exec_whisper@basic-fds-all:
- shard-glk: [INCOMPLETE][125] -> [PASS][126]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-glk3/igt@gem_exec_whisper@basic-fds-all.html
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-glk6/igt@gem_exec_whisper@basic-fds-all.html
* igt@gem_workarounds@suspend-resume-context:
- shard-apl: [DMESG-WARN][127] ([i915#180]) -> [PASS][128] +2 similar issues
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-apl4/igt@gem_workarounds@suspend-resume-context.html
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-apl4/igt@gem_workarounds@suspend-resume-context.html
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][129] ([i915#1436] / [i915#716]) -> [PASS][130]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-skl10/igt@gen9_exec_parse@allowed-single.html
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/shard-skl8/igt@gen9_exec_parse@allowed-single.html
* igt@i915_selftest@live@hangcheck:
- shard-iclb: [INCOMPLETE][131] ([i915#5308]) -> [PASS][132]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11350/shard-iclb5/igt@i915_selftest@live@hangcheck.html
[132]: https://intel-gfx-ci.
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22541/index.html
[-- Attachment #2: Type: text/html, Size: 33759 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks
2022-03-11 10:06 [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
` (3 preceding siblings ...)
2022-03-11 12:28 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
@ 2022-03-11 16:21 ` Bjorn Helgaas
4 siblings, 0 replies; 8+ messages in thread
From: Bjorn Helgaas @ 2022-03-11 16:21 UTC (permalink / raw)
To: Jani Nikula; +Cc: Bjorn Helgaas, linux-pci, intel-gfx, x86
On Fri, Mar 11, 2022 at 12:06:38PM +0200, Jani Nikula wrote:
> early-quirks.c is the only user of drm/i915_drm.h that also needs
> drm/i915_pciids.h. Include the masses of PCI ID macros only where
> needed.
>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-pci@vger.kernel.org
> Cc: x86@kernel.org
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
FWIW:
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
> ---
>
> I'm hoping to merge this via drm-intel with the other patch.
> ---
> arch/x86/kernel/early-quirks.c | 1 +
> include/drm/i915_drm.h | 1 -
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
> index bd6dad83c65b..805596736e20 100644
> --- a/arch/x86/kernel/early-quirks.c
> +++ b/arch/x86/kernel/early-quirks.c
> @@ -18,6 +18,7 @@
> #include <linux/bcma/bcma_regs.h>
> #include <linux/platform_data/x86/apple.h>
> #include <drm/i915_drm.h>
> +#include <drm/i915_pciids.h>
> #include <asm/pci-direct.h>
> #include <asm/dma.h>
> #include <asm/io_apic.h>
> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
> index 6722005884db..afbf3ef5643e 100644
> --- a/include/drm/i915_drm.h
> +++ b/include/drm/i915_drm.h
> @@ -26,7 +26,6 @@
> #ifndef _I915_DRM_H_
> #define _I915_DRM_H_
>
> -#include <drm/i915_pciids.h>
> #include <uapi/drm/i915_drm.h>
>
> /* For use by IPS driver */
> --
> 2.30.2
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed
2022-03-11 10:06 ` [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
@ 2022-03-17 17:50 ` Ville Syrjälä
2022-03-17 18:23 ` Jani Nikula
0 siblings, 1 reply; 8+ messages in thread
From: Ville Syrjälä @ 2022-03-17 17:50 UTC (permalink / raw)
To: Jani Nikula; +Cc: Bjorn Helgaas, linux-pci, intel-gfx, x86
On Fri, Mar 11, 2022 at 12:06:39PM +0200, Jani Nikula wrote:
> Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
> being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
> drm/i915_drm.h only where needed.
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Looks sensible to me. Series is
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 ++
> drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 ++
> drivers/gpu/drm/i915/intel_memory_region.c | 2 ++
> drivers/gpu/drm/i915/intel_memory_region.h | 2 +-
> drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
> include/drm/i915_drm.h | 2 +-
> 6 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> index 444f8268b9c5..ede084f36ca9 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
> @@ -3,6 +3,8 @@
> * Copyright © 2019 Intel Corporation
> */
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "gem/i915_gem_region.h"
> #include "gem/i915_gem_lmem.h"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> index c9b2e8b91053..f4fbae2f9dcc 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
> @@ -3,6 +3,8 @@
> * Copyright © 2019 Intel Corporation
> */
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "i915_gem_region.h"
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
> index 1c841f68169a..ded78b83e0b5 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.c
> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
> @@ -5,6 +5,8 @@
>
> #include <linux/prandom.h>
>
> +#include <uapi/drm/i915_drm.h>
> +
> #include "intel_memory_region.h"
> #include "i915_drv.h"
> #include "i915_ttm_buddy_manager.h"
> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
> index 21dcbd620758..bbc35ec5c090 100644
> --- a/drivers/gpu/drm/i915/intel_memory_region.h
> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
> @@ -10,7 +10,7 @@
> #include <linux/mutex.h>
> #include <linux/io-mapping.h>
> #include <drm/drm_mm.h>
> -#include <drm/i915_drm.h>
> +#include <uapi/drm/i915_drm.h>
>
> struct drm_i915_private;
> struct drm_i915_gem_object;
> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> index 598840b73dfa..92b00b4de240 100644
> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
> @@ -3,8 +3,6 @@
> * Copyright(c) 2020, Intel Corporation. All rights reserved.
> */
>
> -#include <drm/i915_drm.h>
> -
> #include "i915_drv.h"
>
> #include "intel_pxp.h"
> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
> index afbf3ef5643e..7adce327c1c2 100644
> --- a/include/drm/i915_drm.h
> +++ b/include/drm/i915_drm.h
> @@ -26,7 +26,7 @@
> #ifndef _I915_DRM_H_
> #define _I915_DRM_H_
>
> -#include <uapi/drm/i915_drm.h>
> +#include <linux/types.h>
>
> /* For use by IPS driver */
> unsigned long i915_read_mch_val(void);
> --
> 2.30.2
--
Ville Syrjälä
Intel
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed
2022-03-17 17:50 ` Ville Syrjälä
@ 2022-03-17 18:23 ` Jani Nikula
0 siblings, 0 replies; 8+ messages in thread
From: Jani Nikula @ 2022-03-17 18:23 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: Bjorn Helgaas, linux-pci, intel-gfx, x86
On Thu, 17 Mar 2022, Ville Syrjälä <ville.syrjala@linux.intel.com> wrote:
> On Fri, Mar 11, 2022 at 12:06:39PM +0200, Jani Nikula wrote:
>> Remove the uapi/drm/i915_drm.h include from drm/i915_drm.h, and stop
>> being a proxy for uapi/drm/i915_drm.h. Include uapi/drm/i915_drm.h and
>> drm/i915_drm.h only where needed.
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Looks sensible to me. Series is
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Thanks for the review, pushed to drm-intel-next, with Bjorn's ack.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/gem/i915_gem_lmem.c | 2 ++
>> drivers/gpu/drm/i915/gem/i915_gem_region.c | 2 ++
>> drivers/gpu/drm/i915/intel_memory_region.c | 2 ++
>> drivers/gpu/drm/i915/intel_memory_region.h | 2 +-
>> drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 2 --
>> include/drm/i915_drm.h | 2 +-
>> 6 files changed, 8 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> index 444f8268b9c5..ede084f36ca9 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_lmem.c
>> @@ -3,6 +3,8 @@
>> * Copyright © 2019 Intel Corporation
>> */
>>
>> +#include <uapi/drm/i915_drm.h>
>> +
>> #include "intel_memory_region.h"
>> #include "gem/i915_gem_region.h"
>> #include "gem/i915_gem_lmem.h"
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_region.c b/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> index c9b2e8b91053..f4fbae2f9dcc 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_region.c
>> @@ -3,6 +3,8 @@
>> * Copyright © 2019 Intel Corporation
>> */
>>
>> +#include <uapi/drm/i915_drm.h>
>> +
>> #include "intel_memory_region.h"
>> #include "i915_gem_region.h"
>> #include "i915_drv.h"
>> diff --git a/drivers/gpu/drm/i915/intel_memory_region.c b/drivers/gpu/drm/i915/intel_memory_region.c
>> index 1c841f68169a..ded78b83e0b5 100644
>> --- a/drivers/gpu/drm/i915/intel_memory_region.c
>> +++ b/drivers/gpu/drm/i915/intel_memory_region.c
>> @@ -5,6 +5,8 @@
>>
>> #include <linux/prandom.h>
>>
>> +#include <uapi/drm/i915_drm.h>
>> +
>> #include "intel_memory_region.h"
>> #include "i915_drv.h"
>> #include "i915_ttm_buddy_manager.h"
>> diff --git a/drivers/gpu/drm/i915/intel_memory_region.h b/drivers/gpu/drm/i915/intel_memory_region.h
>> index 21dcbd620758..bbc35ec5c090 100644
>> --- a/drivers/gpu/drm/i915/intel_memory_region.h
>> +++ b/drivers/gpu/drm/i915/intel_memory_region.h
>> @@ -10,7 +10,7 @@
>> #include <linux/mutex.h>
>> #include <linux/io-mapping.h>
>> #include <drm/drm_mm.h>
>> -#include <drm/i915_drm.h>
>> +#include <uapi/drm/i915_drm.h>
>>
>> struct drm_i915_private;
>> struct drm_i915_gem_object;
>> diff --git a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> index 598840b73dfa..92b00b4de240 100644
>> --- a/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> +++ b/drivers/gpu/drm/i915/pxp/intel_pxp_session.c
>> @@ -3,8 +3,6 @@
>> * Copyright(c) 2020, Intel Corporation. All rights reserved.
>> */
>>
>> -#include <drm/i915_drm.h>
>> -
>> #include "i915_drv.h"
>>
>> #include "intel_pxp.h"
>> diff --git a/include/drm/i915_drm.h b/include/drm/i915_drm.h
>> index afbf3ef5643e..7adce327c1c2 100644
>> --- a/include/drm/i915_drm.h
>> +++ b/include/drm/i915_drm.h
>> @@ -26,7 +26,7 @@
>> #ifndef _I915_DRM_H_
>> #define _I915_DRM_H_
>>
>> -#include <uapi/drm/i915_drm.h>
>> +#include <linux/types.h>
>>
>> /* For use by IPS driver */
>> unsigned long i915_read_mch_val(void);
>> --
>> 2.30.2
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-03-17 18:23 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-03-11 10:06 [Intel-gfx] [PATCH 1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Jani Nikula
2022-03-11 10:06 ` [Intel-gfx] [PATCH 2/2] drm/i915: include uapi/drm/i915_drm.h directly where needed Jani Nikula
2022-03-17 17:50 ` Ville Syrjälä
2022-03-17 18:23 ` Jani Nikula
2022-03-11 10:27 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] x86/gpu: include drm/i915_pciids.h directly in early quirks Patchwork
2022-03-11 10:56 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-11 12:28 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
2022-03-11 16:21 ` [Intel-gfx] [PATCH 1/2] " Bjorn Helgaas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox