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

This code is in fact driver core rather than display specific. Pass
struct drm_device instead of struct intel_display.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/1f633154f5f3106f55d7525a711bf347f5635ea7.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 4bc9a053ca40a2dfbf3d53d7744e76fac15dd34c..3fbdf75415cc41e515c9618aa9a99744678ca620 100644 (file)
--- 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 c802a4b2bfc7f8b75c7742cd729ca8ad07d34a66..8af409bff0f0969e2e3c3bb99546f7cf686e091d 100644 (file)
--- 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 3b7b59d664b5e84ce7b1fde8ab7e861cb1a09718..1fa44ed28543dd6f52c07a8d3f3e8ff1ddd500b6 100644 (file)
--- 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 c23da0dd5336aa24727f492e7029f9ddbe6cbf31..3dfab0c2b827f664c06754dd621683de9c27ccf2 100644 (file)
--- 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)