From e33d9a9679af2c2a58ffc708bf743bbe0a2ad57f Mon Sep 17 00:00:00 2001 From: jsg Date: Tue, 28 Mar 2023 00:19:53 +0000 Subject: [PATCH] drm/i915: Introduce intel_panel_init_alloc() From Ville Syrjala e340197a453987c48cdeeeb6447d0944513de538 in linux-6.1.y/6.1.20 f70f8153e3642337b444fbc0c64d546a46bbcd62 in mainline linux --- sys/dev/pci/drm/i915/display/intel_connector.c | 2 +- sys/dev/pci/drm/i915/display/intel_panel.c | 7 +++++++ sys/dev/pci/drm/i915/display/intel_panel.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/drm/i915/display/intel_connector.c b/sys/dev/pci/drm/i915/display/intel_connector.c index 6d5cbeb8df4..8bb296f3d62 100644 --- a/sys/dev/pci/drm/i915/display/intel_connector.c +++ b/sys/dev/pci/drm/i915/display/intel_connector.c @@ -54,7 +54,7 @@ int intel_connector_init(struct intel_connector *connector) __drm_atomic_helper_connector_reset(&connector->base, &conn_state->base); - INIT_LIST_HEAD(&connector->panel.fixed_modes); + intel_panel_init_alloc(connector); return 0; } diff --git a/sys/dev/pci/drm/i915/display/intel_panel.c b/sys/dev/pci/drm/i915/display/intel_panel.c index f72f4646c0d..8bd7af99cd2 100644 --- a/sys/dev/pci/drm/i915/display/intel_panel.c +++ b/sys/dev/pci/drm/i915/display/intel_panel.c @@ -648,6 +648,13 @@ intel_panel_mode_valid(struct intel_connector *connector, return MODE_OK; } +void intel_panel_init_alloc(struct intel_connector *connector) +{ + struct intel_panel *panel = &connector->panel; + + INIT_LIST_HEAD(&panel->fixed_modes); +} + int intel_panel_init(struct intel_connector *connector) { struct intel_panel *panel = &connector->panel; diff --git a/sys/dev/pci/drm/i915/display/intel_panel.h b/sys/dev/pci/drm/i915/display/intel_panel.h index 5c5b5b7f95b..4b51e1c51da 100644 --- a/sys/dev/pci/drm/i915/display/intel_panel.h +++ b/sys/dev/pci/drm/i915/display/intel_panel.h @@ -18,6 +18,7 @@ struct intel_connector; struct intel_crtc_state; struct intel_encoder; +void intel_panel_init_alloc(struct intel_connector *connector); int intel_panel_init(struct intel_connector *connector); void intel_panel_fini(struct intel_connector *connector); enum drm_connector_status -- 2.20.1