[Intel-gfx] [PATCH 2/6] drm/i915: Simplify modeset_get_crtc_power_domains() arguments

[Ville Syrjala]

From: Ville Syrjälä <ville.syrj...@linux.intel.com>

Pass just the crtc state to modeset_get_crtc_power_domains(). We
can get the crtc from therein.

Signed-off-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
---
 drivers/gpu/drm/i915/display/intel_display.c | 21 ++++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 919f5ac844c8..1074fde47410 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -6741,11 +6741,10 @@ intel_aux_power_domain(struct intel_digital_port 
*dig_port)
        }
 }
 
-static u64 get_crtc_power_domains(struct intel_crtc *crtc,
-                                 struct intel_crtc_state *crtc_state)
+static u64 get_crtc_power_domains(struct intel_crtc_state *crtc_state)
 {
-       struct drm_device *dev = crtc->base.dev;
-       struct drm_i915_private *dev_priv = to_i915(dev);
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
+       struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        struct drm_encoder *encoder;
        enum pipe pipe = crtc->pipe;
        u64 mask;
@@ -6760,7 +6759,8 @@ static u64 get_crtc_power_domains(struct intel_crtc *crtc,
            crtc_state->pch_pfit.force_thru)
                mask |= BIT_ULL(POWER_DOMAIN_PIPE_PANEL_FITTER(pipe));
 
-       drm_for_each_encoder_mask(encoder, dev, crtc_state->base.encoder_mask) {
+       drm_for_each_encoder_mask(encoder, &dev_priv->drm,
+                                 crtc_state->base.encoder_mask) {
                struct intel_encoder *intel_encoder = to_intel_encoder(encoder);
 
                mask |= BIT_ULL(intel_encoder->power_domain);
@@ -6776,16 +6776,16 @@ static u64 get_crtc_power_domains(struct intel_crtc 
*crtc,
 }
 
 static u64
-modeset_get_crtc_power_domains(struct intel_crtc *crtc,
-                              struct intel_crtc_state *crtc_state)
+modeset_get_crtc_power_domains(struct intel_crtc_state *crtc_state)
 {
+       struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);
        struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
        enum intel_display_power_domain domain;
        u64 domains, new_domains, old_domains;
 
        old_domains = crtc->enabled_power_domains;
        crtc->enabled_power_domains = new_domains =
-               get_crtc_power_domains(crtc, crtc_state);
+               get_crtc_power_domains(crtc_state);
 
        domains = new_domains & ~old_domains;
 
@@ -13876,8 +13876,7 @@ static void intel_atomic_commit_tail(struct 
intel_atomic_state *state)
                    new_crtc_state->update_pipe) {
 
                        put_domains[crtc->pipe] =
-                               modeset_get_crtc_power_domains(crtc,
-                                       new_crtc_state);
+                               modeset_get_crtc_power_domains(new_crtc_state);
                }
 
                if (!needs_modeset(new_crtc_state))
@@ -16971,7 +16970,7 @@ intel_modeset_setup_hw_state(struct drm_device *dev,
                u64 put_domains;
 
                crtc_state = to_intel_crtc_state(crtc->base.state);
-               put_domains = modeset_get_crtc_power_domains(crtc, crtc_state);
+               put_domains = modeset_get_crtc_power_domains(crtc_state);
                if (WARN_ON(put_domains))
                        modeset_put_power_domains(dev_priv, put_domains);
        }
-- 
2.21.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx