Commit f2887e7f authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

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: 67a98f7e ("drm/xe/display: Re-use display vmas when possible")
Cc: Lucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250305110106.564366-1-dev@lankhorst.se


Signed-off-by: default avatarMaarten Lankhorst <dev@lankhorst.se>
parent 6069b21f

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

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
					   NULL, size,

					   ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |

					   XE_BO_FLAG_STOLEN |

					   XE_BO_FLAG_PINNED);

					   XE_BO_FLAG_GGTT | XE_BO_FLAG_PINNED);

		if (!IS_ERR(obj))

			drm_info(&xe->drm, "Allocated fbdev into stolen\n");

		else
@@ -56,7 +56,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
		obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe), NULL, size,

					   ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |

					   XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |

					   XE_BO_FLAG_PINNED);

					   XE_BO_FLAG_GGTT | XE_BO_FLAG_PINNED);

	}



	if (IS_ERR(obj)) {