[PATCH] drm/i915:Remove unused parameter in marco.

Intel-GFX Archive on lore.kernel.org
 help / color / mirror / Atom feed

* [PATCH] drm/i915:Remove unused parameter in marco.
@ 2024-08-31 13:51 He Lugang
  2024-09-02 12:16 ` ✗ Fi.CI.BAT: failure for " Patchwork
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: He Lugang @ 2024-08-31 13:51 UTC (permalink / raw)
  To: jani.nikula, joonas.lahtinen, rodrigo.vivi, tursulin, airlied,
	daniel
  Cc: intel-gfx, dri-devel, He Lugang

The parameter dev_priv is actually not used in macro PORT_ALPM_CTL
and PORT_ALPM_LFPS_CTL,so remove it to simplify the code.

Signed-off-by: He Lugang <helugang@uniontech.com>
---
 drivers/gpu/drm/i915/display/intel_alpm.c     | 4 ++--
 drivers/gpu/drm/i915/display/intel_psr.c      | 2 +-
 drivers/gpu/drm/i915/display/intel_psr_regs.h | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c
index 82ee778b2efe..7a93ba627aa6 100644
--- a/drivers/gpu/drm/i915/display/intel_alpm.c
+++ b/drivers/gpu/drm/i915/display/intel_alpm.c
@@ -330,7 +330,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
 			ALPM_CTL_AUX_LESS_WAKE_TIME(intel_dp->alpm_parameters.aux_less_wake_lines);
 
 		intel_de_write(display,
-			       PORT_ALPM_CTL(display, port),
+			       PORT_ALPM_CTL(port),
 			       PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE |
 			       PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(15) |
 			       PORT_ALPM_CTL_MAX_PHY_SWING_HOLD(0) |
@@ -338,7 +338,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
 				       intel_dp->alpm_parameters.silence_period_sym_clocks));
 
 		intel_de_write(display,
-			       PORT_ALPM_LFPS_CTL(display, port),
+			       PORT_ALPM_LFPS_CTL(port),
 			       PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT(10) |
 			       PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION(
 				       intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) |
diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
index 257526362b39..d66dbb529e1d 100644
--- a/drivers/gpu/drm/i915/display/intel_psr.c
+++ b/drivers/gpu/drm/i915/display/intel_psr.c
@@ -2076,7 +2076,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
 			     ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
 
 		intel_de_rmw(dev_priv,
-			     PORT_ALPM_CTL(dev_priv, cpu_transcoder),
+			     PORT_ALPM_CTL(cpu_transcoder),
 			     PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
 	}
 
diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
index 642bb15fb547..b4984e589d7e 100644
--- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
+++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
@@ -295,7 +295,7 @@
 
 #define _PORT_ALPM_CTL_A			0x16fa2c
 #define _PORT_ALPM_CTL_B			0x16fc2c
-#define PORT_ALPM_CTL(dev_priv, port)		_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
+#define PORT_ALPM_CTL(port)			_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
 #define  PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE	REG_BIT(31)
 #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK	REG_GENMASK(23, 20)
 #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(val)	REG_FIELD_PREP(PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK, val)
@@ -306,7 +306,7 @@
 
 #define _PORT_ALPM_LFPS_CTL_A					0x16fa30
 #define _PORT_ALPM_LFPS_CTL_B					0x16fc30
-#define PORT_ALPM_LFPS_CTL(dev_priv, port)			_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
+#define PORT_ALPM_LFPS_CTL(port)				_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
 #define  PORT_ALPM_LFPS_CTL_LFPS_START_POLARITY			REG_BIT(31)
 #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MASK		REG_GENMASK(27, 24)
 #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MIN		7
-- 
2.45.2


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* ✗ Fi.CI.BAT: failure for drm/i915:Remove unused parameter in marco.
  2024-08-31 13:51 [PATCH] drm/i915:Remove unused parameter in marco He Lugang
@ 2024-09-02 12:16 ` Patchwork
  2024-09-05 12:06 ` ✗ Fi.CI.BUILD: failure for drm/i915:Remove unused parameter in marco. (rev2) Patchwork
  2024-09-05 17:04 ` [PATCH] drm/i915:Remove unused parameter in marco Rodrigo Vivi
  2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2024-09-02 12:16 UTC (permalink / raw)
  To: He Lugang; +Cc: intel-gfx

[-- Attachment #1: Type: text/plain, Size: 11673 bytes --]

== Series Details ==

Series: drm/i915:Remove unused parameter in marco.
URL   : https://patchwork.freedesktop.org/series/138076/
State : failure

== Summary ==

CI Bug Log - changes from CI_DRM_15341 -> Patchwork_138076v1
====================================================

Summary
-------

  **FAILURE**

  Serious unknown changes coming with Patchwork_138076v1 absolutely need to be
  verified manually.
  
  If you think the reported changes have nothing to do with the changes
  introduced in Patchwork_138076v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) 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_138076v1/index.html

Participating hosts (39 -> 37)
------------------------------

  Additional (1): bat-arls-1 
  Missing    (3): fi-cfl-8109u fi-snb-2520m fi-kbl-8809g 

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

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

### IGT changes ###

#### Possible regressions ####

  * igt@i915_selftest@live@gt_mocs:
    - bat-twl-2:          [PASS][1] -> [DMESG-WARN][2]
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-twl-2/igt@i915_selftest@live@gt_mocs.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-twl-2/igt@i915_selftest@live@gt_mocs.html

  
#### Suppressed ####

  The following results come from untrusted machines, tests, or statuses.
  They do not affect the overall result.

  * igt@i915_module_load@load:
    - {bat-arlh-3}:       [PASS][3] -> [INCOMPLETE][4]
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-arlh-3/igt@i915_module_load@load.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arlh-3/igt@i915_module_load@load.html

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

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

### IGT changes ###

#### Issues hit ####

  * igt@core_auth@basic-auth:
    - bat-adlp-9:         [PASS][5] -> [DMESG-WARN][6] ([i915#12119])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-adlp-9/igt@core_auth@basic-auth.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-adlp-9/igt@core_auth@basic-auth.html

  * igt@debugfs_test@basic-hwmon:
    - bat-arls-1:         NOTRUN -> [SKIP][7] ([i915#9318])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@debugfs_test@basic-hwmon.html

  * igt@fbdev@read:
    - bat-arls-1:         NOTRUN -> [DMESG-WARN][8] ([i915#12102])
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@fbdev@read.html

  * igt@gem_lmem_swapping@random-engines:
    - bat-arls-1:         NOTRUN -> [SKIP][9] ([i915#10213]) +3 other tests skip
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@gem_lmem_swapping@random-engines.html

  * igt@gem_mmap@basic:
    - bat-arls-1:         NOTRUN -> [SKIP][10] ([i915#11343] / [i915#4083])
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@gem_mmap@basic.html

  * igt@gem_render_tiled_blits@basic:
    - bat-arls-1:         NOTRUN -> [SKIP][11] ([i915#10197] / [i915#10211] / [i915#4079])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@gem_render_tiled_blits@basic.html

  * igt@gem_tiled_blits@basic:
    - bat-arls-1:         NOTRUN -> [SKIP][12] ([i915#10196] / [i915#4077]) +2 other tests skip
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@gem_tiled_blits@basic.html

  * igt@gem_tiled_pread_basic:
    - bat-arls-1:         NOTRUN -> [SKIP][13] ([i915#10206] / [i915#4079])
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@gem_tiled_pread_basic.html

  * igt@i915_pm_rps@basic-api:
    - bat-arls-1:         NOTRUN -> [SKIP][14] ([i915#10209] / [i915#11681])
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@i915_pm_rps@basic-api.html

  * igt@i915_selftest@live@gtt:
    - bat-arls-2:         [PASS][15] -> [DMESG-WARN][16] ([i915#10341])
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-arls-2/igt@i915_selftest@live@gtt.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-2/igt@i915_selftest@live@gtt.html

  * igt@i915_selftest@live@ring_submission:
    - bat-arls-2:         [PASS][17] -> [DMESG-FAIL][18] ([i915#10262]) +15 other tests dmesg-fail
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-arls-2/igt@i915_selftest@live@ring_submission.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-2/igt@i915_selftest@live@ring_submission.html

  * igt@kms_addfb_basic@addfb25-x-tiled-legacy:
    - bat-arls-1:         NOTRUN -> [SKIP][19] ([i915#10200]) +9 other tests skip
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@kms_addfb_basic@addfb25-x-tiled-legacy.html

  * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy:
    - bat-arls-1:         NOTRUN -> [SKIP][20] ([i915#10202] / [i915#11346]) +1 other test skip
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html

  * igt@kms_dsc@dsc-basic:
    - bat-arls-1:         NOTRUN -> [SKIP][21] ([i915#11346] / [i915#9886])
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@kms_dsc@dsc-basic.html

  * igt@kms_force_connector_basic@force-load-detect:
    - bat-arls-1:         NOTRUN -> [SKIP][22] ([i915#10207] / [i915#11346])
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@kms_force_connector_basic@force-load-detect.html

  * igt@kms_pm_backlight@basic-brightness:
    - bat-arls-1:         NOTRUN -> [SKIP][23] ([i915#11346] / [i915#9812])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@kms_pm_backlight@basic-brightness.html

  * igt@kms_psr@psr-primary-mmap-gtt:
    - bat-arls-1:         NOTRUN -> [SKIP][24] ([i915#11346] / [i915#9732]) +3 other tests skip
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@kms_psr@psr-primary-mmap-gtt.html

  * igt@kms_setmode@basic-clone-single-crtc:
    - bat-arls-1:         NOTRUN -> [SKIP][25] ([i915#10208] / [i915#8809])
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@kms_setmode@basic-clone-single-crtc.html

  * igt@prime_vgem@basic-fence-read:
    - bat-arls-1:         NOTRUN -> [SKIP][26] ([i915#10212] / [i915#3708])
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@prime_vgem@basic-fence-read.html

  * igt@prime_vgem@basic-gtt:
    - bat-arls-1:         NOTRUN -> [SKIP][27] ([i915#10196] / [i915#3708] / [i915#4077]) +1 other test skip
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@prime_vgem@basic-gtt.html

  * igt@prime_vgem@basic-read:
    - bat-arls-1:         NOTRUN -> [SKIP][28] ([i915#10214] / [i915#3708])
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@prime_vgem@basic-read.html

  * igt@prime_vgem@basic-write:
    - bat-arls-1:         NOTRUN -> [SKIP][29] ([i915#10216] / [i915#3708])
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-1/igt@prime_vgem@basic-write.html

  
#### Possible fixes ####

  * igt@debugfs_test@read_all_entries:
    - bat-adlp-9:         [DMESG-WARN][30] ([i915#12119]) -> [PASS][31]
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-adlp-9/igt@debugfs_test@read_all_entries.html
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-adlp-9/igt@debugfs_test@read_all_entries.html

  * igt@i915_selftest@live@gt_lrc:
    - bat-arls-5:         [DMESG-WARN][32] ([i915#12121]) -> [PASS][33]
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-arls-5/igt@i915_selftest@live@gt_lrc.html
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-5/igt@i915_selftest@live@gt_lrc.html

  
#### Warnings ####

  * igt@i915_selftest@live@hangcheck:
    - bat-arls-2:         [DMESG-WARN][34] ([i915#11349]) -> [DMESG-FAIL][35] ([i915#10262])
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_15341/bat-arls-2/igt@i915_selftest@live@hangcheck.html
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_138076v1/bat-arls-2/igt@i915_selftest@live@hangcheck.html

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

  [i915#10196]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10196
  [i915#10197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10197
  [i915#10200]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10200
  [i915#10202]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10202
  [i915#10206]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10206
  [i915#10207]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10207
  [i915#10208]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10208
  [i915#10209]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10209
  [i915#10211]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10211
  [i915#10212]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10212
  [i915#10213]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10213
  [i915#10214]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10214
  [i915#10216]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10216
  [i915#10262]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10262
  [i915#10341]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10341
  [i915#11343]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11343
  [i915#11346]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11346
  [i915#11349]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11349
  [i915#11681]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11681
  [i915#12102]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12102
  [i915#12119]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12119
  [i915#12121]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/12121
  [i915#3708]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3708
  [i915#4077]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4077
  [i915#4079]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4079
  [i915#4083]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4083
  [i915#8809]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8809
  [i915#9318]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9318
  [i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732
  [i915#9812]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9812
  [i915#9886]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9886


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

  * Linux: CI_DRM_15341 -> Patchwork_138076v1

  CI-20190529: 20190529
  CI_DRM_15341: 007f07b7fe11b9afe6d0012535e5931ebcae73a4 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_8001: d3a77fc98e89cc94b03be2b0903d44f83480b8a0 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git
  Patchwork_138076v1: 007f07b7fe11b9afe6d0012535e5931ebcae73a4 @ git://anongit.freedesktop.org/gfx-ci/linux

== Logs ==

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

[-- Attachment #2: Type: text/html, Size: 13835 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* ✗ Fi.CI.BUILD: failure for drm/i915:Remove unused parameter in marco. (rev2)
  2024-08-31 13:51 [PATCH] drm/i915:Remove unused parameter in marco He Lugang
  2024-09-02 12:16 ` ✗ Fi.CI.BAT: failure for " Patchwork
@ 2024-09-05 12:06 ` Patchwork
  2024-09-05 17:04 ` [PATCH] drm/i915:Remove unused parameter in marco Rodrigo Vivi
  2 siblings, 0 replies; 6+ messages in thread
From: Patchwork @ 2024-09-05 12:06 UTC (permalink / raw)
  To: He Lugang; +Cc: intel-gfx

== Series Details ==

Series: drm/i915:Remove unused parameter in marco. (rev2)
URL   : https://patchwork.freedesktop.org/series/138076/
State : failure

== Summary ==

Error: patch https://patchwork.freedesktop.org/api/1.0/series/138076/revisions/2/mbox/ not applied
Applying: drm/i915:Remove unused parameter in marco.
Using index info to reconstruct a base tree...
M	drivers/gpu/drm/i915/display/intel_alpm.c
M	drivers/gpu/drm/i915/display/intel_psr.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/gpu/drm/i915/display/intel_psr.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_psr.c
Auto-merging drivers/gpu/drm/i915/display/intel_alpm.c
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 drm/i915:Remove unused parameter in marco.
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Build failed, no error log produced

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915:Remove unused parameter in marco.
  2024-08-31 13:51 [PATCH] drm/i915:Remove unused parameter in marco He Lugang
  2024-09-02 12:16 ` ✗ Fi.CI.BAT: failure for " Patchwork
  2024-09-05 12:06 ` ✗ Fi.CI.BUILD: failure for drm/i915:Remove unused parameter in marco. (rev2) Patchwork
@ 2024-09-05 17:04 ` Rodrigo Vivi
  2024-09-05 17:08   ` Jani Nikula
  2 siblings, 1 reply; 6+ messages in thread
From: Rodrigo Vivi @ 2024-09-05 17:04 UTC (permalink / raw)
  To: He Lugang
  Cc: jani.nikula, joonas.lahtinen, tursulin, airlied, daniel,
	intel-gfx, dri-devel

On Sat, Aug 31, 2024 at 09:51:14PM +0800, He Lugang wrote:
> The parameter dev_priv is actually not used in macro PORT_ALPM_CTL
> and PORT_ALPM_LFPS_CTL,so remove it to simplify the code.

It is magically used on our back... hence the build failures that CI got.
Jani is doing a great clean-up work on the display code to get rid
of this 'dev_priv' usages in favor of a better display code separation
and using intel_display struct.

But thanks for the patch and the interest to help.

> 
> Signed-off-by: He Lugang <helugang@uniontech.com>
> ---
>  drivers/gpu/drm/i915/display/intel_alpm.c     | 4 ++--
>  drivers/gpu/drm/i915/display/intel_psr.c      | 2 +-
>  drivers/gpu/drm/i915/display/intel_psr_regs.h | 4 ++--
>  3 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c
> index 82ee778b2efe..7a93ba627aa6 100644
> --- a/drivers/gpu/drm/i915/display/intel_alpm.c
> +++ b/drivers/gpu/drm/i915/display/intel_alpm.c
> @@ -330,7 +330,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
>  			ALPM_CTL_AUX_LESS_WAKE_TIME(intel_dp->alpm_parameters.aux_less_wake_lines);
>  
>  		intel_de_write(display,
> -			       PORT_ALPM_CTL(display, port),
> +			       PORT_ALPM_CTL(port),
>  			       PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE |
>  			       PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(15) |
>  			       PORT_ALPM_CTL_MAX_PHY_SWING_HOLD(0) |
> @@ -338,7 +338,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
>  				       intel_dp->alpm_parameters.silence_period_sym_clocks));
>  
>  		intel_de_write(display,
> -			       PORT_ALPM_LFPS_CTL(display, port),
> +			       PORT_ALPM_LFPS_CTL(port),
>  			       PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT(10) |
>  			       PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION(
>  				       intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) |
> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
> index 257526362b39..d66dbb529e1d 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr.c
> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
> @@ -2076,7 +2076,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
>  			     ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
>  
>  		intel_de_rmw(dev_priv,
> -			     PORT_ALPM_CTL(dev_priv, cpu_transcoder),
> +			     PORT_ALPM_CTL(cpu_transcoder),
>  			     PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
>  	}
>  
> diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
> index 642bb15fb547..b4984e589d7e 100644
> --- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
> +++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
> @@ -295,7 +295,7 @@
>  
>  #define _PORT_ALPM_CTL_A			0x16fa2c
>  #define _PORT_ALPM_CTL_B			0x16fc2c
> -#define PORT_ALPM_CTL(dev_priv, port)		_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
> +#define PORT_ALPM_CTL(port)			_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
>  #define  PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE	REG_BIT(31)
>  #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK	REG_GENMASK(23, 20)
>  #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(val)	REG_FIELD_PREP(PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK, val)
> @@ -306,7 +306,7 @@
>  
>  #define _PORT_ALPM_LFPS_CTL_A					0x16fa30
>  #define _PORT_ALPM_LFPS_CTL_B					0x16fc30
> -#define PORT_ALPM_LFPS_CTL(dev_priv, port)			_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
> +#define PORT_ALPM_LFPS_CTL(port)				_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
>  #define  PORT_ALPM_LFPS_CTL_LFPS_START_POLARITY			REG_BIT(31)
>  #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MASK		REG_GENMASK(27, 24)
>  #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MIN		7
> -- 
> 2.45.2
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915:Remove unused parameter in marco.
  2024-09-05 17:04 ` [PATCH] drm/i915:Remove unused parameter in marco Rodrigo Vivi
@ 2024-09-05 17:08   ` Jani Nikula
  2024-09-06  6:06     ` HeLuang
  0 siblings, 1 reply; 6+ messages in thread
From: Jani Nikula @ 2024-09-05 17:08 UTC (permalink / raw)
  To: Rodrigo Vivi, He Lugang
  Cc: joonas.lahtinen, tursulin, airlied, daniel, intel-gfx, dri-devel

On Thu, 05 Sep 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
> On Sat, Aug 31, 2024 at 09:51:14PM +0800, He Lugang wrote:
>> The parameter dev_priv is actually not used in macro PORT_ALPM_CTL
>> and PORT_ALPM_LFPS_CTL,so remove it to simplify the code.
>
> It is magically used on our back... hence the build failures that CI got.
> Jani is doing a great clean-up work on the display code to get rid
> of this 'dev_priv' usages in favor of a better display code separation
> and using intel_display struct.

I actually think this should(tm) work. It's just that it needs a rebase.

BR,
Jani.

>
> But thanks for the patch and the interest to help.
>
>> 
>> Signed-off-by: He Lugang <helugang@uniontech.com>
>> ---
>>  drivers/gpu/drm/i915/display/intel_alpm.c     | 4 ++--
>>  drivers/gpu/drm/i915/display/intel_psr.c      | 2 +-
>>  drivers/gpu/drm/i915/display/intel_psr_regs.h | 4 ++--
>>  3 files changed, 5 insertions(+), 5 deletions(-)
>> 
>> diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c
>> index 82ee778b2efe..7a93ba627aa6 100644
>> --- a/drivers/gpu/drm/i915/display/intel_alpm.c
>> +++ b/drivers/gpu/drm/i915/display/intel_alpm.c
>> @@ -330,7 +330,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
>>  			ALPM_CTL_AUX_LESS_WAKE_TIME(intel_dp->alpm_parameters.aux_less_wake_lines);
>>  
>>  		intel_de_write(display,
>> -			       PORT_ALPM_CTL(display, port),
>> +			       PORT_ALPM_CTL(port),
>>  			       PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE |
>>  			       PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(15) |
>>  			       PORT_ALPM_CTL_MAX_PHY_SWING_HOLD(0) |
>> @@ -338,7 +338,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
>>  				       intel_dp->alpm_parameters.silence_period_sym_clocks));
>>  
>>  		intel_de_write(display,
>> -			       PORT_ALPM_LFPS_CTL(display, port),
>> +			       PORT_ALPM_LFPS_CTL(port),
>>  			       PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT(10) |
>>  			       PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION(
>>  				       intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) |
>> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
>> index 257526362b39..d66dbb529e1d 100644
>> --- a/drivers/gpu/drm/i915/display/intel_psr.c
>> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
>> @@ -2076,7 +2076,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
>>  			     ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
>>  
>>  		intel_de_rmw(dev_priv,
>> -			     PORT_ALPM_CTL(dev_priv, cpu_transcoder),
>> +			     PORT_ALPM_CTL(cpu_transcoder),
>>  			     PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
>>  	}
>>  
>> diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
>> index 642bb15fb547..b4984e589d7e 100644
>> --- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
>> +++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
>> @@ -295,7 +295,7 @@
>>  
>>  #define _PORT_ALPM_CTL_A			0x16fa2c
>>  #define _PORT_ALPM_CTL_B			0x16fc2c
>> -#define PORT_ALPM_CTL(dev_priv, port)		_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
>> +#define PORT_ALPM_CTL(port)			_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
>>  #define  PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE	REG_BIT(31)
>>  #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK	REG_GENMASK(23, 20)
>>  #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(val)	REG_FIELD_PREP(PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK, val)
>> @@ -306,7 +306,7 @@
>>  
>>  #define _PORT_ALPM_LFPS_CTL_A					0x16fa30
>>  #define _PORT_ALPM_LFPS_CTL_B					0x16fc30
>> -#define PORT_ALPM_LFPS_CTL(dev_priv, port)			_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
>> +#define PORT_ALPM_LFPS_CTL(port)				_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
>>  #define  PORT_ALPM_LFPS_CTL_LFPS_START_POLARITY			REG_BIT(31)
>>  #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MASK		REG_GENMASK(27, 24)
>>  #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MIN		7
>> -- 
>> 2.45.2
>> 

-- 
Jani Nikula, Intel

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] drm/i915:Remove unused parameter in marco.
  2024-09-05 17:08   ` Jani Nikula
@ 2024-09-06  6:06     ` HeLuang
  0 siblings, 0 replies; 6+ messages in thread
From: HeLuang @ 2024-09-06  6:06 UTC (permalink / raw)
  To: Jani Nikula, Rodrigo Vivi
  Cc: joonas.lahtinen, tursulin, airlied, daniel, intel-gfx, dri-devel



在 2024/9/6 01:08, Jani Nikula 写道:
> On Thu, 05 Sep 2024, Rodrigo Vivi <rodrigo.vivi@intel.com> wrote:
>> On Sat, Aug 31, 2024 at 09:51:14PM +0800, He Lugang wrote:
>>> The parameter dev_priv is actually not used in macro PORT_ALPM_CTL
>>> and PORT_ALPM_LFPS_CTL,so remove it to simplify the code.
>>
>> It is magically used on our back... hence the build failures that CI got.
>> Jani is doing a great clean-up work on the display code to get rid
>> of this 'dev_priv' usages in favor of a better display code separation
>> and using intel_display struct.
> 
> I actually think this should(tm) work. It's just that it needs a rebase.
> 
> BR,
> Jani.
> 
OK,thannks for your reply,I'll rebase it.
>>
>> But thanks for the patch and the interest to help.
>>
Very glad if that will be help!
>>>
>>> Signed-off-by: He Lugang <helugang@uniontech.com>
>>> ---
>>>   drivers/gpu/drm/i915/display/intel_alpm.c     | 4 ++--
>>>   drivers/gpu/drm/i915/display/intel_psr.c      | 2 +-
>>>   drivers/gpu/drm/i915/display/intel_psr_regs.h | 4 ++--
>>>   3 files changed, 5 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/i915/display/intel_alpm.c b/drivers/gpu/drm/i915/display/intel_alpm.c
>>> index 82ee778b2efe..7a93ba627aa6 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_alpm.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_alpm.c
>>> @@ -330,7 +330,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
>>>   			ALPM_CTL_AUX_LESS_WAKE_TIME(intel_dp->alpm_parameters.aux_less_wake_lines);
>>>   
>>>   		intel_de_write(display,
>>> -			       PORT_ALPM_CTL(display, port),
>>> +			       PORT_ALPM_CTL(port),
>>>   			       PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE |
>>>   			       PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(15) |
>>>   			       PORT_ALPM_CTL_MAX_PHY_SWING_HOLD(0) |
>>> @@ -338,7 +338,7 @@ static void lnl_alpm_configure(struct intel_dp *intel_dp,
>>>   				       intel_dp->alpm_parameters.silence_period_sym_clocks));
>>>   
>>>   		intel_de_write(display,
>>> -			       PORT_ALPM_LFPS_CTL(display, port),
>>> +			       PORT_ALPM_LFPS_CTL(port),
>>>   			       PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT(10) |
>>>   			       PORT_ALPM_LFPS_CTL_LFPS_HALF_CYCLE_DURATION(
>>>   				       intel_dp->alpm_parameters.lfps_half_cycle_num_of_syms) |
>>> diff --git a/drivers/gpu/drm/i915/display/intel_psr.c b/drivers/gpu/drm/i915/display/intel_psr.c
>>> index 257526362b39..d66dbb529e1d 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_psr.c
>>> +++ b/drivers/gpu/drm/i915/display/intel_psr.c
>>> @@ -2076,7 +2076,7 @@ static void intel_psr_disable_locked(struct intel_dp *intel_dp)
>>>   			     ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
>>>   
>>>   		intel_de_rmw(dev_priv,
>>> -			     PORT_ALPM_CTL(dev_priv, cpu_transcoder),
>>> +			     PORT_ALPM_CTL(cpu_transcoder),
>>>   			     PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE, 0);
>>>   	}
>>>   
>>> diff --git a/drivers/gpu/drm/i915/display/intel_psr_regs.h b/drivers/gpu/drm/i915/display/intel_psr_regs.h
>>> index 642bb15fb547..b4984e589d7e 100644
>>> --- a/drivers/gpu/drm/i915/display/intel_psr_regs.h
>>> +++ b/drivers/gpu/drm/i915/display/intel_psr_regs.h
>>> @@ -295,7 +295,7 @@
>>>   
>>>   #define _PORT_ALPM_CTL_A			0x16fa2c
>>>   #define _PORT_ALPM_CTL_B			0x16fc2c
>>> -#define PORT_ALPM_CTL(dev_priv, port)		_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
>>> +#define PORT_ALPM_CTL(port)			_MMIO_PORT(port, _PORT_ALPM_CTL_A, _PORT_ALPM_CTL_B)
>>>   #define  PORT_ALPM_CTL_ALPM_AUX_LESS_ENABLE	REG_BIT(31)
>>>   #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK	REG_GENMASK(23, 20)
>>>   #define  PORT_ALPM_CTL_MAX_PHY_SWING_SETUP(val)	REG_FIELD_PREP(PORT_ALPM_CTL_MAX_PHY_SWING_SETUP_MASK, val)
>>> @@ -306,7 +306,7 @@
>>>   
>>>   #define _PORT_ALPM_LFPS_CTL_A					0x16fa30
>>>   #define _PORT_ALPM_LFPS_CTL_B					0x16fc30
>>> -#define PORT_ALPM_LFPS_CTL(dev_priv, port)			_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
>>> +#define PORT_ALPM_LFPS_CTL(port)				_MMIO_PORT(port, _PORT_ALPM_LFPS_CTL_A, _PORT_ALPM_LFPS_CTL_B)
>>>   #define  PORT_ALPM_LFPS_CTL_LFPS_START_POLARITY			REG_BIT(31)
>>>   #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MASK		REG_GENMASK(27, 24)
>>>   #define  PORT_ALPM_LFPS_CTL_LFPS_CYCLE_COUNT_MIN		7
>>> -- 
>>> 2.45.2
>>>
> 

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2024-09-09 12:37 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-31 13:51 [PATCH] drm/i915:Remove unused parameter in marco He Lugang
2024-09-02 12:16 ` ✗ Fi.CI.BAT: failure for " Patchwork
2024-09-05 12:06 ` ✗ Fi.CI.BUILD: failure for drm/i915:Remove unused parameter in marco. (rev2) Patchwork
2024-09-05 17:04 ` [PATCH] drm/i915:Remove unused parameter in marco Rodrigo Vivi
2024-09-05 17:08   ` Jani Nikula
2024-09-06  6:06     ` HeLuang

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox