| Message ID | 20240918144343.2876184-7-ankit.k.nautiyal@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Ultrajoiner basic functionality series | expand |
On Wed, Sep 18, 2024 at 08:13:34PM +0530, Ankit Nautiyal wrote: > 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@intel.com> > --- > drivers/gpu/drm/i915/display/intel_display_debugfs.c | 2 ++ > drivers/gpu/drm/i915/display/intel_dp.c | 2 ++ > 2 files changed, 4 insertions(+) > > diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c > index 5775413c6763..85742400348f 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; ^^^^^^^^^^^ I don't think you need the fallthough keyword here because there is nothing else being done in this case. > + 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 96ad048b68cf..369829ea5a12 100644 > --- a/drivers/gpu/drm/i915/display/intel_dp.c > +++ b/drivers/gpu/drm/i915/display/intel_dp.c > @@ -1288,6 +1288,8 @@ int intel_dp_compute_num_pipes(struct intel_dp *intel_dp, > int hdisplay, int clock) > { > switch (connector->force_joined_pipes) { > + case 1: > + fallthrough; > case 2: > return connector->force_joined_pipes; > default: This hunk would completely disappear with the previously suggested simplification to this function.
diff --git a/drivers/gpu/drm/i915/display/intel_display_debugfs.c b/drivers/gpu/drm/i915/display/intel_display_debugfs.c index 5775413c6763..85742400348f 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 96ad048b68cf..369829ea5a12 100644 --- a/drivers/gpu/drm/i915/display/intel_dp.c +++ b/drivers/gpu/drm/i915/display/intel_dp.c @@ -1288,6 +1288,8 @@ int intel_dp_compute_num_pipes(struct intel_dp *intel_dp, int hdisplay, int clock) { switch (connector->force_joined_pipes) { + case 1: + fallthrough; case 2: return connector->force_joined_pipes; default:
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@intel.com> --- drivers/gpu/drm/i915/display/intel_display_debugfs.c | 2 ++ drivers/gpu/drm/i915/display/intel_dp.c | 2 ++ 2 files changed, 4 insertions(+)