Commit 5c3a6885 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/1f633154f5f3106f55d7525a711bf347f5635ea7.1758184771.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent f379035f

drivers/gpu/drm/i915/display/intel_fbdev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/intel_fbdev_fb.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/i915/display/intel_fbdev_fb.h

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/xe/display/intel_fbdev_fb.c

+2 −4
Original line number Diff line number Diff line
@@ -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)