Commit 925ac8bc authored by Ville Syrjälä's avatar Ville Syrjälä

drm/i915: Remove some local 'mode_changed' bools

These 'mode_changed' booleans aren't very helpful. Just
replace them with direct intel_crtc_needs_modeset() calls
which is more descriptive.
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20221021162442.27283-3-ville.syrjala@linux.intel.com
parent 52a90349
...@@ -4831,14 +4831,14 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, ...@@ -4831,14 +4831,14 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state,
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev); struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
struct intel_crtc_state *crtc_state = struct intel_crtc_state *crtc_state =
intel_atomic_get_new_crtc_state(state, crtc); intel_atomic_get_new_crtc_state(state, crtc);
bool mode_changed = intel_crtc_needs_modeset(crtc_state);
int ret; int ret;
if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv) && if (DISPLAY_VER(dev_priv) < 5 && !IS_G4X(dev_priv) &&
mode_changed && !crtc_state->hw.active) intel_crtc_needs_modeset(crtc_state) &&
!crtc_state->hw.active)
crtc_state->update_wm_post = true; crtc_state->update_wm_post = true;
if (mode_changed) { if (intel_crtc_needs_modeset(crtc_state)) {
ret = intel_dpll_crtc_get_shared_dpll(state, crtc); ret = intel_dpll_crtc_get_shared_dpll(state, crtc);
if (ret) if (ret)
return ret; return ret;
...@@ -4851,7 +4851,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, ...@@ -4851,7 +4851,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state,
if (c8_planes_changed(crtc_state)) if (c8_planes_changed(crtc_state))
crtc_state->uapi.color_mgmt_changed = true; crtc_state->uapi.color_mgmt_changed = true;
if (mode_changed || if (intel_crtc_needs_modeset(crtc_state) ||
intel_crtc_needs_fastset(crtc_state) || intel_crtc_needs_fastset(crtc_state) ||
crtc_state->uapi.color_mgmt_changed) { crtc_state->uapi.color_mgmt_changed) {
ret = intel_color_check(crtc_state); ret = intel_color_check(crtc_state);
...@@ -4879,7 +4879,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state, ...@@ -4879,7 +4879,7 @@ static int intel_crtc_atomic_check(struct intel_atomic_state *state,
} }
if (DISPLAY_VER(dev_priv) >= 9) { if (DISPLAY_VER(dev_priv) >= 9) {
if (mode_changed || if (intel_crtc_needs_modeset(crtc_state) ||
intel_crtc_needs_fastset(crtc_state)) { intel_crtc_needs_fastset(crtc_state)) {
ret = skl_update_scaler_crtc(crtc_state); ret = skl_update_scaler_crtc(crtc_state);
if (ret) if (ret)
...@@ -6927,9 +6927,7 @@ static int intel_atomic_prepare_commit(struct intel_atomic_state *state) ...@@ -6927,9 +6927,7 @@ static int intel_atomic_prepare_commit(struct intel_atomic_state *state)
return ret; return ret;
for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) { for_each_new_intel_crtc_in_state(state, crtc, crtc_state, i) {
bool mode_changed = intel_crtc_needs_modeset(crtc_state); if (intel_crtc_needs_modeset(crtc_state) ||
if (mode_changed ||
intel_crtc_needs_fastset(crtc_state) || intel_crtc_needs_fastset(crtc_state) ||
crtc_state->uapi.color_mgmt_changed) { crtc_state->uapi.color_mgmt_changed) {
intel_dsb_prepare(crtc_state); intel_dsb_prepare(crtc_state);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment