drm/xe: pass struct xe_device to xe_display_bo_fbdev_prefer_stolen()

This is xe core code, use struct xe_device for simplicity.

Reviewed-by: Michał Grzelak <michal.grzelak@intel.com>
Link: https://patch.msgid.link/56bd532dc5cf460cdbf17c7781f18db5378a28e6.1774950508.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/xe/display/xe_display_bo.c b/drivers/gpu/drm/xe/display/xe_display_bo.c
index bb5eba226240d3d89120738957610953e42b1573..dc0d78ff2d79c044192cfb779efd021ecb7f4979 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_display_bo.c
+++ b/drivers/gpu/drm/xe/display/xe_display_bo.c
@@ -119,9 +119,8 @@ static u32 xe_display_bo_fbdev_pitch_align(u32 stride)
        return ALIGN(stride, XE_PAGE_SIZE);
 }
 
-bool xe_display_bo_fbdev_prefer_stolen(struct drm_device *drm, unsigned int size)
+bool xe_display_bo_fbdev_prefer_stolen(struct xe_device *xe, unsigned int size)
 {
-       struct xe_device *xe = to_xe_device(drm);
        struct ttm_resource_manager *stolen;
 
        stolen = ttm_manager_type(&xe->ttm, XE_PL_STOLEN);
@@ -149,7 +148,7 @@ static struct drm_gem_object *xe_display_bo_fbdev_create(struct drm_device *drm,
 
        obj = ERR_PTR(-ENODEV);
 
-       if (xe_display_bo_fbdev_prefer_stolen(drm, size)) {
+       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,

diff --git a/drivers/gpu/drm/xe/display/xe_display_bo.h b/drivers/gpu/drm/xe/display/xe_display_bo.h
index 8980e6ecf54a24653ea4480d7fa1e5ba2fe6dc72..c72056884ff41cf3a2f935d03e66738b80e4cea0 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_display_bo.h
+++ b/drivers/gpu/drm/xe/display/xe_display_bo.h
@@ -6,9 +6,9 @@
 
 #include <linux/types.h>
 
-struct drm_device;
+struct xe_device;
 
-bool xe_display_bo_fbdev_prefer_stolen(struct drm_device *drm, unsigned int size);
+bool xe_display_bo_fbdev_prefer_stolen(struct xe_device *xe, unsigned int size);
 
 extern const struct intel_display_bo_interface xe_display_bo_interface;
 

diff --git a/drivers/gpu/drm/xe/display/xe_initial_plane.c b/drivers/gpu/drm/xe/display/xe_initial_plane.c
index 73ae502bb2a5dfdd60cf49dc06d16af125c43a31..1c7a4e8c390c01b3042fa35553dfb07b8ce44b49 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_initial_plane.c
+++ b/drivers/gpu/drm/xe/display/xe_initial_plane.c
@@ -87,7 +87,7 @@ initial_plane_bo(struct xe_device *xe,
 
                if (IS_ENABLED(CONFIG_FRAMEBUFFER_CONSOLE) &&
                    IS_ENABLED(CONFIG_DRM_FBDEV_EMULATION) &&
-                   !xe_display_bo_fbdev_prefer_stolen(&xe->drm, plane_config->size)) {
+                   !xe_display_bo_fbdev_prefer_stolen(xe, plane_config->size)) {
                        drm_info(&xe->drm, "Initial FB size exceeds half of stolen, discarding\n");
                        return NULL;
                }