]> git.ipfire.org Git - thirdparty/kernel/linux.git/commit
drm/i915/joiner: Make joiner "nomodeset" state copy independent of pipe order
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 8 Apr 2026 15:57:43 +0000 (18:57 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 13 Apr 2026 07:16:11 +0000 (10:16 +0300)
commit482bcc7ee600dcb5fb937dc742d051977fb5983c
tree805ed55a7387a55bfb40d93714d115a0a6ca7efe
parent4516432284e1b2ad9e70de8067f779c9c1072189
drm/i915/joiner: Make joiner "nomodeset" state copy independent of pipe order

Currently the joiner primary->secondary hw state copy still happens from
the main compute_config loop alongside the primary uapi->hw state copy.
The primary uapi->hw state copy must therefore happen first, or else
we'll end up copying stale junk into the secondary.

We have a WARN in intel_atomic_check_joiner() to make sure the CRTCs
will be walked in the correct order. The plan is to reoder the CRTCs,
which would mess up the order, unless we also adjust the iterators
to keep the pipe order. The actual plan is to do both, so technically
we should be able to just remove the WARN and call it a day.

But relying on the iteration order like this is fragile and confusing,
so let's move the "nomodeset" joiner state copy into the later loop
where the "modeset" state copy is also done. The first loop having
completely finished, we are guaranteed to have up to date hw state
on the primary when we do the copy to the secondary.

Cc: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260408155744.13326-2-ville.syrjala@linux.intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/display/intel_display.c