From: Ville Syrjälä <[email protected]>
Pull the "should we keep the bios fb in stolen?" logic into
into a helper function, same as was done for i915. Gives us
a single place where to tweak the heuristics.
v2: changes related to rebase and consolidated other conditions
for the stolen preference into this single function (Vinod)
Signed-off-by: Ville Syrjälä <[email protected]>
Reviewed-by: Uma Shankar <[email protected]>
Signed-off-by: Vinod Govindapillai <[email protected]>
---
drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 27 ++++++++++++++++++-
drivers/gpu/drm/xe/display/xe_initial_plane.c | 11 ++------
2 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
index 7ad76022cb14..b713d101953f 100644
--- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
+++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
@@ -6,6 +6,7 @@
#include <linux/fb.h>
#include "intel_fbdev_fb.h"
+#include "intel_display_core.h"
#include "xe_bo.h"
#include "xe_ttm_stolen_mgr.h"
#include "xe_wa.h"
@@ -23,6 +24,30 @@ u32 intel_fbdev_fb_pitch_align(u32 stride)
return ALIGN(stride, XE_PAGE_SIZE);
}
+bool intel_fbdev_fb_prefer_stolen(struct intel_display *display,
+ unsigned int size)
+{
+ struct xe_device *xe = to_xe_device(display->drm);
+ struct ttm_resource_manager *stolen;
+
+ stolen = ttm_manager_type(&xe->ttm, XE_PL_STOLEN);
+ if (!stolen)
+ return false;
+
+ if (IS_DGFX(xe))
+ return false;
+
+ if (XE_DEVICE_WA(xe, 22019338487_display))
+ return false;
+
+ /*
+ * If the FB is too big, just don't use it since fbdev is not very
+ * important and we should probably use that space with FBC or other
+ * features.
+ */
+ return stolen->size >= size * 2;
+}
+
struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int
size)
{
struct xe_device *xe = to_xe_device(drm);
@@ -30,7 +55,7 @@ struct drm_gem_object *intel_fbdev_fb_bo_create(struct
drm_device *drm, int size
obj = ERR_PTR(-ENODEV);
- if (!IS_DGFX(xe) && !XE_DEVICE_WA(xe, 22019338487_display)) {
+ if (intel_fbdev_fb_prefer_stolen(xe->display, size)) {
obj = xe_bo_create_pin_map_novm(xe, xe_device_get_root_tile(xe),
size,
ttm_bo_type_kernel,
XE_BO_FLAG_SCANOUT |
diff --git a/drivers/gpu/drm/xe/display/xe_initial_plane.c
b/drivers/gpu/drm/xe/display/xe_initial_plane.c
index 38ecc201ac4e..28b612bf21d2 100644
--- a/drivers/gpu/drm/xe/display/xe_initial_plane.c
+++ b/drivers/gpu/drm/xe/display/xe_initial_plane.c
@@ -17,6 +17,7 @@
#include "intel_display_regs.h"
#include "intel_display_types.h"
#include "intel_fb.h"
+#include "intel_fbdev_fb.h"
#include "intel_fb_pin.h"
#include "xe_bo.h"
#include "xe_vram_types.h"
@@ -90,16 +91,8 @@ initial_plane_bo(struct xe_device *xe,
phys_base = base;
flags |= XE_BO_FLAG_STOLEN;
- if (XE_DEVICE_WA(xe, 22019338487_display))
- return NULL;
-
- /*
- * If the FB is too big, just don't use it since fbdev is not
very
- * important and we should probably use that space with FBC or
other
- * features.
- */
if (IS_ENABLED(CONFIG_FRAMEBUFFER_CONSOLE) &&
- plane_config->size * 2 > stolen->size)
+ !intel_fbdev_fb_prefer_stolen(xe->display,
plane_config->size))
return NULL;
}
--
2.43.0
