Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [Intel-xe] [PATCH] Revert "FIXME: drm/i915/ips: apparently silence warnings"
@ 2023-09-18  7:12 Chaitanya Kumar Borah
  2023-09-27  5:36 ` Shankar, Uma
                   ` (7 more replies)
  0 siblings, 8 replies; 13+ messages in thread
From: Chaitanya Kumar Borah @ 2023-09-18  7:12 UTC (permalink / raw)
  To: intel-xe; +Cc: Jani Nikula

This reverts commit 004360063d3b8a29cdf599ed18dc6a23c6e61513.

There seems to be no effect of this patch i.e. removing this
patch yields no compiler warnings. Hence, revert.

Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>

Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Uma Shankar <uma.shankar@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 9df8081f78d9..d0ec09621fe4 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4195,8 +4195,8 @@ static u16 hsw_linetime_wm(const struct intel_crtc_state *crtc_state)
 	return min(linetime_wm, 0x1ff);
 }
 
-static inline u16 hsw_ips_linetime_wm(const struct intel_crtc_state *crtc_state,
-				      const struct intel_cdclk_state *cdclk_state)
+static u16 hsw_ips_linetime_wm(const struct intel_crtc_state *crtc_state,
+			       const struct intel_cdclk_state *cdclk_state)
 {
 	const struct drm_display_mode *pipe_mode =
 		&crtc_state->hw.pipe_mode;
@@ -4239,7 +4239,7 @@ static int hsw_compute_linetime_wm(struct intel_atomic_state *state,
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	struct intel_crtc_state *crtc_state =
 		intel_atomic_get_new_crtc_state(state, crtc);
-	__maybe_unused const struct intel_cdclk_state *cdclk_state;
+	const struct intel_cdclk_state *cdclk_state;
 
 	if (DISPLAY_VER(dev_priv) >= 9)
 		crtc_state->linetime = skl_linetime_wm(crtc_state);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [Intel-xe] [PATCH] Revert "FIXME: drm/i915/ips: apparently silence warnings"
@ 2023-10-10 12:19 Chaitanya Kumar Borah
  2023-10-11  8:54 ` Shankar, Uma
  0 siblings, 1 reply; 13+ messages in thread
From: Chaitanya Kumar Borah @ 2023-10-10 12:19 UTC (permalink / raw)
  To: intel-xe

This reverts commit efdb834bbd7c6cd80e018dd0c0935070f2f27169.

Signed-off-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index b28b4b718a2b..4b73db93d23d 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -4199,8 +4199,8 @@ static u16 hsw_linetime_wm(const struct intel_crtc_state *crtc_state)
 	return min(linetime_wm, 0x1ff);
 }
 
-static inline u16 hsw_ips_linetime_wm(const struct intel_crtc_state *crtc_state,
-				      const struct intel_cdclk_state *cdclk_state)
+static u16 hsw_ips_linetime_wm(const struct intel_crtc_state *crtc_state,
+			       const struct intel_cdclk_state *cdclk_state)
 {
 	const struct drm_display_mode *pipe_mode =
 		&crtc_state->hw.pipe_mode;
@@ -4243,7 +4243,7 @@ static int hsw_compute_linetime_wm(struct intel_atomic_state *state,
 	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
 	struct intel_crtc_state *crtc_state =
 		intel_atomic_get_new_crtc_state(state, crtc);
-	__maybe_unused const struct intel_cdclk_state *cdclk_state;
+	const struct intel_cdclk_state *cdclk_state;
 
 	if (DISPLAY_VER(dev_priv) >= 9)
 		crtc_state->linetime = skl_linetime_wm(crtc_state);
-- 
2.25.1


^ permalink raw reply related	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2023-10-12  3:41 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-18  7:12 [Intel-xe] [PATCH] Revert "FIXME: drm/i915/ips: apparently silence warnings" Chaitanya Kumar Borah
2023-09-27  5:36 ` Shankar, Uma
2023-09-27  6:59   ` Jani Nikula
2023-09-27 10:08 ` [Intel-xe] ✓ CI.Patch_applied: success for Revert "FIXME: drm/i915/ips: apparently silence warnings" (rev2) Patchwork
2023-09-27 10:08 ` [Intel-xe] ✗ CI.checkpatch: warning " Patchwork
2023-09-27 10:09 ` [Intel-xe] ✓ CI.KUnit: success " Patchwork
2023-09-27 10:16 ` [Intel-xe] ✓ CI.Build: " Patchwork
2023-09-27 10:16 ` [Intel-xe] ✓ CI.Hooks: " Patchwork
2023-09-27 10:18 ` [Intel-xe] ✗ CI.checksparse: warning " Patchwork
2023-09-27 10:50 ` [Intel-xe] ✓ CI.BAT: success " Patchwork
  -- strict thread matches above, loose matches on Subject: below --
2023-10-10 12:19 [Intel-xe] [PATCH] Revert "FIXME: drm/i915/ips: apparently silence warnings" Chaitanya Kumar Borah
2023-10-11  8:54 ` Shankar, Uma
2023-10-12  3:41   ` Shankar, Uma

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