From: jsg Date: Wed, 26 Jul 2023 06:09:12 +0000 (+0000) Subject: drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=024151521159ed7fa892d52dc1f6ab53c2b9538a;p=openbsd drm/i915: Don't preserve dpll_hw_state for slave crtc in Bigjoiner From Stanislav Lisovskiy f1e746aedd7dfbdea84b690c56154a11b68dc4de in linux-6.1.y/6.1.40 5c413188c68da0e4bffc93de1c80257e20741e69 in mainline linux --- diff --git a/sys/dev/pci/drm/i915/display/intel_display.c b/sys/dev/pci/drm/i915/display/intel_display.c index 83fe57121bf..1acfc87e692 100644 --- a/sys/dev/pci/drm/i915/display/intel_display.c +++ b/sys/dev/pci/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);