Allow forcing ultrajoiner through debugfs. Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@xxxxxxxxx> Reviewed-by: Suraj Kandpal <suraj.kandpal@xxxxxxxxx> --- drivers/gpu/drm/i915/display/intel_display_debugfs.c | 6 ++++++ drivers/gpu/drm/i915/display/intel_dp.c | 2 ++ 2 files changed, 8 insertions(+) diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 8b0cb750d9ae..5d94ce6060f6 100644 --- a/drivers/gpu/drm/i915/display/intel_display_debugfs.c +++ b/drivers/gpu/drm/i915/display/intel_display_debugfs.c @@ -1554,6 +1554,12 @@ static ssize_t i915_joiner_write(struct file *file, else drm_dbg(display->drm, "Force joiner not supported for the config\n"); break; + case 4: + if (intel_display_can_use_ultrajoiner(display)) + connector->force_joined_pipes = force_join_pipes; + else + drm_dbg(display->drm, "Force ultrajoiner not supported for the config\n"); + break; default: drm_dbg(display->drm, "Ignoring Invalid num of pipes %d for force joining\n", force_join_pipes); diff --git a/drivers/gpu/drm/i915/display/intel_dp.c b/drivers/gpu/drm/i915/display/intel_dp.c index 9160614d74c6..149fdcfb297d 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1308,6 +1308,8 @@ int intel_dp_compute_joiner_pipes(struct intel_dp *intel_dp, case 1: fallthrough; case 2: + fallthrough; + case 4: return connector->force_joined_pipes; default: MISSING_CASE(connector->force_joined_pipes); -- 2.45.2
