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: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/379c306c692c50f6af3b6f2488c213f12627954f.1756835342.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/i9xx_plane.c b/drivers/gpu/drm/i915/display/i9xx_plane.c
index 3eb96d8abba8f2092486c285ae4b8e7bda887b10..9a39e9efbfaf1399d20f6ff3297a65a9ad641a85 100644 (file)
--- a/drivers/gpu/drm/i915/display/i9xx_plane.c
+++ b/drivers/gpu/drm/i915/display/i9xx_plane.c
@@ -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;

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 71b4fa19f1e59c0faf5eccd705b3f05383fce559..3f2cbcd2626da0c68eab7f45eaa0a8bc85e0d654 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -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);
 

diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index bdd76b3729578a5c1f92f593e6745e09250eb3e4..7d77022235a5e8d133088112d3cbce47e070fe3a 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -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);

diff --git a/drivers/gpu/drm/i915/display/skl_universal_plane.c b/drivers/gpu/drm/i915/display/skl_universal_plane.c
index 950dc79dbdd46027ac44cfb5eaf9a15d6a6c4fa8..59ee0830de02f23ebfcc4d940d1758cdee1b23d8 100644 (file)
--- a/drivers/gpu/drm/i915/display/skl_universal_plane.c
+++ b/drivers/gpu/drm/i915/display/skl_universal_plane.c
@@ -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;