Commit 7326099d authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/fbdev: abstract bo creation 



Separate fbdev bo creation into a separate function
intel_fbdev_fb_bo_create().

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/cb3999ceae43d56e075c28a1f4581169ce457ab0.1758184771.git.jani.nikula@intel.com


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

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

+23 −10
Original line number Diff line number Diff line
@@ -13,17 +13,11 @@ 
#include "intel_fb.h"

#include "intel_fbdev_fb.h"



struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,

					       struct drm_mode_fb_cmd2 *mode_cmd)

struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int size)

{

	struct intel_display *display = to_intel_display(drm);

	struct drm_i915_private *dev_priv = to_i915(drm);

	struct drm_framebuffer *fb;

	struct drm_i915_gem_object *obj;

	int size;



	size = mode_cmd->pitches[0] * mode_cmd->height;

	size = PAGE_ALIGN(size);



	obj = ERR_PTR(-ENODEV);

	if (HAS_LMEM(dev_priv)) {
@@ -49,17 +43,36 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm, 
		return ERR_PTR(-ENOMEM);

	}



	fb = intel_framebuffer_create(intel_bo_to_drm_bo(obj),

	return &obj->base;

}



struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,

					       struct drm_mode_fb_cmd2 *mode_cmd)

{

	struct drm_framebuffer *fb;

	struct drm_gem_object *obj;

	int size;



	size = mode_cmd->pitches[0] * mode_cmd->height;

	size = PAGE_ALIGN(size);



	obj = intel_fbdev_fb_bo_create(drm, size);

	if (IS_ERR(obj)) {

		fb = ERR_CAST(obj);

		goto err;

	}



	fb = intel_framebuffer_create(obj,

				      drm_get_format_info(drm,

							  mode_cmd->pixel_format,

							  mode_cmd->modifier[0]),

				      mode_cmd);

	if (IS_ERR(fb)) {

		i915_gem_object_put(obj);

		drm_gem_object_put(obj);

		goto err;

	}



	i915_gem_object_put(obj);

	drm_gem_object_put(obj);



	return to_intel_framebuffer(fb);

err:

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

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ struct fb_info; 
struct i915_vma;

struct intel_display;



struct drm_gem_object *intel_fbdev_fb_bo_create(struct drm_device *drm, int size);

struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_device *drm,

					       struct drm_mode_fb_cmd2 *mode_cmd);

int intel_fbdev_fb_fill_info(struct intel_display *display, struct fb_info *info,