Commit 6eca4dbe authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Change intel_fbdev_fb_alloc() return type 



Change intel_fbdev_fb_alloc() to return struct intel_fb instead
of struct drm_framebuffer. Let's us eliminate some annoying
aliasing variables in the fbdev setup code.

v2: Assing the results to the correct variable (Jani)
    Fix xe's copy

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240510102233.25057-1-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Acked-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
parent 67f5728a

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

+4 −5
Original line number Diff line number Diff line
@@ -207,13 +207,12 @@ static int intelfb_create(struct drm_fb_helper *helper, 
		intel_fb = ifbdev->fb = NULL;

	}

	if (!intel_fb || drm_WARN_ON(dev, !intel_fb_obj(&intel_fb->base))) {

		struct drm_framebuffer *fb;

		drm_dbg_kms(&dev_priv->drm,

			    "no BIOS fb, allocating a new one\n");

		fb = intel_fbdev_fb_alloc(helper, sizes);

		if (IS_ERR(fb))

			return PTR_ERR(fb);

		intel_fb = ifbdev->fb = to_intel_framebuffer(fb);

		intel_fb = intel_fbdev_fb_alloc(helper, sizes);

		if (IS_ERR(intel_fb))

			return PTR_ERR(intel_fb);

		ifbdev->fb = intel_fb;

	} else {

		drm_dbg_kms(&dev_priv->drm, "re-using BIOS fb\n");

		prealloc = true;

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

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#include "intel_display_types.h"

#include "intel_fbdev_fb.h"



struct drm_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

					       struct drm_fb_helper_surface_size *sizes)

{

	struct drm_framebuffer *fb;
@@ -63,7 +63,7 @@ struct drm_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
	fb = intel_framebuffer_create(obj, &mode_cmd);

	i915_gem_object_put(obj);



	return fb;

	return to_intel_framebuffer(fb);

}



int intel_fbdev_fb_fill_info(struct drm_i915_private *i915, struct fb_info *info,

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

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ struct drm_i915_private; 
struct fb_info;

struct i915_vma;



struct drm_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

					       struct drm_fb_helper_surface_size *sizes);

int intel_fbdev_fb_fill_info(struct drm_i915_private *i915, struct fb_info *info,

			     struct drm_i915_gem_object *obj, struct i915_vma *vma);

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

+5 −4
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include "i915_drv.h"

#include "intel_display_types.h"



struct drm_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,

					       struct drm_fb_helper_surface_size *sizes)

{

	struct drm_framebuffer *fb;
@@ -70,10 +70,11 @@ struct drm_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper, 
	}



	drm_gem_object_put(intel_bo_to_drm_bo(obj));

	return fb;



	return to_intel_framebuffer(fb);



err:

	return fb;

	return ERR_CAST(fb);

}



int intel_fbdev_fb_fill_info(struct drm_i915_private *i915, struct fb_info *info,