drm/i915: Introduce intel_crtc_is_bigjoiner_{slave,master}()

Introduce helpers to query whether the crtc is the slave/master
for bigjoiner. This decouples most places from the exact
state layout we use to track this relationship, allowing us
to change and extend it more easily.

Performed with cocci:
@@
expression S, E;
@@
(
  S->bigjoiner_slave = E;
|
- S->bigjoiner_slave
+ intel_crtc_is_bigjoiner_slave(S)
)

@@
expression S, E;
@@
(
- E && S->bigjoiner && !intel_crtc_is_bigjoiner_slave(S)
+ E && intel_crtc_is_bigjoiner_master(S)
|
- S->bigjoiner && !intel_crtc_is_bigjoiner_slave(S)
+ intel_crtc_is_bigjoiner_master(S)
)

@@
expression S;
@@
- (intel_crtc_is_bigjoiner_master(S))
+ intel_crtc_is_bigjoiner_master(S)

@@
expression S, E1, E2, E3;
@@
- intel_crtc_is_bigjoiner_slave(S) ? E1 : S->bigjoiner ? E2 : E3
+ intel_crtc_is_bigjoiner_slave(S) ? E1 : intel_crtc_is_bigjoiner_master(S) ? E2 : E3

@@
typedef bool;
@@
+ bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state)
+ {
+ 	return crtc_state->bigjoiner_slave;
+ }
+
  intel_master_crtc(...) {...}

@@
typedef bool;
@@
+ bool intel_crtc_is_bigjoiner_master(const struct intel_crtc_state *crtc_state)
+ {
+ 	return crtc_state->bigjoiner && !crtc_state->bigjoiner_slave;
+ }
+
  intel_master_crtc(...) {...}

@@
typedef bool;
identifier S;
@@
- bool is_trans_port_sync_mode(const struct intel_crtc_state *S);
+ bool is_trans_port_sync_mode(const struct intel_crtc_state *state);
+ bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state);
+ bool intel_crtc_is_bigjoiner_master(const struct intel_crtc_state *crtc_state);

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220203183823.22890-7-ville.syrjala@linux.intel.com
Reviewed-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index bec02333bdebaa59aecf1b52ce4f744f2f48b6b0..41d52889dfce7376bf5166aed79e5e2d0658024e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -403,7 +403,7 @@ int intel_plane_atomic_check(struct intel_atomic_state *state,
        struct intel_crtc_state *new_crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
 
-       if (new_crtc_state && new_crtc_state->bigjoiner_slave) {
+       if (new_crtc_state && intel_crtc_is_bigjoiner_slave(new_crtc_state)) {
                struct intel_plane *master_plane =
                        intel_crtc_get_plane(new_crtc_state->bigjoiner_linked_crtc,
                                             plane->id);
@@ -633,7 +633,7 @@ int intel_atomic_plane_check_clipping(struct intel_plane_state *plane_state,
        }
 
        /* right side of the image is on the slave crtc, adjust dst to match */
-       if (crtc_state->bigjoiner_slave)
+       if (intel_crtc_is_bigjoiner_slave(crtc_state))
                drm_rect_translate(dst, -crtc_state->pipe_src_w, 0);
 
        /*

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 354b08d6f81d08e5f83c088cf13bdfbd1b60aa59..3f0e1e127595c9db4bcadce1fedb7fec735b09f6 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -2926,7 +2926,7 @@ static void intel_enable_ddi(struct intel_atomic_state *state,
 {
        drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
 
-       if (!crtc_state->bigjoiner_slave)
+       if (!intel_crtc_is_bigjoiner_slave(crtc_state))
                intel_ddi_enable_transcoder_func(encoder, crtc_state);
 
        intel_vrr_enable(encoder, crtc_state);

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 3478e716eb8dfcd3fb32c7e443f398746aa55c48..163522faa4e1ad3e6d2057eed5bbd79cf43df036 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -338,9 +338,19 @@ is_trans_port_sync_mode(const struct intel_crtc_state *crtc_state)
                is_trans_port_sync_slave(crtc_state);
 }
 
+bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state)
+{
+       return crtc_state->bigjoiner_slave;
+}
+
+bool intel_crtc_is_bigjoiner_master(const struct intel_crtc_state *crtc_state)
+{
+       return crtc_state->bigjoiner && !crtc_state->bigjoiner_slave;
+}
+
 static struct intel_crtc *intel_master_crtc(const struct intel_crtc_state *crtc_state)
 {
-       if (crtc_state->bigjoiner_slave)
+       if (intel_crtc_is_bigjoiner_slave(crtc_state))
                return crtc_state->bigjoiner_linked_crtc;
        else
                return to_intel_crtc(crtc_state->uapi.crtc);
@@ -1848,13 +1858,13 @@ static void icl_ddi_bigjoiner_pre_enable(struct intel_atomic_state *state,
        /*
         * Enable sequence steps 1-7 on bigjoiner master
         */
-       if (crtc_state->bigjoiner_slave)
+       if (intel_crtc_is_bigjoiner_slave(crtc_state))
                intel_encoders_pre_pll_enable(state, master_crtc);
 
        if (crtc_state->shared_dpll)
                intel_enable_shared_dpll(crtc_state);
 
-       if (crtc_state->bigjoiner_slave)
+       if (intel_crtc_is_bigjoiner_slave(crtc_state))
                intel_encoders_pre_enable(state, master_crtc);
 }
 
@@ -1918,7 +1928,8 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
        if (DISPLAY_VER(dev_priv) >= 9 || IS_BROADWELL(dev_priv))
                bdw_set_pipemisc(new_crtc_state);
 
-       if (!new_crtc_state->bigjoiner_slave && !transcoder_is_dsi(cpu_transcoder))
+       if (!intel_crtc_is_bigjoiner_slave(new_crtc_state) &&
+           !transcoder_is_dsi(cpu_transcoder))
                hsw_configure_cpu_transcoder(new_crtc_state);
 
        crtc->active = true;
@@ -1958,7 +1969,7 @@ static void hsw_crtc_enable(struct intel_atomic_state *state,
                icl_pipe_mbus_enable(crtc, dbuf_state->joined_mbus);
        }
 
-       if (new_crtc_state->bigjoiner_slave)
+       if (intel_crtc_is_bigjoiner_slave(new_crtc_state))
                intel_crtc_vblank_on(new_crtc_state);
 
        intel_encoders_enable(state, crtc);
@@ -2043,7 +2054,7 @@ static void hsw_crtc_disable(struct intel_atomic_state *state,
         * FIXME collapse everything to one hook.
         * Need care with mst->ddi interactions.
         */
-       if (!old_crtc_state->bigjoiner_slave) {
+       if (!intel_crtc_is_bigjoiner_slave(old_crtc_state)) {
                intel_encoders_disable(state, crtc);
                intel_encoders_post_disable(state, crtc);
        }
@@ -5390,8 +5401,8 @@ static void intel_dump_pipe_config(const struct intel_crtc_state *pipe_config,
                    pipe_config->sync_mode_slaves_mask);
 
        drm_dbg_kms(&dev_priv->drm, "bigjoiner: %s\n",
-                   pipe_config->bigjoiner_slave ? "slave" :
-                   pipe_config->bigjoiner ? "master" : "no");
+                   intel_crtc_is_bigjoiner_slave(pipe_config) ? "slave" :
+                   intel_crtc_is_bigjoiner_master(pipe_config) ? "master" : "no");
 
        drm_dbg_kms(&dev_priv->drm, "splitter: %s, link count %d, overlap %d\n",
                    enableddisabled(pipe_config->splitter.enable),
@@ -5593,7 +5604,7 @@ intel_crtc_copy_uapi_to_hw_state_nomodeset(struct intel_atomic_state *state,
        struct intel_crtc_state *crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
 
-       WARN_ON(crtc_state->bigjoiner_slave);
+       WARN_ON(intel_crtc_is_bigjoiner_slave(crtc_state));
 
        drm_property_replace_blob(&crtc_state->hw.degamma_lut,
                                  crtc_state->uapi.degamma_lut);
@@ -5610,7 +5621,7 @@ intel_crtc_copy_uapi_to_hw_state_modeset(struct intel_atomic_state *state,
        struct intel_crtc_state *crtc_state =
                intel_atomic_get_new_crtc_state(state, crtc);
 
-       WARN_ON(crtc_state->bigjoiner_slave);
+       WARN_ON(intel_crtc_is_bigjoiner_slave(crtc_state));
 
        crtc_state->hw.enable = crtc_state->uapi.enable;
        crtc_state->hw.active = crtc_state->uapi.active;
@@ -5623,7 +5634,7 @@ intel_crtc_copy_uapi_to_hw_state_modeset(struct intel_atomic_state *state,
 
 static void intel_crtc_copy_hw_to_uapi_state(struct intel_crtc_state *crtc_state)
 {
-       if (crtc_state->bigjoiner_slave)
+       if (intel_crtc_is_bigjoiner_slave(crtc_state))
                return;
 
        crtc_state->uapi.enable = crtc_state->hw.enable;
@@ -7385,7 +7396,7 @@ static int intel_atomic_check_bigjoiner(struct intel_atomic_state *state,
        struct intel_crtc *slave_crtc;
 
        WARN_ON(master_crtc_state->bigjoiner_linked_crtc);
-       WARN_ON(master_crtc_state->bigjoiner_slave);
+       WARN_ON(intel_crtc_is_bigjoiner_slave(master_crtc_state));
 
        if (!master_crtc_state->bigjoiner)
                return 0;
@@ -7637,7 +7648,7 @@ static int intel_bigjoiner_add_affected_crtcs(struct intel_atomic_state *state)
        for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
                /* Kill old bigjoiner link, we may re-establish afterwards */
                if (intel_crtc_needs_modeset(crtc_state) &&
-                   crtc_state->bigjoiner && !crtc_state->bigjoiner_slave)
+                   intel_crtc_is_bigjoiner_master(crtc_state))
                        kill_bigjoiner_slave(state, crtc);
        }
 
@@ -7682,7 +7693,7 @@ static int intel_atomic_check(struct drm_device *dev,
        for_each_oldnew_intel_crtc_in_state(state, crtc, old_crtc_state,
                                            new_crtc_state, i) {
                if (!intel_crtc_needs_modeset(new_crtc_state)) {
-                       if (new_crtc_state->bigjoiner_slave)
+                       if (intel_crtc_is_bigjoiner_slave(new_crtc_state))
                                copy_bigjoiner_crtc_state_nomodeset(state, crtc);
                        else
                                intel_crtc_copy_uapi_to_hw_state_nomodeset(state, crtc);
@@ -7690,7 +7701,7 @@ static int intel_atomic_check(struct drm_device *dev,
                }
 
                if (!new_crtc_state->uapi.enable) {
-                       if (!new_crtc_state->bigjoiner_slave) {
+                       if (!intel_crtc_is_bigjoiner_slave(new_crtc_state)) {
                                intel_crtc_copy_uapi_to_hw_state_modeset(state, crtc);
                                any_ms = true;
                        }
@@ -8009,7 +8020,7 @@ static void intel_enable_crtc(struct intel_atomic_state *state,
 
        dev_priv->display->crtc_enable(state, crtc);
 
-       if (new_crtc_state->bigjoiner_slave)
+       if (intel_crtc_is_bigjoiner_slave(new_crtc_state))
                return;
 
        /* vblanks work again, re-enable pipe CRC. */
@@ -8126,7 +8137,7 @@ static void intel_commit_modeset_disables(struct intel_atomic_state *state)
                 */
                if (!is_trans_port_sync_slave(old_crtc_state) &&
                    !intel_dp_mst_is_slave_trans(old_crtc_state) &&
-                   !old_crtc_state->bigjoiner_slave)
+                   !intel_crtc_is_bigjoiner_slave(old_crtc_state))
                        continue;
 
                intel_old_crtc_state_disables(state, old_crtc_state,
@@ -8241,7 +8252,7 @@ static void skl_commit_modeset_enables(struct intel_atomic_state *state)
 
                if (intel_dp_mst_is_slave_trans(new_crtc_state) ||
                    is_trans_port_sync_master(new_crtc_state) ||
-                   (new_crtc_state->bigjoiner && !new_crtc_state->bigjoiner_slave))
+                   intel_crtc_is_bigjoiner_master(new_crtc_state))
                        continue;
 
                modeset_pipes &= ~BIT(pipe);
@@ -9953,7 +9964,7 @@ static void intel_sanitize_crtc(struct intel_crtc *crtc,
        /* Adjust the state of the output pipe according to whether we
         * have active connectors/encoders. */
        if (crtc_state->hw.active && !intel_crtc_has_encoders(crtc) &&
-           !crtc_state->bigjoiner_slave)
+           !intel_crtc_is_bigjoiner_slave(crtc_state))
                intel_crtc_disable_noatomic(crtc, ctx);
 
        if (crtc_state->hw.active || HAS_GMCH(dev_priv)) {
@@ -10167,7 +10178,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
                        /* read out to slave crtc as well for bigjoiner */
                        if (crtc_state->bigjoiner) {
                                /* encoder should read be linked to bigjoiner master */
-                               WARN_ON(crtc_state->bigjoiner_slave);
+                               WARN_ON(intel_crtc_is_bigjoiner_slave(crtc_state));
 
                                crtc = crtc_state->bigjoiner_linked_crtc;
                                crtc_state = to_intel_crtc_state(crtc->base.state);

diff --git a/drivers/gpu/drm/i915/display/intel_display.h b/drivers/gpu/drm/i915/display/intel_display.h
index b8455e2b237341e3d589257b3cc94320e6ebe3b8..4a3ab9015af6571577b80aad2a5b2821ca762660 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display.h
+++ b/drivers/gpu/drm/i915/display/intel_display.h
@@ -555,6 +555,8 @@ intel_mode_valid_max_plane_size(struct drm_i915_private *dev_priv,
                                bool bigjoiner);
 enum phy intel_port_to_phy(struct drm_i915_private *i915, enum port port);
 bool is_trans_port_sync_mode(const struct intel_crtc_state *state);
+bool intel_crtc_is_bigjoiner_slave(const struct intel_crtc_state *crtc_state);
+bool intel_crtc_is_bigjoiner_master(const struct intel_crtc_state *crtc_state);
 
 void intel_plane_destroy(struct drm_plane *plane);
 void intel_enable_transcoder(const struct intel_crtc_state *new_crtc_state);

diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index f6c4ad8fce19fb10dc4fb9850391059faf14f8a8..3c3b681d2fdb0908c38bdd202ff58f852bf488e0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -939,7 +939,7 @@ static void intel_crtc_info(struct seq_file *m, struct intel_crtc *crtc)
                seq_printf(m, "\tLinked to [CRTC:%d:%s] as a %s\n",
                           crtc_state->bigjoiner_linked_crtc->base.base.id,
                           crtc_state->bigjoiner_linked_crtc->base.name,
-                          crtc_state->bigjoiner_slave ? "slave" : "master");
+                          intel_crtc_is_bigjoiner_slave(crtc_state) ? "slave" : "master");
 
        for_each_intel_encoder_mask(&dev_priv->drm, encoder,
                                    crtc_state->uapi.encoder_mask)

diff --git a/drivers/gpu/drm/i915/display/intel_vdsc.c b/drivers/gpu/drm/i915/display/intel_vdsc.c
index 3faea903b9ae5ae522102317673f5e6ab7445b36..b83b59cf2b784adb2b3df789b1dad7a7ad8ee7ad 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_vdsc.c
+++ b/drivers/gpu/drm/i915/display/intel_vdsc.c
@@ -1126,7 +1126,7 @@ void intel_uncompressed_joiner_enable(const struct intel_crtc_state *crtc_state)
        u32 dss_ctl1_val = 0;
 
        if (crtc_state->bigjoiner && !crtc_state->dsc.compression_enable) {
-               if (crtc_state->bigjoiner_slave)
+               if (intel_crtc_is_bigjoiner_slave(crtc_state))
                        dss_ctl1_val |= UNCOMPRESSED_JOINER_SLAVE;
                else
                        dss_ctl1_val |= UNCOMPRESSED_JOINER_MASTER;
@@ -1154,7 +1154,7 @@ void intel_dsc_enable(const struct intel_crtc_state *crtc_state)
        }
        if (crtc_state->bigjoiner) {
                dss_ctl1_val |= BIG_JOINER_ENABLE;
-               if (!crtc_state->bigjoiner_slave)
+               if (!intel_crtc_is_bigjoiner_slave(crtc_state))
                        dss_ctl1_val |= MASTER_BIG_JOINER_ENABLE;
        }
        intel_de_write(dev_priv, dss_ctl1_reg(crtc, crtc_state->cpu_transcoder), dss_ctl1_val);