* [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names
@ 2023-02-07 11:06 Jani Nikula
2023-02-07 11:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Jani Nikula @ 2023-02-07 11:06 UTC (permalink / raw)
To: intel-gfx; +Cc: jani.nikula
The ucode part in the init, fini, suspend and resume function names is
just unnecessary. Drop it.
Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
drivers/gpu/drm/i915/display/intel_dmc.c | 20 ++++++++++----------
drivers/gpu/drm/i915/display/intel_dmc.h | 8 ++++----
drivers/gpu/drm/i915/i915_driver.c | 6 +++---
4 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 166662ade593..a8c91fda40a8 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -8639,7 +8639,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
if (!HAS_DISPLAY(i915))
return 0;
- intel_dmc_ucode_init(i915);
+ intel_dmc_init(i915);
i915->display.wq.modeset = alloc_ordered_workqueue("i915_modeset", 0);
i915->display.wq.flip = alloc_workqueue("i915_flip", WQ_HIGHPRI |
@@ -8674,7 +8674,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
return 0;
cleanup_vga_client_pw_domain_dmc:
- intel_dmc_ucode_fini(i915);
+ intel_dmc_fini(i915);
intel_power_domains_driver_remove(i915);
intel_vga_unregister(i915);
cleanup_bios:
@@ -9000,7 +9000,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
/* part #3: call after gem init */
void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)
{
- intel_dmc_ucode_fini(i915);
+ intel_dmc_fini(i915);
intel_power_domains_driver_remove(i915);
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
index 3b8e8193d042..f70ada2357dc 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.c
+++ b/drivers/gpu/drm/i915/display/intel_dmc.c
@@ -918,13 +918,13 @@ static void dmc_load_work_fn(struct work_struct *work)
}
/**
- * intel_dmc_ucode_init() - initialize the firmware loading.
+ * intel_dmc_init() - initialize the firmware loading.
* @dev_priv: i915 drm device.
*
* This function is called at the time of loading the display driver to read
* firmware from a .bin file and copied into a internal memory.
*/
-void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
+void intel_dmc_init(struct drm_i915_private *dev_priv)
{
struct intel_dmc *dmc = &dev_priv->display.dmc;
@@ -1002,14 +1002,14 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
}
/**
- * intel_dmc_ucode_suspend() - prepare DMC firmware before system suspend
+ * intel_dmc_suspend() - prepare DMC firmware before system suspend
* @dev_priv: i915 drm device
*
* Prepare the DMC firmware before entering system suspend. This includes
* flushing pending work items and releasing any resources acquired during
* init.
*/
-void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv)
+void intel_dmc_suspend(struct drm_i915_private *dev_priv)
{
if (!HAS_DMC(dev_priv))
return;
@@ -1022,13 +1022,13 @@ void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv)
}
/**
- * intel_dmc_ucode_resume() - init DMC firmware during system resume
+ * intel_dmc_resume() - init DMC firmware during system resume
* @dev_priv: i915 drm device
*
* Reinitialize the DMC firmware during system resume, reacquiring any
- * resources released in intel_dmc_ucode_suspend().
+ * resources released in intel_dmc_suspend().
*/
-void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv)
+void intel_dmc_resume(struct drm_i915_private *dev_priv)
{
if (!HAS_DMC(dev_priv))
return;
@@ -1042,20 +1042,20 @@ void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv)
}
/**
- * intel_dmc_ucode_fini() - unload the DMC firmware.
+ * intel_dmc_fini() - unload the DMC firmware.
* @dev_priv: i915 drm device.
*
* Firmmware unloading includes freeing the internal memory and reset the
* firmware loading status.
*/
-void intel_dmc_ucode_fini(struct drm_i915_private *dev_priv)
+void intel_dmc_fini(struct drm_i915_private *dev_priv)
{
enum intel_dmc_id dmc_id;
if (!HAS_DMC(dev_priv))
return;
- intel_dmc_ucode_suspend(dev_priv);
+ intel_dmc_suspend(dev_priv);
drm_WARN_ON(&dev_priv->drm, dev_priv->display.dmc.wakeref);
for_each_dmc_id(dmc_id)
diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h b/drivers/gpu/drm/i915/display/intel_dmc.h
index 88eae74dbcf2..c9808bbe7162 100644
--- a/drivers/gpu/drm/i915/display/intel_dmc.h
+++ b/drivers/gpu/drm/i915/display/intel_dmc.h
@@ -46,14 +46,14 @@ struct intel_dmc {
intel_wakeref_t wakeref;
};
-void intel_dmc_ucode_init(struct drm_i915_private *i915);
+void intel_dmc_init(struct drm_i915_private *i915);
void intel_dmc_load_program(struct drm_i915_private *i915);
void intel_dmc_disable_program(struct drm_i915_private *i915);
void intel_dmc_enable_pipe(struct drm_i915_private *i915, enum pipe pipe);
void intel_dmc_disable_pipe(struct drm_i915_private *i915, enum pipe pipe);
-void intel_dmc_ucode_fini(struct drm_i915_private *i915);
-void intel_dmc_ucode_suspend(struct drm_i915_private *i915);
-void intel_dmc_ucode_resume(struct drm_i915_private *i915);
+void intel_dmc_fini(struct drm_i915_private *i915);
+void intel_dmc_suspend(struct drm_i915_private *i915);
+void intel_dmc_resume(struct drm_i915_private *i915);
bool intel_dmc_has_payload(struct drm_i915_private *i915);
void intel_dmc_debugfs_register(struct drm_i915_private *i915);
void intel_dmc_print_error_state(struct drm_i915_error_state_buf *m,
diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
index 13bf4fe52f9f..57305bb00dbc 100644
--- a/drivers/gpu/drm/i915/i915_driver.c
+++ b/drivers/gpu/drm/i915/i915_driver.c
@@ -1004,7 +1004,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
intel_suspend_encoders(i915);
intel_shutdown_encoders(i915);
- intel_dmc_ucode_suspend(i915);
+ intel_dmc_suspend(i915);
i915_gem_suspend(i915);
@@ -1096,7 +1096,7 @@ static int i915_drm_suspend(struct drm_device *dev)
dev_priv->suspend_count++;
- intel_dmc_ucode_suspend(dev_priv);
+ intel_dmc_suspend(dev_priv);
enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
@@ -1217,7 +1217,7 @@ static int i915_drm_resume(struct drm_device *dev)
/* Must be called after GGTT is resumed. */
intel_dpt_resume(dev_priv);
- intel_dmc_ucode_resume(dev_priv);
+ intel_dmc_resume(dev_priv);
i915_restore_display(dev_priv);
intel_pps_unlock_regs_wa(dev_priv);
--
2.34.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Intel-gfx] ✗ Fi.CI.SPARSE: warning for drm/i915/dmc: drop "ucode" from function names
2023-02-07 11:06 [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names Jani Nikula
@ 2023-02-07 11:46 ` Patchwork
2023-02-07 12:12 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-02-07 11:46 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
== Series Details ==
Series: drm/i915/dmc: drop "ucode" from function names
URL : https://patchwork.freedesktop.org/series/113735/
State : warning
== Summary ==
Error: dim sparse failed
Sparse version: v0.6.2
Fast mode used, each commit won't be checked separately.
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915/dmc: drop "ucode" from function names
2023-02-07 11:06 [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names Jani Nikula
2023-02-07 11:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
@ 2023-02-07 12:12 ` Patchwork
2023-02-07 14:39 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-02-07 19:14 ` [Intel-gfx] [PATCH] " Matt Roper
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-02-07 12:12 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 3547 bytes --]
== Series Details ==
Series: drm/i915/dmc: drop "ucode" from function names
URL : https://patchwork.freedesktop.org/series/113735/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12708 -> Patchwork_113735v1
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/index.html
Participating hosts (36 -> 35)
------------------------------
Missing (1): fi-snb-2520m
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_113735v1:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* igt@i915_selftest@live@migrate:
- {bat-rpls-2}: [PASS][1] -> [DMESG-FAIL][2]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/bat-rpls-2/igt@i915_selftest@live@migrate.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/bat-rpls-2/igt@i915_selftest@live@migrate.html
Known issues
------------
Here are the changes found in Patchwork_113735v1 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@i915_selftest@live@gt_heartbeat:
- fi-kbl-soraka: [PASS][3] -> [DMESG-FAIL][4] ([i915#5334] / [i915#7872])
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/fi-kbl-soraka/igt@i915_selftest@live@gt_heartbeat.html
#### Possible fixes ####
* igt@i915_selftest@live@workarounds:
- {bat-dg2-11}: [DMESG-WARN][5] -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/bat-dg2-11/igt@i915_selftest@live@workarounds.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/bat-dg2-11/igt@i915_selftest@live@workarounds.html
* igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions:
- fi-bsw-n3050: [FAIL][7] ([i915#6298]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/fi-bsw-n3050/igt@kms_cursor_legacy@basic-busy-flip-before-cursor@atomic-transitions.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[i915#4258]: https://gitlab.freedesktop.org/drm/intel/issues/4258
[i915#4983]: https://gitlab.freedesktop.org/drm/intel/issues/4983
[i915#5334]: https://gitlab.freedesktop.org/drm/intel/issues/5334
[i915#6298]: https://gitlab.freedesktop.org/drm/intel/issues/6298
[i915#7872]: https://gitlab.freedesktop.org/drm/intel/issues/7872
Build changes
-------------
* Linux: CI_DRM_12708 -> Patchwork_113735v1
CI-20190529: 20190529
CI_DRM_12708: e9426d9d1eeb72f84725043dd2a9e073d9a6f1d7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7153: f47f859f13376958a2bd199423b1f0ff53dddbe0 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113735v1: e9426d9d1eeb72f84725043dd2a9e073d9a6f1d7 @ git://anongit.freedesktop.org/gfx-ci/linux
### Linux commits
94d9ee3f75c3 drm/i915/dmc: drop "ucode" from function names
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/index.html
[-- Attachment #2: Type: text/html, Size: 4121 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Intel-gfx] ✓ Fi.CI.IGT: success for drm/i915/dmc: drop "ucode" from function names
2023-02-07 11:06 [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names Jani Nikula
2023-02-07 11:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2023-02-07 12:12 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
@ 2023-02-07 14:39 ` Patchwork
2023-02-07 19:14 ` [Intel-gfx] [PATCH] " Matt Roper
3 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2023-02-07 14:39 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
[-- Attachment #1: Type: text/plain, Size: 22666 bytes --]
== Series Details ==
Series: drm/i915/dmc: drop "ucode" from function names
URL : https://patchwork.freedesktop.org/series/113735/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_12708_full -> Patchwork_113735v1_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/index.html
Participating hosts (10 -> 10)
------------------------------
No changes in participating hosts
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in Patchwork_113735v1_full:
### IGT changes ###
#### Suppressed ####
The following results come from untrusted machines, tests, or statuses.
They do not affect the overall result.
* {igt@kms_dsc@dsc-basic}:
- {shard-tglu}: NOTRUN -> [SKIP][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-6/igt@kms_dsc@dsc-basic.html
Known issues
------------
Here are the changes found in Patchwork_113735v1_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_exec_fair@basic-none-rrul@rcs0:
- shard-glk: NOTRUN -> [FAIL][2] ([i915#2842])
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk1/igt@gem_exec_fair@basic-none-rrul@rcs0.html
* igt@gem_exec_fair@basic-none@vcs0:
- shard-glk: [PASS][3] -> [FAIL][4] ([i915#2842]) +1 similar issue
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-glk7/igt@gem_exec_fair@basic-none@vcs0.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk9/igt@gem_exec_fair@basic-none@vcs0.html
* igt@gem_lmem_swapping@massive:
- shard-glk: NOTRUN -> [SKIP][5] ([fdo#109271] / [i915#4613])
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk1/igt@gem_lmem_swapping@massive.html
* igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a:
- shard-glk: NOTRUN -> [SKIP][6] ([fdo#109271] / [i915#1937])
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk1/igt@i915_pm_lpsp@kms-lpsp@kms-lpsp-hdmi-a.html
* igt@kms_big_fb@linear-16bpp-rotate-90:
- shard-glk: NOTRUN -> [SKIP][7] ([fdo#109271]) +16 similar issues
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk1/igt@kms_big_fb@linear-16bpp-rotate-90.html
* igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs:
- shard-glk: NOTRUN -> [SKIP][8] ([fdo#109271] / [i915#3886])
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk1/igt@kms_ccs@pipe-a-random-ccs-data-y_tiled_gen12_mc_ccs.html
* igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy:
- shard-glk: [PASS][9] -> [FAIL][10] ([i915#72])
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-glk7/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk9/igt@kms_cursor_legacy@2x-long-flip-vs-cursor-legacy.html
#### Possible fixes ####
* igt@gem_ctx_persistence@legacy-engines-hang@blt:
- {shard-rkl}: [SKIP][11] ([i915#6252]) -> [PASS][12]
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-5/igt@gem_ctx_persistence@legacy-engines-hang@blt.html
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-3/igt@gem_ctx_persistence@legacy-engines-hang@blt.html
* igt@gem_exec_endless@dispatch@bcs0:
- {shard-rkl}: [SKIP][13] ([i915#6247]) -> [PASS][14]
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-5/igt@gem_exec_endless@dispatch@bcs0.html
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-3/igt@gem_exec_endless@dispatch@bcs0.html
* igt@gem_exec_fair@basic-pace@rcs0:
- {shard-rkl}: [FAIL][15] ([i915#2842]) -> [PASS][16] +2 similar issues
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-1/igt@gem_exec_fair@basic-pace@rcs0.html
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@gem_exec_fair@basic-pace@rcs0.html
* igt@gem_exec_reloc@basic-gtt-read-noreloc:
- {shard-rkl}: [SKIP][17] ([i915#3281]) -> [PASS][18] +11 similar issues
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-1/igt@gem_exec_reloc@basic-gtt-read-noreloc.html
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@gem_exec_reloc@basic-gtt-read-noreloc.html
* igt@gem_partial_pwrite_pread@writes-after-reads:
- {shard-rkl}: [SKIP][19] ([i915#3282]) -> [PASS][20] +4 similar issues
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-1/igt@gem_partial_pwrite_pread@writes-after-reads.html
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@gem_partial_pwrite_pread@writes-after-reads.html
* igt@gen9_exec_parse@allowed-single:
- shard-glk: [ABORT][21] ([i915#5566]) -> [PASS][22]
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-glk3/igt@gen9_exec_parse@allowed-single.html
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk1/igt@gen9_exec_parse@allowed-single.html
* igt@gen9_exec_parse@bb-start-out:
- {shard-rkl}: [SKIP][23] ([i915#2527]) -> [PASS][24] +3 similar issues
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-6/igt@gen9_exec_parse@bb-start-out.html
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@gen9_exec_parse@bb-start-out.html
* igt@i915_pm_rpm@dpms-lpsp:
- {shard-dg1}: [SKIP][25] ([i915#1397]) -> [PASS][26]
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-dg1-17/igt@i915_pm_rpm@dpms-lpsp.html
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-dg1-14/igt@i915_pm_rpm@dpms-lpsp.html
* igt@i915_pm_rpm@drm-resources-equal:
- {shard-tglu}: [SKIP][27] ([i915#3547]) -> [PASS][28]
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-tglu-6/igt@i915_pm_rpm@drm-resources-equal.html
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-1/igt@i915_pm_rpm@drm-resources-equal.html
* igt@i915_pm_rpm@fences:
- {shard-rkl}: [SKIP][29] ([i915#1849]) -> [PASS][30] +2 similar issues
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-5/igt@i915_pm_rpm@fences.html
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-6/igt@i915_pm_rpm@fences.html
* igt@i915_selftest@live@hangcheck:
- {shard-rkl}: [INCOMPLETE][31] -> [PASS][32]
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-3/igt@i915_selftest@live@hangcheck.html
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-3/igt@i915_selftest@live@hangcheck.html
* igt@kms_big_fb@x-tiled-16bpp-rotate-180:
- {shard-tglu}: [SKIP][33] ([i915#1845] / [i915#7651]) -> [PASS][34] +4 similar issues
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-tglu-6/igt@kms_big_fb@x-tiled-16bpp-rotate-180.html
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-8/igt@kms_big_fb@x-tiled-16bpp-rotate-180.html
* igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs:
- {shard-tglu}: [SKIP][35] ([i915#7651]) -> [PASS][36] +16 similar issues
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-tglu-6/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-8/igt@kms_ccs@pipe-c-crc-primary-rotation-180-y_tiled_gen12_rc_ccs.html
* igt@kms_fbcon_fbt@fbc:
- {shard-rkl}: [SKIP][37] ([i915#1849] / [i915#4098]) -> [PASS][38] +9 similar issues
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-5/igt@kms_fbcon_fbt@fbc.html
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-6/igt@kms_fbcon_fbt@fbc.html
* igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2:
- shard-glk: [FAIL][39] ([i915#79]) -> [PASS][40]
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-glk6/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-glk3/igt@kms_flip@2x-flip-vs-expired-vblank@ab-hdmi-a1-hdmi-a2.html
* igt@kms_plane@plane-position-covered@pipe-a-planes:
- {shard-tglu}: [SKIP][41] ([i915#1849] / [i915#3558]) -> [PASS][42] +1 similar issue
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-tglu-6/igt@kms_plane@plane-position-covered@pipe-a-planes.html
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-1/igt@kms_plane@plane-position-covered@pipe-a-planes.html
* igt@kms_properties@crtc-properties-atomic:
- {shard-tglu}: [SKIP][43] ([i915#1849]) -> [PASS][44] +4 similar issues
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-tglu-6/igt@kms_properties@crtc-properties-atomic.html
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-1/igt@kms_properties@crtc-properties-atomic.html
* igt@kms_psr@sprite_mmap_gtt:
- {shard-rkl}: [SKIP][45] ([i915#1072]) -> [PASS][46] +1 similar issue
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-1/igt@kms_psr@sprite_mmap_gtt.html
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-6/igt@kms_psr@sprite_mmap_gtt.html
* igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-a:
- {shard-tglu}: [SKIP][47] ([fdo#109274]) -> [PASS][48] +1 similar issue
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-tglu-6/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-a.html
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-8/igt@kms_universal_plane@universal-plane-pageflip-windowed-pipe-a.html
* igt@kms_universal_plane@universal-plane-pipe-b-sanity:
- {shard-rkl}: [SKIP][49] ([i915#1845] / [i915#4070] / [i915#4098]) -> [PASS][50]
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-1/igt@kms_universal_plane@universal-plane-pipe-b-sanity.html
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-6/igt@kms_universal_plane@universal-plane-pipe-b-sanity.html
* igt@kms_vblank@pipe-b-ts-continuation-idle:
- {shard-rkl}: [SKIP][51] ([i915#1845] / [i915#4098]) -> [PASS][52] +13 similar issues
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-5/igt@kms_vblank@pipe-b-ts-continuation-idle.html
[52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-6/igt@kms_vblank@pipe-b-ts-continuation-idle.html
* igt@perf@gen8-unprivileged-single-ctx-counters:
- {shard-rkl}: [SKIP][53] ([i915#2436]) -> [PASS][54]
[53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-1/igt@perf@gen8-unprivileged-single-ctx-counters.html
[54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@perf@gen8-unprivileged-single-ctx-counters.html
* igt@perf_pmu@idle@rcs0:
- {shard-rkl}: [FAIL][55] ([i915#4349]) -> [PASS][56]
[55]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-6/igt@perf_pmu@idle@rcs0.html
[56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@perf_pmu@idle@rcs0.html
* igt@prime_vgem@basic-fence-flip:
- {shard-tglu}: [SKIP][57] ([fdo#109295]) -> [PASS][58]
[57]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-tglu-6/igt@prime_vgem@basic-fence-flip.html
[58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-tglu-1/igt@prime_vgem@basic-fence-flip.html
* igt@prime_vgem@basic-write:
- {shard-rkl}: [SKIP][59] ([fdo#109295] / [i915#3291] / [i915#3708]) -> [PASS][60]
[59]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-3/igt@prime_vgem@basic-write.html
[60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@prime_vgem@basic-write.html
* igt@prime_vgem@coherency-gtt:
- {shard-rkl}: [SKIP][61] ([fdo#109295] / [fdo#111656] / [i915#3708]) -> [PASS][62]
[61]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_12708/shard-rkl-1/igt@prime_vgem@coherency-gtt.html
[62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/shard-rkl-5/igt@prime_vgem@coherency-gtt.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109274]: https://bugs.freedesktop.org/show_bug.cgi?id=109274
[fdo#109279]: https://bugs.freedesktop.org/show_bug.cgi?id=109279
[fdo#109280]: https://bugs.freedesktop.org/show_bug.cgi?id=109280
[fdo#109283]: https://bugs.freedesktop.org/show_bug.cgi?id=109283
[fdo#109285]: https://bugs.freedesktop.org/show_bug.cgi?id=109285
[fdo#109289]: https://bugs.freedesktop.org/show_bug.cgi?id=109289
[fdo#109295]: https://bugs.freedesktop.org/show_bug.cgi?id=109295
[fdo#109312]: https://bugs.freedesktop.org/show_bug.cgi?id=109312
[fdo#109315]: https://bugs.freedesktop.org/show_bug.cgi?id=109315
[fdo#109506]: https://bugs.freedesktop.org/show_bug.cgi?id=109506
[fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
[fdo#110189]: https://bugs.freedesktop.org/show_bug.cgi?id=110189
[fdo#110723]: https://bugs.freedesktop.org/show_bug.cgi?id=110723
[fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
[fdo#111614]: https://bugs.freedesktop.org/show_bug.cgi?id=111614
[fdo#111615]: https://bugs.freedesktop.org/show_bug.cgi?id=111615
[fdo#111644]: https://bugs.freedesktop.org/show_bug.cgi?id=111644
[fdo#111656]: https://bugs.freedesktop.org/show_bug.cgi?id=111656
[fdo#111825]: https://bugs.freedesktop.org/show_bug.cgi?id=111825
[fdo#111827]: https://bugs.freedesktop.org/show_bug.cgi?id=111827
[fdo#112283]: https://bugs.freedesktop.org/show_bug.cgi?id=112283
[i915#1072]: https://gitlab.freedesktop.org/drm/intel/issues/1072
[i915#132]: https://gitlab.freedesktop.org/drm/intel/issues/132
[i915#1397]: https://gitlab.freedesktop.org/drm/intel/issues/1397
[i915#1769]: https://gitlab.freedesktop.org/drm/intel/issues/1769
[i915#1825]: https://gitlab.freedesktop.org/drm/intel/issues/1825
[i915#1839]: https://gitlab.freedesktop.org/drm/intel/issues/1839
[i915#1845]: https://gitlab.freedesktop.org/drm/intel/issues/1845
[i915#1849]: https://gitlab.freedesktop.org/drm/intel/issues/1849
[i915#1937]: https://gitlab.freedesktop.org/drm/intel/issues/1937
[i915#2190]: https://gitlab.freedesktop.org/drm/intel/issues/2190
[i915#2435]: https://gitlab.freedesktop.org/drm/intel/issues/2435
[i915#2436]: https://gitlab.freedesktop.org/drm/intel/issues/2436
[i915#2437]: https://gitlab.freedesktop.org/drm/intel/issues/2437
[i915#2527]: https://gitlab.freedesktop.org/drm/intel/issues/2527
[i915#2575]: https://gitlab.freedesktop.org/drm/intel/issues/2575
[i915#2582]: https://gitlab.freedesktop.org/drm/intel/issues/2582
[i915#2587]: https://gitlab.freedesktop.org/drm/intel/issues/2587
[i915#2658]: https://gitlab.freedesktop.org/drm/intel/issues/2658
[i915#2672]: https://gitlab.freedesktop.org/drm/intel/issues/2672
[i915#2705]: https://gitlab.freedesktop.org/drm/intel/issues/2705
[i915#280]: https://gitlab.freedesktop.org/drm/intel/issues/280
[i915#2842]: https://gitlab.freedesktop.org/drm/intel/issues/2842
[i915#2856]: https://gitlab.freedesktop.org/drm/intel/issues/2856
[i915#2920]: https://gitlab.freedesktop.org/drm/intel/issues/2920
[i915#3116]: https://gitlab.freedesktop.org/drm/intel/issues/3116
[i915#3281]: https://gitlab.freedesktop.org/drm/intel/issues/3281
[i915#3282]: https://gitlab.freedesktop.org/drm/intel/issues/3282
[i915#3291]: https://gitlab.freedesktop.org/drm/intel/issues/3291
[i915#3297]: https://gitlab.freedesktop.org/drm/intel/issues/3297
[i915#3299]: https://gitlab.freedesktop.org/drm/intel/issues/3299
[i915#3359]: https://gitlab.freedesktop.org/drm/intel/issues/3359
[i915#3361]: https://gitlab.freedesktop.org/drm/intel/issues/3361
[i915#3458]: https://gitlab.freedesktop.org/drm/intel/issues/3458
[i915#3469]: https://gitlab.freedesktop.org/drm/intel/issues/3469
[i915#3536]: https://gitlab.freedesktop.org/drm/intel/issues/3536
[i915#3539]: https://gitlab.freedesktop.org/drm/intel/issues/3539
[i915#3546]: https://gitlab.freedesktop.org/drm/intel/issues/3546
[i915#3547]: https://gitlab.freedesktop.org/drm/intel/issues/3547
[i915#3555]: https://gitlab.freedesktop.org/drm/intel/issues/3555
[i915#3558]: https://gitlab.freedesktop.org/drm/intel/issues/3558
[i915#3591]: https://gitlab.freedesktop.org/drm/intel/issues/3591
[i915#3637]: https://gitlab.freedesktop.org/drm/intel/issues/3637
[i915#3638]: https://gitlab.freedesktop.org/drm/intel/issues/3638
[i915#3639]: https://gitlab.freedesktop.org/drm/intel/issues/3639
[i915#3689]: https://gitlab.freedesktop.org/drm/intel/issues/3689
[i915#3708]: https://gitlab.freedesktop.org/drm/intel/issues/3708
[i915#3734]: https://gitlab.freedesktop.org/drm/intel/issues/3734
[i915#3742]: https://gitlab.freedesktop.org/drm/intel/issues/3742
[i915#3825]: https://gitlab.freedesktop.org/drm/intel/issues/3825
[i915#3840]: https://gitlab.freedesktop.org/drm/intel/issues/3840
[i915#3886]: https://gitlab.freedesktop.org/drm/intel/issues/3886
[i915#3955]: https://gitlab.freedesktop.org/drm/intel/issues/3955
[i915#3989]: https://gitlab.freedesktop.org/drm/intel/issues/3989
[i915#404]: https://gitlab.freedesktop.org/drm/intel/issues/404
[i915#4070]: https://gitlab.freedesktop.org/drm/intel/issues/4070
[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#4098]: https://gitlab.freedesktop.org/drm/intel/issues/4098
[i915#4103]: https://gitlab.freedesktop.org/drm/intel/issues/4103
[i915#4212]: https://gitlab.freedesktop.org/drm/intel/issues/4212
[i915#4270]: https://gitlab.freedesktop.org/drm/intel/issues/4270
[i915#433]: https://gitlab.freedesktop.org/drm/intel/issues/433
[i915#4349]: https://gitlab.freedesktop.org/drm/intel/issues/4349
[i915#4387]: https://gitlab.freedesktop.org/drm/intel/issues/4387
[i915#4525]: https://gitlab.freedesktop.org/drm/intel/issues/4525
[i915#4538]: https://gitlab.freedesktop.org/drm/intel/issues/4538
[i915#454]: https://gitlab.freedesktop.org/drm/intel/issues/454
[i915#4565]: https://gitlab.freedesktop.org/drm/intel/issues/4565
[i915#4613]: https://gitlab.freedesktop.org/drm/intel/issues/4613
[i915#4812]: https://gitlab.freedesktop.org/drm/intel/issues/4812
[i915#4833]: https://gitlab.freedesktop.org/drm/intel/issues/4833
[i915#4852]: https://gitlab.freedesktop.org/drm/intel/issues/4852
[i915#4859]: https://gitlab.freedesktop.org/drm/intel/issues/4859
[i915#5176]: https://gitlab.freedesktop.org/drm/intel/issues/5176
[i915#5235]: https://gitlab.freedesktop.org/drm/intel/issues/5235
[i915#5286]: https://gitlab.freedesktop.org/drm/intel/issues/5286
[i915#5289]: https://gitlab.freedesktop.org/drm/intel/issues/5289
[i915#5325]: https://gitlab.freedesktop.org/drm/intel/issues/5325
[i915#533]: https://gitlab.freedesktop.org/drm/intel/issues/533
[i915#5439]: https://gitlab.freedesktop.org/drm/intel/issues/5439
[i915#5563]: https://gitlab.freedesktop.org/drm/intel/issues/5563
[i915#5566]: https://gitlab.freedesktop.org/drm/intel/issues/5566
[i915#6095]: https://gitlab.freedesktop.org/drm/intel/issues/6095
[i915#6227]: https://gitlab.freedesktop.org/drm/intel/issues/6227
[i915#6245]: https://gitlab.freedesktop.org/drm/intel/issues/6245
[i915#6247]: https://gitlab.freedesktop.org/drm/intel/issues/6247
[i915#6248]: https://gitlab.freedesktop.org/drm/intel/issues/6248
[i915#6252]: https://gitlab.freedesktop.org/drm/intel/issues/6252
[i915#6334]: https://gitlab.freedesktop.org/drm/intel/issues/6334
[i915#6344]: https://gitlab.freedesktop.org/drm/intel/issues/6344
[i915#6433]: https://gitlab.freedesktop.org/drm/intel/issues/6433
[i915#6497]: https://gitlab.freedesktop.org/drm/intel/issues/6497
[i915#6524]: https://gitlab.freedesktop.org/drm/intel/issues/6524
[i915#658]: https://gitlab.freedesktop.org/drm/intel/issues/658
[i915#6621]: https://gitlab.freedesktop.org/drm/intel/issues/6621
[i915#6768]: https://gitlab.freedesktop.org/drm/intel/issues/6768
[i915#6944]: https://gitlab.freedesktop.org/drm/intel/issues/6944
[i915#6953]: https://gitlab.freedesktop.org/drm/intel/issues/6953
[i915#7037]: https://gitlab.freedesktop.org/drm/intel/issues/7037
[i915#7116]: https://gitlab.freedesktop.org/drm/intel/issues/7116
[i915#7118]: https://gitlab.freedesktop.org/drm/intel/issues/7118
[i915#7128]: https://gitlab.freedesktop.org/drm/intel/issues/7128
[i915#72]: https://gitlab.freedesktop.org/drm/intel/issues/72
[i915#7294]: https://gitlab.freedesktop.org/drm/intel/issues/7294
[i915#7561]: https://gitlab.freedesktop.org/drm/intel/issues/7561
[i915#7651]: https://gitlab.freedesktop.org/drm/intel/issues/7651
[i915#7697]: https://gitlab.freedesktop.org/drm/intel/issues/7697
[i915#7711]: https://gitlab.freedesktop.org/drm/intel/issues/7711
[i915#7742]: https://gitlab.freedesktop.org/drm/intel/issues/7742
[i915#7828]: https://gitlab.freedesktop.org/drm/intel/issues/7828
[i915#79]: https://gitlab.freedesktop.org/drm/intel/issues/79
[i915#7949]: https://gitlab.freedesktop.org/drm/intel/issues/7949
[i915#7957]: https://gitlab.freedesktop.org/drm/intel/issues/7957
Build changes
-------------
* Linux: CI_DRM_12708 -> Patchwork_113735v1
CI-20190529: 20190529
CI_DRM_12708: e9426d9d1eeb72f84725043dd2a9e073d9a6f1d7 @ git://anongit.freedesktop.org/gfx-ci/linux
IGT_7153: f47f859f13376958a2bd199423b1f0ff53dddbe0 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
Patchwork_113735v1: e9426d9d1eeb72f84725043dd2a9e073d9a6f1d7 @ git://anongit.freedesktop.org/gfx-ci/linux
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_113735v1/index.html
[-- Attachment #2: Type: text/html, Size: 17919 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names
2023-02-07 11:06 [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names Jani Nikula
` (2 preceding siblings ...)
2023-02-07 14:39 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
@ 2023-02-07 19:14 ` Matt Roper
2023-02-08 10:44 ` Jani Nikula
3 siblings, 1 reply; 6+ messages in thread
From: Matt Roper @ 2023-02-07 19:14 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
On Tue, Feb 07, 2023 at 01:06:19PM +0200, Jani Nikula wrote:
> The ucode part in the init, fini, suspend and resume function names is
> just unnecessary. Drop it.
>
> Cc: Imre Deak <imre.deak@intel.com>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_dmc.c | 20 ++++++++++----------
> drivers/gpu/drm/i915/display/intel_dmc.h | 8 ++++----
> drivers/gpu/drm/i915/i915_driver.c | 6 +++---
> 4 files changed, 20 insertions(+), 20 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
> index 166662ade593..a8c91fda40a8 100644
> --- a/drivers/gpu/drm/i915/display/intel_display.c
> +++ b/drivers/gpu/drm/i915/display/intel_display.c
> @@ -8639,7 +8639,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
> if (!HAS_DISPLAY(i915))
> return 0;
>
> - intel_dmc_ucode_init(i915);
> + intel_dmc_init(i915);
>
> i915->display.wq.modeset = alloc_ordered_workqueue("i915_modeset", 0);
> i915->display.wq.flip = alloc_workqueue("i915_flip", WQ_HIGHPRI |
> @@ -8674,7 +8674,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
> return 0;
>
> cleanup_vga_client_pw_domain_dmc:
> - intel_dmc_ucode_fini(i915);
> + intel_dmc_fini(i915);
> intel_power_domains_driver_remove(i915);
> intel_vga_unregister(i915);
> cleanup_bios:
> @@ -9000,7 +9000,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
> /* part #3: call after gem init */
> void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)
> {
> - intel_dmc_ucode_fini(i915);
> + intel_dmc_fini(i915);
>
> intel_power_domains_driver_remove(i915);
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
> index 3b8e8193d042..f70ada2357dc 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
> @@ -918,13 +918,13 @@ static void dmc_load_work_fn(struct work_struct *work)
> }
>
> /**
> - * intel_dmc_ucode_init() - initialize the firmware loading.
> + * intel_dmc_init() - initialize the firmware loading.
> * @dev_priv: i915 drm device.
> *
> * This function is called at the time of loading the display driver to read
> * firmware from a .bin file and copied into a internal memory.
> */
> -void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
> +void intel_dmc_init(struct drm_i915_private *dev_priv)
> {
> struct intel_dmc *dmc = &dev_priv->display.dmc;
>
> @@ -1002,14 +1002,14 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
> }
>
> /**
> - * intel_dmc_ucode_suspend() - prepare DMC firmware before system suspend
> + * intel_dmc_suspend() - prepare DMC firmware before system suspend
> * @dev_priv: i915 drm device
> *
> * Prepare the DMC firmware before entering system suspend. This includes
> * flushing pending work items and releasing any resources acquired during
> * init.
> */
> -void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv)
> +void intel_dmc_suspend(struct drm_i915_private *dev_priv)
> {
> if (!HAS_DMC(dev_priv))
> return;
> @@ -1022,13 +1022,13 @@ void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv)
> }
>
> /**
> - * intel_dmc_ucode_resume() - init DMC firmware during system resume
> + * intel_dmc_resume() - init DMC firmware during system resume
> * @dev_priv: i915 drm device
> *
> * Reinitialize the DMC firmware during system resume, reacquiring any
> - * resources released in intel_dmc_ucode_suspend().
> + * resources released in intel_dmc_suspend().
> */
> -void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv)
> +void intel_dmc_resume(struct drm_i915_private *dev_priv)
> {
> if (!HAS_DMC(dev_priv))
> return;
> @@ -1042,20 +1042,20 @@ void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv)
> }
>
> /**
> - * intel_dmc_ucode_fini() - unload the DMC firmware.
> + * intel_dmc_fini() - unload the DMC firmware.
> * @dev_priv: i915 drm device.
> *
> * Firmmware unloading includes freeing the internal memory and reset the
> * firmware loading status.
> */
> -void intel_dmc_ucode_fini(struct drm_i915_private *dev_priv)
> +void intel_dmc_fini(struct drm_i915_private *dev_priv)
> {
> enum intel_dmc_id dmc_id;
>
> if (!HAS_DMC(dev_priv))
> return;
>
> - intel_dmc_ucode_suspend(dev_priv);
> + intel_dmc_suspend(dev_priv);
> drm_WARN_ON(&dev_priv->drm, dev_priv->display.dmc.wakeref);
>
> for_each_dmc_id(dmc_id)
> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h b/drivers/gpu/drm/i915/display/intel_dmc.h
> index 88eae74dbcf2..c9808bbe7162 100644
> --- a/drivers/gpu/drm/i915/display/intel_dmc.h
> +++ b/drivers/gpu/drm/i915/display/intel_dmc.h
> @@ -46,14 +46,14 @@ struct intel_dmc {
> intel_wakeref_t wakeref;
> };
>
> -void intel_dmc_ucode_init(struct drm_i915_private *i915);
> +void intel_dmc_init(struct drm_i915_private *i915);
> void intel_dmc_load_program(struct drm_i915_private *i915);
> void intel_dmc_disable_program(struct drm_i915_private *i915);
> void intel_dmc_enable_pipe(struct drm_i915_private *i915, enum pipe pipe);
> void intel_dmc_disable_pipe(struct drm_i915_private *i915, enum pipe pipe);
> -void intel_dmc_ucode_fini(struct drm_i915_private *i915);
> -void intel_dmc_ucode_suspend(struct drm_i915_private *i915);
> -void intel_dmc_ucode_resume(struct drm_i915_private *i915);
> +void intel_dmc_fini(struct drm_i915_private *i915);
> +void intel_dmc_suspend(struct drm_i915_private *i915);
> +void intel_dmc_resume(struct drm_i915_private *i915);
> bool intel_dmc_has_payload(struct drm_i915_private *i915);
> void intel_dmc_debugfs_register(struct drm_i915_private *i915);
> void intel_dmc_print_error_state(struct drm_i915_error_state_buf *m,
> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
> index 13bf4fe52f9f..57305bb00dbc 100644
> --- a/drivers/gpu/drm/i915/i915_driver.c
> +++ b/drivers/gpu/drm/i915/i915_driver.c
> @@ -1004,7 +1004,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
> intel_suspend_encoders(i915);
> intel_shutdown_encoders(i915);
>
> - intel_dmc_ucode_suspend(i915);
> + intel_dmc_suspend(i915);
>
> i915_gem_suspend(i915);
>
> @@ -1096,7 +1096,7 @@ static int i915_drm_suspend(struct drm_device *dev)
>
> dev_priv->suspend_count++;
>
> - intel_dmc_ucode_suspend(dev_priv);
> + intel_dmc_suspend(dev_priv);
>
> enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>
> @@ -1217,7 +1217,7 @@ static int i915_drm_resume(struct drm_device *dev)
> /* Must be called after GGTT is resumed. */
> intel_dpt_resume(dev_priv);
>
> - intel_dmc_ucode_resume(dev_priv);
> + intel_dmc_resume(dev_priv);
>
> i915_restore_display(dev_priv);
> intel_pps_unlock_regs_wa(dev_priv);
> --
> 2.34.1
>
--
Matt Roper
Graphics Software Engineer
Linux GPU Platform Enablement
Intel Corporation
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names
2023-02-07 19:14 ` [Intel-gfx] [PATCH] " Matt Roper
@ 2023-02-08 10:44 ` Jani Nikula
0 siblings, 0 replies; 6+ messages in thread
From: Jani Nikula @ 2023-02-08 10:44 UTC (permalink / raw)
To: Matt Roper; +Cc: intel-gfx
On Tue, 07 Feb 2023, Matt Roper <matthew.d.roper@intel.com> wrote:
> On Tue, Feb 07, 2023 at 01:06:19PM +0200, Jani Nikula wrote:
>> The ucode part in the init, fini, suspend and resume function names is
>> just unnecessary. Drop it.
>>
>> Cc: Imre Deak <imre.deak@intel.com>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>
> Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Thanks for the review, pushed to din.
BR,
Jani.
>
>> ---
>> drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
>> drivers/gpu/drm/i915/display/intel_dmc.c | 20 ++++++++++----------
>> drivers/gpu/drm/i915/display/intel_dmc.h | 8 ++++----
>> drivers/gpu/drm/i915/i915_driver.c | 6 +++---
>> 4 files changed, 20 insertions(+), 20 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
>> index 166662ade593..a8c91fda40a8 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display.c
>> @@ -8639,7 +8639,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
>> if (!HAS_DISPLAY(i915))
>> return 0;
>>
>> - intel_dmc_ucode_init(i915);
>> + intel_dmc_init(i915);
>>
>> i915->display.wq.modeset = alloc_ordered_workqueue("i915_modeset", 0);
>> i915->display.wq.flip = alloc_workqueue("i915_flip", WQ_HIGHPRI |
>> @@ -8674,7 +8674,7 @@ int intel_modeset_init_noirq(struct drm_i915_private *i915)
>> return 0;
>>
>> cleanup_vga_client_pw_domain_dmc:
>> - intel_dmc_ucode_fini(i915);
>> + intel_dmc_fini(i915);
>> intel_power_domains_driver_remove(i915);
>> intel_vga_unregister(i915);
>> cleanup_bios:
>> @@ -9000,7 +9000,7 @@ void intel_modeset_driver_remove_noirq(struct drm_i915_private *i915)
>> /* part #3: call after gem init */
>> void intel_modeset_driver_remove_nogem(struct drm_i915_private *i915)
>> {
>> - intel_dmc_ucode_fini(i915);
>> + intel_dmc_fini(i915);
>>
>> intel_power_domains_driver_remove(i915);
>>
>> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.c b/drivers/gpu/drm/i915/display/intel_dmc.c
>> index 3b8e8193d042..f70ada2357dc 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dmc.c
>> +++ b/drivers/gpu/drm/i915/display/intel_dmc.c
>> @@ -918,13 +918,13 @@ static void dmc_load_work_fn(struct work_struct *work)
>> }
>>
>> /**
>> - * intel_dmc_ucode_init() - initialize the firmware loading.
>> + * intel_dmc_init() - initialize the firmware loading.
>> * @dev_priv: i915 drm device.
>> *
>> * This function is called at the time of loading the display driver to read
>> * firmware from a .bin file and copied into a internal memory.
>> */
>> -void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
>> +void intel_dmc_init(struct drm_i915_private *dev_priv)
>> {
>> struct intel_dmc *dmc = &dev_priv->display.dmc;
>>
>> @@ -1002,14 +1002,14 @@ void intel_dmc_ucode_init(struct drm_i915_private *dev_priv)
>> }
>>
>> /**
>> - * intel_dmc_ucode_suspend() - prepare DMC firmware before system suspend
>> + * intel_dmc_suspend() - prepare DMC firmware before system suspend
>> * @dev_priv: i915 drm device
>> *
>> * Prepare the DMC firmware before entering system suspend. This includes
>> * flushing pending work items and releasing any resources acquired during
>> * init.
>> */
>> -void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv)
>> +void intel_dmc_suspend(struct drm_i915_private *dev_priv)
>> {
>> if (!HAS_DMC(dev_priv))
>> return;
>> @@ -1022,13 +1022,13 @@ void intel_dmc_ucode_suspend(struct drm_i915_private *dev_priv)
>> }
>>
>> /**
>> - * intel_dmc_ucode_resume() - init DMC firmware during system resume
>> + * intel_dmc_resume() - init DMC firmware during system resume
>> * @dev_priv: i915 drm device
>> *
>> * Reinitialize the DMC firmware during system resume, reacquiring any
>> - * resources released in intel_dmc_ucode_suspend().
>> + * resources released in intel_dmc_suspend().
>> */
>> -void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv)
>> +void intel_dmc_resume(struct drm_i915_private *dev_priv)
>> {
>> if (!HAS_DMC(dev_priv))
>> return;
>> @@ -1042,20 +1042,20 @@ void intel_dmc_ucode_resume(struct drm_i915_private *dev_priv)
>> }
>>
>> /**
>> - * intel_dmc_ucode_fini() - unload the DMC firmware.
>> + * intel_dmc_fini() - unload the DMC firmware.
>> * @dev_priv: i915 drm device.
>> *
>> * Firmmware unloading includes freeing the internal memory and reset the
>> * firmware loading status.
>> */
>> -void intel_dmc_ucode_fini(struct drm_i915_private *dev_priv)
>> +void intel_dmc_fini(struct drm_i915_private *dev_priv)
>> {
>> enum intel_dmc_id dmc_id;
>>
>> if (!HAS_DMC(dev_priv))
>> return;
>>
>> - intel_dmc_ucode_suspend(dev_priv);
>> + intel_dmc_suspend(dev_priv);
>> drm_WARN_ON(&dev_priv->drm, dev_priv->display.dmc.wakeref);
>>
>> for_each_dmc_id(dmc_id)
>> diff --git a/drivers/gpu/drm/i915/display/intel_dmc.h b/drivers/gpu/drm/i915/display/intel_dmc.h
>> index 88eae74dbcf2..c9808bbe7162 100644
>> --- a/drivers/gpu/drm/i915/display/intel_dmc.h
>> +++ b/drivers/gpu/drm/i915/display/intel_dmc.h
>> @@ -46,14 +46,14 @@ struct intel_dmc {
>> intel_wakeref_t wakeref;
>> };
>>
>> -void intel_dmc_ucode_init(struct drm_i915_private *i915);
>> +void intel_dmc_init(struct drm_i915_private *i915);
>> void intel_dmc_load_program(struct drm_i915_private *i915);
>> void intel_dmc_disable_program(struct drm_i915_private *i915);
>> void intel_dmc_enable_pipe(struct drm_i915_private *i915, enum pipe pipe);
>> void intel_dmc_disable_pipe(struct drm_i915_private *i915, enum pipe pipe);
>> -void intel_dmc_ucode_fini(struct drm_i915_private *i915);
>> -void intel_dmc_ucode_suspend(struct drm_i915_private *i915);
>> -void intel_dmc_ucode_resume(struct drm_i915_private *i915);
>> +void intel_dmc_fini(struct drm_i915_private *i915);
>> +void intel_dmc_suspend(struct drm_i915_private *i915);
>> +void intel_dmc_resume(struct drm_i915_private *i915);
>> bool intel_dmc_has_payload(struct drm_i915_private *i915);
>> void intel_dmc_debugfs_register(struct drm_i915_private *i915);
>> void intel_dmc_print_error_state(struct drm_i915_error_state_buf *m,
>> diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c
>> index 13bf4fe52f9f..57305bb00dbc 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1004,7 +1004,7 @@ void i915_driver_shutdown(struct drm_i915_private *i915)
>> intel_suspend_encoders(i915);
>> intel_shutdown_encoders(i915);
>>
>> - intel_dmc_ucode_suspend(i915);
>> + intel_dmc_suspend(i915);
>>
>> i915_gem_suspend(i915);
>>
>> @@ -1096,7 +1096,7 @@ static int i915_drm_suspend(struct drm_device *dev)
>>
>> dev_priv->suspend_count++;
>>
>> - intel_dmc_ucode_suspend(dev_priv);
>> + intel_dmc_suspend(dev_priv);
>>
>> enable_rpm_wakeref_asserts(&dev_priv->runtime_pm);
>>
>> @@ -1217,7 +1217,7 @@ static int i915_drm_resume(struct drm_device *dev)
>> /* Must be called after GGTT is resumed. */
>> intel_dpt_resume(dev_priv);
>>
>> - intel_dmc_ucode_resume(dev_priv);
>> + intel_dmc_resume(dev_priv);
>>
>> i915_restore_display(dev_priv);
>> intel_pps_unlock_regs_wa(dev_priv);
>> --
>> 2.34.1
>>
--
Jani Nikula, Intel Open Source Graphics Center
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-02-08 10:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-07 11:06 [Intel-gfx] [PATCH] drm/i915/dmc: drop "ucode" from function names Jani Nikula
2023-02-07 11:46 ` [Intel-gfx] ✗ Fi.CI.SPARSE: warning for " Patchwork
2023-02-07 12:12 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-02-07 14:39 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork
2023-02-07 19:14 ` [Intel-gfx] [PATCH] " Matt Roper
2023-02-08 10:44 ` Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).