Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org
Cc: jani.nikula@intel.com, ville.syrjala@linux.intel.com
Subject: [PATCH v3 4/9] drm/i915/pps: add vlv_pps_pipe_init()
Date: Wed, 18 Sep 2024 20:47:44 +0300	[thread overview]
Message-ID: <2829a5bab5e9a4dcddc3a2bb87e12559000543ea.1726681620.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1726681620.git.jani.nikula@intel.com>

We need to track PPS also for non-eDP usage on VLV/CHV. Add new
vlv_pps_pipe_init() for initializing the related parts, hiding the PPS
pipe details inside PPS code.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_dp.c  | 6 ++----
 drivers/gpu/drm/i915/display/intel_pps.c | 7 +++++++
 drivers/gpu/drm/i915/display/intel_pps.h | 1 +
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 9f908dbd45ea..12706f24a36d 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -6893,10 +6893,8 @@ intel_dp_init_connector(struct intel_digital_port *dig_port,
 	intel_dp_set_default_sink_rates(intel_dp);
 	intel_dp_set_default_max_sink_lane_count(intel_dp);
 
-	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv)) {
-		intel_dp->pps.vlv_pps_pipe = INVALID_PIPE;
-		intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);
-	}
+	if (IS_VALLEYVIEW(dev_priv) || IS_CHERRYVIEW(dev_priv))
+		vlv_pps_pipe_init(intel_dp);
 
 	intel_dp_aux_init(intel_dp);
 	intel_connector->dp.dsc_decompression_aux = &intel_dp->aux;
diff --git a/drivers/gpu/drm/i915/display/intel_pps.c b/drivers/gpu/drm/i915/display/intel_pps.c
index 649dc6ad2278..5957e79186f0 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.c
+++ b/drivers/gpu/drm/i915/display/intel_pps.c
@@ -1211,6 +1211,13 @@ static void vlv_steal_power_sequencer(struct intel_display *display,
 	}
 }
 
+/* Call on all DP, not just eDP */
+void vlv_pps_pipe_init(struct intel_dp *intel_dp)
+{
+	intel_dp->pps.vlv_pps_pipe = INVALID_PIPE;
+	intel_dp->pps.vlv_active_pipe = vlv_active_pipe(intel_dp);
+}
+
 void vlv_pps_init(struct intel_encoder *encoder,
 		  const struct intel_crtc_state *crtc_state)
 {
diff --git a/drivers/gpu/drm/i915/display/intel_pps.h b/drivers/gpu/drm/i915/display/intel_pps.h
index 0c5da83a559e..5686e900e7de 100644
--- a/drivers/gpu/drm/i915/display/intel_pps.h
+++ b/drivers/gpu/drm/i915/display/intel_pps.h
@@ -45,6 +45,7 @@ void intel_pps_init_late(struct intel_dp *intel_dp);
 void intel_pps_encoder_reset(struct intel_dp *intel_dp);
 void intel_pps_reset_all(struct intel_display *display);
 
+void vlv_pps_pipe_init(struct intel_dp *intel_dp);
 void vlv_pps_init(struct intel_encoder *encoder,
 		  const struct intel_crtc_state *crtc_state);
 
-- 
2.39.2


  parent reply	other threads:[~2024-09-18 17:48 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-18 17:47 [PATCH v3 0/9] drm/i915/pps: hide VLV/CHV PPS pipe stuff inside intel_pps.c Jani Nikula
2024-09-18 17:47 ` [PATCH v3 1/9] drm/i915/pps: add vlv_ prefix to pps_pipe and active_pipe members Jani Nikula
2024-09-18 17:47 ` [PATCH v3 2/9] drm/i915/pps: add bxt_ prefix to pps_reset Jani Nikula
2024-09-18 17:47 ` [PATCH v3 3/9] drm/i915/pps: only touch the vlv_ members on VLV/CHV Jani Nikula
2024-09-18 19:13   ` Ville Syrjälä
2024-09-19  9:13     ` Jani Nikula
2024-09-18 17:47 ` Jani Nikula [this message]
2024-09-18 17:47 ` [PATCH v3 5/9] drm/i915/pps: add vlv_pps_pipe_reset() Jani Nikula
2024-09-18 17:47 ` [PATCH v3 6/9] drm/i915/pps: add vlv_pps_port_disable() Jani Nikula
2024-09-18 17:47 ` [PATCH v3 7/9] drm/i915/pps: rename vlv_pps_init() to vlv_pps_port_enable_unlocked() Jani Nikula
2024-09-18 17:47 ` [PATCH v3 8/9] drm/i915/pps: add vlv_pps_backlight_initial_pipe() Jani Nikula
2024-09-18 17:47 ` [PATCH v3 9/9] drm/i915/pps: move vlv_active_pipe() to intel_pps.c Jani Nikula
2024-09-18 22:21 ` ✓ CI.Patch_applied: success for drm/i915/pps: hide VLV/CHV PPS pipe stuff inside intel_pps.c (rev2) Patchwork
2024-09-18 22:22 ` ✓ CI.checkpatch: " Patchwork
2024-09-18 22:25 ` ✓ CI.KUnit: " Patchwork
2024-09-18 22:38 ` ✓ CI.Build: " Patchwork
2024-09-18 22:41 ` ✓ CI.Hooks: " Patchwork
2024-09-18 22:42 ` ✗ CI.checksparse: warning " Patchwork
2024-09-18 23:05 ` ✓ CI.BAT: success " Patchwork
2024-09-19 12:39 ` ✗ CI.FULL: 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=2829a5bab5e9a4dcddc3a2bb87e12559000543ea.1726681620.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=intel-gfx@lists.freedesktop.org \
    --cc=intel-xe@lists.freedesktop.org \
    --cc=ville.syrjala@linux.intel.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox