From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>

Date: Fri, 25 Nov 2022 19:31:48 +0200

Subject: [PATCH] drm/i915: Introduce intel_panel_init_alloc()

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

References: bsc#1012628

Patch-mainline: 6.2.7

Git-commit: f70f8153e3642337b444fbc0c64d546a46bbcd62

[ Upstream commit f70f8153e3642337b444fbc0c64d546a46bbcd62 ]

Introduce a place where we can initialize connector->panel

after it's been allocated. We already have a intel_panel_init()

so had to get creative with the name and came up with

intel_panel_init_alloc().

Cc: Animesh Manna <animesh.manna@intel.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Link: https://patchwork.freedesktop.org/patch/msgid/20221125173156.31689-2-ville.syrjala@linux.intel.com

Stable-dep-of: 14e591a1930c ("drm/i915: Populate encoder->devdata for DSI on icl+")

Signed-off-by: Sasha Levin <sashal@kernel.org>

Signed-off-by: Jiri Slaby <jslaby@suse.cz>

---

 drivers/gpu/drm/i915/display/intel_connector.c | 2 +-

 drivers/gpu/drm/i915/display/intel_panel.c     | 7 +++++++

 drivers/gpu/drm/i915/display/intel_panel.h     | 1 +

 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/display/intel_connector.c b/drivers/gpu/drm/i915/display/intel_connector.c

index 6205ddd3..562da3b7 100644

--- a/drivers/gpu/drm/i915/display/intel_connector.c

+++ b/drivers/gpu/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/drivers/gpu/drm/i915/display/intel_panel.c b/drivers/gpu/drm/i915/display/intel_panel.c

index 1640726b..b49228eb 100644

--- a/drivers/gpu/drm/i915/display/intel_panel.c

+++ b/drivers/gpu/drm/i915/display/intel_panel.c

@@ -661,6 +661,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/drivers/gpu/drm/i915/display/intel_panel.h b/drivers/gpu/drm/i915/display/intel_panel.h

index 5c5b5b7f..4b51e1c5 100644

--- a/drivers/gpu/drm/i915/display/intel_panel.h

+++ b/drivers/gpu/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.35.3