Commit cef2c726 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/fb: add intel_framebuffer_alloc() 



Add intel_framebuffer_alloc() to hide intel_bo_alloc_framebuffer(), as
that doesn't feel like the correct abstraction.

Cc: Jocelyn Falempe <jfalempe@redhat.com>
Cc: Maarten Lankhorst <dev@lankhorst.se>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/379c306c692c50f6af3b6f2488c213f12627954f.1756835342.git.jani.nikula@intel.com
parent 45b95459

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

+1 −2
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include "i9xx_plane.h"

#include "i9xx_plane_regs.h"

#include "intel_atomic.h"

#include "intel_bo.h"

#include "intel_de.h"

#include "intel_display_irq.h"

#include "intel_display_regs.h"
@@ -1178,7 +1177,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc, 


	drm_WARN_ON(display->drm, pipe != crtc->pipe);



	intel_fb = intel_bo_alloc_framebuffer();

	intel_fb = intel_framebuffer_alloc();

	if (!intel_fb) {

		drm_dbg_kms(display->drm, "failed to alloc fb\n");

		return;

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

+6 −1
Original line number Diff line number Diff line
@@ -2340,6 +2340,11 @@ intel_user_framebuffer_create(struct drm_device *dev, 
	return fb;

}



struct intel_framebuffer *intel_framebuffer_alloc(void)

{

	return intel_bo_alloc_framebuffer();

}



struct drm_framebuffer *

intel_framebuffer_create(struct drm_gem_object *obj,

			 struct drm_mode_fb_cmd2 *mode_cmd)
@@ -2347,7 +2352,7 @@ intel_framebuffer_create(struct drm_gem_object *obj, 
	struct intel_framebuffer *intel_fb;

	int ret;



	intel_fb = intel_bo_alloc_framebuffer();

	intel_fb = intel_framebuffer_alloc();

	if (!intel_fb)

		return ERR_PTR(-ENOMEM);

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

+3 −0
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ void intel_add_fb_offsets(int *x, int *y, 
int intel_framebuffer_init(struct intel_framebuffer *ifb,

			   struct drm_gem_object *obj,

			   struct drm_mode_fb_cmd2 *mode_cmd);



struct intel_framebuffer *intel_framebuffer_alloc(void);



struct drm_framebuffer *

intel_framebuffer_create(struct drm_gem_object *obj,

			 struct drm_mode_fb_cmd2 *mode_cmd);

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

+1 −1
Original line number Diff line number Diff line
@@ -3028,7 +3028,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc, 
		return;

	}



	intel_fb = intel_bo_alloc_framebuffer();

	intel_fb = intel_framebuffer_alloc();

	if (!intel_fb) {

		drm_dbg_kms(display->drm, "failed to alloc fb\n");

		return;