drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
Subsystems (2)
PATCH 1/2 drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
Declarations should be where the implementation is.
--- drivers/gpu/drm/i915/i915_drv.h | 3 --- drivers/gpu/drm/i915/intel_uncore.h | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/i915_drv.h +0 -3
@@ -1778,9 +1778,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/intel_uncore.h +6 -1
@@ -32,10 +32,12 @@#include "i915_reg.h" +struct drm_device ; +struct drm_file ;struct drm_i915_private ; +struct intel_gt ;struct intel_runtime_pm ;struct intel_uncore ; -struct intel_gt ;struct intel_uncore_mmio_debug {spinlock_t lock;/** lock is also taken in irq contexts. */
@@ -455,4 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,#define raw_reg_write (base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) +int i915_reg_read_ioctl (struct drm_device *dev,void *data, +struct drm_file *file); +#endif /* !__INTEL_UNCORE_H__ */
Signature · 1 line
2.30.2
PATCH 2/2 drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
Follow the usual naming convention.
--- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/i915/i915_driver.c +1 -1
@@ -1805,7 +1805,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_WAIT , i915_gem_wait_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_CREATE_EXT , i915_gem_context_create_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_DESTROY , i915_gem_context_destroy_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_REG_READ , i915_reg_read_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_REG_READ , intel_uncore_reg_read_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GET_RESET_STATS , i915_gem_context_reset_stats_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_USERPTR , i915_gem_userptr_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),
drivers/gpu/drm/i915/intel_uncore.c +2 -2
@@ -2269,8 +2269,8 @@ static const struct reg_whitelist { .size = 8 } }; -int i915_reg_read_ioctl (struct drm_device *dev, -void *data,struct drm_file *file) +int intel_uncore_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;
drivers/gpu/drm/i915/intel_uncore.h +2 -2
@@ -457,7 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,#define raw_reg_write (base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) -int i915_reg_read_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int intel_uncore_reg_read_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);#endif /* !__INTEL_UNCORE_H__ */
Signature · 1 line
2.30.2
Re: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
Quoted 1 line · Jani Nikula
Follow the usual naming convention.
But intel_uncore_ prefix usually means functions takes intel_uncore as the first argument.
Maybe solution here is that i915_reg_read_ioctl does not belong in intel_uncore.c, it being the UAPI layer thing? I guess arguments could be made for either way.
Regards,
Tvrtko
Quoted 50 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_driver.c +1
-1@@ -1805,7 +1805,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_WAIT , i915_gem_wait_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_CREATE_EXT , i915_gem_context_create_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_DESTROY , i915_gem_context_destroy_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_REG_READ , i915_reg_read_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_REG_READ , intel_uncore_reg_read_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GET_RESET_STATS , i915_gem_context_reset_stats_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_USERPTR , i915_gem_userptr_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),drivers/gpu/drm/i915/intel_uncore.c +2
-2@@ -2269,8 +2269,8 @@ static const struct reg_whitelist { .size = 8 } }; -int i915_reg_read_ioctl (struct drm_device *dev, -void *data,struct drm_file *file) +int intel_uncore_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;drivers/gpu/drm/i915/intel_uncore.h +2
-2@@ -457,7 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,#define raw_reg_write (base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) -int i915_reg_read_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int intel_uncore_reg_read_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);#endif /* !__INTEL_UNCORE_H__ */
Patchwork
CI[Intel-gfx] ✗ Fi.CI.SPARSE: warning for series starting with [1/2] drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
URL : https://patchwork.freedesktop.org/series/98499/
State : warning
== Summary ==
$ dim sparse --fast origin/drm-tip Sparse version: v0.6.2 Fast mode used, each commit won't be checked separately.
Re: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
In reply to Tvrtko UrsulinQuoted 9 lines · Tvrtko Ursulin
Quoted 1 line · Jani Nikula
Follow the usual naming convention.
But
intel_uncore_prefix usually means functions takesintel_uncoreas the first argument.Maybe solution here is that
i915_reg_read_ioctldoes not belong inintel_uncore.c, it being the UAPI layer thing? I guess arguments could be made for either way.
My position is that the function and file prefixes go hand in hand. You'll always know where to place a function, and you'll always know where the function is to be found.
If you can *also* make the context argument follow the pattern, it's obviously better, and indicates the division to files is working out nicely. However, in a lot of cases you'll need to pass struct drm_i915_private or similar as the first parameter to e.g. init functions. It can't be the rigid rule.
I'm fine with moving the entire function somewhere else, as long as the declaration is not in i915_drv.h. There's no longer a i915_drv.c, and i915_drv.h should not have function declarations at all.
BR,
Jani.
Quoted 55 lines
Regards,
Tvrtko
Quoted 50 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_driver.c +1
-1@@ -1805,7 +1805,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_WAIT , i915_gem_wait_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_CREATE_EXT , i915_gem_context_create_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_DESTROY , i915_gem_context_destroy_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_REG_READ , i915_reg_read_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_REG_READ , intel_uncore_reg_read_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GET_RESET_STATS , i915_gem_context_reset_stats_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_USERPTR , i915_gem_userptr_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),drivers/gpu/drm/i915/intel_uncore.c +2
-2@@ -2269,8 +2269,8 @@ static const struct reg_whitelist { .size = 8 } }; -int i915_reg_read_ioctl (struct drm_device *dev, -void *data,struct drm_file *file) +int intel_uncore_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;drivers/gpu/drm/i915/intel_uncore.h +2
-2@@ -457,7 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,#define raw_reg_write (base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) -int i915_reg_read_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int intel_uncore_reg_read_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);#endif /* !__INTEL_UNCORE_H__ */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Patchwork
CI[Intel-gfx] ✓ Fi.CI.BAT: success for series starting with [1/2] drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
URL : https://patchwork.freedesktop.org/series/98499/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_11047 -> Patchwork_21925
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/index.html
Participating hosts (48 -> 37)
------------------------------
Additional (2): fi-kbl-soraka fi-icl-u2
Missing (13): fi-ilk-m540 bat-dg1-6 bat-dg1-5 fi-hsw-4200u fi-bsw-cyan bat-adlp-6 bat-adlp-4 fi-ctg-p8600 fi-pnv-d510 bat-rpls-1 fi-bdw-samus bat-jsl-2 bat-jsl-1
Known issues
------------
Here are the changes found in Patchwork_21925 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@amdgpu/amd_cs_nop@fork-gfx0:
- fi-icl-u2: NOTRUN -> [SKIP][1] ([fdo#109315]) +17 similar issues
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-icl-u2/igt@amdgpu/[email protected]
* igt@gem_exec_fence@basic-busy@bcs0:
- fi-kbl-soraka: NOTRUN -> [SKIP][2] ([fdo#109271]) +16 similar issues
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-kbl-soraka/igt@gem_exec_fence@[email protected]
* igt@gem_huc_copy@huc-copy:
- fi-kbl-soraka: NOTRUN -> [SKIP][3] ([fdo#109271] / [i915#2190])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-kbl-soraka/igt@[email protected]
- fi-icl-u2: NOTRUN -> [SKIP][4] ([i915#2190])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-icl-u2/igt@[email protected]
* igt@gem_lmem_swapping@basic:
- fi-kbl-soraka: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613]) +3 similar issues
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-kbl-soraka/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random-engines:
- fi-icl-u2: NOTRUN -> [SKIP][6] ([i915#4613]) +3 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-icl-u2/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- fi-kbl-soraka: NOTRUN -> [DMESG-FAIL][7] ([i915#1886] / [i915#2291])
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-kbl-soraka/igt@i915_selftest@live@gt_pm.html
* igt@kms_chamelium@common-hpd-after-suspend:
- fi-kbl-soraka: NOTRUN -> [SKIP][8] ([fdo#109271] / [fdo#111827]) +8 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-kbl-soraka/igt@[email protected]
* igt@kms_chamelium@hdmi-hpd-fast:
- fi-icl-u2: NOTRUN -> [SKIP][9] ([fdo#111827]) +8 similar issues
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-icl-u2/igt@[email protected]
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
- fi-icl-u2: NOTRUN -> [SKIP][10] ([fdo#109278]) +2 similar issues
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-icl-u2/igt@[email protected]
* igt@kms_force_connector_basic@force-load-detect:
- fi-icl-u2: NOTRUN -> [SKIP][11] ([fdo#109285])
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-icl-u2/igt@[email protected]
* igt@kms_pipe_crc_basic@compare-crc-sanitycheck-pipe-d:
- fi-kbl-soraka: NOTRUN -> [SKIP][12] ([fdo#109271] / [i915#533])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-kbl-soraka/igt@[email protected]
* igt@kms_psr@primary_page_flip:
- fi-skl-6600u: [PASS][13] -> [FAIL][14] ([i915#4547])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-skl-6600u/igt@kms_psr@primary_page_flip.html
* igt@prime_vgem@basic-userptr:
- fi-icl-u2: NOTRUN -> [SKIP][15] ([i915#3301])
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-icl-u2/igt@[email protected]
#### Possible fixes ####
* igt@kms_frontbuffer_tracking@basic:
- fi-cml-u2: [DMESG-WARN][16] ([i915#4269]) -> [PASS][17]
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/fi-cml-u2/igt@[email protected]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-cml-u2/igt@[email protected]
#### Warnings ####
* igt@runner@aborted:
- fi-skl-6600u: [FAIL][18] ([i915#1436] / [i915#2722] / [i915#4312]) -> [FAIL][19] ([i915#4312])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/fi-skl-6600u/igt@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/fi-skl-6600u/igt@[email protected]
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109278]: https://bugs.freedesktop.org/show_bug.cgi?id=109278
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1436]: https://gitlab.freedesktop.org/drm/intel/issues/1436
[i915#1886]: https://gitlab.freedesktop.org/drm/intel/issues/1886
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2291]: https://gitlab.freedesktop.org/drm/intel/issues/2291
[i915#2722]: https://gitlab.freedesktop.org/drm/intel/issues/2722
[i915#3301]: https://gitlab.freedesktop.org/drm/intel/issues/3301
[i915#4269]: https://gitlab.freedesktop.org/drm/intel/issues/4269
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4547]: https://gitlab.freedesktop.org/drm/intel/issues/4547
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
Build changes
-------------
* Linux: CI_DRM_11047 -> Patchwork_21925
CI-20190529: 20190529
CI_DRM_11047: f50e5d7abd1873b3488081da88dc8412584280b9 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6323: 9dbaa0d5be7a859cda9b7d54c20ba96a596f43bd @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_21925: f152d466ca818a4104916fec78e7c293d64cb27f @ git://anongit.freedesktop.org/gfx-ci/linux
== Linux commits ==
f152d466ca81 drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl 341fc6f92a0f drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/index.html
Re: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
In reply to Jani NikulaQuoted 21 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin
Quoted 1 line · Jani Nikula
Follow the usual naming convention.
But
intel_uncore_prefix usually means functions takesintel_uncoreas the first argument.Maybe solution here is that
i915_reg_read_ioctldoes not belong inintel_uncore.c, it being the UAPI layer thing? I guess arguments could be made for either way.My position is that the function and file prefixes go hand in hand. You'll always know where to place a function, and you'll always know where the function is to be found.
If you can *also* make the context argument follow the pattern, it's obviously better, and indicates the division to files is working out nicely. However, in a lot of cases you'll need to pass struct
drm_i915_privateor similar as the first parameter to e.g. init functions. It can't be the rigid rule.
Quoted 3 lines
I'm fine with moving the entire function somewhere else, as long as the declaration is not in
i915_drv.h. There's no longer ai915_drv.c, andi915_drv.hshould not have function declarations at all.
Yes I agree it cannot be a rigid rule. I just that it feels intel_uncore.[hc] is too low level to me to hold an ioctl implementation, and header actually feels wrong to have the declaration. Not least it is about _one_ of the uncores, while the ioctl is not operating on that level, albeit undefined at the moment how exactly it would work for multi-tile.
Would it be too early, or unwarranted at this point, to maybe consider adding i915_ioctls.[hc]?
I like the i915_ prefix of ioctls for consistency.. i915_getparam_ioctl, i915_query_ioctl, i915_perf_..., i915_gem_....
Regards,
Tvrtko
Quoted 60 lines
BR,
Jani.Quoted 55 lines
Regards,
Tvrtko
Quoted 50 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_driver.c +1
-1@@ -1805,7 +1805,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_WAIT , i915_gem_wait_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_CREATE_EXT , i915_gem_context_create_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_DESTROY , i915_gem_context_destroy_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_REG_READ , i915_reg_read_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_REG_READ , intel_uncore_reg_read_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GET_RESET_STATS , i915_gem_context_reset_stats_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_USERPTR , i915_gem_userptr_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),drivers/gpu/drm/i915/intel_uncore.c +2
-2@@ -2269,8 +2269,8 @@ static const struct reg_whitelist { .size = 8 } }; -int i915_reg_read_ioctl (struct drm_device *dev, -void *data,struct drm_file *file) +int intel_uncore_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;drivers/gpu/drm/i915/intel_uncore.h +2
-2@@ -457,7 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,#define raw_reg_write (base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) -int i915_reg_read_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int intel_uncore_reg_read_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);#endif /* !__INTEL_UNCORE_H__ */
Patchwork
CI[Intel-gfx] ✗ Fi.CI.IGT: failure for series starting with [1/2] drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
In reply to Jani Nikula== Series Details ==
== Series Details ==
Series: series starting with [1/2] drm/i915: move i915_reg_read_ioctl declaration to intel_uncore.h
URL : https://patchwork.freedesktop.org/series/98499/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_11047_full -> Patchwork_21925_full
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_21925_full absolutely need to be verified manually.
If you think the reported changes have nothing to do with the changes introduced in Patchwork_21925_full, please notify your bug team to allow them to document this new failure mode, which will reduce false positives in CI.
Participating hosts (13 -> 12)
------------------------------
Missing (1): shard-dg1
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_21925_full:
### IGT changes ###
#### Possible regressions ####
* igt@kms_frontbuffer_tracking@psr-1p-rte:
- shard-tglb: [PASS][1] -> [INCOMPLETE][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglb6/igt@[email protected]
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb8/igt@[email protected]
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses. They do not affect the overall result.
* igt@gem_create@create-clear:
- {shard-rkl}: NOTRUN -> ([PASS][3], [INCOMPLETE][4])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-4/igt@[email protected]
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-5/igt@[email protected]
* igt@gem_exec_whisper@basic-fds-priority:
- {shard-rkl}: NOTRUN -> [INCOMPLETE][5] +1 similar issue
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-5/igt@[email protected]
* igt@gem_exec_whisper@basic-queues-priority:
- {shard-rkl}: [PASS][6] -> [DMESG-FAIL][7]
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-6/igt@[email protected]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-5/igt@[email protected]
* igt@gem_flink_race@flink_close:
- {shard-rkl}: [PASS][8] -> [INCOMPLETE][9]
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@gem_flink_race@flink_close.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-5/igt@gem_flink_race@flink_close.html
* igt@i915_pm_dc@dc6-psr:
- {shard-tglu}: NOTRUN -> [SKIP][10]
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglu-1/igt@[email protected]
* igt@testdisplay:
- {shard-tglu}: [PASS][11] -> [DMESG-WARN][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglu-1/[email protected]
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglu-5/[email protected]
Known issues
------------
Here are the changes found in Patchwork_21925_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_create@create-massive:
- shard-tglb: NOTRUN -> [DMESG-WARN][13] ([i915#3002])
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb7/igt@[email protected]
* igt@gem_eio@in-flight-contexts-immediate:
- shard-tglb: [PASS][14] -> [TIMEOUT][15] ([i915#3063])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglb7/igt@[email protected]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb3/igt@[email protected]
* igt@gem_eio@in-flight-suspend:
- shard-apl: NOTRUN -> [DMESG-WARN][16] ([i915#180])
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl6/igt@[email protected]
* igt@gem_exec_fair@basic-flow@rcs0:
- shard-skl: NOTRUN -> [SKIP][17] ([fdo#109271]) +190 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl5/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-solo@rcs0:
- shard-kbl: [PASS][18] -> [FAIL][19] ([i915#2842]) +1 similar issue
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-kbl4/igt@gem_exec_fair@[email protected]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl7/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-throttle@rcs0:
- shard-iclb: [PASS][20] -> [FAIL][21] ([i915#2849])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb5/igt@gem_exec_fair@[email protected]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb1/igt@gem_exec_fair@[email protected]
* igt@gem_huc_copy@huc-copy:
- shard-tglb: [PASS][22] -> [SKIP][23] ([i915#2190])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglb1/igt@[email protected]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb6/igt@[email protected]
* igt@gem_lmem_swapping@parallel-random:
- shard-apl: NOTRUN -> [SKIP][24] ([fdo#109271] / [i915#4613])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl7/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][25] ([fdo#109271] / [i915#4613]) +1 similar issue
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl4/igt@[email protected]
* igt@gem_lmem_swapping@random:
- shard-skl: NOTRUN -> [SKIP][26] ([fdo#109271] / [i915#4613])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl2/igt@[email protected]
* igt@gem_lmem_swapping@smem-oom:
- shard-tglb: NOTRUN -> [SKIP][27] ([i915#4613])
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb7/igt@[email protected]
* igt@gem_userptr_blits@input-checking:
- shard-skl: NOTRUN -> [DMESG-WARN][28] ([i915#3002]) +1 similar issue
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl5/igt@[email protected]
* igt@gem_workarounds@suspend-resume:
- shard-kbl: [PASS][29] -> [DMESG-WARN][30] ([i915#180])
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-kbl6/igt@[email protected]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl4/igt@[email protected]
* igt@gen9_exec_parse@allowed-all:
- shard-glk: [PASS][31] -> [DMESG-WARN][32] ([i915#1436] / [i915#716])
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-glk2/igt@[email protected]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-glk8/igt@[email protected]
* igt@i915_pm_dc@dc6-dpms:
- shard-kbl: NOTRUN -> [FAIL][33] ([i915#454])
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl3/igt@[email protected]
* igt@i915_suspend@debugfs-reader:
- shard-apl: [PASS][34] -> [DMESG-WARN][35] ([i915#180]) +1 similar issue
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-apl4/igt@[email protected]
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl3/igt@[email protected]
* igt@kms_async_flips@alternate-sync-async-flip:
- shard-skl: [PASS][36] -> [FAIL][37] ([i915#2521])
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-skl10/igt@[email protected]
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl9/igt@[email protected]
- shard-glk: [PASS][38] -> [FAIL][39] ([i915#2521])
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-glk4/igt@[email protected]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-glk2/igt@[email protected]
* igt@kms_big_fb@y-tiled-max-hw-stride-64bpp-rotate-0-async-flip:
- shard-skl: NOTRUN -> [FAIL][40] ([i915#3763])
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl6/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-0-hflip:
- shard-apl: NOTRUN -> [SKIP][41] ([fdo#109271] / [i915#3777])
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl7/igt@[email protected]
- shard-kbl: NOTRUN -> [SKIP][42] ([fdo#109271] / [i915#3777])
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl4/igt@[email protected]
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-async-flip:
- shard-skl: NOTRUN -> [FAIL][43] ([i915#3743]) +2 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl5/igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-async-flip.html
* igt@kms_big_fb@yf-tiled-max-hw-stride-32bpp-rotate-180-hflip:
- shard-skl: NOTRUN -> [SKIP][44] ([fdo#109271] / [i915#3777])
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl6/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs_cc:
- shard-kbl: NOTRUN -> [SKIP][45] ([fdo#109271] / [i915#3886]) +3 similar issues
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl3/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc:
- shard-skl: NOTRUN -> [SKIP][46] ([fdo#109271] / [i915#3886]) +10 similar issues
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl6/igt@kms_ccs@pipe-b-crc-primary-rotation-180-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc:
- shard-apl: NOTRUN -> [SKIP][47] ([fdo#109271] / [i915#3886]) +5 similar issues
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl3/igt@kms_ccs@pipe-c-ccs-on-another-bo-y_tiled_gen12_rc_ccs_cc.html
* igt@kms_chamelium@dp-hpd-storm-disable:
- shard-apl: NOTRUN -> [SKIP][48] ([fdo#109271] / [fdo#111827]) +4 similar issues
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl7/igt@[email protected]
* igt@kms_color_chamelium@pipe-a-ctm-blue-to-red:
- shard-kbl: NOTRUN -> [SKIP][49] ([fdo#109271] / [fdo#111827]) +5 similar issues
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl3/igt@[email protected]
* igt@kms_color_chamelium@pipe-b-ctm-max:
- shard-skl: NOTRUN -> [SKIP][50] ([fdo#109271] / [fdo#111827]) +14 similar issues
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl2/igt@[email protected]
* igt@kms_content_protection@atomic-dpms:
- shard-apl: NOTRUN -> [TIMEOUT][51] ([i915#1319])
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl3/igt@[email protected]
- shard-kbl: NOTRUN -> [TIMEOUT][52] ([i915#1319])
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-suspend:
- shard-kbl: NOTRUN -> [DMESG-WARN][53] ([i915#180])
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl4/igt@[email protected]
* igt@kms_cursor_crc@pipe-d-cursor-512x170-random:
- shard-tglb: NOTRUN -> [SKIP][54] ([fdo#109279] / [i915#3359])
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb7/igt@[email protected]
* igt@kms_cursor_edge_walk@pipe-d-64x64-left-edge:
- shard-kbl: NOTRUN -> [SKIP][55] ([fdo#109271]) +83 similar issues
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl3/igt@[email protected]
* igt@kms_cursor_legacy@2x-cursor-vs-flip-atomic:
- shard-tglb: NOTRUN -> [SKIP][56] ([fdo#109274] / [fdo#111825])
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb7/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size:
- shard-iclb: [PASS][57] -> [FAIL][58] ([i915#2346])
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb7/igt@kms_cursor_legacy@flip-vs-cursor-atomic-transitions-varying-size.html
* igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling:
- shard-iclb: [PASS][59] -> [SKIP][60] ([i915#3701])
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb1/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb2/igt@kms_flip_scaled_crc@flip-64bpp-ytile-to-32bpp-ytile-downscaling.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-wc:
- shard-tglb: NOTRUN -> [SKIP][61] ([fdo#109280] / [fdo#111825]) +1 similar issue
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb7/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-wc.html
* igt@kms_pipe_crc_basic@disable-crc-after-crtc-pipe-d:
- shard-apl: NOTRUN -> [SKIP][62] ([fdo#109271] / [i915#533])
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl7/igt@[email protected]
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-d:
- shard-skl: NOTRUN -> [SKIP][63] ([fdo#109271] / [i915#533])
[63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl5/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-alpha-7efc:
- shard-skl: NOTRUN -> [FAIL][64] ([fdo#108145] / [i915#265]) +1 similar issue
[64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl3/igt@[email protected]
* igt@kms_plane_alpha_blend@pipe-a-coverage-7efc:
- shard-skl: [PASS][65] -> [FAIL][66] ([fdo#108145] / [i915#265])
[65]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-skl4/igt@[email protected]
[66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl9/igt@[email protected]
* igt@kms_psr2_sf@overlay-plane-update-continuous-sf:
- shard-apl: NOTRUN -> [SKIP][67] ([fdo#109271] / [i915#658])
[67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl8/igt@[email protected]
* igt@kms_psr2_sf@primary-plane-update-sf-dmg-area:
- shard-kbl: NOTRUN -> [SKIP][68] ([fdo#109271] / [i915#658])
[68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl3/igt@[email protected]
* igt@kms_psr2_su@frontbuffer-xrgb8888:
- shard-skl: NOTRUN -> [SKIP][69] ([fdo#109271] / [i915#658]) +1 similar issue
[69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl3/igt@[email protected]
* igt@kms_psr@psr2_sprite_blt:
- shard-iclb: [PASS][70] -> [SKIP][71] ([fdo#109441])
[70]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb2/igt@kms_psr@psr2_sprite_blt.html
[71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb5/igt@kms_psr@psr2_sprite_blt.html
* igt@kms_vblank@pipe-d-ts-continuation-idle:
- shard-apl: NOTRUN -> [SKIP][72] ([fdo#109271]) +92 similar issues
[72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl6/igt@[email protected]
* igt@kms_vblank@pipe-d-wait-idle:
- shard-kbl: NOTRUN -> [SKIP][73] ([fdo#109271] / [i915#533]) +2 similar issues
[73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl3/igt@[email protected]
* igt@kms_writeback@writeback-invalid-parameters:
- shard-kbl: NOTRUN -> [SKIP][74] ([fdo#109271] / [i915#2437])
[74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl4/igt@[email protected]
- shard-apl: NOTRUN -> [SKIP][75] ([fdo#109271] / [i915#2437])
[75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl7/igt@[email protected]
* igt@kms_writeback@writeback-pixel-formats:
- shard-skl: NOTRUN -> [SKIP][76] ([fdo#109271] / [i915#2437])
[76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl2/igt@[email protected]
* igt@nouveau_crc@pipe-b-ctx-flip-detection:
- shard-tglb: NOTRUN -> [SKIP][77] ([i915#2530])
[77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb7/igt@[email protected]
* igt@perf@polling-parameterized:
- shard-skl: NOTRUN -> [FAIL][78] ([i915#1542])
[78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl2/igt@[email protected]
* igt@perf@short-reads:
- shard-skl: NOTRUN -> [FAIL][79] ([i915#51])
[79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl6/igt@[email protected]
* igt@sysfs_clients@create:
- shard-skl: NOTRUN -> [SKIP][80] ([fdo#109271] / [i915#2994]) +1 similar issue
[80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl6/igt@[email protected]
* igt@sysfs_clients@fair-0:
- shard-kbl: NOTRUN -> [SKIP][81] ([fdo#109271] / [i915#2994])
[81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl3/igt@[email protected]
#### Possible fixes ####
* igt@feature_discovery@psr2:
- {shard-rkl}: [SKIP][82] ([i915#658]) -> [PASS][83]
[82]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@gem_ctx_shared@detached-shared-gtt:
- {shard-rkl}: [INCOMPLETE][84] -> [PASS][85] +2 similar issues
[84]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-5/igt@[email protected]
[85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@gem_eio@unwedge-stress:
- shard-iclb: [TIMEOUT][86] ([i915#2481] / [i915#3070]) -> [PASS][87]
[86]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb2/igt@[email protected]
[87]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb6/igt@[email protected]
* igt@gem_exec_balancer@bonded-pair:
- {shard-tglu}: [FAIL][88] ([i915#1888]) -> [PASS][89]
[88]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglu-1/igt@[email protected]
[89]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglu-7/igt@[email protected]
* igt@gem_exec_balancer@parallel-out-fence:
- shard-iclb: [SKIP][90] ([i915#4525]) -> [PASS][91] +1 similar issue
[90]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb8/igt@[email protected]
[91]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb1/igt@[email protected]
* igt@gem_exec_fair@basic-none-share@rcs0:
- shard-iclb: [FAIL][92] ([i915#2842]) -> [PASS][93]
[92]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb1/igt@gem_exec_fair@[email protected]
[93]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb2/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@rcs0:
- shard-kbl: [FAIL][94] ([i915#2842]) -> [PASS][95] +1 similar issue
[94]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-kbl1/igt@gem_exec_fair@[email protected]
[95]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl1/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-none@vecs0:
- shard-apl: [FAIL][96] ([i915#2842]) -> [PASS][97] +1 similar issue
[96]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-apl4/igt@gem_exec_fair@[email protected]
[97]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl3/igt@gem_exec_fair@[email protected]
* igt@gem_exec_fair@basic-pace-share@rcs0:
- shard-tglb: [FAIL][98] ([i915#2842]) -> [PASS][99]
[98]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglb6/igt@gem_exec_fair@[email protected]
[99]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglb3/igt@gem_exec_fair@[email protected]
- {shard-rkl}: [FAIL][100] ([i915#2842]) -> ([PASS][101], [PASS][102])
[100]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@gem_exec_fair@[email protected]
[101]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-2/igt@gem_exec_fair@[email protected]
[102]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-4/igt@gem_exec_fair@[email protected]
* igt@gem_exec_whisper@basic-contexts-priority:
- {shard-rkl}: [DMESG-FAIL][103] -> ([PASS][104], [PASS][105])
[103]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-5/igt@[email protected]
[104]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-1/igt@[email protected]
[105]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-4/igt@[email protected]
* igt@gem_exec_whisper@basic-queues-priority-all:
- shard-glk: [DMESG-WARN][106] ([i915#118]) -> [PASS][107] +1 similar issue
[106]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-glk7/igt@[email protected]
[107]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-glk5/igt@[email protected]
* igt@gen9_exec_parse@allowed-single:
- shard-skl: [DMESG-WARN][108] ([i915#1436] / [i915#716]) -> [PASS][109]
[108]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-skl6/igt@[email protected]
[109]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl5/igt@[email protected]
* igt@i915_module_load@reload-with-fault-injection:
- shard-skl: [DMESG-WARN][110] ([i915#1982]) -> [PASS][111]
[110]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-skl8/igt@[email protected]
[111]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-skl10/igt@[email protected]
* igt@i915_pm_dc@dc9-dpms:
- shard-iclb: [SKIP][112] ([i915#4281]) -> [PASS][113]
[112]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb3/igt@[email protected]
[113]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb1/igt@[email protected]
* igt@i915_pm_rc6_residency@rc6-fence:
- {shard-tglu}: [WARN][114] ([i915#2681]) -> [PASS][115]
[114]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglu-1/igt@[email protected]
[115]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglu-5/igt@[email protected]
* igt@i915_pm_rpm@dpms-mode-unset-lpsp:
- {shard-rkl}: [SKIP][116] ([i915#1397]) -> [PASS][117]
[116]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[117]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@i915_selftest@live@gt_pm:
- {shard-tglu}: [DMESG-FAIL][118] ([i915#3987]) -> [PASS][119]
[118]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglu-8/igt@i915_selftest@live@gt_pm.html
[119]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglu-8/igt@i915_selftest@live@gt_pm.html
* igt@i915_suspend@fence-restore-tiled2untiled:
- shard-apl: [DMESG-WARN][120] ([i915#180]) -> [PASS][121] +3 similar issues
[120]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-apl8/igt@[email protected]
[121]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-apl8/igt@[email protected]
* igt@i915_suspend@sysfs-reader:
- shard-kbl: [DMESG-WARN][122] ([i915#180]) -> [PASS][123] +1 similar issue
[122]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-kbl6/igt@[email protected]
[123]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-kbl4/igt@[email protected]
* igt@kms_big_fb@linear-16bpp-rotate-180:
- {shard-tglu}: [DMESG-WARN][124] ([i915#402]) -> [PASS][125]
[124]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-tglu-1/igt@[email protected]
[125]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-tglu-5/igt@[email protected]
* igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs:
- {shard-rkl}: [SKIP][126] ([i915#1845] / [i915#4098]) -> [PASS][127] +1 similar issue
[126]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs.html
[127]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@kms_ccs@pipe-a-bad-rotation-90-y_tiled_gen12_rc_ccs.html
* igt@kms_color@pipe-a-ctm-max:
- {shard-rkl}: [SKIP][128] ([i915#1149] / [i915#1849]) -> [PASS][129]
[128]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-5/igt@[email protected]
[129]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@kms_color@pipe-a-legacy-gamma:
- {shard-rkl}: [SKIP][130] ([i915#1849] / [i915#4070]) -> [PASS][131] +3 similar issues
[130]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[131]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@kms_color@pipe-b-ctm-max:
- {shard-rkl}: [SKIP][132] ([i915#1149] / [i915#1849] / [i915#4070]) -> [PASS][133]
[132]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[133]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_crc@pipe-a-cursor-128x128-rapid-movement:
- {shard-rkl}: [SKIP][134] ([fdo#112022] / [i915#4070]) -> [PASS][135] +2 similar issues
[134]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[135]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_crc@pipe-b-cursor-64x64-sliding:
- {shard-rkl}: ([SKIP][136], [SKIP][137]) ([fdo#112022] / [i915#4070]) -> [PASS][138]
[136]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[137]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-4/igt@[email protected]
[138]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@cursor-vs-flip-varying-size:
- {shard-rkl}: [SKIP][139] ([fdo#111825] / [i915#4070]) -> [PASS][140] +1 similar issue
[139]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[140]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@cursora-vs-flipa-legacy:
- {shard-rkl}: ([SKIP][141], [SKIP][142]) ([fdo#111825] / [i915#4070]) -> [PASS][143]
[141]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-4/igt@[email protected]
[142]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-rkl-1/igt@[email protected]
[143]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-rkl-6/igt@[email protected]
* igt@kms_cursor_legacy@flip-vs-cursor-toggle:
- shard-iclb: [FAIL][144] ([i915#2346]) -> [PASS][145] +1 similar issue
[144]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_11047/shard-iclb7/igt@[email protected]
[145]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/shard-iclb4/igt@kms_cursor_legacy@flip-vs-cur
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_21925/index.html
Re: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
In reply to Tvrtko UrsulinQuoted 33 lines · Tvrtko Ursulin
Quoted 21 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin
Quoted 1 line · Jani Nikula
Follow the usual naming convention.
But
intel_uncore_prefix usually means functions takesintel_uncoreas the first argument.Maybe solution here is that
i915_reg_read_ioctldoes not belong inintel_uncore.c, it being the UAPI layer thing? I guess arguments could be made for either way.My position is that the function and file prefixes go hand in hand. You'll always know where to place a function, and you'll always know where the function is to be found.
If you can *also* make the context argument follow the pattern, it's obviously better, and indicates the division to files is working out nicely. However, in a lot of cases you'll need to pass struct
drm_i915_privateor similar as the first parameter to e.g. init functions. It can't be the rigid rule.Quoted 3 lines
I'm fine with moving the entire function somewhere else, as long as the declaration is not in
i915_drv.h. There's no longer ai915_drv.c, andi915_drv.hshould not have function declarations at all.Yes I agree it cannot be a rigid rule. I just that it feels intel_uncore.[hc] is too low level to me to hold an ioctl implementation, and header actually feels wrong to have the declaration. Not least it is about _one_ of the uncores, while the ioctl is not operating on that level, albeit undefined at the moment how exactly it would work for multi-tile.
Quoted 2 lines
Would it be too early, or unwarranted at this point, to maybe consider adding i915_ioctls.[hc]?
Then the conversation would be about putting together a ton of unrelated functions where the only thing in common is that they're an ioctl implementation. Arguably many of them would have less in common than the reg read ioctl has with uncore!
And when is it okay to put an ioctl in the i915_ioctls.c file and when is it warranted to put it somewhere else? It's just a different set of problems.
Quoted 2 lines
I like the
i915_prefix of ioctls for consistency..i915_getparam_ioctl,i915_query_ioctl,i915_perf_...,i915_gem_....
The display ioctls have intel_ prefix anyway. It's the _ioctl suffix that we use.
Again, my main driver here is cleaning up i915_drv.h. I can shove the reg read ioctl somewhere other than intel_uncore.[ch] too. But as it stands, the only alternative that seems better than intel_uncore.[ch] at the moment is adding a dedicated file for a 60-line function.
BR,
Jani.
Quoted 65 lines
Regards,
Tvrtko
Quoted 60 lines
BR,
Jani.Quoted 55 lines
Regards,
Tvrtko
Quoted 50 lines
Signed-off-by Jani Nikula <[email protected]>--- drivers/gpu/drm/i915/i915_driver.c | 2 +- drivers/gpu/drm/i915/intel_uncore.c | 4 ++-- drivers/gpu/drm/i915/intel_uncore.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)drivers/gpu/drm/i915/i915_driver.c +1
-1@@ -1805,7 +1805,7 @@ static const struct drm_ioctl_desc i915_ioctls[] = {DRM_IOCTL_DEF_DRV (I915_GEM_WAIT , i915_gem_wait_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_CREATE_EXT , i915_gem_context_create_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_CONTEXT_DESTROY , i915_gem_context_destroy_ioctl,DRM_RENDER_ALLOW ), -DRM_IOCTL_DEF_DRV (I915_REG_READ , i915_reg_read_ioctl,DRM_RENDER_ALLOW ), +DRM_IOCTL_DEF_DRV (I915_REG_READ , intel_uncore_reg_read_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GET_RESET_STATS , i915_gem_context_reset_stats_ioctl,DRM_RENDER_ALLOW ),DRM_IOCTL_DEF_DRV (I915_GEM_USERPTR , i915_gem_userptr_ioctl,DRM_RENDER_ALLOW ), DRM_IOCTL_DEF_DRV(I915_GEM_CONTEXT_GETPARAM, i915_gem_context_getparam_ioctl, DRM_RENDER_ALLOW),drivers/gpu/drm/i915/intel_uncore.c +2
-2@@ -2269,8 +2269,8 @@ static const struct reg_whitelist { .size = 8 } }; -int i915_reg_read_ioctl (struct drm_device *dev, -void *data,struct drm_file *file) +int intel_uncore_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;drivers/gpu/drm/i915/intel_uncore.h +2
-2@@ -457,7 +457,7 @@ static inline int intel_uncore_write_and_verify(struct intel_uncore *uncore,#define raw_reg_write (base, reg, value) \ writel(value, base + i915_mmio_reg_offset(reg)) -int i915_reg_read_ioctl (struct drm_device *dev,void *data, -struct drm_file *file); +int intel_uncore_reg_read_ioctl (struct drm_device *dev,void *data, +struct drm_file *file);#endif /* !__INTEL_UNCORE_H__ */
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
Quoted 34 lines · Jani Nikula
Quoted 33 lines · Tvrtko Ursulin
Quoted 21 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin
Quoted 1 line · Jani Nikula
Follow the usual naming convention.
But
intel_uncore_prefix usually means functions takesintel_uncoreas the first argument.Maybe solution here is that
i915_reg_read_ioctldoes not belong inintel_uncore.c, it being the UAPI layer thing? I guess arguments could be made for either way.My position is that the function and file prefixes go hand in hand. You'll always know where to place a function, and you'll always know where the function is to be found.
If you can *also* make the context argument follow the pattern, it's obviously better, and indicates the division to files is working out nicely. However, in a lot of cases you'll need to pass struct
drm_i915_privateor similar as the first parameter to e.g. init functions. It can't be the rigid rule.Quoted 3 lines
I'm fine with moving the entire function somewhere else, as long as the declaration is not in
i915_drv.h. There's no longer ai915_drv.c, andi915_drv.hshould not have function declarations at all.Yes I agree it cannot be a rigid rule. I just that it feels intel_uncore.[hc] is too low level to me to hold an ioctl implementation, and header actually feels wrong to have the declaration. Not least it is about _one_ of the uncores, while the ioctl is not operating on that level, albeit undefined at the moment how exactly it would work for multi-tile.
Quoted 7 lines
Quoted 2 lines
Would it be too early, or unwarranted at this point, to maybe consider adding i915_ioctls.[hc]?
Then the conversation would be about putting together a ton of unrelated functions where the only thing in common is that they're an ioctl implementation. Arguably many of them would have less in common than the reg read ioctl has with uncore!
I imagined it as a place for ioctls which don't fit anywhere else, like it this case it is not a family of ioctls but and odd one out. So yes, first "problem" would be there is only one to put there and no line of sight for others.
Quoted 3 lines
And when is it okay to put an ioctl in the
i915_ioctls.cfile and when is it warranted to put it somewhere else? It's just a different set of problems.
When it does not fit anywhere else?
Quoted 10 lines
Quoted 2 lines
I like the
i915_prefix of ioctls for consistency..i915_getparam_ioctl,i915_query_ioctl,i915_perf_...,i915_gem_....The display ioctls have
intel_prefix anyway. It's the_ioctlsuffix that we use.Again, my main driver here is cleaning up
i915_drv.h. I can shove the reg read ioctl somewhere other than intel_uncore.[ch] too. But as it stands, the only alternative that seems better than intel_uncore.[ch] at the moment is adding a dedicated file for a 60-line function.
I understand your motivation and I wouldn't nack your efforts, but I also cannot yet make myself ack it. Is 60 lines so bad? Lets see..
$ find . -name "*.c" -print0 | xargs -0 wc -l | sort -nr
...
59 ./selftests/mock_request.c
59 ./gt/uc/intel_uc_debugfs.c
59 ./gem/i915_gemfs.c
52 ./selftests/igt_mmap.c
51 ./selftests/igt_reset.c
49 ./selftests/mock_uncore.c
47 ./selftests/igt_atomic.c
36 ./gt/uc/intel_huc_debugfs.c
36 ./gt/intel_gt_engines_debugfs.c
35 ./selftests/igt_flush_test.c
34 ./selftests/librapl.c
34 ./gvt/trace_points.c
29 ./gt/selftests/mock_timeline.c
27 ./gt/selftest_engine.c
26 ./gt/uc/intel_huc_fw.c
15 ./i915_config.c
14 ./i915_trace_points.c
9 ./display/intel_display_trace.cSo kind of meh, wouldn't be first. I'd add a dedicated file just for the benefit of being able to legitimately keep the i915_reg_read_ioctl name. Come multi-tile it may get company. Even though at the moment I am not aware anyone is trying to add multi-tile aware reg read, but I expect there will be need as long as need for the existing one exists.
Regards,
Tvrtko
Re: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
Quoted 89 lines · Tvrtko Ursulin
Quoted 34 lines · Jani Nikula
Quoted 33 lines · Tvrtko Ursulin
Quoted 21 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin
Quoted 1 line · Jani Nikula
Follow the usual naming convention.
But
intel_uncore_prefix usually means functions takesintel_uncoreas the first argument.Maybe solution here is that
i915_reg_read_ioctldoes not belong inintel_uncore.c, it being the UAPI layer thing? I guess arguments could be made for either way.My position is that the function and file prefixes go hand in hand. You'll always know where to place a function, and you'll always know where the function is to be found.
If you can *also* make the context argument follow the pattern, it's obviously better, and indicates the division to files is working out nicely. However, in a lot of cases you'll need to pass struct
drm_i915_privateor similar as the first parameter to e.g. init functions. It can't be the rigid rule.Quoted 3 lines
I'm fine with moving the entire function somewhere else, as long as the declaration is not in
i915_drv.h. There's no longer ai915_drv.c, andi915_drv.hshould not have function declarations at all.Yes I agree it cannot be a rigid rule. I just that it feels intel_uncore.[hc] is too low level to me to hold an ioctl implementation, and header actually feels wrong to have the declaration. Not least it is about _one_ of the uncores, while the ioctl is not operating on that level, albeit undefined at the moment how exactly it would work for multi-tile.
Quoted 7 lines
Quoted 2 lines
Would it be too early, or unwarranted at this point, to maybe consider adding i915_ioctls.[hc]?
Then the conversation would be about putting together a ton of unrelated functions where the only thing in common is that they're an ioctl implementation. Arguably many of them would have less in common than the reg read ioctl has with uncore!
I imagined it as a place for ioctls which don't fit anywhere else, like it this case it is not a family of ioctls but and odd one out. So yes, first "problem" would be there is only one to put there and no line of sight for others.
Quoted 3 lines
And when is it okay to put an ioctl in the
i915_ioctls.cfile and when is it warranted to put it somewhere else? It's just a different set of problems.When it does not fit anywhere else?
Quoted 10 lines
Quoted 2 lines
I like the
i915_prefix of ioctls for consistency..i915_getparam_ioctl,i915_query_ioctl,i915_perf_...,i915_gem_....The display ioctls have
intel_prefix anyway. It's the_ioctlsuffix that we use.Again, my main driver here is cleaning up
i915_drv.h. I can shove the reg read ioctl somewhere other than intel_uncore.[ch] too. But as it stands, the only alternative that seems better than intel_uncore.[ch] at the moment is adding a dedicated file for a 60-line function.I understand your motivation and I wouldn't nack your efforts, but I also cannot yet make myself ack it. Is 60 lines so bad? Lets see..
$ find . -name "*.c" -print0 | xargs -0 wc -l | sort -nr ... 59 ./selftests/mock_request.c 59 ./gt/uc/intel_uc_debugfs.c 59 ./gem/i915_gemfs.c 52 ./selftests/igt_mmap.c 51 ./selftests/igt_reset.c 49 ./selftests/mock_uncore.c 47 ./selftests/igt_atomic.c 36 ./gt/uc/intel_huc_debugfs.c 36 ./gt/intel_gt_engines_debugfs.c 35 ./selftests/igt_flush_test.c 34 ./selftests/librapl.c 34 ./gvt/trace_points.c 29 ./gt/selftests/mock_timeline.c 27 ./gt/selftest_engine.c 26 ./gt/uc/intel_huc_fw.c 15 ./i915_config.c 14 ./i915_trace_points.c 9 ./display/intel_display_trace.c
Quoted 5 lines
So kind of meh, wouldn't be first. I'd add a dedicated file just for the benefit of being able to legitimately keep the
i915_reg_read_ioctlname. Come multi-tile it may get company. Even though at the moment I am not aware anyone is trying to add multi-tile aware reg read, but I expect there will be need as long as need for the existing one exists.
So this got stalled a bit, and sidestepped from the main goal of just cleaning up i915_drv.h from the clutter that absolutely does not belong there.
Can we just merge patch 1, leave further cleanup to follow-up, and move on?
BR,
Jani.
Signature · 1 line
Jani Nikula, Intel Open Source Graphics Center
Re: [Intel-gfx] [PATCH 2/2] drm/i915/uncore: rename i915_reg_read_ioctl intel_uncore_reg_read_ioctl
Quoted 96 lines · Jani Nikula
Quoted 89 lines · Tvrtko Ursulin
Quoted 34 lines · Jani Nikula
Quoted 33 lines · Tvrtko Ursulin
Quoted 21 lines · Jani Nikula
Quoted 9 lines · Tvrtko Ursulin
Quoted 1 line · Jani Nikula
Follow the usual naming convention.
But
intel_uncore_prefix usually means functions takesintel_uncoreas the first argument.Maybe solution here is that
i915_reg_read_ioctldoes not belong inintel_uncore.c, it being the UAPI layer thing? I guess arguments could be made for either way.My position is that the function and file prefixes go hand in hand. You'll always know where to place a function, and you'll always know where the function is to be found.
If you can *also* make the context argument follow the pattern, it's obviously better, and indicates the division to files is working out nicely. However, in a lot of cases you'll need to pass struct
drm_i915_privateor similar as the first parameter to e.g. init functions. It can't be the rigid rule.Quoted 3 lines
I'm fine with moving the entire function somewhere else, as long as the declaration is not in
i915_drv.h. There's no longer ai915_drv.c, andi915_drv.hshould not have function declarations at all.Yes I agree it cannot be a rigid rule. I just that it feels intel_uncore.[hc] is too low level to me to hold an ioctl implementation, and header actually feels wrong to have the declaration. Not least it is about _one_ of the uncores, while the ioctl is not operating on that level, albeit undefined at the moment how exactly it would work for multi-tile.
Quoted 7 lines
Quoted 2 lines
Would it be too early, or unwarranted at this point, to maybe consider adding i915_ioctls.[hc]?
Then the conversation would be about putting together a ton of unrelated functions where the only thing in common is that they're an ioctl implementation. Arguably many of them would have less in common than the reg read ioctl has with uncore!
I imagined it as a place for ioctls which don't fit anywhere else, like it this case it is not a family of ioctls but and odd one out. So yes, first "problem" would be there is only one to put there and no line of sight for others.
Quoted 3 lines
And when is it okay to put an ioctl in the
i915_ioctls.cfile and when is it warranted to put it somewhere else? It's just a different set of problems.When it does not fit anywhere else?
Quoted 10 lines
Quoted 2 lines
I like the
i915_prefix of ioctls for consistency..i915_getparam_ioctl,i915_query_ioctl,i915_perf_...,i915_gem_....The display ioctls have
intel_prefix anyway. It's the_ioctlsuffix that we use.Again, my main driver here is cleaning up
i915_drv.h. I can shove the reg read ioctl somewhere other than intel_uncore.[ch] too. But as it stands, the only alternative that seems better than intel_uncore.[ch] at the moment is adding a dedicated file for a 60-line function.I understand your motivation and I wouldn't nack your efforts, but I also cannot yet make myself ack it. Is 60 lines so bad? Lets see..
$ find . -name "*.c" -print0 | xargs -0 wc -l | sort -nr ... 59 ./selftests/mock_request.c 59 ./gt/uc/intel_uc_debugfs.c 59 ./gem/i915_gemfs.c 52 ./selftests/igt_mmap.c 51 ./selftests/igt_reset.c 49 ./selftests/mock_uncore.c 47 ./selftests/igt_atomic.c 36 ./gt/uc/intel_huc_debugfs.c 36 ./gt/intel_gt_engines_debugfs.c 35 ./selftests/igt_flush_test.c 34 ./selftests/librapl.c 34 ./gvt/trace_points.c 29 ./gt/selftests/mock_timeline.c 27 ./gt/selftest_engine.c 26 ./gt/uc/intel_huc_fw.c 15 ./i915_config.c 14 ./i915_trace_points.c 9 ./display/intel_display_trace.cQuoted 5 lines
So kind of meh, wouldn't be first. I'd add a dedicated file just for the benefit of being able to legitimately keep the
i915_reg_read_ioctlname. Come multi-tile it may get company. Even though at the moment I am not aware anyone is trying to add multi-tile aware reg read, but I expect there will be need as long as need for the existing one exists.
Quoted 6 lines
So this got stalled a bit, and sidestepped from the main goal of just cleaning up
i915_drv.hfrom the clutter that absolutely does not belong there.Can we just merge patch 1, leave further cleanup to follow-up, and move on?
Sorry but I don't think the ioctl belongs in gt/intel_uncore.h either so I can't make myself ack it. But I am not nacking it either, as said before, if you find someone else to support it.
I would add i915_ioctls.[ch] even if they hold just this one.
Regards,
Tvrtko