drm/{i915, xe}/fbdev: pass struct drm_device to intel_fbdev_fb_alloc()

The function doesn't actually need struct drm_fb_helper for anything,
just pass struct drm_device.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/16360584f80cdc5ee35fd94cfd92fd3955588dfd.1758184771.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 7c4709d58aa345fe6dba6a2b768350327b1ae52f..46c6de5f60888156cd8b5b085c243d32db171506 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -237,7 +237,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
        if (!fb || drm_WARN_ON(display->drm, !intel_fb_bo(&fb->base))) {
                drm_dbg_kms(display->drm,
                            "no BIOS fb, allocating a new one\n");
-               fb = intel_fbdev_fb_alloc(helper, sizes);
+               fb = intel_fbdev_fb_alloc(display->drm, sizes);
                if (IS_ERR(fb))
                        return PTR_ERR(fb);
        } else {

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
index b9dfd00a7d05b4691fa16d896aadfe58dbf27e1d..4de13d1a4c7a7bddd02937aea3686b342ad2c5d0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
@@ -13,11 +13,11 @@
 #include "intel_fb.h"
 #include "intel_fbdev_fb.h"
 
-struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
+struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,
                                               struct drm_fb_helper_surface_size *sizes)
 {
-       struct intel_display *display = to_intel_display(helper->dev);
-       struct drm_i915_private *dev_priv = to_i915(display->drm);
+       struct intel_display *display = to_intel_display(drm);
+       struct drm_i915_private *dev_priv = to_i915(drm);
        struct drm_framebuffer *fb;
        struct drm_mode_fb_cmd2 mode_cmd = {};
        struct drm_i915_gem_object *obj;
@@ -58,12 +58,12 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
        }
 
        if (IS_ERR(obj)) {
-               drm_err(display->drm, "failed to allocate framebuffer (%pe)\n", obj);
+               drm_err(drm, "failed to allocate framebuffer (%pe)\n", obj);
                return ERR_PTR(-ENOMEM);
        }
 
        fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj),
-                                     drm_get_format_info(display->drm,
+                                     drm_get_format_info(drm,
                                                          mode_cmd.pixel_format,
                                                          mode_cmd.modifier[0]),
                                      &mode_cmd);

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
index cb79572727150267badb99c019001b274a18dcce..668ae355f5e5b8103728dc7279e5307e69b3135a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
@@ -6,14 +6,14 @@
 #ifndef __INTEL_FBDEV_FB_H__
 #define __INTEL_FBDEV_FB_H__
 
-struct drm_fb_helper;
+struct drm_device;
 struct drm_fb_helper_surface_size;
 struct drm_gem_object;
 struct fb_info;
 struct i915_vma;
 struct intel_display;
 
-struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
+struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,
                                               struct drm_fb_helper_surface_size *sizes);
 int intel_fbdev_fb_fill_info(struct intel_display *display, struct fb_info *info,
                             struct drm_gem_object *obj, struct i915_vma *vma);

diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
index 7dd581da7b79d153a7af49ee64888bc56b840787..b9e855c543040f648b4722010b18becff93c72d5 100644 (file)
--- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
+++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
@@ -15,12 +15,11 @@
 
 #include <generated/xe_wa_oob.h>
 
-struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
+struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,
                                               struct drm_fb_helper_surface_size *sizes)
 {
        struct drm_framebuffer *fb;
-       struct drm_device *dev = helper->dev;
-       struct xe_device *xe = to_xe_device(dev);
+       struct xe_device *xe = to_xe_device(drm);
        struct drm_mode_fb_cmd2 mode_cmd = {};
        struct xe_bo *obj;
        int size;
@@ -67,7 +66,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
        }
 
        fb = intel_framebuffer_create(&obj->ttm.base,
-                                     drm_get_format_info(dev,
+                                     drm_get_format_info(drm,
                                                          mode_cmd.pixel_format,
                                                          mode_cmd.modifier[0]),
                                      &mode_cmd);