hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/drivers/gpu/drm/i915/display/intel_display.c
....@@ -5844,7 +5844,7 @@
58445844 num_encoders++;
58455845 }
58465846
5847
- drm_WARN(encoder->base.dev, num_encoders != 1,
5847
+ drm_WARN(state->base.dev, num_encoders != 1,
58485848 "%d encoders for pipe %c\n",
58495849 num_encoders, pipe_name(crtc->pipe));
58505850
....@@ -13335,6 +13335,7 @@
1333513335 * only fields that are know to not cause problems are preserved. */
1333613336
1333713337 saved_state->uapi = crtc_state->uapi;
13338
+ saved_state->inherited = crtc_state->inherited;
1333813339 saved_state->scaler_state = crtc_state->scaler_state;
1333913340 saved_state->shared_dpll = crtc_state->shared_dpll;
1334013341 saved_state->dpll_hw_state = crtc_state->dpll_hw_state;