]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe: Fix DPT allocation paths.
authorMaarten Lankhorst <dev@lankhorst.se>
Tue, 30 Jun 2026 13:55:20 +0000 (15:55 +0200)
committerThomas Hellström <thomas.hellstrom@linux.intel.com>
Thu, 13 Aug 2026 12:56:33 +0000 (14:56 +0200)
Remove the fallback for VRAM to system memory, I tested it and that
doesn't work at all, only a black screen with pipe fault errors were
observed.

On systems with media GT, extra latency is added when accessing stolen
memory when the GT is in MC6. Since we additionally aren't counting how
much memory is used for stolen and we could in theory fill up the
entire stolen area with DPT's, avoid using stolen and only use the
default memory region.

Using stolen may also result in random system hangs under load.

Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/work_items/7513
Fixes: 775d0adc01a5 ("drm/xe/fbdev: Limit the usage of stolen for LNL+")
Cc: <stable@vger.kernel.org> # v6.12+
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Link: https://patch.msgid.link/20260630135523.1775379-2-dev@lankhorst.se
Signed-off-by: Maarten Lankhorst <dev@lankhorst.se>
Acked-by: Matthew Brost <matthew.brost@intel.com> #teams
(cherry picked from commit a196406a3831291598fe8e73245914f7acffdfe0)
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
drivers/gpu/drm/xe/display/xe_fb_pin.c

index 5f4a0cd8deca0db149cbdc73a0f858d56b8193c2..73469ea5f333d30f1ff14d958d2d84aab5bd2b69 100644 (file)
@@ -164,31 +164,14 @@ static int __xe_pin_fb_vma_dpt(struct drm_gem_object *obj,
                dpt_size = ALIGN(intel_rotation_info_size(&view->rotated) * 8,
                                 XE_PAGE_SIZE);
 
-       if (IS_DGFX(xe))
-               dpt = xe_bo_create_pin_map_at_novm(xe, tile0,
-                                                  dpt_size, ~0ull,
-                                                  ttm_bo_type_kernel,
-                                                  XE_BO_FLAG_VRAM0 |
-                                                  XE_BO_FLAG_GGTT |
-                                                  XE_BO_FLAG_PAGETABLE,
-                                                  pin_params->alignment, false);
-       else
-               dpt = xe_bo_create_pin_map_at_novm(xe, tile0,
-                                                  dpt_size,  ~0ull,
-                                                  ttm_bo_type_kernel,
-                                                  XE_BO_FLAG_STOLEN |
-                                                  XE_BO_FLAG_GGTT |
-                                                  XE_BO_FLAG_PAGETABLE,
-                                                  pin_params->alignment, false);
-       if (IS_ERR(dpt))
-               dpt = xe_bo_create_pin_map_at_novm(xe, tile0,
-                                                  dpt_size,  ~0ull,
-                                                  ttm_bo_type_kernel,
-                                                  XE_BO_FLAG_SYSTEM |
-                                                  XE_BO_FLAG_GGTT |
-                                                  XE_BO_FLAG_PAGETABLE |
-                                                  XE_BO_FLAG_FORCE_WC,
-                                                  pin_params->alignment, false);
+       dpt = xe_bo_create_pin_map_at_novm(xe, tile0,
+                                          dpt_size,  ~0ull,
+                                          ttm_bo_type_kernel,
+                                          XE_BO_FLAG_VRAM_IF_DGFX(tile0) |
+                                          XE_BO_FLAG_GGTT |
+                                          XE_BO_FLAG_PAGETABLE |
+                                          XE_BO_FLAG_FORCE_WC,
+                                          pin_params->alignment, false);
        if (IS_ERR(dpt))
                return PTR_ERR(dpt);