From: Ville Syrjala <ville.syrjala@linux.intel.com>
To: intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v2 08/13] drm/i915: Extract intel_crtc_compute_pipe_mode()
Date: Wed, 23 Feb 2022 15:13:10 +0200 [thread overview]
Message-ID: <20220223131315.18016-9-ville.syrjala@linux.intel.com> (raw)
In-Reply-To: <20220223131315.18016-1-ville.syrjala@linux.intel.com>
From: Ville Syrjälä <ville.syrjala@linux.intel.com>
Pull intel_crtc_compute_pipe_mode() out from
intel_crtc_compute_config(). Since it's semi related
we'll suck in the max dotclock/double wide checks in
as well.
And we'll pimp the debugs while at it.
Reviewed-by: Manasi Navare <manasi.d.navare@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
drivers/gpu/drm/i915/display/intel_display.c | 28 ++++++++++++++------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display.c b/drivers/gpu/drm/i915/display/intel_display.c
index 111c2458dac2..84829f31d73b 100644
--- a/drivers/gpu/drm/i915/display/intel_display.c
+++ b/drivers/gpu/drm/i915/display/intel_display.c
@@ -2836,17 +2836,12 @@ static int intel_crtc_compute_pipe_src(struct intel_crtc_state *crtc_state)
return 0;
}
-static int intel_crtc_compute_config(struct intel_crtc *crtc,
- struct intel_crtc_state *crtc_state)
+static int intel_crtc_compute_pipe_mode(struct intel_crtc_state *crtc_state)
{
+ struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_i915_private *i915 = to_i915(crtc->base.dev);
struct drm_display_mode *pipe_mode = &crtc_state->hw.pipe_mode;
int clock_limit = i915->max_dotclk_freq;
- int ret;
-
- ret = intel_crtc_compute_pipe_src(crtc_state);
- if (ret)
- return ret;
drm_mode_copy(pipe_mode, &crtc_state->hw.adjusted_mode);
@@ -2872,12 +2867,29 @@ static int intel_crtc_compute_config(struct intel_crtc *crtc,
if (pipe_mode->crtc_clock > clock_limit) {
drm_dbg_kms(&i915->drm,
- "requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n",
+ "[CRTC:%d:%s] requested pixel clock (%d kHz) too high (max: %d kHz, double wide: %s)\n",
+ crtc->base.base.id, crtc->base.name,
pipe_mode->crtc_clock, clock_limit,
yesno(crtc_state->double_wide));
return -EINVAL;
}
+ return 0;
+}
+
+static int intel_crtc_compute_config(struct intel_crtc *crtc,
+ struct intel_crtc_state *crtc_state)
+{
+ int ret;
+
+ ret = intel_crtc_compute_pipe_src(crtc_state);
+ if (ret)
+ return ret;
+
+ ret = intel_crtc_compute_pipe_mode(crtc_state);
+ if (ret)
+ return ret;
+
intel_crtc_compute_pixel_rate(crtc_state);
if (crtc_state->has_pch_encoder)
--
2.34.1
next prev parent reply other threads:[~2022-02-23 13:13 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-23 13:13 [Intel-gfx] [PATCH v2 00/13] drm/i915: Move bigjoiner refactoring Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 01/13] drm/i915: Avoid negative shift due to bigjoiner_pipes==0 Ville Syrjala
2022-02-23 19:54 ` Navare, Manasi
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 02/13] drm/i915: Fix cursor coordinates on bigjoiner slave Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 03/13] drm/i915: Remove nop bigjoiner state copy Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 04/13] drm/i915: Rename variables in intel_crtc_compute_config() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 05/13] drm/i915: Extract intel_splitter_adjust_timings() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 06/13] drm/i915: Extract intel_bigjoiner_adjust_timings() Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 07/13] drm/i915: Extract intel_crtc_compute_pipe_src() Ville Syrjala
2022-02-23 13:13 ` Ville Syrjala [this message]
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 09/13] drm/i915: Fix MSO vs. bigjoiner timings confusion Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 10/13] drm/i915: Start tracking PIPESRC as a drm_rect Ville Syrjala
2022-03-03 22:20 ` Navare, Manasi
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 11/13] drm/i915: Eliminate bigjoiner boolean Ville Syrjala
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 12/13] drm/i915: Use bigjoiner_pipes more Ville Syrjala
2022-02-23 20:00 ` Navare, Manasi
2022-02-24 10:35 ` Ville Syrjälä
2022-03-03 22:29 ` Navare, Manasi
2022-02-23 13:13 ` [Intel-gfx] [PATCH v2 13/13] drm/i915: Make the PIPESC rect relative to the entire bigjoiner area Ville Syrjala
2022-03-03 22:41 ` Navare, Manasi
2022-03-04 15:10 ` Ville Syrjälä
2022-03-10 0:29 ` Navare, Manasi
2022-02-24 5:45 ` [Intel-gfx] ✓ Fi.CI.BAT: success for drm/i915: Move bigjoiner refactoring (rev2) Patchwork
2022-02-24 17:20 ` [Intel-gfx] ✓ Fi.CI.IGT: " 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=20220223131315.18016-9-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox