Skip to content

Commit f2887e7

Browse files
author
Maarten Lankhorst
committed
drm/xe/display: Fix fbdev GGTT mapping handling.
FBDEV ggtt is not restored correctly, add missing GGTT flag to intel_fbdev_fb_alloc to make it work. This ensures that the global GGTT mapping is always restored on resume. The GGTT mapping would otherwise be created in intel_fb_pin_to_ggtt() by intel_fbdev anyway. This fixes the fbdev device not working after resume. Fixes: 67a98f7 ("drm/xe/display: Re-use display vmas when possible") Cc: Lucas De Marchi <[email protected]> Reviewed-by: Lucas De Marchi <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Maarten Lankhorst <[email protected]>
1 parent 6069b21 commit f2887e7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/gpu/drm/xe/display/intel_fbdev_fb.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
4545
NULL, size,
4646
ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
4747
XE_BO_FLAG_STOLEN |
48-
XE_BO_FLAG_PINNED);
48+
XE_BO_FLAG_GGTT | XE_BO_FLAG_PINNED);
4949
if (!IS_ERR(obj))
5050
drm_info(&xe->drm, "Allocated fbdev into stolen\n");
5151
else
@@ -56,7 +56,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
5656
obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe), NULL, size,
5757
ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
5858
XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |
59-
XE_BO_FLAG_PINNED);
59+
XE_BO_FLAG_GGTT | XE_BO_FLAG_PINNED);
6060
}
6161

6262
if (IS_ERR(obj)) {

0 commit comments

Comments
 (0)