drm/i915: Don't pass the framebuffer to low level pinning functions

Now that we have the pin_params the low level pinning code no
longer needs the entire framebuffer structure. The gem object
alone (along with the pin_params) is enough.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/20260416174448.28264-12-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.h b/drivers/gpu/drm/i915/display/intel_fb_pin.h
index 95f83bf7411fa0a19d053c5c40ad3b820a8d9f35..5825503c38ea915c07bc0d1acc7d88193bbe4303 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.h
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.h
@@ -8,7 +8,7 @@
 
 #include <linux/types.h>
 
-struct drm_framebuffer;
+struct drm_gem_object;
 struct i915_vma;
 struct intel_plane_state;
 struct i915_gtt_view;
@@ -26,7 +26,7 @@ struct intel_fb_pin_params {
 };
 
 struct i915_vma *
-intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
+intel_fb_pin_to_ggtt(struct drm_gem_object *obj,
                     const struct intel_fb_pin_params *pin_params,
                     int *out_fence_id);
 

diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c b/drivers/gpu/drm/i915/display/intel_fbdev.c
index 4c3e54acde81488500c6a7db2965184da6370c50..9ab0ac49abb7ece0776c6d64791702e6f8eec0f5 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/display/intel_fbdev.c
@@ -306,6 +306,8 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
                sizes->fb_height = fb->base.height;
        }
 
+       obj = intel_fb_bo(&fb->base);
+
        /* Pin the GGTT vma for our access via info->screen_base.
         * This also validates that any existing fb inherited from the
         * BIOS is suitable for own access.
@@ -317,7 +319,7 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
                                                       DRM_MODE_ROTATE_0);
        pin_params.needs_low_address = intel_plane_needs_low_address(display);
 
-       vma = intel_fb_pin_to_ggtt(&fb->base, &pin_params, NULL);
+       vma = intel_fb_pin_to_ggtt(obj, &pin_params, NULL);
        if (IS_ERR(vma)) {
                ret = PTR_ERR(vma);
                goto out_unlock;
@@ -328,8 +330,6 @@ int intel_fbdev_driver_fbdev_probe(struct drm_fb_helper *helper,
 
        info->fbops = &intelfb_ops;
 
-       obj = intel_fb_bo(&fb->base);
-
        ret = intel_bo_fbdev_fill_info(obj, info, vma);
        if (ret)
                goto out_unpin;

diff --git a/drivers/gpu/drm/i915/i915_fb_pin.c b/drivers/gpu/drm/i915/i915_fb_pin.c
index 5060ec8c76caee07d209604c2d4b9dbc4005671d..b0e121462ca36a37b1700e73be830a92d63efa87 100644 (file)
--- a/drivers/gpu/drm/i915/i915_fb_pin.c
+++ b/drivers/gpu/drm/i915/i915_fb_pin.c
@@ -23,12 +23,10 @@
 #include "i915_vma.h"
 
 static struct i915_vma *
-intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
-                   struct intel_dpt *dpt,
+intel_fb_pin_to_dpt(struct drm_gem_object *_obj, struct intel_dpt *dpt,
                    const struct intel_fb_pin_params *pin_params)
 {
-       struct drm_i915_private *i915 = to_i915(fb->dev);
-       struct drm_gem_object *_obj = intel_fb_bo(fb);
+       struct drm_i915_private *i915 = to_i915(_obj->dev);
        struct drm_i915_gem_object *obj = to_intel_bo(_obj);
        struct i915_address_space *vm = i915_dpt_to_vm(dpt);
        struct i915_gem_ww_ctx ww;
@@ -108,12 +106,11 @@ err:
 }
 
 struct i915_vma *
-intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
+intel_fb_pin_to_ggtt(struct drm_gem_object *_obj,
                     const struct intel_fb_pin_params *pin_params,
                     int *out_fence_id)
 {
-       struct drm_i915_private *i915 = to_i915(fb->dev);
-       struct drm_gem_object *_obj = intel_fb_bo(fb);
+       struct drm_i915_private *i915 = to_i915(_obj->dev);
        struct drm_i915_gem_object *obj = to_intel_bo(_obj);
        intel_wakeref_t wakeref;
        struct i915_gem_ww_ctx ww;
@@ -275,7 +272,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
                };
                int fence_id = -1;
 
-               vma = intel_fb_pin_to_ggtt(&fb->base, &pin_params,
+               vma = intel_fb_pin_to_ggtt(intel_fb_bo(&fb->base), &pin_params,
                                           intel_plane_uses_fence(plane_state) ? &fence_id : NULL);
                if (IS_ERR(vma))
                        return PTR_ERR(vma);
@@ -295,7 +292,7 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state,
 
                plane_state->ggtt_vma = vma;
 
-               vma = intel_fb_pin_to_dpt(&fb->base, fb->dpt, &pin_params);
+               vma = intel_fb_pin_to_dpt(intel_fb_bo(&fb->base), fb->dpt, &pin_params);
                if (IS_ERR(vma)) {
                        i915_dpt_unpin_from_ggtt(fb->dpt);
                        plane_state->ggtt_vma = NULL;

diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index 44562769fbc9a970089e248919553fce8188b6cc..5d7b30f629308da8854f5a0813c764c25b7ea6a1 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -139,14 +139,13 @@ write_dpt_remapped(struct xe_bo *bo,
        }
 }
 
-static int __xe_pin_fb_vma_dpt(const struct intel_framebuffer *fb,
+static int __xe_pin_fb_vma_dpt(struct drm_gem_object *obj,
                               const struct intel_fb_pin_params *pin_params,
                               struct i915_vma *vma)
 {
-       struct xe_device *xe = to_xe_device(fb->base.dev);
+       struct xe_device *xe = to_xe_device(obj->dev);
        struct xe_tile *tile0 = xe_device_get_root_tile(xe);
        struct xe_ggtt *ggtt = tile0->mem.ggtt;
-       struct drm_gem_object *obj = intel_fb_bo(&fb->base);
        const struct i915_gtt_view *view = pin_params->view;
        struct xe_bo *bo = gem_to_xe_bo(obj), *dpt;
        u32 dpt_size, size = bo->ttm.base.size;
@@ -268,14 +267,13 @@ static void write_ggtt_rotated_node(struct xe_ggtt *ggtt, struct xe_ggtt_node *n
                                   rot_info->plane[i].dst_stride);
 }
 
-static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb,
+static int __xe_pin_fb_vma_ggtt(struct drm_gem_object *obj,
                                const struct intel_fb_pin_params *pin_params,
                                struct i915_vma *vma)
 {
-       struct drm_gem_object *obj = intel_fb_bo(&fb->base);
        const struct i915_gtt_view *view = pin_params->view;
        struct xe_bo *bo = gem_to_xe_bo(obj);
-       struct xe_device *xe = to_xe_device(fb->base.dev);
+       struct xe_device *xe = to_xe_device(obj->dev);
        struct xe_tile *tile0 = xe_device_get_root_tile(xe);
        struct xe_ggtt *ggtt = tile0->mem.ggtt;
        u64 pte, size;
@@ -318,13 +316,11 @@ static int __xe_pin_fb_vma_ggtt(const struct intel_framebuffer *fb,
        return ret;
 }
 
-static struct i915_vma *__xe_pin_fb_vma(const struct intel_framebuffer *fb, bool is_dpt,
+static struct i915_vma *__xe_pin_fb_vma(struct drm_gem_object *obj, bool is_dpt,
                                        const struct intel_fb_pin_params *pin_params)
 {
-       struct drm_device *dev = fb->base.dev;
-       struct xe_device *xe = to_xe_device(dev);
+       struct xe_device *xe = to_xe_device(obj->dev);
        struct i915_vma *vma = kzalloc(sizeof(*vma), GFP_KERNEL);
-       struct drm_gem_object *obj = intel_fb_bo(&fb->base);
        struct xe_bo *bo = gem_to_xe_bo(obj);
        struct xe_validation_ctx ctx;
        struct drm_exec exec;
@@ -376,9 +372,9 @@ static struct i915_vma *__xe_pin_fb_vma(const struct intel_framebuffer *fb, bool
 
        vma->bo = bo;
        if (is_dpt)
-               ret = __xe_pin_fb_vma_dpt(fb, pin_params, vma);
+               ret = __xe_pin_fb_vma_dpt(obj, pin_params, vma);
        else
-               ret = __xe_pin_fb_vma_ggtt(fb, pin_params, vma);
+               ret = __xe_pin_fb_vma_ggtt(obj, pin_params, vma);
        if (ret)
                goto err_unpin;
 
@@ -412,14 +408,14 @@ static void __xe_unpin_fb_vma(struct i915_vma *vma)
 }
 
 struct i915_vma *
-intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
+intel_fb_pin_to_ggtt(struct drm_gem_object *obj,
                     const struct intel_fb_pin_params *pin_params,
                     int *out_fence_id)
 {
        if (out_fence_id)
                *out_fence_id = -1;
 
-       return __xe_pin_fb_vma(to_intel_framebuffer(fb), false, pin_params);
+       return __xe_pin_fb_vma(obj, false, pin_params);
 }
 
 void intel_fb_unpin_vma(struct i915_vma *vma, int fence_id)
@@ -469,7 +465,6 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
        struct drm_gem_object *obj = intel_fb_bo(fb);
        struct xe_bo *bo = gem_to_xe_bo(obj);
        struct i915_vma *vma;
-       struct intel_framebuffer *intel_fb = to_intel_framebuffer(fb);
        struct intel_plane *plane = to_intel_plane(new_plane_state->uapi.plane);
        struct intel_fb_pin_params pin_params = {
                .view = &new_plane_state->view.gtt,
@@ -483,8 +478,7 @@ int intel_plane_pin_fb(struct intel_plane_state *new_plane_state,
        /* We reject creating !SCANOUT fb's, so this is weird.. */
        drm_WARN_ON(bo->ttm.base.dev, !(bo->flags & XE_BO_FLAG_FORCE_WC));
 
-       vma = __xe_pin_fb_vma(intel_fb, intel_fb_uses_dpt(&intel_fb->base),
-                             &pin_params);
+       vma = __xe_pin_fb_vma(obj, intel_fb_uses_dpt(fb), &pin_params);
 
        if (IS_ERR(vma))
                return PTR_ERR(vma);

diff --git a/drivers/gpu/drm/xe/display/xe_initial_plane.c b/drivers/gpu/drm/xe/display/xe_initial_plane.c
index 4f0ad4692ed6e9f4f08d371c5117a2c9655637a5..8e3c0c4b81fe152fb41c89af71529e12a3e95871 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_initial_plane.c
+++ b/drivers/gpu/drm/xe/display/xe_initial_plane.c
@@ -138,7 +138,7 @@ xe_initial_plane_setup(struct drm_plane_state *_plane_state,
                .view = &plane_state->view.gtt,
        };
 
-       vma = intel_fb_pin_to_ggtt(fb, &pin_params, NULL);
+       vma = intel_fb_pin_to_ggtt(intel_fb_bo(fb), &pin_params, NULL);
        if (IS_ERR(vma))
                return PTR_ERR(vma);