mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 09:12:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

drm/i915/display: Refactor enable_joiner_pipes

Browse Source 
Pass the current pipe into enabled_joiner_pipes(), and let it figure out
the proper bitmasks for us. Since the enabled_joiner_pipes now gets the
primary and secondary pipes wrt a given pipe, the helpers
to get primary pipe and secondary pipes are no longer required.

v2:
-Simplify helper get_joiner_primary_pipes. (Ville)
-Nuke get_joiner_secondary_pipes. (Ville)
-Add more drm_WARNs final primary/secondary pipes. (Ville)
v3: Drop ultrajoiner stuff and add it in subsequent patches. (Ville)
v4:
-Replace input variable name primary_pipes to primary_pipe for
enabled_joiner_pipes()
-Avoid get_joiner_primary_pipe and use primary_pipes set by
enabled_joiner_pipes(). (Ville)

Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Suggested-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240930163549.416410-5-ankit.k.nautiyal@intel.com
This commit is contained in:
Ankit Nautiyal
2024-09-30 22:05:40 +05:30
parent 8c2b586095
commit f9ee6b5748
1 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
drivers/gpu/drm/i915/display/intel_display.c
View File

@@ -3663,8 +3663,16 @@ static u8 expected_bigjoiner_secondary_pipes(u8 bigjoiner_primary_pipes)
return expected_secondary_pipes(bigjoiner_primary_pipes, 2);
}
static u8 get_joiner_primary_pipe(enum pipe pipe, u8 primary_pipes)
{
primary_pipes &= GENMASK(pipe, 0);
return primary_pipes ? BIT(fls(primary_pipes) - 1) : 0;
}
static void enabled_joiner_pipes(struct drm_i915_private *dev_priv,
u8 *primary_pipes, u8 *secondary_pipes)
enum pipe pipe,
u8 *primary_pipe, u8 *secondary_pipes)
{
struct intel_display *display = to_intel_display(&dev_priv->drm);
u8 primary_uncompressed_joiner_pipes, primary_bigjoiner_pipes;
@@ -3703,45 +3711,38 @@ static void enabled_joiner_pipes(struct drm_i915_private *dev_priv,
expected_uncompressed_joiner_secondary_pipes(primary_uncompressed_joiner_pipes),
secondary_uncompressed_joiner_pipes);
*primary_pipes = primary_uncompressed_joiner_pipes | primary_bigjoiner_pipes;
*primary_pipe = 0;
*secondary_pipes = 0;
*secondary_pipes = secondary_uncompressed_joiner_pipes | secondary_bigjoiner_pipes;
if (uncompressed_joiner_pipes & BIT(pipe)) {
*primary_pipe = get_joiner_primary_pipe(pipe, primary_uncompressed_joiner_pipes);
*secondary_pipes = secondary_uncompressed_joiner_pipes &
expected_uncompressed_joiner_secondary_pipes(*primary_pipe);
/* Joiner pipes should always be consecutive primary and secondary */
drm_WARN(display->drm, *secondary_pipes != *primary_pipes << 1,
"Joiner misconfigured (primary pipes %#x, secondary pipes %#x)\n",
*primary_pipes, *secondary_pipes);
}
drm_WARN(display->drm,
expected_uncompressed_joiner_secondary_pipes(*primary_pipe) !=
*secondary_pipes,
"Wrong uncompressed joiner secondary pipes for primary_pipe %#x (expected %#x, current %#x)\n",
*primary_pipe,
expected_uncompressed_joiner_secondary_pipes(*primary_pipe),
*secondary_pipes);
return;
}
static enum pipe get_joiner_primary_pipe(enum pipe pipe, u8 primary_pipes, u8 secondary_pipes)
{
if ((secondary_pipes & BIT(pipe)) == 0)
return pipe;
if (bigjoiner_pipes & BIT(pipe)) {
*primary_pipe = get_joiner_primary_pipe(pipe, primary_bigjoiner_pipes);
*secondary_pipes = secondary_bigjoiner_pipes &
expected_bigjoiner_secondary_pipes(*primary_pipe);
/* ignore everything above our pipe */
primary_pipes &= ~GENMASK(7, pipe);
/* highest remaining bit should be our primary pipe */
return fls(primary_pipes) - 1;
}
static u8 get_joiner_secondary_pipes(enum pipe pipe, u8 primary_pipes, u8 secondary_pipes)
{
enum pipe primary_pipe, next_primary_pipe;
primary_pipe = get_joiner_primary_pipe(pipe, primary_pipes, secondary_pipes);
if ((primary_pipes & BIT(primary_pipe)) == 0)
return 0;
/* ignore our primary pipe and everything below it */
primary_pipes &= ~GENMASK(primary_pipe, 0);
/* make sure a high bit is set for the ffs() */
primary_pipes |= BIT(7);
/* lowest remaining bit should be the next primary pipe */
next_primary_pipe = ffs(primary_pipes) - 1;
return secondary_pipes & GENMASK(next_primary_pipe - 1, primary_pipe);
drm_WARN(display->drm,
expected_bigjoiner_secondary_pipes(*primary_pipe) !=
*secondary_pipes,
"Wrong bigjoiner secondary pipes for primary_pipe %#x (expected %#x, current %#x)\n",
*primary_pipe,
expected_bigjoiner_secondary_pipes(*primary_pipe),
*secondary_pipes);
return;
}
}
static u8 hsw_panel_transcoders(struct drm_i915_private *i915)
@@ -3760,7 +3761,7 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc)
struct drm_i915_private *dev_priv = to_i915(dev);
u8 panel_transcoder_mask = hsw_panel_transcoders(dev_priv);
enum transcoder cpu_transcoder;
u8 primary_pipes, secondary_pipes;
u8 primary_pipe, secondary_pipes;
u8 enabled_transcoders = 0;
/*
@@ -3813,10 +3814,9 @@ static u8 hsw_enabled_transcoders(struct intel_crtc *crtc)
enabled_transcoders |= BIT(cpu_transcoder);
/* joiner secondary -> consider the primary pipe's transcoder as well */
enabled_joiner_pipes(dev_priv, &primary_pipes, &secondary_pipes);
enabled_joiner_pipes(dev_priv, crtc->pipe, &primary_pipe, &secondary_pipes);
if (secondary_pipes & BIT(crtc->pipe)) {
cpu_transcoder = (enum transcoder)
get_joiner_primary_pipe(crtc->pipe, primary_pipes, secondary_pipes);
cpu_transcoder = (enum transcoder)ffs(primary_pipe) - 1;
if (transcoder_ddi_func_is_enabled(dev_priv, cpu_transcoder))
enabled_transcoders |= BIT(cpu_transcoder);
}
@@ -3947,17 +3947,15 @@ static void intel_joiner_get_config(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);
u8 primary_pipes, secondary_pipes;
u8 primary_pipe, secondary_pipes;
enum pipe pipe = crtc->pipe;
enabled_joiner_pipes(i915, &primary_pipes, &secondary_pipes);
enabled_joiner_pipes(i915, pipe, &primary_pipe, &secondary_pipes);
if (((primary_pipes | secondary_pipes) & BIT(pipe)) == 0)
if (((primary_pipe | secondary_pipes) & BIT(pipe)) == 0)
return;
crtc_state->joiner_pipes =
BIT(get_joiner_primary_pipe(pipe, primary_pipes, secondary_pipes)) |
get_joiner_secondary_pipes(pipe, primary_pipes, secondary_pipes);
crtc_state->joiner_pipes = primary_pipe | secondary_pipes;
}
static bool hsw_get_pipe_config(struct intel_crtc *crtc,