[PATCH 2/2] drm/i915/display: Add debugfs support to avoid joiner
Ankit Nautiyal
ankit.k.nautiyal at intel.com
Tue Sep 10 05:31:35 UTC 2024
Currently debugfs for joiner can take a value of 0->dont care and
2->join 2 pipes. Add option to force to use only 1 pipe.
If debugfs is set to 1, force to exactly one pipe (ie. no
joiner despite what the automagic logic is saying).
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal at intel.com>
---
.../drm/i915/display/intel_display_debugfs.c | 2 +
drivers/gpu/drm/i915/display/intel_dp.c | 49 ++++++++++++++-----
drivers/gpu/drm/i915/display/intel_dp.h | 6 +--
drivers/gpu/drm/i915/display/intel_dp_mst.c | 10 ++--
4 files changed, 47 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
index 7dd43c8c8750..9cba8713dea3 100644
--- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c
+++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c
@@ -1533,6 +1533,8 @@ static ssize_t i915_joiner_write(struct file *file,
switch (force_join_pipes) {
case 0:
fallthrough;
+ case 1:
+ fallthrough;
case 2:
connector->force_joined_pipes = force_join_pipes;
break;
diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c
index 5c30d4488141..d67e188c154d 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.c
+++ b/drivers/gpu/drm/i915/display/intel_dp.c
@@ -1261,17 +1261,40 @@ intel_dp_mode_valid_downstream(struct intel_connector *connector,
return MODE_OK;
}
-bool intel_dp_need_joiner(struct intel_dp *intel_dp,
- struct intel_connector *connector,
- int hdisplay, int clock)
+static
+bool intel_dp_needs_bigjoiner(struct intel_dp *intel_dp,
+ struct intel_connector *connector,
+ int hdisplay, int clock)
{
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
- if (!intel_dp_has_joiner(intel_dp))
- return false;
+ return clock > i915->display.cdclk.max_dotclk_freq || hdisplay > 5120;
+}
+
+int intel_dp_compute_joiner_pipes(struct intel_dp *intel_dp,
+ struct intel_connector *connector,
+ int hdisplay, int clock)
+{
+ int num_joined_pipes = 0;
+
+ switch (connector->force_joined_pipes) {
+ case 1:
+ num_joined_pipes = connector->force_joined_pipes;
+ break;
+ case 2:
+ if (intel_dp_has_joiner(intel_dp))
+ num_joined_pipes = connector->force_joined_pipes;
+ break;
+ default:
+ MISSING_CASE(connector->force_joined_pipes);
+ fallthrough;
+ case 0:
+ if (intel_dp_has_joiner(intel_dp) &&
+ intel_dp_needs_bigjoiner(intel_dp, connector, hdisplay, clock))
+ num_joined_pipes = 2;
+ }
- return clock > i915->display.cdclk.max_dotclk_freq || hdisplay > 5120 ||
- connector->force_joined_pipes == 2;
+ return num_joined_pipes;
}
bool intel_dp_has_dsc(const struct intel_connector *connector)
@@ -1329,8 +1352,8 @@ intel_dp_mode_valid(struct drm_connector *_connector,
target_clock = fixed_mode->clock;
}
- if (intel_dp_need_joiner(intel_dp, connector,
- mode->hdisplay, target_clock)) {
+ if (intel_dp_compute_joiner_pipes(intel_dp, connector,
+ mode->hdisplay, target_clock) == 2) {
joiner = true;
max_dotclk *= 2;
}
@@ -2523,15 +2546,17 @@ intel_dp_compute_link_config(struct intel_encoder *encoder,
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
struct link_config_limits limits;
bool dsc_needed, joiner_needs_dsc;
+ int num_joined_pipes;
int ret = 0;
if (pipe_config->fec_enable &&
!intel_dp_supports_fec(intel_dp, connector, pipe_config))
return -EINVAL;
- if (intel_dp_need_joiner(intel_dp, connector,
- adjusted_mode->crtc_hdisplay,
- adjusted_mode->crtc_clock))
+ num_joined_pipes = intel_dp_compute_joiner_pipes(intel_dp, connector,
+ adjusted_mode->crtc_hdisplay,
+ adjusted_mode->crtc_clock);
+ if (num_joined_pipes == 2)
pipe_config->joiner_pipes = GENMASK(crtc->pipe + 1, crtc->pipe);
joiner_needs_dsc = intel_dp_joiner_needs_dsc(i915, pipe_config->joiner_pipes);
diff --git a/drivers/gpu/drm/i915/display/intel_dp.h b/drivers/gpu/drm/i915/display/intel_dp.h
index 1b9aaddd8c35..bc9a82d82df2 100644
--- a/drivers/gpu/drm/i915/display/intel_dp.h
+++ b/drivers/gpu/drm/i915/display/intel_dp.h
@@ -153,9 +153,9 @@ int intel_dp_dsc_sink_max_compressed_bpp(const struct intel_connector *connector
u8 intel_dp_dsc_get_slice_count(const struct intel_connector *connector,
int mode_clock, int mode_hdisplay,
bool bigjoiner);
-bool intel_dp_need_joiner(struct intel_dp *intel_dp,
- struct intel_connector *connector,
- int hdisplay, int clock);
+int intel_dp_compute_joiner_pipes(struct intel_dp *intel_dp,
+ struct intel_connector *connector,
+ int hdisplay, int clock);
static inline unsigned int intel_dp_unused_lane_mask(int lane_count)
{
diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c b/drivers/gpu/drm/i915/display/intel_dp_mst.c
index 15541932b809..9f7cb36f93f6 100644
--- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
+++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
@@ -577,9 +577,9 @@ static int intel_dp_mst_compute_config(struct intel_encoder *encoder,
if (adjusted_mode->flags & DRM_MODE_FLAG_DBLSCAN)
return -EINVAL;
- if (intel_dp_need_joiner(intel_dp, connector,
- adjusted_mode->crtc_hdisplay,
- adjusted_mode->crtc_clock))
+ if (intel_dp_compute_joiner_pipes(intel_dp, connector,
+ adjusted_mode->crtc_hdisplay,
+ adjusted_mode->crtc_clock) == 2)
pipe_config->joiner_pipes = GENMASK(crtc->pipe + 1, crtc->pipe);
pipe_config->sink_format = INTEL_OUTPUT_FORMAT_RGB;
@@ -1465,8 +1465,8 @@ intel_dp_mst_mode_valid_ctx(struct drm_connector *connector,
* corresponding link capabilities of the sink) in case the
* stream is uncompressed for it by the last branch device.
*/
- if (intel_dp_need_joiner(intel_dp, intel_connector,
- mode->hdisplay, target_clock)) {
+ if (intel_dp_compute_joiner_pipes(intel_dp, intel_connector,
+ mode->hdisplay, target_clock) == 2) {
joiner = true;
max_dotclk *= 2;
}
--
2.45.2
More information about the Intel-gfx-trybot
mailing list