* [Intel-gfx] [PATCH] drm/i915: Clean up some namespacing
@ 2022-10-04 15:09 Ville Syrjala
2022-10-04 15:13 ` Jani Nikula
2022-10-04 20:54 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
0 siblings, 2 replies; 3+ messages in thread
From: Ville Syrjala @ 2022-10-04 15:09 UTC (permalink / raw)
To: intel-gfx; +Cc: Jani Nikula
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Rename a few functions from intel_crtc_foo_init() to
intel_foo_crtc_init() so that the namespaec clearly
indicates what feature/file we're talking about.
If left out intel_crtc_crc_init() because the whole crc
stuff uses intel_crtc_ as its namespace currently.
Suggested-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_color.c | 2 +-
drivers/gpu/drm/i915/display/intel_color.h | 2 +-
drivers/gpu/drm/i915/display/intel_crtc.c | 4 ++--
drivers/gpu/drm/i915/display/intel_drrs.c | 4 ++--
drivers/gpu/drm/i915/display/intel_drrs.h | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
index 0c73b2ba1283..fc23d5d8f7fd 100644
--- a/drivers/gpu/drm/i915/display/intel_color.c
+++ b/drivers/gpu/drm/i915/display/intel_color.c
@@ -2209,7 +2209,7 @@ static const struct intel_color_funcs ilk_color_funcs = {
.read_luts = ilk_read_luts,
};
-void intel_crtc_color_init(struct intel_crtc *crtc)
+void intel_color_crtc_init(struct intel_crtc *crtc)
{
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
bool has_ctm = INTEL_INFO(dev_priv)->display.color.degamma_lut_size != 0;
diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
index 67702451e2fd..04984e6000b6 100644
--- a/drivers/gpu/drm/i915/display/intel_color.h
+++ b/drivers/gpu/drm/i915/display/intel_color.h
@@ -14,7 +14,7 @@ struct drm_i915_private;
struct drm_property_blob;
void intel_color_init_hooks(struct drm_i915_private *i915);
-void intel_crtc_color_init(struct intel_crtc *crtc);
+void intel_color_crtc_init(struct intel_crtc *crtc);
int intel_color_check(struct intel_crtc_state *crtc_state);
void intel_color_commit_noarm(const struct intel_crtc_state *crtc_state);
void intel_color_commit_arm(const struct intel_crtc_state *crtc_state);
diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
index 2d9fc7383bfc..6be1fe34c83b 100644
--- a/drivers/gpu/drm/i915/display/intel_crtc.c
+++ b/drivers/gpu/drm/i915/display/intel_crtc.c
@@ -365,8 +365,8 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
BIT(DRM_SCALING_FILTER_DEFAULT) |
BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
- intel_crtc_color_init(crtc);
- intel_crtc_drrs_init(crtc);
+ intel_color_crtc_init(crtc);
+ intel_drrs_crtc_init(crtc);
intel_crtc_crc_init(crtc);
cpu_latency_qos_add_request(&crtc->vblank_pm_qos, PM_QOS_DEFAULT_VALUE);
diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c
index 2b94a62ef65a..e27408efaae2 100644
--- a/drivers/gpu/drm/i915/display/intel_drrs.c
+++ b/drivers/gpu/drm/i915/display/intel_drrs.c
@@ -284,14 +284,14 @@ void intel_drrs_flush(struct drm_i915_private *dev_priv,
}
/**
- * intel_crtc_drrs_init - Init DRRS for CRTC
+ * intel_drrs_crtc_init - Init DRRS for CRTC
* @crtc: crtc
*
* This function is called only once at driver load to initialize basic
* DRRS stuff.
*
*/
-void intel_crtc_drrs_init(struct intel_crtc *crtc)
+void intel_drrs_crtc_init(struct intel_crtc *crtc)
{
INIT_DELAYED_WORK(&crtc->drrs.work, intel_drrs_downclock_work);
mutex_init(&crtc->drrs.mutex);
diff --git a/drivers/gpu/drm/i915/display/intel_drrs.h b/drivers/gpu/drm/i915/display/intel_drrs.h
index 041248bf5d67..8ef5f93a80ff 100644
--- a/drivers/gpu/drm/i915/display/intel_drrs.h
+++ b/drivers/gpu/drm/i915/display/intel_drrs.h
@@ -23,7 +23,7 @@ void intel_drrs_invalidate(struct drm_i915_private *dev_priv,
unsigned int frontbuffer_bits);
void intel_drrs_flush(struct drm_i915_private *dev_priv,
unsigned int frontbuffer_bits);
-void intel_crtc_drrs_init(struct intel_crtc *crtc);
+void intel_drrs_crtc_init(struct intel_crtc *crtc);
void intel_drrs_crtc_debugfs_add(struct intel_crtc *crtc);
void intel_drrs_connector_debugfs_add(struct intel_connector *connector);
--
2.35.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Clean up some namespacing
2022-10-04 15:09 [Intel-gfx] [PATCH] drm/i915: Clean up some namespacing Ville Syrjala
@ 2022-10-04 15:13 ` Jani Nikula
2022-10-04 20:54 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2022-10-04 15:13 UTC (permalink / raw)
To: Ville Syrjala, intel-gfx
On Tue, 04 Oct 2022, Ville Syrjala <ville.syrjala@linux.intel.com> wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Rename a few functions from intel_crtc_foo_init() to
> intel_foo_crtc_init() so that the namespaec clearly
> indicates what feature/file we're talking about.
>
> If left out intel_crtc_crc_init() because the whole crc
*I
> stuff uses intel_crtc_ as its namespace currently.
>
> Suggested-by: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_color.c | 2 +-
> drivers/gpu/drm/i915/display/intel_color.h | 2 +-
> drivers/gpu/drm/i915/display/intel_crtc.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_drrs.c | 4 ++--
> drivers/gpu/drm/i915/display/intel_drrs.h | 2 +-
> 5 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_color.c b/drivers/gpu/drm/i915/display/intel_color.c
> index 0c73b2ba1283..fc23d5d8f7fd 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.c
> +++ b/drivers/gpu/drm/i915/display/intel_color.c
> @@ -2209,7 +2209,7 @@ static const struct intel_color_funcs ilk_color_funcs = {
> .read_luts = ilk_read_luts,
> };
>
> -void intel_crtc_color_init(struct intel_crtc *crtc)
> +void intel_color_crtc_init(struct intel_crtc *crtc)
> {
> struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
> bool has_ctm = INTEL_INFO(dev_priv)->display.color.degamma_lut_size != 0;
> diff --git a/drivers/gpu/drm/i915/display/intel_color.h b/drivers/gpu/drm/i915/display/intel_color.h
> index 67702451e2fd..04984e6000b6 100644
> --- a/drivers/gpu/drm/i915/display/intel_color.h
> +++ b/drivers/gpu/drm/i915/display/intel_color.h
> @@ -14,7 +14,7 @@ struct drm_i915_private;
> struct drm_property_blob;
>
> void intel_color_init_hooks(struct drm_i915_private *i915);
> -void intel_crtc_color_init(struct intel_crtc *crtc);
> +void intel_color_crtc_init(struct intel_crtc *crtc);
> int intel_color_check(struct intel_crtc_state *crtc_state);
> void intel_color_commit_noarm(const struct intel_crtc_state *crtc_state);
> void intel_color_commit_arm(const struct intel_crtc_state *crtc_state);
> diff --git a/drivers/gpu/drm/i915/display/intel_crtc.c b/drivers/gpu/drm/i915/display/intel_crtc.c
> index 2d9fc7383bfc..6be1fe34c83b 100644
> --- a/drivers/gpu/drm/i915/display/intel_crtc.c
> +++ b/drivers/gpu/drm/i915/display/intel_crtc.c
> @@ -365,8 +365,8 @@ int intel_crtc_init(struct drm_i915_private *dev_priv, enum pipe pipe)
> BIT(DRM_SCALING_FILTER_DEFAULT) |
> BIT(DRM_SCALING_FILTER_NEAREST_NEIGHBOR));
>
> - intel_crtc_color_init(crtc);
> - intel_crtc_drrs_init(crtc);
> + intel_color_crtc_init(crtc);
> + intel_drrs_crtc_init(crtc);
> intel_crtc_crc_init(crtc);
>
> cpu_latency_qos_add_request(&crtc->vblank_pm_qos, PM_QOS_DEFAULT_VALUE);
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.c b/drivers/gpu/drm/i915/display/intel_drrs.c
> index 2b94a62ef65a..e27408efaae2 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.c
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.c
> @@ -284,14 +284,14 @@ void intel_drrs_flush(struct drm_i915_private *dev_priv,
> }
>
> /**
> - * intel_crtc_drrs_init - Init DRRS for CRTC
> + * intel_drrs_crtc_init - Init DRRS for CRTC
> * @crtc: crtc
> *
> * This function is called only once at driver load to initialize basic
> * DRRS stuff.
> *
> */
> -void intel_crtc_drrs_init(struct intel_crtc *crtc)
> +void intel_drrs_crtc_init(struct intel_crtc *crtc)
> {
> INIT_DELAYED_WORK(&crtc->drrs.work, intel_drrs_downclock_work);
> mutex_init(&crtc->drrs.mutex);
> diff --git a/drivers/gpu/drm/i915/display/intel_drrs.h b/drivers/gpu/drm/i915/display/intel_drrs.h
> index 041248bf5d67..8ef5f93a80ff 100644
> --- a/drivers/gpu/drm/i915/display/intel_drrs.h
> +++ b/drivers/gpu/drm/i915/display/intel_drrs.h
> @@ -23,7 +23,7 @@ void intel_drrs_invalidate(struct drm_i915_private *dev_priv,
> unsigned int frontbuffer_bits);
> void intel_drrs_flush(struct drm_i915_private *dev_priv,
> unsigned int frontbuffer_bits);
> -void intel_crtc_drrs_init(struct intel_crtc *crtc);
> +void intel_drrs_crtc_init(struct intel_crtc *crtc);
> void intel_drrs_crtc_debugfs_add(struct intel_crtc *crtc);
> void intel_drrs_connector_debugfs_add(struct intel_connector *connector);
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Intel-gfx] ✗ Fi.CI.BAT: failure for drm/i915: Clean up some namespacing
2022-10-04 15:09 [Intel-gfx] [PATCH] drm/i915: Clean up some namespacing Ville Syrjala
2022-10-04 15:13 ` Jani Nikula
@ 2022-10-04 20:54 ` Patchwork
1 sibling, 0 replies; 3+ messages in thread
From: Patchwork @ 2022-10-04 20:54 UTC (permalink / raw)
To: Ville Syrjala; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 7943 bytes --]
== Series Details ==
Series: drm/i915: Clean up some namespacing
URL : https://patchwork.freedesktop.org/series/109393/
State : failure
== Summary ==
CI Bug Log - changes from CI_DRM_12214 -> Patchwork_109393v1
====================================================
Summary
-------
**FAILURE**
Serious unknown changes coming with Patchwork_109393v1 absolutely need to be
verified manually.
If you think the reported changes have nothing to do with the changes
introduced in Patchwork_109393v1, 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_109393v1/index.html
Participating hosts (44 -> 43)
------------------------------
Additional (2): fi-hsw-4770 bat-atsm-1
Missing (3): fi-ctg-p8600 fi-bdw-samus fi-hsw-4200u
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_109393v1:
### IGT changes ###
#### Possible regressions ####
* igt@i915_selftest@live@gt_pm:
- fi-apl-guc: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/fi-apl-guc/igt@i915_selftest@live@gt_pm.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-apl-guc/igt@i915_selftest@live@gt_pm.html
Known issues
------------
Here are the changes found in Patchwork_109393v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_softpin@allocator-basic-reserve:
- fi-hsw-4770: NOTRUN -> [SKIP][3] ([fdo#109271]) +9 similar issues
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-hsw-4770/igt@gem_softpin@allocator-basic-reserve.html
* igt@i915_pm_backlight@basic-brightness:
- fi-hsw-4770: NOTRUN -> [SKIP][4] ([fdo#109271] / [i915#3012])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-hsw-4770/igt@i915_pm_backlight@basic-brightness.html
* igt@i915_selftest@live:
- fi-cfl-8109u: NOTRUN -> [INCOMPLETE][5] ([i915#6114])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-cfl-8109u/igt@i915_selftest@live.html
* igt@i915_selftest@live@hangcheck:
- fi-snb-2600: [PASS][6] -> [INCOMPLETE][7] ([i915#6992])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-snb-2600/igt@i915_selftest@live@hangcheck.html
* igt@kms_chamelium@dp-crc-fast:
- fi-hsw-4770: NOTRUN -> [SKIP][8] ([fdo#109271] / [fdo#111827]) +8 similar issues
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-hsw-4770/igt@kms_chamelium@dp-crc-fast.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions:
- fi-bsw-kefka: [PASS][9] -> [FAIL][10] ([i915#6298])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-bsw-kefka/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
* igt@kms_psr@sprite_plane_onoff:
- fi-hsw-4770: NOTRUN -> [SKIP][11] ([fdo#109271] / [i915#1072]) +3 similar issues
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-hsw-4770/igt@kms_psr@sprite_plane_onoff.html
* igt@runner@aborted:
- fi-cfl-8109u: NOTRUN -> [FAIL][12] ([i915#4312])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-cfl-8109u/igt@runner@aborted.html
#### Possible fixes ####
* igt@fbdev@read:
- {bat-rpls-2}: [SKIP][13] ([i915#2582]) -> [PASS][14] +4 similar issues
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/bat-rpls-2/igt@fbdev@read.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/bat-rpls-2/igt@fbdev@read.html
* igt@gem_exec_suspend@basic-s3@smem:
- {bat-rplp-1}: [DMESG-WARN][15] ([i915#2867]) -> [PASS][16]
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/bat-rplp-1/igt@gem_exec_suspend@basic-s3@smem.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/bat-rplp-1/igt@gem_exec_suspend@basic-s3@smem.html
* igt@i915_selftest@live@gt_mocs:
- {bat-rpls-2}: [DMESG-FAIL][17] -> [PASS][18]
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/bat-rpls-2/igt@i915_selftest@live@gt_mocs.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/bat-rpls-2/igt@i915_selftest@live@gt_mocs.html
* igt@i915_selftest@live@hangcheck:
- {fi-ehl-2}: [INCOMPLETE][19] ([i915#5153] / [i915#6106]) -> [PASS][20]
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/fi-ehl-2/igt@i915_selftest@live@hangcheck.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-ehl-2/igt@i915_selftest@live@hangcheck.html
* igt@i915_selftest@live@hugepages:
- {bat-rpls-2}: [DMESG-WARN][21] ([i915#5278]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/bat-rpls-2/igt@i915_selftest@live@hugepages.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/bat-rpls-2/igt@i915_selftest@live@hugepages.html
* igt@kms_force_connector_basic@prune-stale-modes:
- fi-cfl-8109u: [DMESG-WARN][23] ([i915#62]) -> [PASS][24]
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12214/fi-cfl-8109u/igt@kms_force_connector_basic@prune-stale-modes.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/fi-cfl-8109u/igt@kms_force_connector_basic@prune-stale-modes.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2867]: https://gitlab.freedesktop.org/drm/intel/issues/2867
[i915#3012]: https://gitlab.freedesktop.org/drm/intel/issues/3012
[i915#4077]: https://gitlab.freedesktop.org/drm/intel/issues/4077
[i915#4079]: https://gitlab.freedesktop.org/drm/intel/issues/4079
[i915#4083]: https://gitlab.freedesktop.org/drm/intel/issues/4083
[i915#4312]: https://gitlab.freedesktop.org/drm/intel/issues/4312
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5153]: https://gitlab.freedesktop.org/drm/intel/issues/5153
[i915#5278]: https://gitlab.freedesktop.org/drm/intel/issues/5278
[i915#5828]: https://gitlab.freedesktop.org/drm/intel/issues/5828
[i915#6106]: https://gitlab.freedesktop.org/drm/intel/issues/6106
[i915#6114]: https://gitlab.freedesktop.org/drm/intel/issues/6114
[i915#62]: https://gitlab.freedesktop.org/drm/intel/issues/62
[i915#6257]: https://gitlab.freedesktop.org/drm/intel/issues/6257
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#6992]: https://gitlab.freedesktop.org/drm/intel/issues/6992
[i915#7030]: https://gitlab.freedesktop.org/drm/intel/issues/7030
Build changes
-------------
* Linux: CI_DRM_12214 -> Patchwork_109393v1
CI-20190529: 20190529
CI_DRM_12214: 605c9d194cc3f4eea4511e19f54adadda0924d42 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_6680: 4097d61efefff3453347a58f511e3cdcd4608d0a @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_109393v1: 605c9d194cc3f4eea4511e19f54adadda0924d42 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
a08410d013af drm/i915: Clean up some namespacing
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_109393v1/index.html
[-- Attachment #2: Type: text/html, Size: 8667 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-10-04 20:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-10-04 15:09 [Intel-gfx] [PATCH] drm/i915: Clean up some namespacing Ville Syrjala
2022-10-04 15:13 ` Jani Nikula
2022-10-04 20:54 ` [Intel-gfx] ✗ Fi.CI.BAT: failure for " Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox