aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuha-Pekka Heikkila <[email protected]>2023-10-12 16:52:08 +0300
committerRodrigo Vivi <[email protected]>2023-12-21 11:44:32 -0500
commitff180adfb923b2619f6a46c5a369d833b543a9f1 (patch)
tree261d5940dc416af2102d821cdd0644dd7ac6a630
parent95ab70f134d837a566f2d998b3090f40227a1b60 (diff)
drm/xe/display: Don't try to use vram if not available
Trying to get bo from vram when vram not available will cause WARN_ON() hence avoid touching vram if not available. Signed-off-by: Juha-Pekka Heikkila <[email protected]> Reviewed-by: Michael J. Ruhl <[email protected]> Signed-off-by: Rodrigo Vivi <[email protected]>
-rw-r--r--drivers/gpu/drm/xe/display/xe_fb_pin.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index 16e04b24daee..9fc2147a2f10 100644
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -62,11 +62,12 @@ static int __xe_pin_fb_vma_dpt(struct intel_framebuffer *fb,
dpt_size = ALIGN(intel_rotation_info_size(&view->rotated) * 8,
XE_PAGE_SIZE);
- dpt = xe_bo_create_pin_map(xe, tile0, NULL, dpt_size,
- ttm_bo_type_kernel,
- XE_BO_CREATE_VRAM0_BIT |
- XE_BO_CREATE_GGTT_BIT);
- if (IS_ERR(dpt))
+ if (IS_DGFX(xe))
+ dpt = xe_bo_create_pin_map(xe, tile0, NULL, dpt_size,
+ ttm_bo_type_kernel,
+ XE_BO_CREATE_VRAM0_BIT |
+ XE_BO_CREATE_GGTT_BIT);
+ else
dpt = xe_bo_create_pin_map(xe, tile0, NULL, dpt_size,
ttm_bo_type_kernel,
XE_BO_CREATE_STOLEN_BIT |