]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/i915/display: Disable AuxCCS framebuffers if built for Xe
authorJuha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Wed, 28 Feb 2024 14:02:25 +0000 (16:02 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Apr 2024 14:37:59 +0000 (16:37 +0200)
[ Upstream commit cf48bddd31deefb9ab07de9a4d0150da6610198a ]

AuxCCS framebuffers don't work on Xe driver hence disable them
from plane capabilities until they are fixed. FlatCCS framebuffers
work and they are left enabled. CCS is left untouched for i915
driver.

Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/933
Signed-off-by: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Tested-by: José Roberto de Souza <jose.souza@intel.com>
Acked-by: Jani Nikula <jani.nikula@intel.com>
Fixes: 44e694958b95 ("drm/xe/display: Implement display support")
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240228140225.858145-1-juhapekka.heikkila@gmail.com
(cherry picked from commit b7232a730fbf043f54fb46fbf4a6e92936770e79)
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/i915/display/skl_universal_plane.c

index 511dc1544854f42aaa5176afca615b0a61ca4a4b..8bba6c2e50989ae7bba2e54e625b12df6566047c 100644 (file)
@@ -2290,6 +2290,9 @@ static u8 skl_get_plane_caps(struct drm_i915_private *i915,
        if (HAS_4TILE(i915))
                caps |= INTEL_PLANE_CAP_TILING_4;
 
+       if (!IS_ENABLED(I915) && !HAS_FLAT_CCS(i915))
+               return caps;
+
        if (skl_plane_has_rc_ccs(i915, pipe, plane_id)) {
                caps |= INTEL_PLANE_CAP_CCS_RC;
                if (DISPLAY_VER(i915) >= 12)