On Thu, Sep 18, 2025 at 11:40:59AM +0300, Jani Nikula wrote:
> This code is in fact driver core rather than display specific. Pass
> struct drm_device instead of struct intel_display.
>
> Signed-off-by: Jani Nikula <jani.nik...@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrj...@linux.intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +-
> drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 6 +++---
> drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 3 +--
> drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 6 ++----
> 4 files changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c
> b/drivers/gpu/drm/i915/display/intel_fbdev.c
> index 4bc9a053ca40..3fbdf75415cc 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
> @@ -332,7 +332,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper
> *helper,
>
> obj = intel_fb_bo(&fb->base);
>
> - ret = intel_fbdev_fb_fill_info(display, info, obj, vma);
> + ret = intel_fbdev_fb_fill_info(display->drm, info, obj, vma);
> if (ret)
> goto out_unpin;
>
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> index c802a4b2bfc7..8af409bff0f0 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.c
> @@ -50,10 +50,10 @@ void intel_fbdev_fb_bo_destroy(struct drm_gem_object *obj)
> drm_gem_object_put(obj);
> }
>
> -int intel_fbdev_fb_fill_info(struct intel_display *display, struct fb_info
> *info,
> +int intel_fbdev_fb_fill_info(struct drm_device *drm, struct fb_info *info,
> struct drm_gem_object *_obj, struct i915_vma *vma)
> {
> - struct drm_i915_private *i915 = to_i915(display->drm);
> + struct drm_i915_private *i915 = to_i915(drm);
> struct drm_i915_gem_object *obj = to_intel_bo(_obj);
> struct i915_gem_ww_ctx ww;
> void __iomem *vaddr;
> @@ -85,7 +85,7 @@ int intel_fbdev_fb_fill_info(struct intel_display *display,
> struct fb_info *info
>
> vaddr = i915_vma_pin_iomap(vma);
> if (IS_ERR(vaddr)) {
> - drm_err(display->drm,
> + drm_err(drm,
> "Failed to remap framebuffer into virtual
> memory (%pe)\n", vaddr);
> ret = PTR_ERR(vaddr);
> continue;
> diff --git a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> index 3b7b59d664b5..1fa44ed28543 100644
> --- a/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> +++ b/drivers/gpu/drm/i915/display/intel_fbdev_fb.h
> @@ -11,11 +11,10 @@ struct drm_gem_object;
> struct drm_mode_fb_cmd2;
> struct fb_info;
> struct i915_vma;
> -struct intel_display;
>
> struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int
> size);
> void intel_fbdev_fb_bo_destroy(struct drm_gem_object *obj);
> -int intel_fbdev_fb_fill_info(struct intel_display *display, struct fb_info
> *info,
> +int intel_fbdev_fb_fill_info(struct drm_device *drm, struct fb_info *info,
> struct drm_gem_object *obj, struct i915_vma *vma);
>
> #endif
> diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> index 37681503edb1..35a5b07eeba4 100644
> --- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> +++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
> @@ -5,8 +5,6 @@
>
> #include <linux/fb.h>
>
> -#include "intel_display_core.h"
> -#include "intel_display_types.h"
> #include "intel_fbdev_fb.h"
> #include "xe_bo.h"
> #include "xe_ttm_stolen_mgr.h"
> @@ -53,11 +51,11 @@ void intel_fbdev_fb_bo_destroy(struct drm_gem_object *obj)
> xe_bo_unpin_map_no_vm(gem_to_xe_bo(obj));
> }
>
> -int intel_fbdev_fb_fill_info(struct intel_display *display, struct fb_info
> *info,
> +int intel_fbdev_fb_fill_info(struct drm_device *drm, struct fb_info *info,
> struct drm_gem_object *_obj, struct i915_vma *vma)
> {
> struct xe_bo *obj = gem_to_xe_bo(_obj);
> - struct pci_dev *pdev = to_pci_dev(display->drm->dev);
> + struct pci_dev *pdev = to_pci_dev(drm->dev);
>
> if (!(obj->flags & XE_BO_FLAG_SYSTEM)) {
> if (obj->flags & XE_BO_FLAG_STOLEN)
> --
> 2.47.3
--
Ville Syrjälä
Intel
