From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Cc: Jani Nikula <jani.nikula@intel.com>
Subject: [Intel-gfx] [PATCH v2 06/12] drm/i915: Simplify watermark state checker calling convention
Date: Thu, 5 Oct 2023 15:27:13 +0300 [thread overview]
Message-ID: <20231005122713.3531-1-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20231004155607.7719-7-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
There is never any reason to pass in both the crtc and its state
as one can always dig out the crtc from its state. But for more
consistency across the whole state checker let's just pass the
overall atomic state+crtc here as well.
v2: Also pass state+crtc here (Jani)
Reviewed-by: Jani Nikula <jani.nikula@intel.com> #v1
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_modeset_verify.c | 2 +-
drivers/gpu/drm/i915/display/skl_watermark.c | 8 +++++---
drivers/gpu/drm/i915/display/skl_watermark.h | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_modeset_verify.c b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
index 47d45ba1e707..e08c1aa25c4d 100644
--- a/drivers/gpu/drm/i915/display/intel_modeset_verify.c
+++ b/drivers/gpu/drm/i915/display/intel_modeset_verify.c
@@ -233,7 +233,7 @@ void intel_modeset_verify_crtc(struct intel_crtc *crtc,
!intel_crtc_needs_fastset(new_crtc_state))
return;
- intel_wm_state_verify(crtc, new_crtc_state);
+ intel_wm_state_verify(state, crtc);
verify_connector_state(state, crtc);
verify_crtc_state(state, crtc);
intel_shared_dpll_state_verify(state, crtc);
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.c b/drivers/gpu/drm/i915/display/skl_watermark.c
index d51cf92c96ae..99b8ccdc3dfa 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.c
+++ b/drivers/gpu/drm/i915/display/skl_watermark.c
@@ -3134,10 +3134,12 @@ static void skl_wm_get_hw_state_and_sanitize(struct drm_i915_private *i915)
skl_wm_sanitize(i915);
}
-void intel_wm_state_verify(struct intel_crtc *crtc,
- const struct intel_crtc_state *new_crtc_state)
+void intel_wm_state_verify(struct intel_atomic_state *state,
+ struct intel_crtc *crtc)
{
- struct drm_i915_private *i915 = to_i915(crtc->base.dev);
+ struct drm_i915_private *i915 = to_i915(state->base.dev);
+ const struct intel_crtc_state *new_crtc_state =
+ intel_atomic_get_new_crtc_state(state, crtc);
struct skl_hw_state {
struct skl_ddb_entry ddb[I915_MAX_PLANES];
struct skl_ddb_entry ddb_y[I915_MAX_PLANES];
diff --git a/drivers/gpu/drm/i915/display/skl_watermark.h b/drivers/gpu/drm/i915/display/skl_watermark.h
index 18e4b0661cbb..fb0da36fd3ec 100644
--- a/drivers/gpu/drm/i915/display/skl_watermark.h
+++ b/drivers/gpu/drm/i915/display/skl_watermark.h
@@ -38,8 +38,8 @@ bool skl_ddb_allocation_overlaps(const struct skl_ddb_entry *ddb,
const struct skl_ddb_entry *entries,
int num_entries, int ignore_idx);
-void intel_wm_state_verify(struct intel_crtc *crtc,
- const struct intel_crtc_state *new_crtc_state);
+void intel_wm_state_verify(struct intel_atomic_state *state,
+ struct intel_crtc *crtc);
void skl_watermark_ipc_init(struct drm_i915_private *i915);
void skl_watermark_ipc_update(struct drm_i915_private *i915);
--
2.41.0
next prev parent reply other threads:[~2023-10-05 12:27 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-04 15:55 [Intel-gfx] [PATCH 00/12] drm/i915: Display state checker cleanup Ville Syrjala
2023-10-04 15:55 ` [Intel-gfx] [PATCH 01/12] drm/i915/psr: Unify PSR pre/post plane update hooks Ville Syrjala
2023-10-04 15:55 ` [Intel-gfx] [PATCH 02/12] drm/i915: Stop clobbering old crtc state during state check Ville Syrjala
2023-10-04 15:55 ` [Intel-gfx] [PATCH 03/12] drm/i915: Constify the crtc states in the DPLL checker Ville Syrjala
2023-10-04 15:55 ` [Intel-gfx] [PATCH 04/12] drm/i915: Simplify DPLL state checker calling convention Ville Syrjala
2023-10-04 15:56 ` [Intel-gfx] [PATCH 05/12] drm/i915: Constify watermark state checker Ville Syrjala
2023-10-04 15:56 ` [Intel-gfx] [PATCH 06/12] drm/i915: Simplify watermark state checker calling convention Ville Syrjala
2023-10-04 16:57 ` Jani Nikula
2023-10-04 17:18 ` Ville Syrjälä
2023-10-05 12:27 ` Ville Syrjala [this message]
2023-10-05 13:08 ` [Intel-gfx] [PATCH v2 " Jani Nikula
2023-10-04 15:56 ` [Intel-gfx] [PATCH 07/12] drm/i915: Constify the snps/c10x PLL state checkers Ville Syrjala
2023-10-04 15:56 ` [Intel-gfx] [PATCH 08/12] drm/i915: Simplify snps/c10x DPLL state checker calling convetion Ville Syrjala
2023-10-04 15:56 ` [Intel-gfx] [PATCH 09/12] drm/i915: Constify remainder of the state checker Ville Syrjala
2023-10-04 15:56 ` [Intel-gfx] [PATCH 10/12] drm/i915: Simplify the state checker calling convetions Ville Syrjala
2023-10-04 15:56 ` [Intel-gfx] [PATCH 11/12] drm/i915: s/pipe_config/crtc_state/ in the state checker Ville Syrjala
2023-10-04 15:56 ` [Intel-gfx] [PATCH 12/12] drm/i915: s/dev_priv/i915/ " Ville Syrjala
2023-10-04 16:58 ` [Intel-gfx] [PATCH 00/12] drm/i915: Display state checker cleanup Jani Nikula
2023-10-04 22:45 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2023-10-04 22:45 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-10-04 23:00 ` [Intel-gfx] ✗ Fi.CI.BAT: failure " Patchwork
2023-10-05 3:28 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Display state checker cleanup (rev2) Patchwork
2023-10-05 3:28 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-10-05 3:42 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-10-05 23:00 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for drm/i915: Display state checker cleanup (rev3) Patchwork
2023-10-05 23:00 ` [Intel-gfx] ✗ Fi.CI.SPARSE: " Patchwork
2023-10-05 23:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2023-10-06 13:19 ` [Intel-gfx] ✗ Fi.CI.IGT: failure " Patchwork
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231005122713.3531-1-ville.syrjala@linux.intel.com \
--to=ville.syrjala@linux.intel.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=jani.nikula@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox