Patch "drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     drm-i915-don-t-preserve-dpll_hw_state-for-slave-crtc.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 8904663c93f143e08f994361105e4c026edf709c
Author: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx>
Date:   Wed Jun 28 17:10:17 2023 +0300

    drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner
    
    [ Upstream commit 5c413188c68da0e4bffc93de1c80257e20741e69 ]
    
    If we are using Bigjoiner dpll_hw_state is supposed to be exactly
    same as for master crtc, so no need to save it's state for slave crtc.
    
    Signed-off-by: Stanislav Lisovskiy <stanislav.lisovskiy@xxxxxxxxx>
    Fixes: 0ff0e219d9b8 ("drm/i915: Compute clocks earlier")
    Reviewed-by: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx>
    Link: https://patchwork.freedesktop.org/patch/msgid/20230628141017.18937-1-stanislav.lisovskiy@xxxxxxxxx
    (cherry picked from commit cbaf758809952c95ec00e796695049babb08bb60)
    Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@xxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 455d9ae6c41c9..da9b995b54c8f 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -5133,7 +5133,6 @@ copy_bigjoiner_crtc_state_modeset(struct intel_atomic_state *state,
 	saved_state->uapi = slave_crtc_state->uapi;
 	saved_state->scaler_state = slave_crtc_state->scaler_state;
 	saved_state->shared_dpll = slave_crtc_state->shared_dpll;
-	saved_state->dpll_hw_state = slave_crtc_state->dpll_hw_state;
 	saved_state->crc_enabled = slave_crtc_state->crc_enabled;
 
 	intel_crtc_free_hw_state(slave_crtc_state);