44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
diff --git a/drivers/gpu/drm/xe/display/xe_display_bo.c b/drivers/gpu/drm/xe/display/xe_display_bo.c
|
|
--- a/drivers/gpu/drm/xe/display/xe_display_bo.c
|
|
+++ b/drivers/gpu/drm/xe/display/xe_display_bo.c
|
|
@@ -147,33 +147,12 @@ static struct drm_gem_object *xe_display_bo_fbdev_create(struct drm_device *drm,
|
|
struct xe_device *xe = to_xe_device(drm);
|
|
struct xe_bo *obj;
|
|
|
|
- obj = ERR_PTR(-ENODEV);
|
|
-
|
|
- if (xe_display_bo_fbdev_prefer_stolen(xe, size)) {
|
|
- obj = xe_bo_create_pin_map_novm(xe, xe_device_get_root_tile(xe),
|
|
- size,
|
|
- ttm_bo_type_kernel,
|
|
- XE_BO_FLAG_FORCE_WC |
|
|
- XE_BO_FLAG_STOLEN |
|
|
- XE_BO_FLAG_GGTT,
|
|
- false);
|
|
- if (!IS_ERR(obj))
|
|
- drm_info(&xe->drm, "Allocated fbdev into stolen\n");
|
|
- else
|
|
- drm_info(&xe->drm, "Allocated fbdev into stolen failed: %li\n", PTR_ERR(obj));
|
|
- } else {
|
|
- drm_info(&xe->drm, "Allocating fbdev: Stolen memory not preferred.\n");
|
|
- }
|
|
-
|
|
- if (IS_ERR(obj)) {
|
|
- obj = xe_bo_create_pin_map_novm(xe, xe_device_get_root_tile(xe), size,
|
|
- ttm_bo_type_kernel,
|
|
- XE_BO_FLAG_FORCE_WC |
|
|
- XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |
|
|
- XE_BO_FLAG_GGTT,
|
|
- false);
|
|
- }
|
|
-
|
|
+ obj = xe_bo_create_pin_map_novm(xe, xe_device_get_root_tile(xe), size,
|
|
+ ttm_bo_type_kernel,
|
|
+ XE_BO_FLAG_FORCE_WC |
|
|
+ XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |
|
|
+ XE_BO_FLAG_GGTT,
|
|
+ false);
|
|
if (IS_ERR(obj)) {
|
|
drm_err(&xe->drm, "failed to allocate framebuffer (%pe)\n", obj);
|
|
return ERR_PTR(-ENOMEM);
|