* [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
@ 2022-09-14 16:35 Jani Nikula
2022-09-14 18:33 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Jani Nikula @ 2022-09-14 16:35 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula, Matthew Auld
The inline function has no place in i915_drv.h. Move it away, un-inline,
and untangle some header dependencies while at it.
Cc: Matthew Auld <matthew.auld@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
I don't know where this belongs, I just know it doesn't belong in
i915_drv.h.
I first tried moving it as inline, but it's really annoying as an inline
because it needs to pull in i915_drv.h, i915_gem_lmem.h, and
i915_gem_object_types.h.
---
drivers/gpu/drm/i915/display/intel_dpt.c | 1 +
drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++++
drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 ++++++++++++
drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 +
drivers/gpu/drm/i915/gt/intel_gsc.c | 1 +
drivers/gpu/drm/i915/gt/intel_migrate.c | 1 +
drivers/gpu/drm/i915/gt/selftest_migrate.c | 1 +
drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 +
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 +
drivers/gpu/drm/i915/i915_drv.h | 13 -------------
drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 +
11 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
index ac587647e1f5..ad1a37b515fb 100644
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -5,6 +5,7 @@
#include "gem/i915_gem_domain.h"
#include "gem/i915_gem_internal.h"
+#include "gem/i915_gem_lmem.h"
#include "gt/gen8_ppgtt.h"
#include "i915_drv.h"
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
index 7317d4102955..a3b7551a57fc 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
+++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
@@ -482,6 +482,10 @@ void *__must_check i915_gem_object_pin_map(struct drm_i915_gem_object *obj,
void *__must_check i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj,
enum i915_map_type type);
+enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
+ struct drm_i915_gem_object *obj,
+ bool always_coherent);
+
void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
unsigned long offset,
unsigned long size);
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
index 4df50b049cea..16f845663ff2 100644
--- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
@@ -466,6 +466,18 @@ void *i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj,
return ret;
}
+enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
+ struct drm_i915_gem_object *obj,
+ bool always_coherent)
+{
+ if (i915_gem_object_is_lmem(obj))
+ return I915_MAP_WC;
+ if (HAS_LLC(i915) || always_coherent)
+ return I915_MAP_WB;
+ else
+ return I915_MAP_WC;
+}
+
void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
unsigned long offset,
unsigned long size)
diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
index b73c91aa5450..1cae24349a96 100644
--- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
@@ -8,6 +8,7 @@
#include <linux/prime_numbers.h>
#include "gem/i915_gem_internal.h"
+#include "gem/i915_gem_lmem.h"
#include "gem/i915_gem_region.h"
#include "gem/i915_gem_ttm.h"
#include "gem/i915_gem_ttm_move.h"
diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.c b/drivers/gpu/drm/i915/gt/intel_gsc.c
index 7af6db3194dd..d56f75b605d8 100644
--- a/drivers/gpu/drm/i915/gt/intel_gsc.c
+++ b/drivers/gpu/drm/i915/gt/intel_gsc.c
@@ -7,6 +7,7 @@
#include <linux/mei_aux.h>
#include "i915_drv.h"
#include "i915_reg.h"
+#include "gem/i915_gem_lmem.h"
#include "gem/i915_gem_region.h"
#include "gt/intel_gsc.h"
#include "gt/intel_gt.h"
diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
index aaaf1906026c..b405a04135ca 100644
--- a/drivers/gpu/drm/i915/gt/intel_migrate.c
+++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
@@ -10,6 +10,7 @@
#include "intel_gtt.h"
#include "intel_migrate.h"
#include "intel_ring.h"
+#include "gem/i915_gem_lmem.h"
struct insert_pte_data {
u64 offset;
diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c
index 2b0c87999949..0dc5309c90a4 100644
--- a/drivers/gpu/drm/i915/gt/selftest_migrate.c
+++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c
@@ -6,6 +6,7 @@
#include <linux/sort.h>
#include "gem/i915_gem_internal.h"
+#include "gem/i915_gem_lmem.h"
#include "selftests/i915_random.h"
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
index 74cbe8eaf531..657f0beb8e06 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
@@ -5,6 +5,7 @@
#include <linux/bsearch.h>
+#include "gem/i915_gem_lmem.h"
#include "gt/intel_engine_regs.h"
#include "gt/intel_gt.h"
#include "gt/intel_gt_mcr.h"
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
index 22ba66e48a9b..ca6f47496869 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
@@ -6,6 +6,7 @@
#include <linux/circ_buf.h>
#include "gem/i915_gem_context.h"
+#include "gem/i915_gem_lmem.h"
#include "gt/gen8_engine_cs.h"
#include "gt/intel_breadcrumbs.h"
#include "gt/intel_context.h"
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index 9f9372931fd2..524b5ee495be 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -40,7 +40,6 @@
#include "display/intel_display_core.h"
#include "gem/i915_gem_context_types.h"
-#include "gem/i915_gem_lmem.h"
#include "gem/i915_gem_shrinker.h"
#include "gem/i915_gem_stolen.h"
@@ -985,16 +984,4 @@ mkwrite_device_info(struct drm_i915_private *dev_priv)
return (struct intel_device_info *)INTEL_INFO(dev_priv);
}
-static inline enum i915_map_type
-i915_coherent_map_type(struct drm_i915_private *i915,
- struct drm_i915_gem_object *obj, bool always_coherent)
-{
- if (i915_gem_object_is_lmem(obj))
- return I915_MAP_WC;
- if (HAS_LLC(i915) || always_coherent)
- return I915_MAP_WB;
- else
- return I915_MAP_WC;
-}
-
#endif
diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
index e050a2de5fd1..ea2cf1080979 100644
--- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
@@ -27,6 +27,7 @@
#include "gem/i915_gem_context.h"
#include "gem/i915_gem_internal.h"
+#include "gem/i915_gem_lmem.h"
#include "gem/i915_gem_region.h"
#include "gem/selftests/mock_context.h"
#include "gt/intel_context.h"
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
2022-09-14 16:35 [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline Jani Nikula
@ 2022-09-14 18:33 ` Patchwork
2022-09-14 18:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2022-09-14 18:33 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
URL : https://patchwork.freedesktop.org/series/108569/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
2022-09-14 16:35 [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline Jani Nikula
2022-09-14 18:33 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
@ 2022-09-14 18:52 ` Patchwork
2022-09-15 7:49 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2022-09-15 11:30 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2022-09-14 18:52 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 4764 bytes --]
== Series Details ==
Series: drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
URL : https://patchwork.freedesktop.org/series/108569/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12135 -> Patchwork_108569v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/index.html
Participating hosts (44 -> 41)
------------------------------
Missing (3): fi-ctg-p8600 bat-dg2-11 bat-jsl-3
Known issues
------------
Here are the changes found in Patchwork_108569v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@hangcheck:
- fi-hsw-g3258: [PASS][1] -> [INCOMPLETE][2] ([i915#3303] / [i915#4785])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/fi-hsw-g3258/igt@i915_selftest@live@hangcheck.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/fi-hsw-g3258/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@requests:
- fi-pnv-d510: [PASS][3] -> [DMESG-FAIL][4] ([i915#4528])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/fi-pnv-d510/igt@i915_selftest@live@requests.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/fi-pnv-d510/igt@i915_selftest@live@requests.html
- fi-blb-e6850: [PASS][5] -> [DMESG-FAIL][6] ([i915#4528])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/fi-blb-e6850/igt@i915_selftest@live@requests.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/fi-blb-e6850/igt@i915_selftest@live@requests.html
* igt@runner@aborted:
- fi-pnv-d510: NOTRUN -> [FAIL][7] ([fdo#109271] / [i915#2403] / [i915#4312])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/fi-pnv-d510/igt@runner@aborted.html
- fi-hsw-g3258: NOTRUN -> [FAIL][8] ([fdo#109271] / [i915#4312] / [i915#6246])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/fi-hsw-g3258/igt@runner@aborted.html
#### Possible fixes ####
* igt@gem_exec_suspend@basic-s0@smem:
- {bat-rplp-1}: [DMESG-WARN][9] ([i915#2867] / [i915#6842]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/bat-rplp-1/igt@gem_exec_suspend@basic-s0@smem.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/bat-rplp-1/igt@gem_exec_suspend@basic-s0@smem.html
* igt@i915_selftest@live@reset:
- {bat-adln-1}: [DMESG-FAIL][11] ([i915#4983]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/bat-adln-1/igt@i915_selftest@live@reset.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/bat-adln-1/igt@i915_selftest@live@reset.html
* igt@i915_selftest@live@slpc:
- {bat-rpls-1}: [DMESG-FAIL][13] ([i915#6367]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/bat-rpls-1/igt@i915_selftest@live@slpc.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/bat-rpls-1/igt@i915_selftest@live@slpc.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#2403]: https://gitlab.freedesktop.org/drm/intel/issues/2403
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4528]: https://gitlab.freedesktop.org/drm/intel/issues/4528
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#6246]: https://gitlab.freedesktop.org/drm/intel/issues/6246
[i915#6367]: https://gitlab.freedesktop.org/drm/intel/issues/6367
[i915#6842]: https://gitlab.freedesktop.org/drm/intel/issues/6842
Build changes
-------------
* Linux: CI_DRM_12135 -> Patchwork_108569v1
CI-20190529: 20190529
CI_DRM_12135: 9ba4c45313414a567e0b4a6d5f5c3dc27d86592e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6656: 24100c4e181c50e3678aeca9c641b8a43555ad73 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_108569v1: 9ba4c45313414a567e0b4a6d5f5c3dc27d86592e @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
08030c53454c drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/index.html
[-- Attachment #2: Type: text/html, Size: 5679 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
2022-09-14 16:35 [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline Jani Nikula
2022-09-14 18:33 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2022-09-14 18:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2022-09-15 7:49 ` Tvrtko Ursulin
2022-09-20 16:59 ` Matthew Auld
2022-09-15 11:30 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " Patchwork
3 siblings, 1 reply; 7+ messages in thread
From: Tvrtko Ursulin @ 2022-09-15 7:49 UTC (permalink / raw)
To: Jani Nikula, intel-gfx; +Cc: Matthew Auld
On 14/09/2022 17:35, Jani Nikula wrote:
> The inline function has no place in i915_drv.h. Move it away, un-inline,
> and untangle some header dependencies while at it.
>
> Cc: Matthew Auld <matthew.auld@intel.com>
> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> ---
>
> I don't know where this belongs, I just know it doesn't belong in
> i915_drv.h.
Don't know either.. it straddles the line between objects and platforms
by definition. Maybe Matt will have an idea or opinion.
Regards,
Tvrtko
> I first tried moving it as inline, but it's really annoying as an inline
> because it needs to pull in i915_drv.h, i915_gem_lmem.h, and
> i915_gem_object_types.h.
> ---
> drivers/gpu/drm/i915/display/intel_dpt.c | 1 +
> drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++++
> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 ++++++++++++
> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 +
> drivers/gpu/drm/i915/gt/intel_gsc.c | 1 +
> drivers/gpu/drm/i915/gt/intel_migrate.c | 1 +
> drivers/gpu/drm/i915/gt/selftest_migrate.c | 1 +
> drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 +
> drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 +
> drivers/gpu/drm/i915/i915_drv.h | 13 -------------
> drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 +
> 11 files changed, 24 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
> index ac587647e1f5..ad1a37b515fb 100644
> --- a/drivers/gpu/drm/i915/display/intel_dpt.c
> +++ b/drivers/gpu/drm/i915/display/intel_dpt.c
> @@ -5,6 +5,7 @@
>
> #include "gem/i915_gem_domain.h"
> #include "gem/i915_gem_internal.h"
> +#include "gem/i915_gem_lmem.h"
> #include "gt/gen8_ppgtt.h"
>
> #include "i915_drv.h"
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> index 7317d4102955..a3b7551a57fc 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
> @@ -482,6 +482,10 @@ void *__must_check i915_gem_object_pin_map(struct drm_i915_gem_object *obj,
> void *__must_check i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj,
> enum i915_map_type type);
>
> +enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
> + struct drm_i915_gem_object *obj,
> + bool always_coherent);
> +
> void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
> unsigned long offset,
> unsigned long size);
> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> index 4df50b049cea..16f845663ff2 100644
> --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
> @@ -466,6 +466,18 @@ void *i915_gem_object_pin_map_unlocked(struct drm_i915_gem_object *obj,
> return ret;
> }
>
> +enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
> + struct drm_i915_gem_object *obj,
> + bool always_coherent)
> +{
> + if (i915_gem_object_is_lmem(obj))
> + return I915_MAP_WC;
> + if (HAS_LLC(i915) || always_coherent)
> + return I915_MAP_WB;
> + else
> + return I915_MAP_WC;
> +}
> +
> void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
> unsigned long offset,
> unsigned long size)
> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> index b73c91aa5450..1cae24349a96 100644
> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
> @@ -8,6 +8,7 @@
> #include <linux/prime_numbers.h>
>
> #include "gem/i915_gem_internal.h"
> +#include "gem/i915_gem_lmem.h"
> #include "gem/i915_gem_region.h"
> #include "gem/i915_gem_ttm.h"
> #include "gem/i915_gem_ttm_move.h"
> diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.c b/drivers/gpu/drm/i915/gt/intel_gsc.c
> index 7af6db3194dd..d56f75b605d8 100644
> --- a/drivers/gpu/drm/i915/gt/intel_gsc.c
> +++ b/drivers/gpu/drm/i915/gt/intel_gsc.c
> @@ -7,6 +7,7 @@
> #include <linux/mei_aux.h>
> #include "i915_drv.h"
> #include "i915_reg.h"
> +#include "gem/i915_gem_lmem.h"
> #include "gem/i915_gem_region.h"
> #include "gt/intel_gsc.h"
> #include "gt/intel_gt.h"
> diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c b/drivers/gpu/drm/i915/gt/intel_migrate.c
> index aaaf1906026c..b405a04135ca 100644
> --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
> +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
> @@ -10,6 +10,7 @@
> #include "intel_gtt.h"
> #include "intel_migrate.h"
> #include "intel_ring.h"
> +#include "gem/i915_gem_lmem.h"
>
> struct insert_pte_data {
> u64 offset;
> diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c b/drivers/gpu/drm/i915/gt/selftest_migrate.c
> index 2b0c87999949..0dc5309c90a4 100644
> --- a/drivers/gpu/drm/i915/gt/selftest_migrate.c
> +++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c
> @@ -6,6 +6,7 @@
> #include <linux/sort.h>
>
> #include "gem/i915_gem_internal.h"
> +#include "gem/i915_gem_lmem.h"
>
> #include "selftests/i915_random.h"
>
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> index 74cbe8eaf531..657f0beb8e06 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
> @@ -5,6 +5,7 @@
>
> #include <linux/bsearch.h>
>
> +#include "gem/i915_gem_lmem.h"
> #include "gt/intel_engine_regs.h"
> #include "gt/intel_gt.h"
> #include "gt/intel_gt_mcr.h"
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> index 22ba66e48a9b..ca6f47496869 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
> @@ -6,6 +6,7 @@
> #include <linux/circ_buf.h>
>
> #include "gem/i915_gem_context.h"
> +#include "gem/i915_gem_lmem.h"
> #include "gt/gen8_engine_cs.h"
> #include "gt/intel_breadcrumbs.h"
> #include "gt/intel_context.h"
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index 9f9372931fd2..524b5ee495be 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -40,7 +40,6 @@
> #include "display/intel_display_core.h"
>
> #include "gem/i915_gem_context_types.h"
> -#include "gem/i915_gem_lmem.h"
> #include "gem/i915_gem_shrinker.h"
> #include "gem/i915_gem_stolen.h"
>
> @@ -985,16 +984,4 @@ mkwrite_device_info(struct drm_i915_private *dev_priv)
> return (struct intel_device_info *)INTEL_INFO(dev_priv);
> }
>
> -static inline enum i915_map_type
> -i915_coherent_map_type(struct drm_i915_private *i915,
> - struct drm_i915_gem_object *obj, bool always_coherent)
> -{
> - if (i915_gem_object_is_lmem(obj))
> - return I915_MAP_WC;
> - if (HAS_LLC(i915) || always_coherent)
> - return I915_MAP_WB;
> - else
> - return I915_MAP_WC;
> -}
> -
> #endif
> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> index e050a2de5fd1..ea2cf1080979 100644
> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
> @@ -27,6 +27,7 @@
>
> #include "gem/i915_gem_context.h"
> #include "gem/i915_gem_internal.h"
> +#include "gem/i915_gem_lmem.h"
> #include "gem/i915_gem_region.h"
> #include "gem/selftests/mock_context.h"
> #include "gt/intel_context.h"
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
2022-09-14 16:35 [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline Jani Nikula
` (2 preceding siblings ...)
2022-09-15 7:49 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
@ 2022-09-15 11:30 ` Patchwork
3 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2022-09-15 11:30 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 31644 bytes --]
== Series Details ==
Series: drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
URL : https://patchwork.freedesktop.org/series/108569/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12135_full -> Patchwork_108569v1_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_108569v1_full absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_108569v1_full, please notify your bug team to allow them
to document this new failure mode, which will reduce false positives in CI.
Participating hosts (11 -> 11)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_108569v1_full:
### IGT changes ###
#### Possible regressions ####
* igt@i915_pm_dc@dc5-psr:
- shard-iclb: [PASS][1] -> [FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb2/igt@i915_pm_dc@dc5-psr.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb5/igt@i915_pm_dc@dc5-psr.html
Known issues
------------
Here are the changes found in Patchwork_108569v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_ctx_sseu@invalid-sseu:
- shard-tglb: NOTRUN -> [SKIP][3] ([i915#280])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@gem_ctx_sseu@invalid-sseu.html
* igt@gem_exec_balancer@parallel-keep-submit-fence:
- shard-iclb: [PASS][4] -> [SKIP][5] ([i915#4525])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb2/igt@gem_exec_balancer@parallel-keep-submit-fence.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb5/igt@gem_exec_balancer@parallel-keep-submit-fence.html
* igt@gem_exec_fair@basic-none@vcs1:
- shard-iclb: NOTRUN -> [FAIL][6] ([i915#2842])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb1/igt@gem_exec_fair@basic-none@vcs1.html
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [PASS][7] -> [FAIL][8] ([i915#2842])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-tglb1/igt@gem_exec_fair@basic-pace-share@rcs0.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb7/igt@gem_exec_fair@basic-pace-share@rcs0.html
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][9] -> [SKIP][10] ([i915#2190])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-tglb1/igt@gem_huc_copy@huc-copy.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb7/igt@gem_huc_copy@huc-copy.html
* igt@gem_lmem_swapping@parallel-random:
- shard-iclb: NOTRUN -> [SKIP][11] ([i915#4613])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@gem_lmem_swapping@parallel-random.html
* igt@gem_pxp@create-regular-context-2:
- shard-iclb: NOTRUN -> [SKIP][12] ([i915#4270])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@gem_pxp@create-regular-context-2.html
* igt@gem_workarounds@suspend-resume:
- shard-apl: [PASS][13] -> [DMESG-WARN][14] ([i915#180]) +2 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl3/igt@gem_workarounds@suspend-resume.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl1/igt@gem_workarounds@suspend-resume.html
* igt@gen7_exec_parse@basic-offset:
- shard-iclb: NOTRUN -> [SKIP][15] ([fdo#109289])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@gen7_exec_parse@basic-offset.html
* igt@gen9_exec_parse@bb-start-param:
- shard-iclb: NOTRUN -> [SKIP][16] ([i915#2856])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@gen9_exec_parse@bb-start-param.html
* igt@i915_pm_dc@dc6-dpms:
- shard-iclb: [PASS][17] -> [FAIL][18] ([i915#454])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb5/igt@i915_pm_dc@dc6-dpms.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb3/igt@i915_pm_dc@dc6-dpms.html
* igt@i915_pm_rpm@gem-execbuf-stress-pc8:
- shard-iclb: NOTRUN -> [SKIP][19] ([fdo#109293] / [fdo#109506])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@i915_pm_rpm@gem-execbuf-stress-pc8.html
* igt@i915_pm_rps@engine-order:
- shard-apl: [PASS][20] -> [FAIL][21] ([i915#6537])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl6/igt@i915_pm_rps@engine-order.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl2/igt@i915_pm_rps@engine-order.html
* igt@kms_big_fb@4-tiled-32bpp-rotate-270:
- shard-tglb: NOTRUN -> [SKIP][22] ([i915#5286])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_big_fb@4-tiled-32bpp-rotate-270.html
* igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs:
- shard-iclb: NOTRUN -> [SKIP][23] ([fdo#109278] / [i915#3886]) +1 similar issue
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@kms_ccs@pipe-a-bad-aux-stride-y_tiled_gen12_mc_ccs.html
* igt@kms_ccs@pipe-a-crc-primary-basic-4_tiled_dg2_rc_ccs:
- shard-tglb: NOTRUN -> [SKIP][24] ([i915#3689] / [i915#6095])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_ccs@pipe-a-crc-primary-basic-4_tiled_dg2_rc_ccs.html
* igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_ccs:
- shard-tglb: NOTRUN -> [SKIP][25] ([i915#3689]) +2 similar issues
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_ccs.html
* igt@kms_chamelium@hdmi-frame-dump:
- shard-tglb: NOTRUN -> [SKIP][26] ([fdo#109284] / [fdo#111827]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_chamelium@hdmi-frame-dump.html
* igt@kms_color_chamelium@ctm-limited-range:
- shard-apl: NOTRUN -> [SKIP][27] ([fdo#109271] / [fdo#111827])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl6/igt@kms_color_chamelium@ctm-limited-range.html
* igt@kms_cursor_crc@cursor-random-512x170:
- shard-iclb: NOTRUN -> [SKIP][28] ([i915#3359])
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@kms_cursor_crc@cursor-random-512x170.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size:
- shard-glk: [PASS][29] -> [FAIL][30] ([i915#2346])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk9/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions-varying-size.html
* igt@kms_flip@2x-flip-vs-suspend:
- shard-iclb: NOTRUN -> [SKIP][31] ([fdo#109274])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@kms_flip@2x-flip-vs-suspend.html
* igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][32] ([i915#2672])
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-yftileccs-to-64bpp-yftile-upscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling@pipe-a-default-mode:
- shard-iclb: [PASS][33] -> [SKIP][34] ([i915#3555])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb3/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling@pipe-a-default-mode.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-64bpp-ytile-downscaling@pipe-a-default-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-downscaling@pipe-a-valid-mode:
- shard-iclb: NOTRUN -> [SKIP][35] ([i915#2587] / [i915#2672]) +5 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@kms_flip_scaled_crc@flip-64bpp-4tile-to-32bpp-4tiledg2rcccs-downscaling@pipe-a-valid-mode.html
* igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-32bpp-xtile-downscaling@pipe-a-default-mode:
- shard-iclb: NOTRUN -> [SKIP][36] ([i915#3555])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-xtile-to-32bpp-xtile-downscaling@pipe-a-default-mode.html
* igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-pwrite:
- shard-tglb: NOTRUN -> [SKIP][37] ([fdo#109280] / [fdo#111825]) +4 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-2p-scndscrn-spr-indfb-draw-pwrite.html
* igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-mmap-gtt:
- shard-tglb: NOTRUN -> [SKIP][38] ([i915#6497])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_frontbuffer_tracking@fbcpsr-rgb565-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@psr-1p-rte:
- shard-tglb: [PASS][39] -> [INCOMPLETE][40] ([i915#1982])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-tglb5/igt@kms_frontbuffer_tracking@psr-1p-rte.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb8/igt@kms_frontbuffer_tracking@psr-1p-rte.html
* igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-indfb-draw-mmap-cpu:
- shard-iclb: NOTRUN -> [SKIP][41] ([fdo#109280]) +3 similar issues
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@kms_frontbuffer_tracking@psr-2p-primscrn-pri-indfb-draw-mmap-cpu.html
* igt@kms_hdr@bpc-switch-dpms:
- shard-tglb: NOTRUN -> [SKIP][42] ([i915#3555]) +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_hdr@bpc-switch-dpms.html
* igt@kms_plane_alpha_blend@pipe-d-coverage-7efc:
- shard-iclb: NOTRUN -> [SKIP][43] ([fdo#109278]) +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@kms_plane_alpha_blend@pipe-d-coverage-7efc.html
* igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-75@pipe-c-hdmi-a-1:
- shard-glk: NOTRUN -> [SKIP][44] ([fdo#109271]) +3 similar issues
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk8/igt@kms_plane_scaling@planes-upscale-factor-0-25-downscale-factor-0-75@pipe-c-hdmi-a-1.html
* igt@kms_psr2_sf@cursor-plane-update-sf:
- shard-tglb: NOTRUN -> [SKIP][45] ([i915#2920])
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_psr2_sf@cursor-plane-update-sf.html
* igt@kms_psr@psr2_cursor_mmap_gtt:
- shard-iclb: [PASS][46] -> [SKIP][47] ([fdo#109441])
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_gtt.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb5/igt@kms_psr@psr2_cursor_mmap_gtt.html
* igt@kms_psr_stress_test@invalidate-primary-flip-overlay:
- shard-tglb: [PASS][48] -> [SKIP][49] ([i915#5519])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-tglb2/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
- shard-iclb: [PASS][50] -> [SKIP][51] ([i915#5519])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb4/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb7/igt@kms_psr_stress_test@invalidate-primary-flip-overlay.html
* igt@kms_universal_plane@universal-plane-pipe-a-sanity:
- shard-snb: [PASS][52] -> [SKIP][53] ([fdo#109271])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-snb4/igt@kms_universal_plane@universal-plane-pipe-a-sanity.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-snb6/igt@kms_universal_plane@universal-plane-pipe-a-sanity.html
* igt@kms_vblank@pipe-d-query-idle:
- shard-apl: NOTRUN -> [SKIP][54] ([fdo#109271])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl6/igt@kms_vblank@pipe-d-query-idle.html
* igt@nouveau_crc@pipe-d-ctx-flip-skip-current-frame:
- shard-tglb: NOTRUN -> [SKIP][55] ([i915#2530])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@nouveau_crc@pipe-d-ctx-flip-skip-current-frame.html
* igt@prime_nv_api@nv_i915_reimport_twice_check_flink_name:
- shard-tglb: NOTRUN -> [SKIP][56] ([fdo#109291])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@prime_nv_api@nv_i915_reimport_twice_check_flink_name.html
* igt@prime_nv_pcopy@test3_2:
- shard-iclb: NOTRUN -> [SKIP][57] ([fdo#109291])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@prime_nv_pcopy@test3_2.html
* igt@prime_vgem@fence-flip-hang:
- shard-tglb: NOTRUN -> [SKIP][58] ([fdo#109295])
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@prime_vgem@fence-flip-hang.html
#### Possible fixes ####
* igt@gem_eio@unwedge-stress:
- shard-iclb: [TIMEOUT][59] ([i915#3070]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb4/igt@gem_eio@unwedge-stress.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb7/igt@gem_eio@unwedge-stress.html
* igt@gem_exec_balancer@parallel:
- shard-iclb: [SKIP][61] ([i915#4525]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb3/igt@gem_exec_balancer@parallel.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb1/igt@gem_exec_balancer@parallel.html
* igt@gem_exec_fair@basic-none-share@rcs0:
- {shard-tglu}: [FAIL][63] ([i915#2842]) -> [PASS][64]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-tglu-4/igt@gem_exec_fair@basic-none-share@rcs0.html
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglu-2/igt@gem_exec_fair@basic-none-share@rcs0.html
* igt@gem_exec_fair@basic-none-solo@rcs0:
- shard-apl: [FAIL][65] ([i915#2842]) -> [PASS][66] +1 similar issue
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl4/igt@gem_exec_fair@basic-none-solo@rcs0.html
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl6/igt@gem_exec_fair@basic-none-solo@rcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-glk: [FAIL][67] ([i915#2842]) -> [PASS][68]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk2/igt@gem_exec_fair@basic-none@vcs0.html
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk9/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [FAIL][69] ([i915#2842]) -> [PASS][70]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb8/igt@gem_exec_fair@basic-throttle@rcs0.html
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb1/igt@gem_exec_fair@basic-throttle@rcs0.html
* igt@gem_exec_parallel@engines@contexts:
- shard-iclb: [INCOMPLETE][71] ([i915#6453]) -> [PASS][72]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb7/igt@gem_exec_parallel@engines@contexts.html
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb6/igt@gem_exec_parallel@engines@contexts.html
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [DMESG-WARN][73] ([i915#5566] / [i915#716]) -> [PASS][74]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk8/igt@gen9_exec_parse@allowed-single.html
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk8/igt@gen9_exec_parse@allowed-single.html
* igt@i915_module_load@reload-with-fault-injection:
- shard-tglb: [INCOMPLETE][75] ([i915#6775]) -> [PASS][76]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-tglb5/igt@i915_module_load@reload-with-fault-injection.html
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-tglb2/igt@i915_module_load@reload-with-fault-injection.html
* igt@i915_pm_dc@dc6-psr:
- shard-iclb: [FAIL][77] ([i915#454]) -> [PASS][78]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb3/igt@i915_pm_dc@dc6-psr.html
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb1/igt@i915_pm_dc@dc6-psr.html
* igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions:
- shard-glk: [FAIL][79] ([i915#2346]) -> [PASS][80]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk9/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk5/igt@kms_cursor_legacy@flip-vs-cursor@atomic-transitions.html
* igt@kms_cursor_legacy@flip-vs-cursor@toggle:
- shard-iclb: [FAIL][81] ([i915#2346]) -> [PASS][82] +2 similar issues
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor@toggle.html
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb2/igt@kms_cursor_legacy@flip-vs-cursor@toggle.html
* igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1:
- shard-glk: [FAIL][83] ([i915#79]) -> [PASS][84]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk3/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk6/igt@kms_flip@flip-vs-expired-vblank@c-hdmi-a1.html
* igt@kms_flip@flip-vs-suspend@a-dp1:
- shard-apl: [DMESG-WARN][85] ([i915#180]) -> [PASS][86] +1 similar issue
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl2/igt@kms_flip@flip-vs-suspend@a-dp1.html
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl2/igt@kms_flip@flip-vs-suspend@a-dp1.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt:
- shard-glk: [FAIL][87] ([i915#2546]) -> [PASS][88]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render:
- shard-glk: [FAIL][89] ([i915#1888] / [i915#2546]) -> [PASS][90]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk2/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk1/igt@kms_frontbuffer_tracking@fbc-1p-primscrn-spr-indfb-draw-render.html
* igt@kms_plane_lowres@tiling-y@pipe-c-hdmi-a-1:
- shard-glk: [FAIL][91] ([i915#1888]) -> [PASS][92]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-glk2/igt@kms_plane_lowres@tiling-y@pipe-c-hdmi-a-1.html
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-glk1/igt@kms_plane_lowres@tiling-y@pipe-c-hdmi-a-1.html
* igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1:
- shard-iclb: [SKIP][93] ([i915#5176]) -> [PASS][94] +1 similar issue
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb3/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb2/igt@kms_plane_scaling@plane-scaler-with-clipping-clamping-pixel-formats@pipe-b-edp-1.html
* igt@kms_psr2_su@frontbuffer-xrgb8888:
- shard-iclb: [SKIP][95] ([fdo#109642] / [fdo#111068] / [i915#658]) -> [PASS][96]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb7/igt@kms_psr2_su@frontbuffer-xrgb8888.html
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb2/igt@kms_psr2_su@frontbuffer-xrgb8888.html
* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][97] ([fdo#109441]) -> [PASS][98] +2 similar issues
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb3/igt@kms_psr@psr2_sprite_plane_move.html
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html
#### Warnings ####
* igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf:
- shard-iclb: [SKIP][99] ([i915#2920]) -> [SKIP][100] ([i915#658]) +1 similar issue
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb2/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf.html
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb5/igt@kms_psr2_sf@overlay-plane-move-continuous-exceed-fully-sf.html
* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-iclb: [SKIP][101] ([i915#2920]) -> [SKIP][102] ([fdo#111068] / [i915#658])
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb2/igt@kms_psr2_sf@plane-move-sf-dmg-area.html
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb5/igt@kms_psr2_sf@plane-move-sf-dmg-area.html
* igt@kms_psr2_su@page_flip-p010:
- shard-iclb: [FAIL][103] ([i915#5939]) -> [SKIP][104] ([fdo#109642] / [fdo#111068] / [i915#658])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-iclb2/igt@kms_psr2_su@page_flip-p010.html
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-iclb5/igt@kms_psr2_su@page_flip-p010.html
* igt@runner@aborted:
- shard-apl: ([FAIL][105], [FAIL][106], [FAIL][107], [FAIL][108]) ([i915#180] / [i915#3002] / [i915#4312] / [i915#5257] / [i915#6599]) -> ([FAIL][109], [FAIL][110], [FAIL][111], [FAIL][112], [FAIL][113]) ([fdo#109271] / [i915#180] / [i915#3002] / [i915#4312] / [i915#5257] / [i915#6599])
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl2/igt@runner@aborted.html
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl2/igt@runner@aborted.html
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl4/igt@runner@aborted.html
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12135/shard-apl1/igt@runner@aborted.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl6/igt@runner@aborted.html
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl2/igt@runner@aborted.html
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl4/igt@runner@aborted.html
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl1/igt@runner@aborted.html
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_108569v1/shard-apl3/igt@runner@aborted.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109291]: https://bugs.freedesktop.org/show_bug.cgi?id=109291
[fdo#109293]: https://bugs.freedesktop.org/show_bug.cgi?id=109293
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109307]: https://bugs.freedesktop.org/show_bug.cgi?id=109307
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109314]: https://bugs.freedesktop.org/show_bug.cgi?id=109314
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1063]: https://gitlab.freedesktop.org/drm/intel/issues/1063
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2346]: https://gitlab.freedesktop.org/drm/intel/issues/2346
[i915#2410]: https://gitlab.freedesktop.org/drm/intel/issues/2410
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2530]: https://gitlab.freedesktop.org/drm/intel/issues/2530
[i915#2546]: https://gitlab.freedesktop.org/drm/intel/issues/2546
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#284]: https://gitlab.freedesktop.org/drm/intel/issues/284
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3070]: https://gitlab.freedesktop.org/drm/intel/issues/3070
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#3318]: https://gitlab.freedesktop.org/drm/intel/issues/3318
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3825]: https://gitlab.freedesktop.org/drm/intel/issues/3825
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[i915#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#426]: https://gitlab.freedesktop.org/drm/intel/issues/426
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#4281]: https://gitlab.freedesktop.org/drm/intel/issues/4281
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5257]: https://gitlab.freedesktop.org/drm/intel/issues/5257
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5519]: https://gitlab.freedesktop.org/drm/intel/issues/5519
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#5939]: https://gitlab.freedesktop.org/drm/intel/issues/5939
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6117]: https://gitlab.freedesktop.org/drm/intel/issues/6117
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6301]: https://gitlab.freedesktop.org/drm/intel/issues/6301
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6453]: https://gitlab.freedesktop.org/drm/intel/issues/6453
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#6537]: https://gitlab.freedesktop.org/drm/intel/issues/6537
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6599]: https://gitlab.freedesktop.org/drm/intel/issues/6599
[i915#6775]: https://gitlab.freedesktop.org/drm/intel/issues/6775
[i915#716]: https://gitlab.freedesktop.org/drm/intel/issues/716
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
Build changes
-------------
* Linux: CI_DRM_12135 -> Patchwork_108569v1
CI-20190529: 20190529
CI_DRM_12135: 9ba4c45313414a567e0b4a6d5f5c3dc27d86592e @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6656: 24100c4e181c50e3678aeca9c641b8a43555ad73 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_108569v1: 9ba4c45313414a567e0b4a6d5f5c3dc27d86592e @ 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_108569v1/index.html
[-- Attachment #2: Type: text/html, Size: 33908 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
2022-09-15 7:49 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
@ 2022-09-20 16:59 ` Matthew Auld
2022-09-26 10:05 ` Jani Nikula
0 siblings, 1 reply; 7+ messages in thread
From: Matthew Auld @ 2022-09-20 16:59 UTC (permalink / raw)
To: Tvrtko Ursulin, Jani Nikula, intel-gfx
On 15/09/2022 08:49, Tvrtko Ursulin wrote:
>
> On 14/09/2022 17:35, Jani Nikula wrote:
>> The inline function has no place in i915_drv.h. Move it away, un-inline,
>> and untangle some header dependencies while at it.
>>
>> Cc: Matthew Auld <matthew.auld@intel.com>
>> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>
>> ---
>>
>> I don't know where this belongs, I just know it doesn't belong in
>> i915_drv.h.
>
> Don't know either.. it straddles the line between objects and platforms
> by definition. Maybe Matt will have an idea or opinion.
gem_pages.c seems like a good enough spot to me.
Acked-by: Matthew Auld <matthew.auld@intel.com>
>
> Regards,
>
> Tvrtko
>
>> I first tried moving it as inline, but it's really annoying as an inline
>> because it needs to pull in i915_drv.h, i915_gem_lmem.h, and
>> i915_gem_object_types.h.
>> ---
>> drivers/gpu/drm/i915/display/intel_dpt.c | 1 +
>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++++
>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 ++++++++++++
>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 +
>> drivers/gpu/drm/i915/gt/intel_gsc.c | 1 +
>> drivers/gpu/drm/i915/gt/intel_migrate.c | 1 +
>> drivers/gpu/drm/i915/gt/selftest_migrate.c | 1 +
>> drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 +
>> drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 +
>> drivers/gpu/drm/i915/i915_drv.h | 13 -------------
>> drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 +
>> 11 files changed, 24 insertions(+), 13 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c
>> b/drivers/gpu/drm/i915/display/intel_dpt.c
>> index ac587647e1f5..ad1a37b515fb 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dpt.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dpt.c
>> @@ -5,6 +5,7 @@
>> #include "gem/i915_gem_domain.h"
>> #include "gem/i915_gem_internal.h"
>> +#include "gem/i915_gem_lmem.h"
>> #include "gt/gen8_ppgtt.h"
>> #include "i915_drv.h"
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h
>> b/drivers/gpu/drm/i915/gem/i915_gem_object.h
>> index 7317d4102955..a3b7551a57fc 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
>> @@ -482,6 +482,10 @@ void *__must_check i915_gem_object_pin_map(struct
>> drm_i915_gem_object *obj,
>> void *__must_check i915_gem_object_pin_map_unlocked(struct
>> drm_i915_gem_object *obj,
>> enum i915_map_type type);
>> +enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
>> + struct drm_i915_gem_object *obj,
>> + bool always_coherent);
>> +
>> void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
>> unsigned long offset,
>> unsigned long size);
>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>> b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>> index 4df50b049cea..16f845663ff2 100644
>> --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>> @@ -466,6 +466,18 @@ void *i915_gem_object_pin_map_unlocked(struct
>> drm_i915_gem_object *obj,
>> return ret;
>> }
>> +enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
>> + struct drm_i915_gem_object *obj,
>> + bool always_coherent)
>> +{
>> + if (i915_gem_object_is_lmem(obj))
>> + return I915_MAP_WC;
>> + if (HAS_LLC(i915) || always_coherent)
>> + return I915_MAP_WB;
>> + else
>> + return I915_MAP_WC;
>> +}
>> +
>> void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
>> unsigned long offset,
>> unsigned long size)
>> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>> b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>> index b73c91aa5450..1cae24349a96 100644
>> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>> @@ -8,6 +8,7 @@
>> #include <linux/prime_numbers.h>
>> #include "gem/i915_gem_internal.h"
>> +#include "gem/i915_gem_lmem.h"
>> #include "gem/i915_gem_region.h"
>> #include "gem/i915_gem_ttm.h"
>> #include "gem/i915_gem_ttm_move.h"
>> diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.c
>> b/drivers/gpu/drm/i915/gt/intel_gsc.c
>> index 7af6db3194dd..d56f75b605d8 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_gsc.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_gsc.c
>> @@ -7,6 +7,7 @@
>> #include <linux/mei_aux.h>
>> #include "i915_drv.h"
>> #include "i915_reg.h"
>> +#include "gem/i915_gem_lmem.h"
>> #include "gem/i915_gem_region.h"
>> #include "gt/intel_gsc.h"
>> #include "gt/intel_gt.h"
>> diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c
>> b/drivers/gpu/drm/i915/gt/intel_migrate.c
>> index aaaf1906026c..b405a04135ca 100644
>> --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
>> +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
>> @@ -10,6 +10,7 @@
>> #include "intel_gtt.h"
>> #include "intel_migrate.h"
>> #include "intel_ring.h"
>> +#include "gem/i915_gem_lmem.h"
>> struct insert_pte_data {
>> u64 offset;
>> diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c
>> b/drivers/gpu/drm/i915/gt/selftest_migrate.c
>> index 2b0c87999949..0dc5309c90a4 100644
>> --- a/drivers/gpu/drm/i915/gt/selftest_migrate.c
>> +++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c
>> @@ -6,6 +6,7 @@
>> #include <linux/sort.h>
>> #include "gem/i915_gem_internal.h"
>> +#include "gem/i915_gem_lmem.h"
>> #include "selftests/i915_random.h"
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>> index 74cbe8eaf531..657f0beb8e06 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>> @@ -5,6 +5,7 @@
>> #include <linux/bsearch.h>
>> +#include "gem/i915_gem_lmem.h"
>> #include "gt/intel_engine_regs.h"
>> #include "gt/intel_gt.h"
>> #include "gt/intel_gt_mcr.h"
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>> b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>> index 22ba66e48a9b..ca6f47496869 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>> @@ -6,6 +6,7 @@
>> #include <linux/circ_buf.h>
>> #include "gem/i915_gem_context.h"
>> +#include "gem/i915_gem_lmem.h"
>> #include "gt/gen8_engine_cs.h"
>> #include "gt/intel_breadcrumbs.h"
>> #include "gt/intel_context.h"
>> diff --git a/drivers/gpu/drm/i915/i915_drv.h
>> b/drivers/gpu/drm/i915/i915_drv.h
>> index 9f9372931fd2..524b5ee495be 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.h
>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>> @@ -40,7 +40,6 @@
>> #include "display/intel_display_core.h"
>> #include "gem/i915_gem_context_types.h"
>> -#include "gem/i915_gem_lmem.h"
>> #include "gem/i915_gem_shrinker.h"
>> #include "gem/i915_gem_stolen.h"
>> @@ -985,16 +984,4 @@ mkwrite_device_info(struct drm_i915_private
>> *dev_priv)
>> return (struct intel_device_info *)INTEL_INFO(dev_priv);
>> }
>> -static inline enum i915_map_type
>> -i915_coherent_map_type(struct drm_i915_private *i915,
>> - struct drm_i915_gem_object *obj, bool always_coherent)
>> -{
>> - if (i915_gem_object_is_lmem(obj))
>> - return I915_MAP_WC;
>> - if (HAS_LLC(i915) || always_coherent)
>> - return I915_MAP_WB;
>> - else
>> - return I915_MAP_WC;
>> -}
>> -
>> #endif
>> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> index e050a2de5fd1..ea2cf1080979 100644
>> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>> @@ -27,6 +27,7 @@
>> #include "gem/i915_gem_context.h"
>> #include "gem/i915_gem_internal.h"
>> +#include "gem/i915_gem_lmem.h"
>> #include "gem/i915_gem_region.h"
>> #include "gem/selftests/mock_context.h"
>> #include "gt/intel_context.h"
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline
2022-09-20 16:59 ` Matthew Auld
@ 2022-09-26 10:05 ` Jani Nikula
0 siblings, 0 replies; 7+ messages in thread
From: Jani Nikula @ 2022-09-26 10:05 UTC (permalink / raw)
To: Matthew Auld, Tvrtko Ursulin, intel-gfx
On Tue, 20 Sep 2022, Matthew Auld <matthew.auld@intel.com> wrote:
> On 15/09/2022 08:49, Tvrtko Ursulin wrote:
>>
>> On 14/09/2022 17:35, Jani Nikula wrote:
>>> The inline function has no place in i915_drv.h. Move it away, un-inline,
>>> and untangle some header dependencies while at it.
>>>
>>> Cc: Matthew Auld <matthew.auld@intel.com>
>>> Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
>>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>>>
>>> ---
>>>
>>> I don't know where this belongs, I just know it doesn't belong in
>>> i915_drv.h.
>>
>> Don't know either.. it straddles the line between objects and platforms
>> by definition. Maybe Matt will have an idea or opinion.
>
> gem_pages.c seems like a good enough spot to me.
>
> Acked-by: Matthew Auld <matthew.auld@intel.com>
Thanks, pushed to drm-intel-gt-next.
BR,
Jani.
>
>>
>> Regards,
>>
>> Tvrtko
>>
>>> I first tried moving it as inline, but it's really annoying as an inline
>>> because it needs to pull in i915_drv.h, i915_gem_lmem.h, and
>>> i915_gem_object_types.h.
>>> ---
>>> drivers/gpu/drm/i915/display/intel_dpt.c | 1 +
>>> drivers/gpu/drm/i915/gem/i915_gem_object.h | 4 ++++
>>> drivers/gpu/drm/i915/gem/i915_gem_pages.c | 12 ++++++++++++
>>> drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 1 +
>>> drivers/gpu/drm/i915/gt/intel_gsc.c | 1 +
>>> drivers/gpu/drm/i915/gt/intel_migrate.c | 1 +
>>> drivers/gpu/drm/i915/gt/selftest_migrate.c | 1 +
>>> drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 1 +
>>> drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 1 +
>>> drivers/gpu/drm/i915/i915_drv.h | 13 -------------
>>> drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 1 +
>>> 11 files changed, 24 insertions(+), 13 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c
>>> b/drivers/gpu/drm/i915/display/intel_dpt.c
>>> index ac587647e1f5..ad1a37b515fb 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_dpt.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_dpt.c
>>> @@ -5,6 +5,7 @@
>>> #include "gem/i915_gem_domain.h"
>>> #include "gem/i915_gem_internal.h"
>>> +#include "gem/i915_gem_lmem.h"
>>> #include "gt/gen8_ppgtt.h"
>>> #include "i915_drv.h"
>>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_object.h
>>> b/drivers/gpu/drm/i915/gem/i915_gem_object.h
>>> index 7317d4102955..a3b7551a57fc 100644
>>> --- a/drivers/gpu/drm/i915/gem/i915_gem_object.h
>>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_object.h
>>> @@ -482,6 +482,10 @@ void *__must_check i915_gem_object_pin_map(struct
>>> drm_i915_gem_object *obj,
>>> void *__must_check i915_gem_object_pin_map_unlocked(struct
>>> drm_i915_gem_object *obj,
>>> enum i915_map_type type);
>>> +enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
>>> + struct drm_i915_gem_object *obj,
>>> + bool always_coherent);
>>> +
>>> void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
>>> unsigned long offset,
>>> unsigned long size);
>>> diff --git a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>>> b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>>> index 4df50b049cea..16f845663ff2 100644
>>> --- a/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>>> +++ b/drivers/gpu/drm/i915/gem/i915_gem_pages.c
>>> @@ -466,6 +466,18 @@ void *i915_gem_object_pin_map_unlocked(struct
>>> drm_i915_gem_object *obj,
>>> return ret;
>>> }
>>> +enum i915_map_type i915_coherent_map_type(struct drm_i915_private *i915,
>>> + struct drm_i915_gem_object *obj,
>>> + bool always_coherent)
>>> +{
>>> + if (i915_gem_object_is_lmem(obj))
>>> + return I915_MAP_WC;
>>> + if (HAS_LLC(i915) || always_coherent)
>>> + return I915_MAP_WB;
>>> + else
>>> + return I915_MAP_WC;
>>> +}
>>> +
>>> void __i915_gem_object_flush_map(struct drm_i915_gem_object *obj,
>>> unsigned long offset,
>>> unsigned long size)
>>> diff --git a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>>> b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>>> index b73c91aa5450..1cae24349a96 100644
>>> --- a/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>>> +++ b/drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c
>>> @@ -8,6 +8,7 @@
>>> #include <linux/prime_numbers.h>
>>> #include "gem/i915_gem_internal.h"
>>> +#include "gem/i915_gem_lmem.h"
>>> #include "gem/i915_gem_region.h"
>>> #include "gem/i915_gem_ttm.h"
>>> #include "gem/i915_gem_ttm_move.h"
>>> diff --git a/drivers/gpu/drm/i915/gt/intel_gsc.c
>>> b/drivers/gpu/drm/i915/gt/intel_gsc.c
>>> index 7af6db3194dd..d56f75b605d8 100644
>>> --- a/drivers/gpu/drm/i915/gt/intel_gsc.c
>>> +++ b/drivers/gpu/drm/i915/gt/intel_gsc.c
>>> @@ -7,6 +7,7 @@
>>> #include <linux/mei_aux.h>
>>> #include "i915_drv.h"
>>> #include "i915_reg.h"
>>> +#include "gem/i915_gem_lmem.h"
>>> #include "gem/i915_gem_region.h"
>>> #include "gt/intel_gsc.h"
>>> #include "gt/intel_gt.h"
>>> diff --git a/drivers/gpu/drm/i915/gt/intel_migrate.c
>>> b/drivers/gpu/drm/i915/gt/intel_migrate.c
>>> index aaaf1906026c..b405a04135ca 100644
>>> --- a/drivers/gpu/drm/i915/gt/intel_migrate.c
>>> +++ b/drivers/gpu/drm/i915/gt/intel_migrate.c
>>> @@ -10,6 +10,7 @@
>>> #include "intel_gtt.h"
>>> #include "intel_migrate.h"
>>> #include "intel_ring.h"
>>> +#include "gem/i915_gem_lmem.h"
>>> struct insert_pte_data {
>>> u64 offset;
>>> diff --git a/drivers/gpu/drm/i915/gt/selftest_migrate.c
>>> b/drivers/gpu/drm/i915/gt/selftest_migrate.c
>>> index 2b0c87999949..0dc5309c90a4 100644
>>> --- a/drivers/gpu/drm/i915/gt/selftest_migrate.c
>>> +++ b/drivers/gpu/drm/i915/gt/selftest_migrate.c
>>> @@ -6,6 +6,7 @@
>>> #include <linux/sort.h>
>>> #include "gem/i915_gem_internal.h"
>>> +#include "gem/i915_gem_lmem.h"
>>> #include "selftests/i915_random.h"
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>>> index 74cbe8eaf531..657f0beb8e06 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c
>>> @@ -5,6 +5,7 @@
>>> #include <linux/bsearch.h>
>>> +#include "gem/i915_gem_lmem.h"
>>> #include "gt/intel_engine_regs.h"
>>> #include "gt/intel_gt.h"
>>> #include "gt/intel_gt_mcr.h"
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>>> b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>>> index 22ba66e48a9b..ca6f47496869 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>>> @@ -6,6 +6,7 @@
>>> #include <linux/circ_buf.h>
>>> #include "gem/i915_gem_context.h"
>>> +#include "gem/i915_gem_lmem.h"
>>> #include "gt/gen8_engine_cs.h"
>>> #include "gt/intel_breadcrumbs.h"
>>> #include "gt/intel_context.h"
>>> diff --git a/drivers/gpu/drm/i915/i915_drv.h
>>> b/drivers/gpu/drm/i915/i915_drv.h
>>> index 9f9372931fd2..524b5ee495be 100644
>>> --- a/drivers/gpu/drm/i915/i915_drv.h
>>> +++ b/drivers/gpu/drm/i915/i915_drv.h
>>> @@ -40,7 +40,6 @@
>>> #include "display/intel_display_core.h"
>>> #include "gem/i915_gem_context_types.h"
>>> -#include "gem/i915_gem_lmem.h"
>>> #include "gem/i915_gem_shrinker.h"
>>> #include "gem/i915_gem_stolen.h"
>>> @@ -985,16 +984,4 @@ mkwrite_device_info(struct drm_i915_private
>>> *dev_priv)
>>> return (struct intel_device_info *)INTEL_INFO(dev_priv);
>>> }
>>> -static inline enum i915_map_type
>>> -i915_coherent_map_type(struct drm_i915_private *i915,
>>> - struct drm_i915_gem_object *obj, bool always_coherent)
>>> -{
>>> - if (i915_gem_object_is_lmem(obj))
>>> - return I915_MAP_WC;
>>> - if (HAS_LLC(i915) || always_coherent)
>>> - return I915_MAP_WB;
>>> - else
>>> - return I915_MAP_WC;
>>> -}
>>> -
>>> #endif
>>> diff --git a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>>> b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>>> index e050a2de5fd1..ea2cf1080979 100644
>>> --- a/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>>> +++ b/drivers/gpu/drm/i915/selftests/i915_gem_gtt.c
>>> @@ -27,6 +27,7 @@
>>> #include "gem/i915_gem_context.h"
>>> #include "gem/i915_gem_internal.h"
>>> +#include "gem/i915_gem_lmem.h"
>>> #include "gem/i915_gem_region.h"
>>> #include "gem/selftests/mock_context.h"
>>> #include "gt/intel_context.h"
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-09-26 10:06 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-14 16:35 [Intel-gfx] [PATCH] drm/i915: move i915_coherent_map_type() to i915_gem_pages.c and un-inline Jani Nikula
2022-09-14 18:33 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2022-09-14 18:52 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-09-15 7:49 ` [Intel-gfx] [PATCH] " Tvrtko Ursulin
2022-09-20 16:59 ` Matthew Auld
2022-09-26 10:05 ` Jani Nikula
2022-09-15 11:30 ` [Intel-gfx] ✗ Fi.CI.IGT: failure for " 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.