All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH 12/12] drm/i915: Simplify intel_initial_plane_config() calling convention
Date: Wed, 13 Dec 2023 02:42:37 +0200	[thread overview]
Message-ID: <20231213004237.20375-13-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20231213004237.20375-1-ville.syrjala@linux.intel.com>

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

There's no reason the caller of intel_initial_plane_config() should
have to loop over the CRTCs. Pull the loop into the function to
make life simpler for the caller.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 .../drm/i915/display/intel_display_driver.c   |  7 +---
 .../drm/i915/display/intel_plane_initial.c    | 40 +++++++++++--------
 .../drm/i915/display/intel_plane_initial.h    |  4 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index 62f7b10484be..2fe0f4ad359c 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -285,7 +285,6 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)
 {
 	struct drm_device *dev = &i915->drm;
 	enum pipe pipe;
-	struct intel_crtc *crtc;
 	int ret;
 
 	if (!HAS_DISPLAY(i915))
@@ -335,11 +334,7 @@ int intel_display_driver_probe_nogem(struct drm_i915_private *i915)
 	intel_acpi_assign_connector_fwnodes(i915);
 	drm_modeset_unlock_all(dev);
 
-	for_each_intel_crtc(dev, crtc) {
-		if (!to_intel_crtc_state(crtc->base.state)->uapi.active)
-			continue;
-		intel_crtc_initial_plane_config(crtc);
-	}
+	intel_initial_plane_config(i915);
 
 	/*
 	 * Make sure hardware watermarks really match the state we read out.
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index 78bff6181ceb..b7e12b60d68b 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -357,25 +357,31 @@ static void plane_config_fini(struct intel_initial_plane_config *plane_config)
 		i915_vma_put(plane_config->vma);
 }
 
-void intel_crtc_initial_plane_config(struct intel_crtc *crtc)
+void intel_initial_plane_config(struct drm_i915_private *i915)
 {
-	struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
-	struct intel_initial_plane_config plane_config = {};
+	struct intel_crtc *crtc;
 
-	/*
-	 * Note that reserving the BIOS fb up front prevents us
-	 * from stuffing other stolen allocations like the ring
-	 * on top.  This prevents some ugliness at boot time, and
-	 * can even allow for smooth boot transitions if the BIOS
-	 * fb is large enough for the active pipe configuration.
-	 */
-	dev_priv->display.funcs.display->get_initial_plane_config(crtc, &plane_config);
+	for_each_intel_crtc(&i915->drm, crtc) {
+		struct intel_initial_plane_config plane_config = {};
 
-	/*
-	 * If the fb is shared between multiple heads, we'll
-	 * just get the first one.
-	 */
-	intel_find_initial_plane_obj(crtc, &plane_config);
+		if (!to_intel_crtc_state(crtc->base.state)->uapi.active)
+			continue;
 
-	plane_config_fini(&plane_config);
+		/*
+		 * Note that reserving the BIOS fb up front prevents us
+		 * from stuffing other stolen allocations like the ring
+		 * on top.  This prevents some ugliness at boot time, and
+		 * can even allow for smooth boot transitions if the BIOS
+		 * fb is large enough for the active pipe configuration.
+		 */
+		i915->display.funcs.display->get_initial_plane_config(crtc, &plane_config);
+
+		/*
+		 * If the fb is shared between multiple heads, we'll
+		 * just get the first one.
+		 */
+		intel_find_initial_plane_obj(crtc, &plane_config);
+
+		plane_config_fini(&plane_config);
+	}
 }
diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.h b/drivers/gpu/drm/i915/display/intel_plane_initial.h
index c7e35ab3182b..64ab95239cd4 100644
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.h
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.h
@@ -6,8 +6,8 @@
 #ifndef __INTEL_PLANE_INITIAL_H__
 #define __INTEL_PLANE_INITIAL_H__
 
-struct intel_crtc;
+struct drm_i915_private;
 
-void intel_crtc_initial_plane_config(struct intel_crtc *crtc);
+void intel_initial_plane_config(struct drm_i915_private *i915);
 
 #endif
-- 
2.41.0


  parent reply	other threads:[~2023-12-13  0:43 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-12-13  0:42 [PATCH 00/12] drm/i915: (stolen) memory region related fixes Ville Syrjala
2023-12-13  0:42 ` [PATCH 01/12] drm/i915: Use struct resource for memory region IO as well Ville Syrjala
2023-12-13  0:59   ` Ville Syrjälä
2023-12-13 17:01     ` Ville Syrjälä
2023-12-13 15:52   ` Andrzej Hajda
2023-12-13 16:08     ` Ville Syrjälä
2023-12-13  0:42 ` [PATCH 02/12] drm/i915: Print memory region info during probe Ville Syrjala
2023-12-13 16:05   ` Andrzej Hajda
2023-12-13 16:26     ` Ville Syrjälä
2023-12-13 16:49       ` Ville Syrjälä
2023-12-13  0:42 ` [PATCH 03/12] drm/i915: Remove ad-hoc lmem/stolen debugs Ville Syrjala
2023-12-13 16:06   ` Andrzej Hajda
2023-12-13  0:42 ` [PATCH 04/12] drm/i915: Bypass LMEMBAR/GTTMMADR for MTL stolen memory access Ville Syrjala
2023-12-13  9:09   ` Joonas Lahtinen
2023-12-13  9:30     ` Ville Syrjälä
2023-12-13 20:18       ` Sripada, Radhakrishna
2023-12-14  2:03         ` Ville Syrjälä
2023-12-14 21:06           ` Sripada, Radhakrishna
2023-12-15 10:23             ` Ville Syrjälä
2023-12-13  0:42 ` [PATCH 05/12] drm/i915: Disable the "binder" Ville Syrjala
2023-12-13  0:42 ` [PATCH 06/12] drm/i915: Rename the DSM/GSM registers Ville Syrjala
2023-12-13  0:42 ` [PATCH 07/12] drm/i915: Fix PTE decode during initial plane readout Ville Syrjala
2023-12-13  0:42 ` [PATCH 08/12] drm/i915: Fix region start " Ville Syrjala
2023-12-13  0:42 ` [PATCH 09/12] drm/i915: Fix MTL " Ville Syrjala
2023-12-13  0:42 ` [PATCH 10/12] drm/i915: s/phys_base/dma_addr/ Ville Syrjala
2023-12-13  0:42 ` [PATCH 11/12] drm/i915: Split the smem and lmem plane readout apart Ville Syrjala
2023-12-13  0:42 ` Ville Syrjala [this message]
2023-12-13  1:22 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: (stolen) memory region related fixes Patchwork
2023-12-13  1:22 ` ✗ Fi.CI.SPARSE: " Patchwork
2023-12-13  1:37 ` ✗ Fi.CI.BAT: failure " Patchwork
2023-12-13 16:13   ` â " Andrzej Hajda
2023-12-13 17:24     ` Tvrtko Ursulin
2023-12-13 17:28       ` Tvrtko Ursulin
2023-12-14 11:06     ` â " Andrzej Hajda
2023-12-14 23:01       ` Ville Syrjälä
2023-12-15  8:23         ` Ville Syrjälä
2023-12-13  4:31 ` ✗ Fi.CI.CHECKPATCH: warning for drm/i915: (stolen) memory region related fixes (rev2) Patchwork
2023-12-13  4:31 ` ✗ Fi.CI.SPARSE: " Patchwork
2023-12-13  4:49 ` ✗ Fi.CI.BAT: failure " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20231213004237.20375-13-ville.syrjala@linux.intel.com \
    --to=ville.syrjala@linux.intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.