Skip to contentSkip to conversation

drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]

PATCH In review Jani Nikula 3 participants 10 messages Jan 20, 2022 – Jan 21, 2022

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

PATCH 1/1 drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]

Add new files i915_ioctl.[ch] to hold small ioctls that are out of place everywhere else, and not big enough to warrant a file of their own. For starters, it's just for i915_reg_read_ioctl() that's a bit high level for a low level implementation that intel_uncore.[ch] is.

---
 drivers/gpu/drm/i915/Makefile       |  3 +-
 drivers/gpu/drm/i915/i915_driver.c  |  1 +
 drivers/gpu/drm/i915/i915_drv.h     |  3 -
 drivers/gpu/drm/i915/i915_ioctl.c   | 94 +++++++++++++++++++++++++++++
 drivers/gpu/drm/i915/i915_ioctl.h   | 14 +++++
 drivers/gpu/drm/i915/intel_uncore.c | 70 ---------------------
 6 files changed, 111 insertions(+), 74 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/i915_ioctl.c
 create mode 100644 drivers/gpu/drm/i915/i915_ioctl.h
drivers/gpu/drm/i915/Makefile +2 -1
index 451df10e3a36..a26e6736bebb 100644
@@ -32,8 +32,9 @@ subdir-ccflags-y += -I$(srctree)/$(src)
 # core driver code
 i915-y += i915_driver.o \
 	  i915_config.o \
-	  i915_irq.o \
 	  i915_getparam.o \
+	  i915_ioctl.o \
+	  i915_irq.o \
 	  i915_mitigations.o \
 	  i915_module.o \
 	  i915_params.o \
drivers/gpu/drm/i915/i915_driver.c +1 -0
index 8bef67cb6c33..3d41f532a5d6 100644
@@ -76,6 +76,7 @@
 #include "i915_drv.h"
 #include "i915_getparam.h"
 #include "i915_ioc32.h"
+#include "i915_ioctl.h"
 #include "i915_irq.h"
 #include "i915_memcpy.h"
 #include "i915_perf.h"
drivers/gpu/drm/i915/i915_drv.h +0 -3
index 890f1f6fbc49..44c1f98144b4 100644
@@ -1734,9 +1734,6 @@ mkwrite_device_info(struct drm_i915_private *dev_priv)
 	return (struct intel_device_info *)INTEL_INFO(dev_priv);
 }
 
-int i915_reg_read_ioctl(struct drm_device *dev, void *data,
-			struct drm_file *file);
-
 static inline int intel_hws_csb_write_index(struct drm_i915_private *i915)
 {
 	if (GRAPHICS_VER(i915) >= 11)
drivers/gpu/drm/i915/i915_ioctl.c new file +94 -0

94 lines not on this page · raw message

drivers/gpu/drm/i915/i915_ioctl.h new file +14 -0
new file mode 100644
index 000000000000..f16ae87b8b8a
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __I915_IOCTL_H__
+#define __I915_IOCTL_H__
+
+struct drm_device;
+struct drm_file;
+
+int i915_reg_read_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
+
+#endif /* __I915_IOCTL_H__ */
drivers/gpu/drm/i915/intel_uncore.c +0 -70

76 lines not on this page · raw message

Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Jani Nikula

Add new files i915_ioctl.[ch] to hold small ioctls that are out of place everywhere else, and not big enough to warrant a file of their own. For starters, it's just for i915_reg_read_ioctl() that's a bit high level for a low level implementation that intel_uncore.[ch] is.

Copy & paste checks out and I obviously support the idea. :) Thanks for accomodating it.

Regards,

Tvrtko

Quoted 254 lines
---
  drivers/gpu/drm/i915/Makefile       |  3 +-
  drivers/gpu/drm/i915/i915_driver.c  |  1 +
  drivers/gpu/drm/i915/i915_drv.h     |  3 -
  drivers/gpu/drm/i915/i915_ioctl.c   | 94 +++++++++++++++++++++++++++++
  drivers/gpu/drm/i915/i915_ioctl.h   | 14 +++++
  drivers/gpu/drm/i915/intel_uncore.c | 70 ---------------------
  6 files changed, 111 insertions(+), 74 deletions(-)

create mode 100644 drivers/gpu/drm/i915/i915_ioctl.c create mode 100644 drivers/gpu/drm/i915/i915_ioctl.h

drivers/gpu/drm/i915/Makefile +2 -1
index 451df10e3a36..a26e6736bebb 100644
@@ -32,8 +32,9 @@ subdir-ccflags-y += -I$(srctree)/$(src)
  # core driver code
  i915-y += i915_driver.o \
  	  i915_config.o \
-	  i915_irq.o \
  	  i915_getparam.o \
+	  i915_ioctl.o \
+	  i915_irq.o \
  	  i915_mitigations.o \
  	  i915_module.o \
  	  i915_params.o \
drivers/gpu/drm/i915/i915_driver.c +1 -0
index 8bef67cb6c33..3d41f532a5d6 100644
@@ -76,6 +76,7 @@
  #include "i915_drv.h"
  #include "i915_getparam.h"
  #include "i915_ioc32.h"
+#include "i915_ioctl.h"
  #include "i915_irq.h"
  #include "i915_memcpy.h"
  #include "i915_perf.h"
drivers/gpu/drm/i915/i915_drv.h +0 -3
index 890f1f6fbc49..44c1f98144b4 100644
@@ -1734,9 +1734,6 @@ mkwrite_device_info(struct drm_i915_private *dev_priv)
  	return (struct intel_device_info *)INTEL_INFO(dev_priv);
  }
 
-int i915_reg_read_ioctl(struct drm_device *dev, void *data,
-			struct drm_file *file);
-
  static inline int intel_hws_csb_write_index(struct drm_i915_private *i915)
  {
  	if (GRAPHICS_VER(i915) >= 11)
drivers/gpu/drm/i915/i915_ioctl.c new file +94 -0
new file mode 100644
index 000000000000..06a10ccea80b
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#include "gt/intel_engine_regs.h"
+
+#include "i915_drv.h"
+#include "i915_gem.h"
+#include "i915_ioctl.h"
+#include "i915_reg.h"
+#include "intel_runtime_pm.h"
+#include "intel_uncore.h"
+
+/*
+ * This file is for small ioctl functions that are out of place everywhere else,
+ * and not big enough to warrant a file of their own.
+ *
+ * This is not the dumping ground for random ioctls.
+ */
+
+struct reg_whitelist {
+	i915_reg_t offset_ldw;
+	i915_reg_t offset_udw;
+	u8 min_graphics_ver;
+	u8 max_graphics_ver;
+	u8 size;
+};
+
+static const struct reg_whitelist reg_read_whitelist[] = {
+	{
+		.offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE),
+		.offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE),
+		.min_graphics_ver = 4,
+		.max_graphics_ver = 12,
+		.size = 8
+	}
+};
+
+int i915_reg_read_ioctl(struct drm_device *dev,
+			void *data, struct drm_file *unused)
+{
+	struct drm_i915_private *i915 = to_i915(dev);
+	struct intel_uncore *uncore = &i915->uncore;
+	struct drm_i915_reg_read *reg = data;
+	struct reg_whitelist const *entry;
+	intel_wakeref_t wakeref;
+	unsigned int flags;
+	int remain;
+	int ret = 0;
+
+	entry = reg_read_whitelist;
+	remain = ARRAY_SIZE(reg_read_whitelist);
+	while (remain) {
+		u32 entry_offset = i915_mmio_reg_offset(entry->offset_ldw);
+
+		GEM_BUG_ON(!is_power_of_2(entry->size));
+		GEM_BUG_ON(entry->size > 8);
+		GEM_BUG_ON(entry_offset & (entry->size - 1));
+
+		if (IS_GRAPHICS_VER(i915, entry->min_graphics_ver, entry->max_graphics_ver) &&
+		    entry_offset == (reg->offset & -entry->size))
+			break;
+		entry++;
+		remain--;
+	}
+
+	if (!remain)
+		return -EINVAL;
+
+	flags = reg->offset & (entry->size - 1);
+
+	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
+		if (entry->size == 8 && flags == I915_REG_READ_8B_WA)
+			reg->val = intel_uncore_read64_2x32(uncore,
+							    entry->offset_ldw,
+							    entry->offset_udw);
+		else if (entry->size == 8 && flags == 0)
+			reg->val = intel_uncore_read64(uncore,
+						       entry->offset_ldw);
+		else if (entry->size == 4 && flags == 0)
+			reg->val = intel_uncore_read(uncore, entry->offset_ldw);
+		else if (entry->size == 2 && flags == 0)
+			reg->val = intel_uncore_read16(uncore,
+						       entry->offset_ldw);
+		else if (entry->size == 1 && flags == 0)
+			reg->val = intel_uncore_read8(uncore,
+						      entry->offset_ldw);
+		else
+			ret = -EINVAL;
+	}
+
+	return ret;
+}
drivers/gpu/drm/i915/i915_ioctl.h new file +14 -0
new file mode 100644
index 000000000000..f16ae87b8b8a
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __I915_IOCTL_H__
+#define __I915_IOCTL_H__
+
+struct drm_device;
+struct drm_file;
+
+int i915_reg_read_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
+
+#endif /* __I915_IOCTL_H__ */
drivers/gpu/drm/i915/intel_uncore.c +0 -70
index 41d082213e81..00f9a05d2686 100644
@@ -2255,76 +2255,6 @@ void intel_uncore_fini_mmio(struct intel_uncore *uncore)
  	}
  }
 
-static const struct reg_whitelist {
-	i915_reg_t offset_ldw;
-	i915_reg_t offset_udw;
-	u8 min_graphics_ver;
-	u8 max_graphics_ver;
-	u8 size;
-} reg_read_whitelist[] = { {
-	.offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE),
-	.offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE),
-	.min_graphics_ver = 4,
-	.max_graphics_ver = 12,
-	.size = 8
-} };
-
-int i915_reg_read_ioctl(struct drm_device *dev,
-			void *data, struct drm_file *file)
-{
-	struct drm_i915_private *i915 = to_i915(dev);
-	struct intel_uncore *uncore = &i915->uncore;
-	struct drm_i915_reg_read *reg = data;
-	struct reg_whitelist const *entry;
-	intel_wakeref_t wakeref;
-	unsigned int flags;
-	int remain;
-	int ret = 0;
-
-	entry = reg_read_whitelist;
-	remain = ARRAY_SIZE(reg_read_whitelist);
-	while (remain) {
-		u32 entry_offset = i915_mmio_reg_offset(entry->offset_ldw);
-
-		GEM_BUG_ON(!is_power_of_2(entry->size));
-		GEM_BUG_ON(entry->size > 8);
-		GEM_BUG_ON(entry_offset & (entry->size - 1));
-
-		if (IS_GRAPHICS_VER(i915, entry->min_graphics_ver, entry->max_graphics_ver) &&
-		    entry_offset == (reg->offset & -entry->size))
-			break;
-		entry++;
-		remain--;
-	}
-
-	if (!remain)
-		return -EINVAL;
-
-	flags = reg->offset & (entry->size - 1);
-
-	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
-		if (entry->size == 8 && flags == I915_REG_READ_8B_WA)
-			reg->val = intel_uncore_read64_2x32(uncore,
-							    entry->offset_ldw,
-							    entry->offset_udw);
-		else if (entry->size == 8 && flags == 0)
-			reg->val = intel_uncore_read64(uncore,
-						       entry->offset_ldw);
-		else if (entry->size == 4 && flags == 0)
-			reg->val = intel_uncore_read(uncore, entry->offset_ldw);
-		else if (entry->size == 2 && flags == 0)
-			reg->val = intel_uncore_read16(uncore,
-						       entry->offset_ldw);
-		else if (entry->size == 1 && flags == 0)
-			reg->val = intel_uncore_read8(uncore,
-						      entry->offset_ldw);
-		else
-			ret = -EINVAL;
-	}
-
-	return ret;
-}
-
  /**
   * __intel_wait_for_register_fw - wait until register matches expected state
   * @uncore: the struct intel_uncore
#3 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]
URL : https://patchwork.freedesktop.org/series/99096/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
74252406bb4c drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]
-:57: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#57: 
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 210 lines checked

#4 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]
URL : https://patchwork.freedesktop.org/series/99096/
State : warning

== Summary ==

$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
#5 lore raw

[Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]
URL : https://patchwork.freedesktop.org/series/99096/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_11111 -> Patchwork_22039
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_22039 absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_22039, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/index.html

Participating hosts (48 -> 43)
------------------------------

Additional (2): fi-kbl-soraka bat-adlp-4
Missing (7): shard-tglu fi-bsw-cyan fi-icl-u2 fi-pnv-d510 shard-rkl shard-dg1 fi-bdw-samus

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_22039:

### IGT changes ###

#### Possible regressions ####

* igt@kms_addfb_basic@addfb25-framebuffer-vs-set-tiling:
- bat-adlp-4: NOTRUN -> [DMESG-WARN][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/bat-adlp-4/igt@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_exec_fence@basic-busy@bcs0:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271]) +8 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-kbl-soraka/igt@gem_exec_fence@[email protected]

* igt@gem_exec_suspend@basic-s3@smem:
- fi-skl-6600u: [PASS][3] -> [INCOMPLETE][4] ([i915#4547])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11111/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-skl-6600u/igt@gem_exec_suspend@[email protected]
- fi-tgl-1115g4: [PASS][5] -> [FAIL][6] ([i915#1888])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11111/fi-tgl-1115g4/igt@gem_exec_suspend@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-tgl-1115g4/igt@gem_exec_suspend@[email protected]

* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][7] ([fdo#109271] / [i915#2190])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-kbl-soraka/igt@[email protected]

* igt@gem_lmem_swapping@basic:
- bat-adlp-4: NOTRUN -> [SKIP][8] ([i915#4613]) +3 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/bat-adlp-4/igt@[email protected]

* igt@gem_lmem_swapping@parallel-random-engines:
- fi-kbl-soraka: NOTRUN -> [SKIP][9] ([fdo#109271] / [i915#4613]) +3 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-kbl-soraka/igt@[email protected]

* igt@gem_tiled_pread_basic:
- bat-adlp-4: NOTRUN -> [SKIP][10] ([i915#3282])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/bat-adlp-4/igt@gem_tiled_pread_basic.html

* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][11] ([i915#1886] / [i915#2291])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html

* igt@i915_selftest@live@hangcheck:
- bat-dg1-6: [PASS][12] -> [DMESG-FAIL][13] ([i915#4494])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11111/bat-dg1-6/igt@i915_selftest@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/bat-dg1-6/igt@i915_selftest@[email protected]
- fi-ivb-3770: [PASS][14] -> [INCOMPLETE][15] ([i915#3303])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11111/fi-ivb-3770/igt@i915_selftest@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-ivb-3770/igt@i915_selftest@[email protected]
- bat-dg1-5: [PASS][16] -> [DMESG-FAIL][17] ([i915#4494])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11111/bat-dg1-5/igt@i915_selftest@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/bat-dg1-5/igt@i915_selftest@[email protected]

* igt@kms_chamelium@dp-edid-read:
- fi-kbl-soraka: NOTRUN -> [SKIP][18] ([fdo#109271] / [fdo#111827]) +8 similar issues
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-kbl-soraka/igt@[email protected]

* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][19] ([fdo#109271] / [i915#533])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-kbl-soraka/igt@[email protected]

* igt@runner@aborted:
- bat-adlp-4: NOTRUN -> [FAIL][20] ([i915#4312])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/bat-adlp-4/igt@[email protected]
- fi-ivb-3770: NOTRUN -> [FAIL][21] ([fdo#109271] / [i915#4312])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-ivb-3770/igt@[email protected]

#### Possible fixes ####

* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [DMESG-WARN][22] ([i915#4269]) -> [PASS][23]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11111/fi-cml-u2/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/fi-cml-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#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#1888]: https://gitlab.freedesktop.org/drm/intel/issues/1888
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3303]: https://gitlab.freedesktop.org/drm/intel/issues/3303
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4897]: https://gitlab.freedesktop.org/drm/intel/issues/4897
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533

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

* Linux: CI_DRM_11111 -> Patchwork_22039

CI-20190529: 20190529
CI_DRM_11111: fe44f8bdb12374a6168cb561834eb714097f5e5f @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6329: 38f656fdd61119105ecfa2c4dac157cd7dcad204 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22039: 74252406bb4c9af2f5682881c6b20d0dd7cb50ab @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

74252406bb4c drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22039/index.html

#6 lore raw

[Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)
URL : https://patchwork.freedesktop.org/series/99096/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
eb1cf9369ca6 drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]
-:57: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#57: 
new file mode 100644

total: 0 errors, 1 warnings, 0 checks, 210 lines checked

#7 lore raw

[Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)
URL : https://patchwork.freedesktop.org/series/99096/
State : warning

== Summary ==

$ dim sparse --fast origin/drm-tip
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
#8 lore raw

[Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)
URL : https://patchwork.freedesktop.org/series/99096/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_11112 -> Patchwork_22040
====================================================

Summary
-------

**SUCCESS**

No regressions found.

External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/index.html

Participating hosts (46 -> 42)
------------------------------

Missing (4): fi-kbl-soraka fi-bsw-cyan fi-bdw-samus fi-pnv-d510

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

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

### IGT changes ###

#### Issues hit ####

* igt@i915_selftest@live@hangcheck:
- fi-hsw-4770: [PASS][1] -> [INCOMPLETE][2] ([i915#4785])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/fi-hsw-4770/igt@i915_selftest@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/fi-hsw-4770/igt@i915_selftest@[email protected]

* igt@kms_psr@primary_page_flip:
- fi-skl-6600u: [PASS][3] -> [FAIL][4] ([i915#4547])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/fi-skl-6600u/igt@kms_psr@primary_page_flip.html

* igt@runner@aborted:
- fi-skl-6600u: NOTRUN -> [FAIL][5] ([i915#4312])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/fi-skl-6600u/igt@[email protected]
- fi-hsw-4770: NOTRUN -> [FAIL][6] ([fdo#109271] / [i915#1436] / [i915#4312])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/fi-hsw-4770/igt@[email protected]

#### Possible fixes ####

* igt@core_hotunplug@unbind-rebind:
- fi-bwr-2160: [FAIL][7] ([i915#3194]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/fi-bwr-2160/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/fi-bwr-2160/igt@[email protected]

* igt@i915_selftest@live@hangcheck:
- bat-dg1-5: [DMESG-FAIL][9] ([i915#4494]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/bat-dg1-5/igt@i915_selftest@[email protected]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/bat-dg1-5/igt@i915_selftest@[email protected]

[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#3194]: https://gitlab.freedesktop.org/drm/intel/issues/3194
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4494]: https://gitlab.freedesktop.org/drm/intel/issues/4494
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4785]: https://gitlab.freedesktop.org/drm/intel/issues/4785

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

* Linux: CI_DRM_11112 -> Patchwork_22040

CI-20190529: 20190529
CI_DRM_11112: 55b83480a1824372d372852b3b6ceb5f0827caf1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6329: 38f656fdd61119105ecfa2c4dac157cd7dcad204 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22040: eb1cf9369ca6883c6b533d30932a44bb151992e7 @ git://anongit.freedesktop.org/gfx-ci/linux

== Linux commits ==

eb1cf9369ca6 drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch]

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/index.html

#9 lore raw

[Intel-gfx] ✗ Fi.CI.IGT: failure for drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)

In reply to Jani Nikula
== Series Details ==

== Series Details ==

Series: drm/i915: split out i915_reg_read_ioctl() to i915_ioctl.[ch] (rev2)
URL : https://patchwork.freedesktop.org/series/99096/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_11112_full -> Patchwork_22040_full
====================================================

Summary
-------

**FAILURE**

Serious unknown changes coming with Patchwork_22040_full absolutely need to be verified manually.

If you think the reported changes have nothing to do with the changes introduced in Patchwork_22040_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.

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

No changes in participating hosts

Possible new issues
-------------------

Here are the unknown changes that may have been introduced in Patchwork_22040_full:

### IGT changes ###

#### Possible regressions ####

* igt@kms_flip@flip-vs-suspend-interruptible@a-edp1:
- shard-skl: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl4/igt@kms_flip@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl8/igt@kms_flip@[email protected]

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

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

### IGT changes ###

#### Issues hit ####

* igt@gem_eio@in-flight-suspend:
- shard-apl: [PASS][3] -> [INCOMPLETE][4] ([i915#180])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl3/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]

* igt@gem_eio@kms:
- shard-tglb: [PASS][5] -> [FAIL][6] ([i915#232])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-tglb7/igt@[email protected]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb2/igt@[email protected]

* igt@gem_exec_balancer@parallel:
- shard-iclb: [PASS][7] -> [SKIP][8] ([i915#4525]) +2 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb1/igt@[email protected]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb7/igt@[email protected]

* igt@gem_exec_capture@pi@vcs0:
- shard-skl: NOTRUN -> [INCOMPLETE][9] ([i915#4547])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl9/igt@gem_exec_capture@[email protected]

* igt@gem_exec_fair@basic-deadline:
- shard-kbl: [PASS][10] -> [FAIL][11] ([i915#2846])
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl3/igt@[email protected]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl7/igt@[email protected]

* igt@gem_exec_fair@basic-pace@vcs1:
- shard-kbl: [PASS][12] -> [FAIL][13] ([i915#2842]) +1 similar issue
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl1/igt@gem_exec_fair@[email protected]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [PASS][14] -> [FAIL][15] ([i915#2849])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb3/igt@gem_exec_fair@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb6/igt@gem_exec_fair@[email protected]

* igt@gem_lmem_swapping@heavy-random:
- shard-kbl: NOTRUN -> [SKIP][16] ([fdo#109271] / [i915#4613])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@[email protected]

* igt@gem_lmem_swapping@parallel-random-verify:
- shard-skl: NOTRUN -> [SKIP][17] ([fdo#109271] / [i915#4613])
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@[email protected]

* igt@gen7_exec_parse@basic-rejected:
- shard-tglb: NOTRUN -> [SKIP][18] ([fdo#109289])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb5/igt@[email protected]

* igt@gen9_exec_parse@allowed-single:
- shard-skl: [PASS][19] -> [DMESG-WARN][20] ([i915#1436] / [i915#716])
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl8/igt@[email protected]
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl6/igt@[email protected]

* igt@i915_selftest@mock@requests:
- shard-skl: [PASS][21] -> [INCOMPLETE][22] ([i915#4919])
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl7/igt@i915_selftest@[email protected]
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl1/igt@i915_selftest@[email protected]

* igt@i915_suspend@sysfs-reader:
- shard-apl: [PASS][23] -> [DMESG-WARN][24] ([i915#180]) +2 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl4/igt@[email protected]
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]

* igt@kms_big_fb@x-tiled-max-hw-stride-64bpp-rotate-180-hflip:
- shard-skl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#3777])
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@[email protected]

* igt@kms_big_fb@y-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-apl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#3777]) +1 similar issue
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]

* igt@kms_big_fb@yf-tiled-16bpp-rotate-0:
- shard-glk: [PASS][27] -> [DMESG-WARN][28] ([i915#118])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-glk2/igt@[email protected]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-glk7/igt@[email protected]

* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-async-flip:
- shard-skl: NOTRUN -> [FAIL][29] ([i915#3743]) +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-async-flip.html

* igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs:
- shard-apl: NOTRUN -> [SKIP][30] ([fdo#109271] / [i915#3886]) +1 similar issue
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl7/igt@kms_ccs@pipe-b-bad-pixel-format-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs:
- shard-tglb: NOTRUN -> [SKIP][31] ([i915#3689] / [i915#3886])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb5/igt@kms_ccs@pipe-c-crc-sprite-planes-basic-y_tiled_gen12_mc_ccs.html

* igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs:
- shard-skl: NOTRUN -> [SKIP][32] ([fdo#109271] / [i915#3886]) +2 similar issues
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@kms_ccs@pipe-c-random-ccs-data-y_tiled_gen12_mc_ccs.html

* igt@kms_chamelium@hdmi-crc-fast:
- shard-kbl: NOTRUN -> [SKIP][33] ([fdo#109271] / [fdo#111827])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@[email protected]

* igt@kms_color_chamelium@pipe-b-ctm-blue-to-red:
- shard-apl: NOTRUN -> [SKIP][34] ([fdo#109271] / [fdo#111827]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl7/igt@[email protected]

* igt@kms_color_chamelium@pipe-c-ctm-0-25:
- shard-skl: NOTRUN -> [SKIP][35] ([fdo#109271] / [fdo#111827]) +4 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@[email protected]

* igt@kms_color_chamelium@pipe-d-degamma:
- shard-iclb: NOTRUN -> [SKIP][36] ([fdo#109278] / [fdo#109284] / [fdo#111827])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb6/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-max-size-random:
- shard-tglb: NOTRUN -> [SKIP][37] ([i915#3359])
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb8/igt@[email protected]

* igt@kms_flip@2x-flip-vs-modeset-vs-hang:
- shard-kbl: NOTRUN -> [SKIP][38] ([fdo#109271]) +9 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@[email protected]

* igt@kms_flip@flip-vs-suspend-interruptible@b-dp1:
- shard-kbl: [PASS][39] -> [INCOMPLETE][40] ([i915#3614])
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl1/igt@kms_flip@[email protected]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@c-dp1:
- shard-kbl: [PASS][41] -> [DMESG-WARN][42] ([i915#180]) +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl6/igt@kms_flip@[email protected]
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl6/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling:
- shard-iclb: [PASS][43] -> [SKIP][44] ([i915#3701])
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb5/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-16bpp-ytile-downscaling.html

* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-pwrite:
- shard-tglb: NOTRUN -> [SKIP][45] ([fdo#109280] / [fdo#111825]) +2 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb5/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-shrfb-draw-pwrite.html

* igt@kms_frontbuffer_tracking@psr-2p-primscrn-cur-indfb-onoff:
- shard-apl: NOTRUN -> [SKIP][46] ([fdo#109271]) +66 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]

* igt@kms_frontbuffer_tracking@psr-2p-primscrn-spr-indfb-move:
- shard-iclb: NOTRUN -> [SKIP][47] ([fdo#109280])
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb6/igt@[email protected]

* igt@kms_hdr@bpc-switch:
- shard-skl: [PASS][48] -> [FAIL][49] ([i915#1188])
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl4/igt@[email protected]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl10/igt@[email protected]

* igt@kms_plane_alpha_blend@pipe-b-alpha-transparent-fb:
- shard-skl: NOTRUN -> [FAIL][50] ([i915#265])
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@[email protected]

* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-kbl: NOTRUN -> [SKIP][51] ([fdo#109271] / [i915#658])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@[email protected]

* igt@kms_psr@psr2_cursor_mmap_cpu:
- shard-iclb: [PASS][52] -> [SKIP][53] ([fdo#109441]) +3 similar issues
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb6/igt@kms_psr@psr2_cursor_mmap_cpu.html

* igt@kms_vblank@pipe-d-query-forked-busy:
- shard-skl: NOTRUN -> [SKIP][54] ([fdo#109271]) +43 similar issues
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@[email protected]

* igt@kms_vblank@pipe-d-wait-idle:
- shard-apl: NOTRUN -> [SKIP][55] ([fdo#109271] / [i915#533])
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl7/igt@[email protected]

* igt@kms_writeback@writeback-check-output:
- shard-apl: NOTRUN -> [SKIP][56] ([fdo#109271] / [i915#2437]) +1 similar issue
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl8/igt@[email protected]

* igt@sysfs_clients@pidname:
- shard-apl: NOTRUN -> [SKIP][57] ([fdo#109271] / [i915#2994])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl8/igt@[email protected]

#### Possible fixes ####

* igt@drm_mm@all@replace:
- shard-skl: [INCOMPLETE][58] -> [PASS][59]
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl2/igt@drm_mm@[email protected]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl9/igt@drm_mm@[email protected]

* igt@gem_ctx_isolation@preservation-s3@rcs0:
- shard-apl: [DMESG-WARN][60] ([i915#180]) -> [PASS][61] +1 similar issue
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl1/igt@gem_ctx_isolation@[email protected]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl8/igt@gem_ctx_isolation@[email protected]

* igt@gem_eio@in-flight-contexts-1us:
- shard-tglb: [TIMEOUT][62] ([i915#3063]) -> [PASS][63]
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-tglb5/igt@[email protected]
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb6/igt@[email protected]

* igt@gem_exec_balancer@parallel-keep-in-fence:
- shard-iclb: [SKIP][64] ([i915#4525]) -> [PASS][65]
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb5/igt@[email protected]
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb2/igt@[email protected]

* igt@gem_exec_capture@pi@rcs0:
- shard-skl: [INCOMPLETE][66] ([i915#4547]) -> [PASS][67]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl3/igt@gem_exec_capture@[email protected]
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl9/igt@gem_exec_capture@[email protected]

* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [FAIL][68] ([i915#2842]) -> [PASS][69]
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb3/igt@gem_exec_fair@[email protected]
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][70] ([i915#2842]) -> [PASS][71]
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-tglb5/igt@gem_exec_fair@[email protected]
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb2/igt@gem_exec_fair@[email protected]
- shard-apl: [FAIL][72] ([i915#2842]) -> [PASS][73]
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl6/igt@gem_exec_fair@[email protected]
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl8/igt@gem_exec_fair@[email protected]

* igt@gem_exec_whisper@basic-contexts:
- shard-glk: [DMESG-WARN][74] ([i915#118]) -> [PASS][75] +1 similar issue
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-glk1/igt@[email protected]
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-glk8/igt@[email protected]

* igt@gem_huc_copy@huc-copy:
- shard-tglb: [SKIP][76] ([i915#2190]) -> [PASS][77]
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-tglb7/igt@[email protected]
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb1/igt@[email protected]

* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: [DMESG-WARN][78] ([i915#180]) -> [PASS][79]
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl4/igt@[email protected]
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@[email protected]

* igt@kms_fbcon_fbt@fbc-suspend:
- shard-apl: [INCOMPLETE][80] ([i915#180] / [i915#1982]) -> [PASS][81]
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl6/igt@[email protected]
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]

* igt@kms_flip@2x-flip-vs-expired-vblank-interruptible@bc-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][82] ([i915#79]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-glk8/igt@kms_flip@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-glk3/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-expired-vblank-interruptible@b-dp1:
- shard-kbl: [FAIL][84] ([i915#79]) -> [PASS][85]
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl3/igt@kms_flip@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl4/igt@kms_flip@[email protected]

* igt@kms_flip@flip-vs-suspend@c-edp1:
- shard-skl: [INCOMPLETE][86] ([i915#4839]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl6/igt@kms_flip@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl4/igt@kms_flip@[email protected]

* igt@kms_flip@plain-flip-fb-recreate@a-edp1:
- shard-skl: [FAIL][88] ([i915#2122]) -> [PASS][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl9/igt@kms_flip@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl6/igt@kms_flip@[email protected]

* igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling:
- shard-iclb: [SKIP][90] ([i915#3701]) -> [PASS][91] +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb2/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling.html
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb5/igt@kms_flip_scaled_crc@flip-32bpp-ytile-to-32bpp-ytileccs-downscaling.html

* igt@kms_plane@pixel-format@pipe-a-planes:
- shard-glk: [DMESG-FAIL][92] ([i915#118]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-glk3/igt@kms_plane@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-glk2/igt@kms_plane@[email protected]

* igt@kms_plane_alpha_blend@pipe-c-constant-alpha-min:
- shard-skl: [FAIL][94] ([fdo#108145] / [i915#265]) -> [PASS][95]
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl9/igt@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl7/igt@[email protected]

* igt@kms_psr@psr2_sprite_plane_move:
- shard-iclb: [SKIP][96] ([fdo#109441]) -> [PASS][97] +3 similar issues
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb5/igt@kms_psr@psr2_sprite_plane_move.html
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb2/igt@kms_psr@psr2_sprite_plane_move.html

* igt@kms_vblank@pipe-a-ts-continuation-suspend:
- shard-kbl: [DMESG-WARN][98] ([i915#180] / [i915#295]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl4/igt@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@[email protected]

#### Warnings ####

* igt@gem_eio@unwedge-stress:
- shard-tglb: [FAIL][100] ([i915#232]) -> [TIMEOUT][101] ([i915#3063] / [i915#3648])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-tglb5/igt@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-tglb6/igt@[email protected]

* igt@gem_exec_fair@basic-pace@rcs0:
- shard-kbl: [FAIL][102] ([i915#2851]) -> [FAIL][103] ([i915#2842])
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl1/igt@gem_exec_fair@[email protected]
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@gem_exec_fair@[email protected]

* igt@i915_pm_rc6_residency@rc6-idle:
- shard-iclb: [WARN][104] ([i915#1804] / [i915#2684]) -> [WARN][105] ([i915#2684])
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb4/igt@[email protected]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb1/igt@[email protected]

* igt@kms_psr2_sf@plane-move-sf-dmg-area:
- shard-iclb: [SKIP][106] ([fdo#111068] / [i915#658]) -> [SKIP][107] ([i915#2920])
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb5/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb2/igt@[email protected]

* igt@kms_psr2_su@page_flip-nv12:
- shard-iclb: [FAIL][108] ([i915#4148]) -> [SKIP][109] ([fdo#109642] / [fdo#111068] / [i915#658])
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-iclb2/igt@kms_psr2_su@page_flip-nv12.html
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-iclb5/igt@kms_psr2_su@page_flip-nv12.html

* igt@runner@aborted:
- shard-kbl: ([FAIL][110], [FAIL][111], [FAIL][112], [FAIL][113]) ([i915#1814] / [i915#3002] / [i915#4312] / [i915#602]) -> ([FAIL][114], [FAIL][115], [FAIL][116], [FAIL][117]) ([i915#1436] / [i915#180] / [i915#3002] / [i915#4312])
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl4/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl4/igt@[email protected]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl7/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-kbl4/igt@[email protected]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl4/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl6/igt@[email protected]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl3/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-kbl6/igt@[email protected]
- shard-apl: ([FAIL][118], [FAIL][119], [FAIL][120], [FAIL][121], [FAIL][122]) ([i915#180] / [i915#3002] / [i915#4312]) -> ([FAIL][123], [FAIL][124], [FAIL][125], [FAIL][126], [FAIL][127], [FAIL][128]) ([fdo#109271] / [i915#180] / [i915#1814] / [i915#3002] / [i915#4312])
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl1/igt@[email protected]
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl6/igt@[email protected]
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl1/igt@[email protected]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl7/igt@[email protected]
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-apl1/igt@[email protected]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl2/igt@[email protected]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl2/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl2/igt@[email protected]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-apl1/igt@[email protected]
- shard-skl: ([FAIL][129], [FAIL][130], [FAIL][131]) ([i915#3002] / [i915#4312]) -> ([FAIL][132], [FAIL][133], [FAIL][134], [FAIL][135]) ([i915#1436] / [i915#2722] / [i915#3002] / [i915#4312])
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl1/igt@[email protected]
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl3/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11112/shard-skl10/igt@[email protected]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl1/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl6/igt@[email protected]
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl9/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/shard-skl6/igt@[email protected]

[fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109284]: https://bugs.freedesktop.org/show_bug.cgi?id=109284
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#118]: https://gitlab.freedesktop.org/drm/intel/issues/118
[i915#1188]: https://gitlab.freedesktop.org/drm/intel/issues/1188
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#180]: https://gitlab.freedesktop.org/drm/intel/issues/180
[i915#1804]: https://gitlab.freedesktop.org/drm/intel/issues/1804
[i915#1814]: https://gitlab.freedesktop.org/drm/intel/issues/1814
[i915#1982]: https://gitlab.freedesktop.org/drm/intel/issues/1982
[i915#2122]: https://gitlab.freedesktop.org/drm/intel/issues/2122
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#232]: https://gitlab.freedesktop.org/drm/intel/issues/232
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#265]: https://gitlab.freedesktop.org/drm/intel/issues/265
[i915#2684]: https://gitlab.freedesktop.org/drm/intel/issues/2684
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2846]: https://gitlab.freedesktop.org/drm/intel/issues/2846
[i915#2849]: https://gitlab.freedesktop.org/drm/intel/issues/2849
[i915#2851]: https://gitlab.freedesktop.org/drm/intel/issues/2851
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#295]: https://gitlab.freedesktop.org/drm/intel/issues/295
[i915#2994]: https://gitlab.freedesktop.org/drm/intel/issues/2994
[i915#3002]: https://gitlab.freedesktop.org/drm/intel/issues/3002
[i915#3063]: https://gitlab.freedesktop.org/drm/intel/issues/3063
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3614]: https://gitlab.freedesktop.org/drm/intel/issues/3614
[i915#3648]: https://gitlab.freedesktop.org/drm/intel/issues/3648
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3701]: https://gitlab.freedesktop.org/drm/intel/issues/3701
[i915#3743]: https://gitlab.freedesktop.org/drm/intel/issues/3743
[i915#3777]: https://gitlab.freedesktop.org/drm/intel/issues/3777
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#4148]: https://gitlab.freedesktop.org/drm/intel/issues/4148
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4839]: https://gitlab.freedesktop.org/drm/intel/issues/4839
[i915#4919]: https://gitlab.freedesktop.org/drm/intel/issues/4919
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#602]: https://gitlab.freedesktop.org/drm/intel/issues/602
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[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_11112 -> Patchwork_22040

CI-20190529: 20190529
CI_DRM_11112: 55b83480a1824372d372852b3b6ceb5f0827caf1 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6329: 38f656fdd61119105ecfa2c4dac157cd7dcad204 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_22040: eb1cf9369ca6883c6b533d30932a44bb151992e7 @ git://anongit.freedesktop.org/gfx-ci

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_22040/index.html

#2 lore raw
In reply to Tvrtko Ursulin
Quoted 6 lines · Tvrtko Ursulin
Quoted 5 lines · Jani Nikula

Add new files i915_ioctl.[ch] to hold small ioctls that are out of place everywhere else, and not big enough to warrant a file of their own. For starters, it's just for i915_reg_read_ioctl() that's a bit high level for a low level implementation that intel_uncore.[ch] is.

Quoted 7 lines
Quoted 2 lines

Copy & paste checks out and I obviously support the idea. :) Thanks for accomodating it.

Thanks, pushed!

BR,
Jani.

Quoted 259 lines

Regards,

Tvrtko

Quoted 254 lines
---
  drivers/gpu/drm/i915/Makefile       |  3 +-
  drivers/gpu/drm/i915/i915_driver.c  |  1 +
  drivers/gpu/drm/i915/i915_drv.h     |  3 -
  drivers/gpu/drm/i915/i915_ioctl.c   | 94 +++++++++++++++++++++++++++++
  drivers/gpu/drm/i915/i915_ioctl.h   | 14 +++++
  drivers/gpu/drm/i915/intel_uncore.c | 70 ---------------------
  6 files changed, 111 insertions(+), 74 deletions(-)

create mode 100644 drivers/gpu/drm/i915/i915_ioctl.c create mode 100644 drivers/gpu/drm/i915/i915_ioctl.h

drivers/gpu/drm/i915/Makefile +2 -1
index 451df10e3a36..a26e6736bebb 100644
@@ -32,8 +32,9 @@ subdir-ccflags-y += -I$(srctree)/$(src)
  # core driver code
  i915-y += i915_driver.o \
  	  i915_config.o \
-	  i915_irq.o \
  	  i915_getparam.o \
+	  i915_ioctl.o \
+	  i915_irq.o \
  	  i915_mitigations.o \
  	  i915_module.o \
  	  i915_params.o \
drivers/gpu/drm/i915/i915_driver.c +1 -0
index 8bef67cb6c33..3d41f532a5d6 100644
@@ -76,6 +76,7 @@
  #include "i915_drv.h"
  #include "i915_getparam.h"
  #include "i915_ioc32.h"
+#include "i915_ioctl.h"
  #include "i915_irq.h"
  #include "i915_memcpy.h"
  #include "i915_perf.h"
drivers/gpu/drm/i915/i915_drv.h +0 -3
index 890f1f6fbc49..44c1f98144b4 100644
@@ -1734,9 +1734,6 @@ mkwrite_device_info(struct drm_i915_private *dev_priv)
  	return (struct intel_device_info *)INTEL_INFO(dev_priv);
  }
 
-int i915_reg_read_ioctl(struct drm_device *dev, void *data,
-			struct drm_file *file);
-
  static inline int intel_hws_csb_write_index(struct drm_i915_private *i915)
  {
  	if (GRAPHICS_VER(i915) >= 11)
drivers/gpu/drm/i915/i915_ioctl.c new file +94 -0
new file mode 100644
index 000000000000..06a10ccea80b
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: MIT
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#include "gt/intel_engine_regs.h"
+
+#include "i915_drv.h"
+#include "i915_gem.h"
+#include "i915_ioctl.h"
+#include "i915_reg.h"
+#include "intel_runtime_pm.h"
+#include "intel_uncore.h"
+
+/*
+ * This file is for small ioctl functions that are out of place everywhere else,
+ * and not big enough to warrant a file of their own.
+ *
+ * This is not the dumping ground for random ioctls.
+ */
+
+struct reg_whitelist {
+	i915_reg_t offset_ldw;
+	i915_reg_t offset_udw;
+	u8 min_graphics_ver;
+	u8 max_graphics_ver;
+	u8 size;
+};
+
+static const struct reg_whitelist reg_read_whitelist[] = {
+	{
+		.offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE),
+		.offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE),
+		.min_graphics_ver = 4,
+		.max_graphics_ver = 12,
+		.size = 8
+	}
+};
+
+int i915_reg_read_ioctl(struct drm_device *dev,
+			void *data, struct drm_file *unused)
+{
+	struct drm_i915_private *i915 = to_i915(dev);
+	struct intel_uncore *uncore = &i915->uncore;
+	struct drm_i915_reg_read *reg = data;
+	struct reg_whitelist const *entry;
+	intel_wakeref_t wakeref;
+	unsigned int flags;
+	int remain;
+	int ret = 0;
+
+	entry = reg_read_whitelist;
+	remain = ARRAY_SIZE(reg_read_whitelist);
+	while (remain) {
+		u32 entry_offset = i915_mmio_reg_offset(entry->offset_ldw);
+
+		GEM_BUG_ON(!is_power_of_2(entry->size));
+		GEM_BUG_ON(entry->size > 8);
+		GEM_BUG_ON(entry_offset & (entry->size - 1));
+
+		if (IS_GRAPHICS_VER(i915, entry->min_graphics_ver, entry->max_graphics_ver) &&
+		    entry_offset == (reg->offset & -entry->size))
+			break;
+		entry++;
+		remain--;
+	}
+
+	if (!remain)
+		return -EINVAL;
+
+	flags = reg->offset & (entry->size - 1);
+
+	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
+		if (entry->size == 8 && flags == I915_REG_READ_8B_WA)
+			reg->val = intel_uncore_read64_2x32(uncore,
+							    entry->offset_ldw,
+							    entry->offset_udw);
+		else if (entry->size == 8 && flags == 0)
+			reg->val = intel_uncore_read64(uncore,
+						       entry->offset_ldw);
+		else if (entry->size == 4 && flags == 0)
+			reg->val = intel_uncore_read(uncore, entry->offset_ldw);
+		else if (entry->size == 2 && flags == 0)
+			reg->val = intel_uncore_read16(uncore,
+						       entry->offset_ldw);
+		else if (entry->size == 1 && flags == 0)
+			reg->val = intel_uncore_read8(uncore,
+						      entry->offset_ldw);
+		else
+			ret = -EINVAL;
+	}
+
+	return ret;
+}
drivers/gpu/drm/i915/i915_ioctl.h new file +14 -0
new file mode 100644
index 000000000000..f16ae87b8b8a
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2022 Intel Corporation
+ */
+
+#ifndef __I915_IOCTL_H__
+#define __I915_IOCTL_H__
+
+struct drm_device;
+struct drm_file;
+
+int i915_reg_read_ioctl(struct drm_device *dev, void *data, struct drm_file *file);
+
+#endif /* __I915_IOCTL_H__ */
drivers/gpu/drm/i915/intel_uncore.c +0 -70
index 41d082213e81..00f9a05d2686 100644
@@ -2255,76 +2255,6 @@ void intel_uncore_fini_mmio(struct intel_uncore *uncore)
  	}
  }
 
-static const struct reg_whitelist {
-	i915_reg_t offset_ldw;
-	i915_reg_t offset_udw;
-	u8 min_graphics_ver;
-	u8 max_graphics_ver;
-	u8 size;
-} reg_read_whitelist[] = { {
-	.offset_ldw = RING_TIMESTAMP(RENDER_RING_BASE),
-	.offset_udw = RING_TIMESTAMP_UDW(RENDER_RING_BASE),
-	.min_graphics_ver = 4,
-	.max_graphics_ver = 12,
-	.size = 8
-} };
-
-int i915_reg_read_ioctl(struct drm_device *dev,
-			void *data, struct drm_file *file)
-{
-	struct drm_i915_private *i915 = to_i915(dev);
-	struct intel_uncore *uncore = &i915->uncore;
-	struct drm_i915_reg_read *reg = data;
-	struct reg_whitelist const *entry;
-	intel_wakeref_t wakeref;
-	unsigned int flags;
-	int remain;
-	int ret = 0;
-
-	entry = reg_read_whitelist;
-	remain = ARRAY_SIZE(reg_read_whitelist);
-	while (remain) {
-		u32 entry_offset = i915_mmio_reg_offset(entry->offset_ldw);
-
-		GEM_BUG_ON(!is_power_of_2(entry->size));
-		GEM_BUG_ON(entry->size > 8);
-		GEM_BUG_ON(entry_offset & (entry->size - 1));
-
-		if (IS_GRAPHICS_VER(i915, entry->min_graphics_ver, entry->max_graphics_ver) &&
-		    entry_offset == (reg->offset & -entry->size))
-			break;
-		entry++;
-		remain--;
-	}
-
-	if (!remain)
-		return -EINVAL;
-
-	flags = reg->offset & (entry->size - 1);
-
-	with_intel_runtime_pm(&i915->runtime_pm, wakeref) {
-		if (entry->size == 8 && flags == I915_REG_READ_8B_WA)
-			reg->val = intel_uncore_read64_2x32(uncore,
-							    entry->offset_ldw,
-							    entry->offset_udw);
-		else if (entry->size == 8 && flags == 0)
-			reg->val = intel_uncore_read64(uncore,
-						       entry->offset_ldw);
-		else if (entry->size == 4 && flags == 0)
-			reg->val = intel_uncore_read(uncore, entry->offset_ldw);
-		else if (entry->size == 2 && flags == 0)
-			reg->val = intel_uncore_read16(uncore,
-						       entry->offset_ldw);
-		else if (entry->size == 1 && flags == 0)
-			reg->val = intel_uncore_read8(uncore,
-						      entry->offset_ldw);
-		else
-			ret = -EINVAL;
-	}
-
-	return ret;
-}
-
  /**
   * __intel_wait_for_register_fw - wait until register matches expected state
   * @uncore: the struct intel_uncore
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center