On 2/16/2022 12:01 AM, Ville Syrjala wrote:
From: Ville Syrjälä <ville.syrj...@linux.intel.com>

We just copied over the whole master crtc state, including
cpu_transcoder+has_audio. No need to copy those again.

Also get rid of the unhelpful comment.

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

diff --git a/drivers/gpu/drm/i915/display/intel_display.c 
b/drivers/gpu/drm/i915/display/intel_display.c
index 622903847551..49ca13abd108 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5779,12 +5779,9 @@ copy_bigjoiner_crtc_state_modeset(struct 
intel_atomic_state *state,
copy_bigjoiner_crtc_state_nomodeset(state, slave_crtc); - /* Some fixups */
        slave_crtc_state->uapi.mode_changed = 
master_crtc_state->uapi.mode_changed;
        slave_crtc_state->uapi.connectors_changed = 
master_crtc_state->uapi.connectors_changed;
        slave_crtc_state->uapi.active_changed = 
master_crtc_state->uapi.active_changed;
-       slave_crtc_state->cpu_transcoder = master_crtc_state->cpu_transcoder;
-       slave_crtc_state->has_audio = master_crtc_state->has_audio;

Makes sense, these two are only set, uapi was preserved from older slave state, so only the relevant bits need to be copied from master here.

Reviewed-by: Ankit Nautiyal <ankit.k.nauti...@intel.com>




return 0;
  }

Reply via email to