From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/drivers/gpu/drm/i915/display/intel_display.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/kernel/drivers/gpu/drm/i915/display/intel_display.c b/kernel/drivers/gpu/drm/i915/display/intel_display.c index 45c2556..9a06bd8 100644 --- a/kernel/drivers/gpu/drm/i915/display/intel_display.c +++ b/kernel/drivers/gpu/drm/i915/display/intel_display.c @@ -5844,7 +5844,7 @@ num_encoders++; } - drm_WARN(encoder->base.dev, num_encoders != 1, + drm_WARN(state->base.dev, num_encoders != 1, "%d encoders for pipe %c\n", num_encoders, pipe_name(crtc->pipe)); @@ -13335,6 +13335,7 @@ * 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; -- Gitblit v1.6.2