]> git.ipfire.org Git - thirdparty/linux.git/commit
drm/i915: Unlink NV12 planes earlier
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Mon, 16 Mar 2026 16:39:51 +0000 (18:39 +0200)
committerVille Syrjälä <ville.syrjala@linux.intel.com>
Sat, 21 Mar 2026 08:15:32 +0000 (10:15 +0200)
commit017ecd04985573eeeb0745fa2c23896fb22ee0cc
tree76499c8b9b30ee8187a38823393a1201ac26e000
parenta464bace0482aa9a83e9aa7beefbaf44cd58e6cf
drm/i915: Unlink NV12 planes earlier

unlink_nv12_plane() will clobber parts of the plane state
potentially already set up by plane_atomic_check(), so we
must make sure not to call the two in the wrong order.
The problem happens when a plane previously selected as
a Y plane is now configured as a normal plane by user space.
plane_atomic_check() will first compute the proper plane
state based on the userspace request, and unlink_nv12_plane()
later clears some of the state.

This used to work on account of unlink_nv12_plane() skipping
the state clearing based on the plane visibility. But I removed
that check, thinking it was an impossible situation. Now when
that situation happens unlink_nv12_plane() will just WARN
and proceed to clobber the state.

Rather than reverting to the old way of doing things, I think
it's more clear if we unlink the NV12 planes before we even
compute the new plane state.

Cc: stable@vger.kernel.org
Reported-by: Khaled Almahallawy <khaled.almahallawy@intel.com>
Closes: https://lore.kernel.org/intel-gfx/20260212004852.1920270-1-khaled.almahallawy@intel.com/
Tested-by: Khaled Almahallawy <khaled.almahallawy@intel.com>
Fixes: 6a01df2f1b2a ("drm/i915: Remove pointless visible check in unlink_nv12_plane()")
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260316163953.12905-2-ville.syrjala@linux.intel.com
Reviewed-by: Uma Shankar <uma.shankar@intel.com>
drivers/gpu/drm/i915/display/intel_plane.c