From: jsg Date: Fri, 31 Mar 2023 02:02:47 +0000 (+0000) Subject: drm/i915: Preserve crtc_state->inherited during state clearing X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=789f0c70d0904560ab502d2acf6abe660d83daae;p=openbsd drm/i915: Preserve crtc_state->inherited during state clearing From Ville Syrjala 220da3bf1fc335ae25b181d6bedcfc63efef6ccc in linux-6.1.y/6.1.22 3a84f2c6c9558c554a90ec26ad25df92fc5e05b7 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 7acf769a292..8901781e239 100644 --- a/sys/dev/pci/drm/i915/display/intel_display.c +++ b/sys/dev/pci/drm/i915/display/intel_display.c @@ -5186,6 +5186,7 @@ intel_crtc_prepare_cleared_state(struct intel_atomic_state *state, * only fields that are know to not cause problems are preserved. */ saved_state->uapi = crtc_state->uapi; + saved_state->inherited = crtc_state->inherited; saved_state->scaler_state = crtc_state->scaler_state; saved_state->shared_dpll = crtc_state->shared_dpll; saved_state->dpll_hw_state = crtc_state->dpll_hw_state;