Skip to content

Commit cef2c72

Browse files
committed
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
1 parent 45b9545 commit cef2c72

4 files changed

Lines changed: 11 additions & 4 deletions

File tree

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "i9xx_plane.h"
1616
#include "i9xx_plane_regs.h"
1717
#include "intel_atomic.h"
18-
#include "intel_bo.h"
1918
#include "intel_de.h"
2019
#include "intel_display_irq.h"
2120
#include "intel_display_regs.h"
@@ -1178,7 +1177,7 @@ i9xx_get_initial_plane_config(struct intel_crtc *crtc,
11781177

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

1181-
intel_fb = intel_bo_alloc_framebuffer();
1180+
intel_fb = intel_framebuffer_alloc();
11821181
if (!intel_fb) {
11831182
drm_dbg_kms(display->drm, "failed to alloc fb\n");
11841183
return;

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2340,14 +2340,19 @@ intel_user_framebuffer_create(struct drm_device *dev,
23402340
return fb;
23412341
}
23422342

2343+
struct intel_framebuffer *intel_framebuffer_alloc(void)
2344+
{
2345+
return intel_bo_alloc_framebuffer();
2346+
}
2347+
23432348
struct drm_framebuffer *
23442349
intel_framebuffer_create(struct drm_gem_object *obj,
23452350
struct drm_mode_fb_cmd2 *mode_cmd)
23462351
{
23472352
struct intel_framebuffer *intel_fb;
23482353
int ret;
23492354

2350-
intel_fb = intel_bo_alloc_framebuffer();
2355+
intel_fb = intel_framebuffer_alloc();
23512356
if (!intel_fb)
23522357
return ERR_PTR(-ENOMEM);
23532358

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ void intel_add_fb_offsets(int *x, int *y,
103103
int intel_framebuffer_init(struct intel_framebuffer *ifb,
104104
struct drm_gem_object *obj,
105105
struct drm_mode_fb_cmd2 *mode_cmd);
106+
107+
struct intel_framebuffer *intel_framebuffer_alloc(void);
108+
106109
struct drm_framebuffer *
107110
intel_framebuffer_create(struct drm_gem_object *obj,
108111
struct drm_mode_fb_cmd2 *mode_cmd);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3028,7 +3028,7 @@ skl_get_initial_plane_config(struct intel_crtc *crtc,
30283028
return;
30293029
}
30303030

3031-
intel_fb = intel_bo_alloc_framebuffer();
3031+
intel_fb = intel_framebuffer_alloc();
30323032
if (!intel_fb) {
30333033
drm_dbg_kms(display->drm, "failed to alloc fb\n");
30343034
return;

0 commit comments

Comments
 (0)