Skip to contentSkip to conversation

drm/i915: header cleanup of the day

PATCH In review Jani Nikula 3 participants 18 messages Aug 8, 2019 – Aug 9, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover drm/i915: header cleanup of the day

The daily dose of header cleanup. I think I'll settle down for a while after this one. ;)

BR,
Jani.

Jani Nikula (10):
drm/i915: remove unused dev_priv->no_aux_handshake drm/i915: move add_taint_for_CI() to i915_utils.h drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h drm/i915: move printing and load error inject to i915_utils.[ch] drm/i915: extract i915_perf.h from i915_drv.h drm/i915: extract i915_sysfs.h from i915_drv.h drm/i915: extract i915_suspend.h from i915_drv.h drm/i915: extract i915_memcpy.h from i915_drv.h drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h drm/i915: extract i915_gem_shrinker.h from i915_drv.h

 drivers/gpu/drm/i915/Makefile                |   1 +
 drivers/gpu/drm/i915/display/intel_display.h |  18 +++
 drivers/gpu/drm/i915/display/intel_dp.c      |   4 -
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h |  31 ++++
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c   |   1 +
 drivers/gpu/drm/i915/gem/i915_gem_stolen.h   |  35 +++++
 drivers/gpu/drm/i915/gt/intel_gt.c           |   1 -
 drivers/gpu/drm/i915/gt/intel_lrc.c          |   1 +
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.c   |   3 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c       |   1 +
 drivers/gpu/drm/i915/i915_drv.c              |  73 +---------
 drivers/gpu/drm/i915/i915_drv.h              | 146 +------------------
 drivers/gpu/drm/i915/i915_gpu_error.c        |   1 +
 drivers/gpu/drm/i915/i915_memcpy.c           |   2 +-
 drivers/gpu/drm/i915/i915_memcpy.h           |  32 ++++
 drivers/gpu/drm/i915/i915_perf.c             |   1 +
 drivers/gpu/drm/i915/i915_perf.h             |  32 ++++
 drivers/gpu/drm/i915/i915_suspend.c          |   1 +
 drivers/gpu/drm/i915/i915_suspend.h          |  14 ++
 drivers/gpu/drm/i915/i915_sysfs.c            |   1 +
 drivers/gpu/drm/i915/i915_sysfs.h            |  14 ++
 drivers/gpu/drm/i915/i915_utils.c            |  78 ++++++++++
 drivers/gpu/drm/i915/i915_utils.h            |  41 ++++++
 23 files changed, 314 insertions(+), 218 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_stolen.h
 create mode 100644 drivers/gpu/drm/i915/i915_memcpy.h
 create mode 100644 drivers/gpu/drm/i915/i915_perf.h
 create mode 100644 drivers/gpu/drm/i915/i915_suspend.h
 create mode 100644 drivers/gpu/drm/i915/i915_sysfs.h
 create mode 100644 drivers/gpu/drm/i915/i915_utils.c
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/10 drm/i915: remove unused dev_priv->no_aux_handshake

The last user of dev_priv->no_aux_handshake was removed in commit 3cf2efb1a7c6 ("Revert "drm/i915/dp: use VBT provided eDP params if available""). Finally remove the leftovers.

---
 drivers/gpu/drm/i915/display/intel_dp.c | 4 ----
 drivers/gpu/drm/i915/i915_drv.h         | 3 ---
 2 files changed, 7 deletions(-)
drivers/gpu/drm/i915/display/intel_dp.c +0 -4
index 109249911576..4884c87c8ed7 100644
@@ -4147,10 +4147,6 @@ intel_edp_init_dpcd(struct intel_dp *intel_dp)
 	drm_dp_read_desc(&intel_dp->aux, &intel_dp->desc,
 			 drm_dp_is_branch(intel_dp->dpcd));
 
-	if (intel_dp->dpcd[DP_DPCD_REV] >= 0x11)
-		dev_priv->no_aux_handshake = intel_dp->dpcd[DP_MAX_DOWNSPREAD] &
-			DP_NO_AUX_HANDSHAKE_LINK_TRAINING;
-
 	/*
 	 * Read the eDP display control registers.
 	 *
drivers/gpu/drm/i915/i915_drv.h +0 -3
index 0d1949a78c44..4b944a125893 100644
@@ -1483,9 +1483,6 @@ struct drm_i915_private {
 	/* backlight registers and fields in struct intel_panel */
 	struct mutex backlight_lock;
 
-	/* LVDS info */
-	bool no_aux_handshake;
-
 	/* protects panel power sequencer state */
 	struct mutex pps_mutex;
 
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

PATCH 2/10 drm/i915: move add_taint_for_CI() to i915_utils.h

In reply to Jani Nikula

Seems like a better fit. Reduce clutter in i915_drv.h.

---
 drivers/gpu/drm/i915/i915_drv.h   | 11 -----------
 drivers/gpu/drm/i915/i915_utils.h | 11 +++++++++++
 2 files changed, 11 insertions(+), 11 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -11
index 4b944a125893..7c4e95173ec4 100644
@@ -2653,15 +2653,4 @@ i915_coherent_map_type(struct drm_i915_private *i915)
 	return HAS_LLC(i915) ? I915_MAP_WB : I915_MAP_WC;
 }
 
-static inline void add_taint_for_CI(unsigned int taint)
-{
-	/*
-	 * The system is "ok", just about surviving for the user, but
-	 * CI results are now unreliable as the HW is very suspect.
-	 * CI checks the taint state after every test and will reboot
-	 * the machine if the kernel is tainted.
-	 */
-	add_taint(taint, LOCKDEP_STILL_OK);
-}
-
 #endif
drivers/gpu/drm/i915/i915_utils.h +11 -0
index 4920ff9aba62..0c0fda36334d 100644
@@ -382,4 +382,15 @@ static inline const char *enableddisabled(bool v)
 	return v ? "enabled" : "disabled";
 }
 
+static inline void add_taint_for_CI(unsigned int taint)
+{
+	/*
+	 * The system is "ok", just about surviving for the user, but
+	 * CI results are now unreliable as the HW is very suspect.
+	 * CI checks the taint state after every test and will reboot
+	 * the machine if the kernel is tainted.
+	 */
+	add_taint(taint, LOCKDEP_STILL_OK);
+}
+
 #endif /* !__I915_UTILS_H */
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#4 lore raw

PATCH 3/10 drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h

In reply to Jani Nikula

It's for display. Seems like a better fit. Reduce clutter in i915_drv.h.

---
 drivers/gpu/drm/i915/display/intel_display.h | 18 ++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h              | 18 ------------------
 2 files changed, 18 insertions(+), 18 deletions(-)
drivers/gpu/drm/i915/display/intel_display.h +18 -0
index bf0d7225e649..e57e6969051d 100644
@@ -571,4 +571,22 @@ void assert_pipe(struct drm_i915_private *dev_priv, enum pipe pipe, bool state);
 #define assert_pipe_enabled(d, p) assert_pipe(d, p, true)
 #define assert_pipe_disabled(d, p) assert_pipe(d, p, false)
 
+/* Use I915_STATE_WARN(x) and I915_STATE_WARN_ON() (rather than WARN() and
+ * WARN_ON()) for hw state sanity checks to check for unexpected conditions
+ * which may not necessarily be a user visible problem.  This will either
+ * WARN() or DRM_ERROR() depending on the verbose_checks moduleparam, to
+ * enable distros and users to tailor their preferred amount of i915 abrt
+ * spam.
+ */
+#define I915_STATE_WARN(condition, format...) ({			\
+	int __ret_warn_on = !!(condition);				\
+	if (unlikely(__ret_warn_on))					\
+		if (!WARN(i915_modparams.verbose_state_checks, format))	\
+			DRM_ERROR(format);				\
+	unlikely(__ret_warn_on);					\
+})
+
+#define I915_STATE_WARN_ON(x)						\
+	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
+
 #endif
drivers/gpu/drm/i915/i915_drv.h +0 -18
index 7c4e95173ec4..21c87309cc32 100644
@@ -104,24 +104,6 @@
 #define DRIVER_DATE		"20190730"
 #define DRIVER_TIMESTAMP	1564512624
 
-/* Use I915_STATE_WARN(x) and I915_STATE_WARN_ON() (rather than WARN() and
- * WARN_ON()) for hw state sanity checks to check for unexpected conditions
- * which may not necessarily be a user visible problem.  This will either
- * WARN() or DRM_ERROR() depending on the verbose_checks moduleparam, to
- * enable distros and users to tailor their preferred amount of i915 abrt
- * spam.
- */
-#define I915_STATE_WARN(condition, format...) ({			\
-	int __ret_warn_on = !!(condition);				\
-	if (unlikely(__ret_warn_on))					\
-		if (!WARN(i915_modparams.verbose_state_checks, format))	\
-			DRM_ERROR(format);				\
-	unlikely(__ret_warn_on);					\
-})
-
-#define I915_STATE_WARN_ON(x)						\
-	I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")
-
 #if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
 
 int __i915_inject_load_error(struct drm_i915_private *i915, int err,
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#5 lore raw

PATCH 4/10 drm/i915: move printing and load error inject to i915_utils.[ch]

In reply to Jani Nikula

Seems like a better fit. Reduce clutter in i915_drv.[ch].

---
 drivers/gpu/drm/i915/Makefile     |  1 +
 drivers/gpu/drm/i915/i915_drv.c   | 69 ---------------------------
 drivers/gpu/drm/i915/i915_drv.h   | 28 -----------
 drivers/gpu/drm/i915/i915_utils.c | 78 +++++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_utils.h | 30 ++++++++++++
 5 files changed, 109 insertions(+), 97 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_utils.c
drivers/gpu/drm/i915/Makefile +1 -0
index ab7faeee88d7..aed6baefbe56 100644
@@ -47,6 +47,7 @@ i915-y += i915_drv.o \
 	  i915_scatterlist.o \
 	  i915_suspend.o \
 	  i915_sysfs.o \
+	  i915_utils.o \
 	  intel_csr.o \
 	  intel_device_info.o \
 	  intel_pch.o \
drivers/gpu/drm/i915/i915_drv.c +0 -69

75 lines not on this page · raw message

drivers/gpu/drm/i915/i915_drv.h +0 -28
index 21c87309cc32..5afc9da133c3 100644
@@ -104,27 +104,6 @@
 #define DRIVER_DATE		"20190730"
 #define DRIVER_TIMESTAMP	1564512624
 
-#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
-
-int __i915_inject_load_error(struct drm_i915_private *i915, int err,
-			     const char *func, int line);
-#define i915_inject_load_error(_i915, _err) \
-	__i915_inject_load_error((_i915), (_err), __func__, __LINE__)
-bool i915_error_injected(void);
-
-#else
-
-#define i915_inject_load_error(_i915, _err) 0
-#define i915_error_injected() false
-
-#endif
-
-#define i915_inject_probe_failure(i915) i915_inject_load_error((i915), -ENODEV)
-
-#define i915_probe_error(i915, fmt, ...)				   \
-	__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
-		      fmt, ##__VA_ARGS__)
-
 struct drm_i915_gem_object;
 
 enum hpd_pin {
@@ -2278,13 +2257,6 @@ intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv)
 }
 
 /* i915_drv.c */
-void __printf(3, 4)
-__i915_printk(struct drm_i915_private *dev_priv, const char *level,
-	      const char *fmt, ...);
-
-#define i915_report_error(dev_priv, fmt, ...)				   \
-	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)
-
 #ifdef CONFIG_COMPAT
 long i915_compat_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
 #else
drivers/gpu/drm/i915/i915_utils.c new file +78 -0

78 lines not on this page · raw message

drivers/gpu/drm/i915/i915_utils.h +30 -0
index 0c0fda36334d..d652ba5d2320 100644
@@ -31,6 +31,8 @@
 #include <linux/types.h>
 #include <linux/workqueue.h>
 
+struct drm_i915_private;
+
 #undef WARN_ON
 /* Many gcc seem to no see through this and fall over :( */
 #if 0
@@ -49,6 +51,34 @@
 #define MISSING_CASE(x) WARN(1, "Missing case (%s == %ld)\n", \
 			     __stringify(x), (long)(x))
 
+void __printf(3, 4)
+__i915_printk(struct drm_i915_private *dev_priv, const char *level,
+	      const char *fmt, ...);
+
+#define i915_report_error(dev_priv, fmt, ...)				   \
+	__i915_printk(dev_priv, KERN_ERR, fmt, ##__VA_ARGS__)
+
+#if IS_ENABLED(CONFIG_DRM_I915_DEBUG)
+
+int __i915_inject_load_error(struct drm_i915_private *i915, int err,
+			     const char *func, int line);
+#define i915_inject_load_error(_i915, _err) \
+	__i915_inject_load_error((_i915), (_err), __func__, __LINE__)
+bool i915_error_injected(void);
+
+#else
+
+#define i915_inject_load_error(_i915, _err) 0
+#define i915_error_injected() false
+
+#endif
+
+#define i915_inject_probe_failure(i915) i915_inject_load_error((i915), -ENODEV)
+
+#define i915_probe_error(i915, fmt, ...)				   \
+	__i915_printk(i915, i915_error_injected() ? KERN_DEBUG : KERN_ERR, \
+		      fmt, ##__VA_ARGS__)
+
 #if defined(GCC_VERSION) && GCC_VERSION >= 70000
 #define add_overflows_t(T, A, B) \
 	__builtin_add_overflow_p((A), (B), (T)0)
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#6 lore raw

PATCH 5/10 drm/i915: extract i915_perf.h from i915_drv.h

In reply to Jani Nikula

It used to be handy that we only had a couple of headers, but over time i915_drv.h has become unwieldy. Extract declarations to a separate header file corresponding to the implementation module, clarifying the modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further includes, using forward declarations as needed. Include the new header only where needed, and sort the modified include directives while at it and as needed.

No functional changes.

---
 drivers/gpu/drm/i915/gt/intel_lrc.c |  1 +
 drivers/gpu/drm/i915/i915_drv.c     |  1 +
 drivers/gpu/drm/i915/i915_drv.h     | 16 ---------------
 drivers/gpu/drm/i915/i915_perf.c    |  1 +
 drivers/gpu/drm/i915/i915_perf.h    | 32 +++++++++++++++++++++++++++++
 5 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_perf.h
drivers/gpu/drm/i915/gt/intel_lrc.c +1 -0
index 2b97641feac3..885b8724518f 100644
@@ -136,6 +136,7 @@
 #include "gem/i915_gem_context.h"
 
 #include "i915_drv.h"
+#include "i915_perf.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"
 #include "intel_engine_pm.h"
drivers/gpu/drm/i915/i915_drv.c +1 -0
index 9cd75c76c257..c0fee7446ce0 100644
@@ -68,6 +68,7 @@
 #include "i915_debugfs.h"
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_perf.h"
 #include "i915_query.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"
drivers/gpu/drm/i915/i915_drv.h +0 -16
index 5afc9da133c3..32feb5d64859 100644
@@ -2417,16 +2417,6 @@ i915_gem_context_lookup(struct drm_i915_file_private *file_priv, u32 id)
 	return ctx;
 }
 
-int i915_perf_open_ioctl(struct drm_device *dev, void *data,
-			 struct drm_file *file);
-int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
-			       struct drm_file *file);
-int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
-				  struct drm_file *file);
-void i915_oa_init_reg_state(struct intel_engine_cs *engine,
-			    struct intel_context *ce,
-			    u32 *reg_state);
-
 /* i915_gem_evict.c */
 int __must_check i915_gem_evict_something(struct i915_address_space *vm,
 					  u64 min_size, u64 alignment,
@@ -2508,12 +2498,6 @@ int intel_engine_cmd_parser(struct intel_engine_cs *engine,
 			    u32 batch_len,
 			    bool is_master);
 
-/* i915_perf.c */
-void i915_perf_init(struct drm_i915_private *dev_priv);
-void i915_perf_fini(struct drm_i915_private *dev_priv);
-void i915_perf_register(struct drm_i915_private *dev_priv);
-void i915_perf_unregister(struct drm_i915_private *dev_priv);
-
 /* i915_suspend.c */
 int i915_save_state(struct drm_i915_private *dev_priv);
 int i915_restore_state(struct drm_i915_private *dev_priv);
drivers/gpu/drm/i915/i915_perf.c +1 -0
index 7b59a7038556..e42b86827d6b 100644
@@ -200,6 +200,7 @@
 #include "gt/intel_lrc_reg.h"
 
 #include "i915_drv.h"
+#include "i915_perf.h"
 #include "oa/i915_oa_hsw.h"
 #include "oa/i915_oa_bdw.h"
 #include "oa/i915_oa_chv.h"
drivers/gpu/drm/i915/i915_perf.h new file +32 -0
new file mode 100644
index 000000000000..a412b16d9ffc
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_PERF_H__
+#define __I915_PERF_H__
+
+#include <linux/types.h>
+
+struct drm_device;
+struct drm_file;
+struct drm_i915_private;
+struct intel_context;
+struct intel_engine_cs;
+
+void i915_perf_init(struct drm_i915_private *i915);
+void i915_perf_fini(struct drm_i915_private *i915);
+void i915_perf_register(struct drm_i915_private *i915);
+void i915_perf_unregister(struct drm_i915_private *i915);
+
+int i915_perf_open_ioctl(struct drm_device *dev, void *data,
+			 struct drm_file *file);
+int i915_perf_add_config_ioctl(struct drm_device *dev, void *data,
+			       struct drm_file *file);
+int i915_perf_remove_config_ioctl(struct drm_device *dev, void *data,
+				  struct drm_file *file);
+void i915_oa_init_reg_state(struct intel_engine_cs *engine,
+			    struct intel_context *ce,
+			    u32 *reg_state);
+
+#endif /* __I915_PERF_H__ */
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#7 lore raw

PATCH 6/10 drm/i915: extract i915_sysfs.h from i915_drv.h

In reply to Jani Nikula

It used to be handy that we only had a couple of headers, but over time i915_drv.h has become unwieldy. Extract declarations to a separate header file corresponding to the implementation module, clarifying the modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further includes, using forward declarations as needed. Include the new header only where needed, and sort the modified include directives while at it and as needed.

No functional changes.

---
 drivers/gpu/drm/i915/i915_drv.c   |  1 +
 drivers/gpu/drm/i915/i915_drv.h   |  4 ----
 drivers/gpu/drm/i915/i915_sysfs.c |  1 +
 drivers/gpu/drm/i915/i915_sysfs.h | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_sysfs.h
drivers/gpu/drm/i915/i915_drv.c +1 -0
index c0fee7446ce0..6621da4f4f18 100644
@@ -70,6 +70,7 @@
 #include "i915_irq.h"
 #include "i915_perf.h"
 #include "i915_query.h"
+#include "i915_sysfs.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"
 #include "intel_csr.h"
drivers/gpu/drm/i915/i915_drv.h +0 -4
index 32feb5d64859..b9f6c443ef7c 100644
@@ -2502,10 +2502,6 @@ int intel_engine_cmd_parser(struct intel_engine_cs *engine,
 int i915_save_state(struct drm_i915_private *dev_priv);
 int i915_restore_state(struct drm_i915_private *dev_priv);
 
-/* i915_sysfs.c */
-void i915_setup_sysfs(struct drm_i915_private *dev_priv);
-void i915_teardown_sysfs(struct drm_i915_private *dev_priv);
-
 /* intel_device_info.c */
 static inline struct intel_device_info *
 mkwrite_device_info(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_sysfs.c +1 -0
index 013c80aa848e..d8a3b180c084 100644
@@ -31,6 +31,7 @@
 #include <linux/sysfs.h>
 
 #include "i915_drv.h"
+#include "i915_sysfs.h"
 #include "intel_pm.h"
 #include "intel_sideband.h"
 
drivers/gpu/drm/i915/i915_sysfs.h new file +14 -0
new file mode 100644
index 000000000000..41afd4366416
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_SYSFS_H__
+#define __I915_SYSFS_H__
+
+struct drm_i915_private;
+
+void i915_setup_sysfs(struct drm_i915_private *i915);
+void i915_teardown_sysfs(struct drm_i915_private *i915);
+
+#endif /* __I915_SYSFS_H__ */
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#8 lore raw

PATCH 7/10 drm/i915: extract i915_suspend.h from i915_drv.h

In reply to Jani Nikula

It used to be handy that we only had a couple of headers, but over time i915_drv.h has become unwieldy. Extract declarations to a separate header file corresponding to the implementation module, clarifying the modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further includes, using forward declarations as needed. Include the new header only where needed, and sort the modified include directives while at it and as needed.

No functional changes.

---
 drivers/gpu/drm/i915/i915_drv.c     |  1 +
 drivers/gpu/drm/i915/i915_drv.h     |  4 ----
 drivers/gpu/drm/i915/i915_suspend.c |  1 +
 drivers/gpu/drm/i915/i915_suspend.h | 14 ++++++++++++++
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_suspend.h
drivers/gpu/drm/i915/i915_drv.c +1 -0
index 6621da4f4f18..6af31a4d9308 100644
@@ -70,6 +70,7 @@
 #include "i915_irq.h"
 #include "i915_perf.h"
 #include "i915_query.h"
+#include "i915_suspend.h"
 #include "i915_sysfs.h"
 #include "i915_trace.h"
 #include "i915_vgpu.h"
drivers/gpu/drm/i915/i915_drv.h +0 -4
index b9f6c443ef7c..f3118bd1d751 100644
@@ -2498,10 +2498,6 @@ int intel_engine_cmd_parser(struct intel_engine_cs *engine,
 			    u32 batch_len,
 			    bool is_master);
 
-/* i915_suspend.c */
-int i915_save_state(struct drm_i915_private *dev_priv);
-int i915_restore_state(struct drm_i915_private *dev_priv);
-
 /* intel_device_info.c */
 static inline struct intel_device_info *
 mkwrite_device_info(struct drm_i915_private *dev_priv)
drivers/gpu/drm/i915/i915_suspend.c +1 -0
index e41cf73a9737..8508a01ad8b9 100644
@@ -31,6 +31,7 @@
 
 #include "i915_drv.h"
 #include "i915_reg.h"
+#include "i915_suspend.h"
 
 static void i915_save_display(struct drm_i915_private *dev_priv)
 {
drivers/gpu/drm/i915/i915_suspend.h new file +14 -0
new file mode 100644
index 000000000000..3a36fb4ecc05
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_SUSPEND_H__
+#define __I915_SUSPEND_H__
+
+struct drm_i915_private;
+
+int i915_save_state(struct drm_i915_private *i915);
+int i915_restore_state(struct drm_i915_private *i915);
+
+#endif /* __I915_SUSPEND_H__ */
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#9 lore raw

PATCH 8/10 drm/i915: extract i915_memcpy.h from i915_drv.h

In reply to Jani Nikula

It used to be handy that we only had a couple of headers, but over time i915_drv.h has become unwieldy. Extract declarations to a separate header file corresponding to the implementation module, clarifying the modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further includes, using forward declarations as needed. Include the new header only where needed, and sort the modified include directives while at it and as needed.

No functional changes.

---
 drivers/gpu/drm/i915/gt/uc/intel_guc_log.c |  3 +-
 drivers/gpu/drm/i915/i915_cmd_parser.c     |  1 +
 drivers/gpu/drm/i915/i915_drv.c            |  1 +
 drivers/gpu/drm/i915/i915_drv.h            | 19 -------------
 drivers/gpu/drm/i915/i915_gpu_error.c      |  1 +
 drivers/gpu/drm/i915/i915_memcpy.c         |  2 +-
 drivers/gpu/drm/i915/i915_memcpy.h         | 32 ++++++++++++++++++++++
 7 files changed, 38 insertions(+), 21 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_memcpy.h
drivers/gpu/drm/i915/gt/uc/intel_guc_log.c +2 -1
index 3460deca12c8..e0326d71041e 100644
@@ -25,8 +25,9 @@
 #include <linux/debugfs.h>
 
 #include "gt/intel_gt.h"
-#include "intel_guc_log.h"
 #include "i915_drv.h"
+#include "i915_memcpy.h"
+#include "intel_guc_log.h"
 
 static void guc_log_capture_logs(struct intel_guc_log *log);
 
drivers/gpu/drm/i915/i915_cmd_parser.c +1 -0
index cb4a0ca72efe..24555102e198 100644
@@ -28,6 +28,7 @@
 #include "gt/intel_engine.h"
 
 #include "i915_drv.h"
+#include "i915_memcpy.h"
 
 /**
  * DOC: batch buffer command parser
drivers/gpu/drm/i915/i915_drv.c +1 -0
index 6af31a4d9308..caac7fc84987 100644
@@ -68,6 +68,7 @@
 #include "i915_debugfs.h"
 #include "i915_drv.h"
 #include "i915_irq.h"
+#include "i915_memcpy.h"
 #include "i915_perf.h"
 #include "i915_query.h"
 #include "i915_suspend.h"
drivers/gpu/drm/i915/i915_drv.h +0 -19
index f3118bd1d751..0ad1175e9357 100644
@@ -2545,25 +2545,6 @@ int i915_reg_read_ioctl(struct drm_device *dev, void *data,
 #define I915_READ_FW(reg__) __I915_REG_OP(read_fw, dev_priv, (reg__))
 #define I915_WRITE_FW(reg__, val__) __I915_REG_OP(write_fw, dev_priv, (reg__), (val__))
 
-void i915_memcpy_init_early(struct drm_i915_private *dev_priv);
-bool i915_memcpy_from_wc(void *dst, const void *src, unsigned long len);
-
-/* The movntdqa instructions used for memcpy-from-wc require 16-byte alignment,
- * as well as SSE4.1 support. i915_memcpy_from_wc() will report if it cannot
- * perform the operation. To check beforehand, pass in the parameters to
- * to i915_can_memcpy_from_wc() - since we only care about the low 4 bits,
- * you only need to pass in the minor offsets, page-aligned pointers are
- * always valid.
- *
- * For just checking for SSE4.1, in the foreknowledge that the future use
- * will be correctly aligned, just use i915_has_memcpy_from_wc().
- */
-#define i915_can_memcpy_from_wc(dst, src, len) \
-	i915_memcpy_from_wc((void *)((unsigned long)(dst) | (unsigned long)(src) | (len)), NULL, 0)
-
-#define i915_has_memcpy_from_wc() \
-	i915_memcpy_from_wc(NULL, NULL, 0)
-
 /* i915_mm.c */
 int remap_io_mapping(struct vm_area_struct *vma,
 		     unsigned long addr, unsigned long pfn, unsigned long size,
drivers/gpu/drm/i915/i915_gpu_error.c +1 -0
index cfe0c42ddefb..35216ca6ae08 100644
@@ -43,6 +43,7 @@
 
 #include "i915_drv.h"
 #include "i915_gpu_error.h"
+#include "i915_memcpy.h"
 #include "i915_scatterlist.h"
 #include "intel_csr.h"
 
drivers/gpu/drm/i915/i915_memcpy.c +1 -1
index 79f8ec756362..07b04b0acb77 100644
@@ -25,7 +25,7 @@
 #include <linux/kernel.h>
 #include <asm/fpu/api.h>
 
-#include "i915_drv.h"
+#include "i915_memcpy.h"
 
 static DEFINE_STATIC_KEY_FALSE(has_movntdqa);
 
drivers/gpu/drm/i915/i915_memcpy.h new file +32 -0
new file mode 100644
index 000000000000..970d84b16987
@@ -0,0 +1,32 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_MEMCPY_H__
+#define __I915_MEMCPY_H__
+
+#include <linux/types.h>
+
+struct drm_i915_private;
+
+void i915_memcpy_init_early(struct drm_i915_private *i915);
+bool i915_memcpy_from_wc(void *dst, const void *src, unsigned long len);
+
+/* The movntdqa instructions used for memcpy-from-wc require 16-byte alignment,
+ * as well as SSE4.1 support. i915_memcpy_from_wc() will report if it cannot
+ * perform the operation. To check beforehand, pass in the parameters to
+ * to i915_can_memcpy_from_wc() - since we only care about the low 4 bits,
+ * you only need to pass in the minor offsets, page-aligned pointers are
+ * always valid.
+ *
+ * For just checking for SSE4.1, in the foreknowledge that the future use
+ * will be correctly aligned, just use i915_has_memcpy_from_wc().
+ */
+#define i915_can_memcpy_from_wc(dst, src, len) \
+	i915_memcpy_from_wc((void *)((unsigned long)(dst) | (unsigned long)(src) | (len)), NULL, 0)
+
+#define i915_has_memcpy_from_wc() \
+	i915_memcpy_from_wc(NULL, NULL, 0)
+
+#endif /* __I915_MEMCPY_H__ */
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#10 lore raw

PATCH 9/10 drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h

In reply to Jani Nikula

It used to be handy that we only had a couple of headers, but over time i915_drv.h has become unwieldy. Extract declarations to a separate header file corresponding to the implementation module, clarifying the modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further includes, using forward declarations as needed. Include the new header from i915_drv.h to avoid sprinkling includes all over the place; this can be changed as a follow-up if necessary.

No functional changes.

---
 drivers/gpu/drm/i915/gem/i915_gem_stolen.c |  1 +
 drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 35 ++++++++++++++++++++++
 drivers/gpu/drm/i915/gt/intel_gt.c         |  1 -
 drivers/gpu/drm/i915/i915_drv.h            | 25 ++--------------
 4 files changed, 39 insertions(+), 23 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_stolen.h
drivers/gpu/drm/i915/gem/i915_gem_stolen.c +1 -0
index 639c852bad12..696dea5ec7c6 100644
@@ -11,6 +11,7 @@
 #include <drm/i915_drm.h>
 
 #include "i915_drv.h"
+#include "i915_gem_stolen.h"
 
 /*
  * The BIOS typically reserves some of the system's memory for the exclusive
drivers/gpu/drm/i915/gem/i915_gem_stolen.h new file +35 -0
new file mode 100644
index 000000000000..2289644d8604
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_GEM_STOLEN_H__
+#define __I915_GEM_STOLEN_H__
+
+#include <linux/types.h>
+
+struct drm_i915_private;
+struct drm_mm_node;
+struct drm_i915_gem_object;
+
+int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv,
+				struct drm_mm_node *node, u64 size,
+				unsigned alignment);
+int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,
+					 struct drm_mm_node *node, u64 size,
+					 unsigned alignment, u64 start,
+					 u64 end);
+void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
+				 struct drm_mm_node *node);
+int i915_gem_init_stolen(struct drm_i915_private *dev_priv);
+void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv);
+struct drm_i915_gem_object *
+i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
+			      resource_size_t size);
+struct drm_i915_gem_object *
+i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv,
+					       resource_size_t stolen_offset,
+					       resource_size_t gtt_offset,
+					       resource_size_t size);
+
+#endif /* __I915_GEM_STOLEN_H__ */
drivers/gpu/drm/i915/gt/intel_gt.c +0 -1
index 75d8c5ee6ecb..c543467a8a1c 100644
@@ -4,7 +4,6 @@
  */
 
 #include "i915_drv.h"
-
 #include "intel_gt.h"
 #include "intel_gt_pm.h"
 #include "intel_uncore.h"
drivers/gpu/drm/i915/i915_drv.h +3 -22
index 0ad1175e9357..36f445bfa01f 100644
@@ -70,6 +70,9 @@
 #include "display/intel_frontbuffer.h"
 #include "display/intel_opregion.h"
 
+#include "gem/i915_gem_context_types.h"
+#include "gem/i915_gem_stolen.h"
+
 #include "gt/intel_lrc.h"
 #include "gt/intel_engine.h"
 #include "gt/intel_gt_types.h"
@@ -84,7 +87,6 @@
 #include "intel_wopcm.h"
 
 #include "i915_gem.h"
-#include "gem/i915_gem_context_types.h"
 #include "i915_gem_fence_reg.h"
 #include "i915_gem_gtt.h"
 #include "i915_gpu_error.h"
@@ -2428,27 +2430,6 @@ int __must_check i915_gem_evict_for_node(struct i915_address_space *vm,
 					 unsigned int flags);
 int i915_gem_evict_vm(struct i915_address_space *vm);
 
-/* i915_gem_stolen.c */
-int i915_gem_stolen_insert_node(struct drm_i915_private *dev_priv,
-				struct drm_mm_node *node, u64 size,
-				unsigned alignment);
-int i915_gem_stolen_insert_node_in_range(struct drm_i915_private *dev_priv,
-					 struct drm_mm_node *node, u64 size,
-					 unsigned alignment, u64 start,
-					 u64 end);
-void i915_gem_stolen_remove_node(struct drm_i915_private *dev_priv,
-				 struct drm_mm_node *node);
-int i915_gem_init_stolen(struct drm_i915_private *dev_priv);
-void i915_gem_cleanup_stolen(struct drm_i915_private *dev_priv);
-struct drm_i915_gem_object *
-i915_gem_object_create_stolen(struct drm_i915_private *dev_priv,
-			      resource_size_t size);
-struct drm_i915_gem_object *
-i915_gem_object_create_stolen_for_preallocated(struct drm_i915_private *dev_priv,
-					       resource_size_t stolen_offset,
-					       resource_size_t gtt_offset,
-					       resource_size_t size);
-
 /* i915_gem_internal.c */
 struct drm_i915_gem_object *
 i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#11 lore raw

PATCH 10/10 drm/i915: extract i915_gem_shrinker.h from i915_drv.h

In reply to Jani Nikula

It used to be handy that we only had a couple of headers, but over time i915_drv.h has become unwieldy. Extract declarations to a separate header file corresponding to the implementation module, clarifying the modularity of the driver.

Ensure the new header is self-contained, and do so with minimal further includes, using forward declarations as needed. Include the new header from i915_drv.h to avoid sprinkling includes all over the place; this can be changed as a follow-up if necessary.

No functional changes.

---
 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h | 31 ++++++++++++++++++++
 drivers/gpu/drm/i915/i915_drv.h              | 18 +-----------
 2 files changed, 32 insertions(+), 17 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_shrinker.h
drivers/gpu/drm/i915/gem/i915_gem_shrinker.h new file +31 -0
new file mode 100644
index 000000000000..b397d7785789
@@ -0,0 +1,31 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef __I915_GEM_SHRINKER_H__
+#define __I915_GEM_SHRINKER_H__
+
+#include <linux/bits.h>
+
+struct drm_i915_private;
+struct mutex;
+
+/* i915_gem_shrinker.c */
+unsigned long i915_gem_shrink(struct drm_i915_private *i915,
+			      unsigned long target,
+			      unsigned long *nr_scanned,
+			      unsigned flags);
+#define I915_SHRINK_UNBOUND	BIT(0)
+#define I915_SHRINK_BOUND	BIT(1)
+#define I915_SHRINK_ACTIVE	BIT(2)
+#define I915_SHRINK_VMAPS	BIT(3)
+#define I915_SHRINK_WRITEBACK	BIT(4)
+
+unsigned long i915_gem_shrink_all(struct drm_i915_private *i915);
+void i915_gem_driver_register__shrinker(struct drm_i915_private *i915);
+void i915_gem_driver_unregister__shrinker(struct drm_i915_private *i915);
+void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
+				    struct mutex *mutex);
+
+#endif /* __I915_GEM_SHRINKER_H__ */
drivers/gpu/drm/i915/i915_drv.h +1 -17
index 36f445bfa01f..0a31f9739f10 100644
@@ -71,6 +71,7 @@
 #include "display/intel_opregion.h"
 
 #include "gem/i915_gem_context_types.h"
+#include "gem/i915_gem_shrinker.h"
 #include "gem/i915_gem_stolen.h"
 
 #include "gt/intel_lrc.h"
@@ -2435,23 +2436,6 @@ struct drm_i915_gem_object *
 i915_gem_object_create_internal(struct drm_i915_private *dev_priv,
 				phys_addr_t size);
 
-/* i915_gem_shrinker.c */
-unsigned long i915_gem_shrink(struct drm_i915_private *i915,
-			      unsigned long target,
-			      unsigned long *nr_scanned,
-			      unsigned flags);
-#define I915_SHRINK_UNBOUND	BIT(0)
-#define I915_SHRINK_BOUND	BIT(1)
-#define I915_SHRINK_ACTIVE	BIT(2)
-#define I915_SHRINK_VMAPS	BIT(3)
-#define I915_SHRINK_WRITEBACK	BIT(4)
-
-unsigned long i915_gem_shrink_all(struct drm_i915_private *i915);
-void i915_gem_driver_register__shrinker(struct drm_i915_private *i915);
-void i915_gem_driver_unregister__shrinker(struct drm_i915_private *i915);
-void i915_gem_shrinker_taints_mutex(struct drm_i915_private *i915,
-				    struct mutex *mutex);
-
 /* i915_gem_tiling.c */
 static inline bool i915_gem_object_needs_bit17_swizzle(struct drm_i915_gem_object *obj)
 {
Signature · 6 lines
2.20.1

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Reviewed-by on v1 1/10
#2 lore raw

Re: [PATCH 01/10] drm/i915: remove unused dev_priv->no_aux_handshake

In reply to Jani Nikula

Quoting Jani Nikula (2019-08-08 14:42:40)

Quoted 3 lines

The last user of dev_priv->no_aux_handshake was removed in commit 3cf2efb1a7c6 ("Revert "drm/i915/dp: use VBT provided eDP params if available""). Finally remove the leftovers.

History checks out. It was introduced as part of the dpcd cache, which we still use. Just not the extra flag.

Quoted 2 lines

-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Reviewed-by on the v1 series
#12 lore raw
In reply to Jani Nikula

Quoting Jani Nikula (2019-08-08 14:42:39)

Quoted 6 lines

The daily dose of header cleanup. I think I'll settle down for a while after this one. ;)

BR,
Jani.

Quoted 11 lines

Jani Nikula (10):
drm/i915: remove unused dev_priv->no_aux_handshake drm/i915: move add_taint_for_CI() to i915_utils.h drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h drm/i915: move printing and load error inject to i915_utils.[ch] drm/i915: extract i915_perf.h from i915_drv.h drm/i915: extract i915_sysfs.h from i915_drv.h drm/i915: extract i915_suspend.h from i915_drv.h drm/i915: extract i915_memcpy.h from i915_drv.h drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h drm/i915: extract i915_gem_shrinker.h from i915_drv.h

No complaints,

I thought I had done a better job of grabbing the GEM stuff and putting in its dungeon. Obviously I need to join it in the dungeon and throw away the key.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#14 lore raw

✗ Fi.CI.CHECKPATCH: warning for drm/i915: header cleanup of the day

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: header cleanup of the day
URL : https://patchwork.freedesktop.org/series/64910/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
263e77d0ad54 drm/i915: remove unused dev_priv->no_aux_handshake
-:7: ERROR:GIT_COMMIT_ID: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 3cf2efb1a7c6 ("Revert "drm/i915/dp: use VBT provided eDP params if available"")'
#7: 
3cf2efb1a7c6 ("Revert "drm/i915/dp: use VBT provided eDP params if

total: 1 errors, 0 warnings, 0 checks, 19 lines checked 51bcb5cc50ae drm/i915: move add_taint_for_CI() to i915_utils.h 967569ca7446 drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h -:33: CHECK:MACRO_ARG_REUSE: Macro argument reuse 'x' - possible side-effects? #33: FILE: drivers/gpu/drm/i915/display/intel_display.h:589:
+#define I915_STATE_WARN_ON(x) \
+ I915_STATE_WARN((x), "%s", "WARN_ON(" __stringify(x) ")")

total: 0 errors, 0 warnings, 1 checks, 46 lines checked
27978f72232d drm/i915: move printing and load error inject to i915_utils.[ch] -:150: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #150:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 242 lines checked
b139c4e58bec drm/i915: extract i915_perf.h from i915_drv.h
-:91: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #91:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 81 lines checked
17f4e89e6e0d drm/i915: extract i915_sysfs.h from i915_drv.h
-:60: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #60:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 38 lines checked
f5ea7f575fdb drm/i915: extract i915_suspend.h from i915_drv.h
-:60: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #60:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 38 lines checked
f7eab6b0a831 drm/i915: extract i915_memcpy.h from i915_drv.h
-:115: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #115:
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 96 lines checked
f38bad2b2252 drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h
-:33: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #33:
new file mode 100644

-:54: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #54: FILE: drivers/gpu/drm/i915/gem/i915_gem_stolen.h:17:
+ unsigned alignment);

-:57: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #57: FILE: drivers/gpu/drm/i915/gem/i915_gem_stolen.h:20:
+ unsigned alignment, u64 start,

total: 0 errors, 3 warnings, 0 checks, 92 lines checked
22892c935c97 drm/i915: extract i915_gem_shrinker.h from i915_drv.h
-:21: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating? #21:
new file mode 100644

-:43: WARNING:UNSPECIFIED_INT: Prefer 'unsigned int' to bare use of 'unsigned' #43: FILE: drivers/gpu/drm/i915/gem/i915_gem_shrinker.h:18:
+ unsigned flags);

-:54: CHECK:UNCOMMENTED_DEFINITION: struct mutex definition without comment #54: FILE: drivers/gpu/drm/i915/gem/i915_gem_shrinker.h:29:
+ struct mutex *mutex);

total: 0 errors, 2 warnings, 1 checks, 61 lines checked

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#15 lore raw

✗ Fi.CI.SPARSE: warning for drm/i915: header cleanup of the day

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: header cleanup of the day
URL : https://patchwork.freedesktop.org/series/64910/
State : warning

== Summary ==

$ dim sparse origin/drm-tip
Sparse version: v0.5.2
Commit: drm/i915: remove unused dev_priv->no_aux_handshake
Okay!

Commit: drm/i915: move add_taint_for_CI() to i915_utils.h Okay!

Commit: drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h Okay!

Commit: drm/i915: move printing and load error inject to i915_utils.[ch] -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:232:16: warning: expression using sizeof(void) -./drivers/gpu/drm/i915/i915_utils.h:87:13: error: incorrect type in conditional -./drivers/gpu/drm/i915/i915_utils.h:87:13: error: undefined identifier '__builtin_mul_overflow'
-./drivers/gpu/drm/i915/i915_utils.h:87:13: got void
-./drivers/gpu/drm/i915/i915_utils.h:90:13: error: incorrect type in conditional -./drivers/gpu/drm/i915/i915_utils.h:90:13: error: undefined identifier '__builtin_add_overflow'
-./drivers/gpu/drm/i915/i915_utils.h:90:13: got void
+./drivers/gpu/drm/i915/i915_utils.h:117:13: error: incorrect type in conditional +./drivers/gpu/drm/i915/i915_utils.h:117:13: error: undefined identifier '__builtin_mul_overflow'
+./drivers/gpu/drm/i915/i915_utils.h:117:13: got void
+./drivers/gpu/drm/i915/i915_utils.h:120:13: error: incorrect type in conditional +./drivers/gpu/drm/i915/i915_utils.h:120:13: error: undefined identifier '__builtin_add_overflow'
+./drivers/gpu/drm/i915/i915_utils.h:120:13: got void
+./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) +./drivers/gpu/drm/i915/i915_utils.h:262:16: warning: expression using sizeof(void) -drivers/gpu/drm/i915/selftests/../i915_utils.h:232:16: warning: expression using sizeof(void) +drivers/gpu/drm/i915/selftests/../i915_utils.h:262:16: warning: expression using sizeof(void)

Commit: drm/i915: extract i915_perf.h from i915_drv.h Okay!

Commit: drm/i915: extract i915_sysfs.h from i915_drv.h Okay!

Commit: drm/i915: extract i915_suspend.h from i915_drv.h Okay!

Commit: drm/i915: extract i915_memcpy.h from i915_drv.h Okay!

Commit: drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h Okay!

Commit: drm/i915: extract i915_gem_shrinker.h from i915_drv.h Okay!

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#16 lore raw

✓ Fi.CI.BAT: success for drm/i915: header cleanup of the day

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: header cleanup of the day
URL : https://patchwork.freedesktop.org/series/64910/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6656 -> Patchwork_13918
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/

Known issues
------------

Here are the changes found in Patchwork_13918 that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live_execlists:
- fi-skl-gvtdvm: [PASS][1] -> [DMESG-FAIL][2] ([fdo#111108])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-skl-gvtdvm/igt@i915_selftest@live_execlists.html

* igt@kms_busy@basic-flip-a:
- fi-kbl-7567u: [PASS][3] -> [SKIP][4] ([fdo#109271] / [fdo#109278]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-kbl-7567u/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-kbl-7567u/igt@[email protected]

* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-7567u: [PASS][5] -> [WARN][6] ([fdo#109380])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-kbl-7567u/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-kbl-7567u/igt@[email protected]

* igt@kms_pipe_crc_basic@read-crc-pipe-c:
- fi-kbl-7567u: [PASS][7] -> [SKIP][8] ([fdo#109271]) +23 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-kbl-7567u/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-kbl-7567u/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_suspend@basic-s3:
- fi-blb-e6850: [INCOMPLETE][9] ([fdo#107718]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-blb-e6850/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-blb-e6850/igt@[email protected]

* igt@i915_selftest@live_execlists:
- fi-bwr-2160: [DMESG-WARN][11] ([fdo#111115]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-bwr-2160/igt@i915_selftest@live_execlists.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-bwr-2160/igt@i915_selftest@live_execlists.html

* igt@i915_selftest@live_hangcheck:
- fi-bwr-2160: [DMESG-FAIL][13] ([fdo#111115]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-bwr-2160/igt@i915_selftest@live_hangcheck.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-bwr-2160/igt@i915_selftest@live_hangcheck.html

* igt@prime_vgem@basic-fence-flip:
- fi-icl-u3: [DMESG-WARN][15] ([fdo#107724]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-icl-u3/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-icl-u3/igt@[email protected]

#### Warnings ####

* igt@i915_pm_rpm@basic-pci-d3-state:
- fi-kbl-guc: [SKIP][17] ([fdo#109271]) -> [FAIL][18] ([fdo#110829])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-kbl-guc/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-kbl-guc/igt@[email protected]

* igt@i915_pm_rpm@module-reload:
- fi-icl-u2: [DMESG-WARN][19] ([fdo#110595]) -> [INCOMPLETE][20] ([fdo#107713] / [fdo#108840])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/fi-icl-u2/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/fi-icl-u2/igt@[email protected]

{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).

[fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108840]: https://bugs.freedesktop.org/show_bug.cgi?id=108840
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
[fdo#110595]: https://bugs.freedesktop.org/show_bug.cgi?id=110595
[fdo#110829]: https://bugs.freedesktop.org/show_bug.cgi?id=110829
[fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
[fdo#111046 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111046
[fdo#111049]: https://bugs.freedesktop.org/show_bug.cgi?id=111049
[fdo#111108]: https://bugs.freedesktop.org/show_bug.cgi?id=111108
[fdo#111115]: https://bugs.freedesktop.org/show_bug.cgi?id=111115

Participating hosts (55 -> 46)
------------------------------

Missing (9): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-bsw-n3050 fi-byt-squawks fi-bsw-cyan fi-icl-y fi-byt-clapper fi-bdw-samus

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_6656 -> Patchwork_13918

CI-20190529: 20190529
CI_DRM_6656: 15b120eed3331e5a6614a94159b6fae46fd8f28d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5125: 35d81d01b1599b4bc4df0e09e25f6f531eed4f8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13918: 22892c935c9738c85ce2d71fd7bd1c9a677a51f4 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

22892c935c97 drm/i915: extract i915_gem_shrinker.h from i915_drv.h f38bad2b2252 drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h f7eab6b0a831 drm/i915: extract i915_memcpy.h from i915_drv.h f5ea7f575fdb drm/i915: extract i915_suspend.h from i915_drv.h 17f4e89e6e0d drm/i915: extract i915_sysfs.h from i915_drv.h b139c4e58bec drm/i915: extract i915_perf.h from i915_drv.h 27978f72232d drm/i915: move printing and load error inject to i915_utils.[ch] 967569ca7446 drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h 51bcb5cc50ae drm/i915: move add_taint_for_CI() to i915_utils.h 263e77d0ad54 drm/i915: remove unused dev_priv->no_aux_handshake

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#17 lore raw

✓ Fi.CI.IGT: success for drm/i915: header cleanup of the day

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: header cleanup of the day
URL : https://patchwork.freedesktop.org/series/64910/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6656_full -> Patchwork_13918_full
====================================================

Summary
-------

**SUCCESS**

No regressions found.

Known issues
------------

Here are the changes found in Patchwork_13918_full that come from known issues:

### IGT changes ###

#### Issues hit ####

* igt@gem_ctx_isolation@rcs0-s3:
- shard-apl: [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +4 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-apl4/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-apl1/igt@[email protected]

* igt@gem_exec_schedule@preempt-other-bsd:
- shard-iclb: [PASS][3] -> [SKIP][4] ([fdo#111325]) +2 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb5/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb2/igt@[email protected]

* igt@gem_exec_schedule@promotion-bsd1:
- shard-iclb: [PASS][5] -> [SKIP][6] ([fdo#109276]) +19 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb4/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb8/igt@[email protected]

* igt@gem_softpin@noreloc-s3:
- shard-skl: [PASS][7] -> [INCOMPLETE][8] ([fdo#104108])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-skl2/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-skl8/igt@[email protected]

* igt@i915_pm_rps@reset:
- shard-glk: [PASS][9] -> [FAIL][10] ([fdo#102250])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-glk3/igt@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-glk5/igt@[email protected]

* igt@i915_suspend@forcewake:
- shard-kbl: [PASS][11] -> [DMESG-WARN][12] ([fdo#108566]) +1 similar issue
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-kbl6/igt@[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-kbl4/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-256x256-random:
- shard-iclb: [PASS][13] -> [INCOMPLETE][14] ([fdo#107713])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb6/igt@[email protected]
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb7/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-skl: [PASS][15] -> [FAIL][16] ([fdo#105363])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-skl10/igt@[email protected]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-skl5/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible:
- shard-kbl: [PASS][17] -> [INCOMPLETE][18] ([fdo#103665])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-kbl2/igt@[email protected]
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-kbl6/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
- shard-iclb: [PASS][19] -> [FAIL][20] ([fdo#103167]) +4 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb6/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html

* igt@kms_plane_alpha_blend@pipe-a-constant-alpha-min:
- shard-skl: [PASS][21] -> [FAIL][22] ([fdo#108145])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-skl7/igt@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-skl6/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-coverage-7efc:
- shard-skl: [PASS][23] -> [FAIL][24] ([fdo#108145] / [fdo#110403])
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-skl1/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-skl9/igt@[email protected]

* igt@kms_psr@no_drrs:
- shard-iclb: [PASS][25] -> [FAIL][26] ([fdo#108341])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb7/igt@kms_psr@no_drrs.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb1/igt@kms_psr@no_drrs.html

* igt@kms_psr@psr2_sprite_mmap_gtt:
- shard-iclb: [PASS][27] -> [SKIP][28] ([fdo#109441]) +1 similar issue
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb2/igt@kms_psr@psr2_sprite_mmap_gtt.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb7/igt@kms_psr@psr2_sprite_mmap_gtt.html

* igt@kms_setmode@basic:
- shard-apl: [PASS][29] -> [FAIL][30] ([fdo#99912])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-apl1/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-apl8/igt@[email protected]

#### Possible fixes ####

* igt@gem_exec_balancer@smoke:
- shard-iclb: [SKIP][31] ([fdo#110854]) -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb8/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb1/igt@[email protected]

* igt@gem_exec_schedule@preempt-queue-bsd:
- shard-iclb: [SKIP][33] -> [PASS][34]
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb2/igt@[email protected]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb5/igt@[email protected]

* igt@gem_exec_schedule@reorder-wide-bsd:
- shard-iclb: [SKIP][35] ([fdo#111325]) -> [PASS][36] +3 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb2/igt@[email protected]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb7/igt@[email protected]

* igt@gem_exec_schedule@semaphore-noskip:
- shard-iclb: [FAIL][37] ([fdo#110946]) -> [PASS][38]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb2/igt@[email protected]
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb7/igt@[email protected]

* igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing:
- shard-kbl: [FAIL][39] ([fdo#109660]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-kbl7/igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-kbl1/igt@kms_atomic_transition@1x-modeset-transitions-nonblocking-fencing.html

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [INCOMPLETE][41] ([fdo#103665]) -> [PASS][42]
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-kbl3/igt@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-kbl3/igt@[email protected]

* igt@kms_cursor_edge_walk@pipe-b-64x64-top-edge:
- shard-apl: [DMESG-WARN][43] ([fdo#111317]) -> [PASS][44] +1 similar issue
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-apl6/igt@[email protected]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-apl8/igt@[email protected]

* igt@kms_cursor_legacy@cursor-vs-flip-toggle:
- shard-hsw: [FAIL][45] ([fdo#103355]) -> [PASS][46]
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-hsw4/igt@[email protected]
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-hsw5/igt@[email protected]

* igt@kms_flip@2x-modeset-vs-vblank-race-interruptible:
- shard-glk: [FAIL][47] ([fdo#103060]) -> [PASS][48]
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-glk8/igt@[email protected]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-glk7/igt@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible:
- shard-apl: [FAIL][49] ([fdo#105363]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-apl5/igt@[email protected]
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-apl1/igt@[email protected]

* igt@kms_flip@flip-vs-suspend:
- shard-snb: [INCOMPLETE][51] ([fdo#105411]) -> [PASS][52]
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-snb1/igt@[email protected]
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-snb2/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbc-suspend:
- shard-kbl: [DMESG-WARN][53] ([fdo#108566]) -> [PASS][54] +3 similar issues
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-kbl6/igt@[email protected]
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-kbl4/igt@[email protected]

* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [FAIL][55] ([fdo#103167]) -> [PASS][56] +3 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

* igt@kms_plane_alpha_blend@pipe-b-coverage-7efc:
- shard-skl: [FAIL][57] ([fdo#108145] / [fdo#110403]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-skl6/igt@[email protected]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-skl1/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][59] ([fdo#108145]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-skl2/igt@[email protected]
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-skl5/igt@[email protected]

* igt@kms_psr@psr2_primary_blt:
- shard-iclb: [SKIP][61] ([fdo#109441]) -> [PASS][62] +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb5/igt@kms_psr@psr2_primary_blt.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb2/igt@kms_psr@psr2_primary_blt.html

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][63] ([fdo#108566]) -> [PASS][64] +2 similar issues
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-apl4/igt@[email protected]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-apl5/igt@[email protected]

* igt@perf@blocking:
- shard-skl: [FAIL][65] ([fdo#110728]) -> [PASS][66]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-skl1/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-skl9/igt@[email protected]

* igt@prime_vgem@fence-wait-bsd2:
- shard-iclb: [SKIP][67] ([fdo#109276]) -> [PASS][68] +14 similar issues
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb8/igt@[email protected]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb1/igt@[email protected]

#### Warnings ####

* igt@gem_ctx_shared@exec-single-timeline-bsd2:
- shard-iclb: [SKIP][69] ([fdo#109276]) -> [FAIL][70] ([fdo#111327])
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb6/igt@[email protected]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb4/igt@[email protected]

* igt@gem_exec_params@invalid-bsd-ring:
- shard-iclb: [FAIL][71] ([fdo#111328]) -> [SKIP][72] ([fdo#109276])
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb4/igt@[email protected]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb8/igt@[email protected]

* igt@gem_mocs_settings@mocs-isolation-bsd2:
- shard-iclb: [SKIP][73] ([fdo#109276]) -> [FAIL][74] ([fdo#111330]) +1 similar issue
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb7/igt@[email protected]
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb1/igt@[email protected]

* igt@gem_mocs_settings@mocs-reset-bsd2:
- shard-iclb: [FAIL][75] ([fdo#111330]) -> [SKIP][76] ([fdo#109276])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb4/igt@[email protected]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb8/igt@[email protected]

* igt@gem_mocs_settings@mocs-settings-bsd2:
- shard-iclb: [FAIL][77] -> [SKIP][78] ([fdo#109276])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6656/shard-iclb2/igt@[email protected]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13918/shard-iclb5/igt@[email protected]

[fdo#102250]: https://bugs.freedesktop.org/show_bug.cgi?id=102250
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103355]: https://bugs.freedesktop.org/show_bug.cgi?id=103355
[fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
[fdo#104108]: https://bugs.freedesktop.org/show_bug.cgi?id=104108
[fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
[fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#108341]: https://bugs.freedesktop.org/show_bug.cgi?id=108341
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#109276]: https://bugs.freedesktop.org/show_bug.cgi?id=109276
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109660]: https://bugs.freedesktop.org/show_bug.cgi?id=109660
[fdo#110403]: https://bugs.freedesktop.org/show_bug.cgi?id=110403
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110854]: https://bugs.freedesktop.org/show_bug.cgi?id=110854
[fdo#110946]: https://bugs.freedesktop.org/show_bug.cgi?id=110946
[fdo#111317]: https://bugs.freedesktop.org/show_bug.cgi?id=111317
[fdo#111325]: https://bugs.freedesktop.org/show_bug.cgi?id=111325
[fdo#111327]: https://bugs.freedesktop.org/show_bug.cgi?id=111327
[fdo#111328]: https://bugs.freedesktop.org/show_bug.cgi?id=111328
[fdo#111330]: https://bugs.freedesktop.org/show_bug.cgi?id=111330
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912

Participating hosts (10 -> 10)
------------------------------

No changes in participating hosts

Build changes
-------------

* CI: CI-20190529 -> None
* Linux: CI_DRM_6656 -> Patchwork_13918

CI-20190529: 20190529
CI_DRM_6656: 15b120eed3331e5a6614a94159b6fae46fd8f28d @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_5125: 35d81d01b1599b4bc4df0e09e25f6f531eed4f8a @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
Patchwork_13918: 22892c935c9738c85ce2d71fd7bd1c9a677a51f4 @ 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_13918/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

#13 lore raw
In reply to Chris Wilson
Quoted 19 lines · Chris Wilson

Quoting Jani Nikula (2019-08-08 14:42:39)

Quoted 6 lines

The daily dose of header cleanup. I think I'll settle down for a while after this one. ;)

BR,
Jani.

Quoted 11 lines

Jani Nikula (10):
drm/i915: remove unused dev_priv->no_aux_handshake drm/i915: move add_taint_for_CI() to i915_utils.h drm/i915: move I915_STATE_WARN() and _ON() to intel_display.h drm/i915: move printing and load error inject to i915_utils.[ch] drm/i915: extract i915_perf.h from i915_drv.h drm/i915: extract i915_sysfs.h from i915_drv.h drm/i915: extract i915_suspend.h from i915_drv.h drm/i915: extract i915_memcpy.h from i915_drv.h drm/i915: extract gem/i915_gem_stolen.h from i915_drv.h drm/i915: extract i915_gem_shrinker.h from i915_drv.h

Quoted 2 lines

No complaints,

Thanks again, pushed.

Quoted 3 lines

I thought I had done a better job of grabbing the GEM stuff and putting in its dungeon. Obviously I need to join it in the dungeon and throw away the key.

Yes, there's still a bunch of gem stuff left in i915_drv.h. I just grabbed some of the low hanging fruit here; I really wouldn't mind if you finished the job!

BR,
Jani.

Signature · 5 lines
Jani Nikula, Intel Open Source Graphics Center
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx