drm/i915/fb: remove intel_fb_obj()

Convert remaining users of the struct drm_i915_gem_object based
intel_fb_obj() to the struct drm_gem_object based intel_fb_bo(), and
remove intel_fb_obj().

Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e1fbf33d71813f39621ba0ac7e404821a3f63588.1726589119.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_dpt.c b/drivers/gpu/drm/i915/display/intel_dpt.c
index 3a6d990..ce8c76e 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_dpt.c
+++ b/drivers/gpu/drm/i915/display/intel_dpt.c
@@ -242,7 +242,7 @@ void intel_dpt_suspend(struct drm_i915_private *i915)
 struct i915_address_space *
 intel_dpt_create(struct intel_framebuffer *fb)
 {
-       struct drm_gem_object *obj = &intel_fb_obj(&fb->base)->base;
+       struct drm_gem_object *obj = intel_fb_bo(&fb->base);
        struct drm_i915_private *i915 = to_i915(obj->dev);
        struct drm_i915_gem_object *dpt_obj;
        struct i915_address_space *vm;

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index 6ac9642..eb5ff3b 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -2122,11 +2122,6 @@ err:
        return ERR_PTR(ret);
 }
 
-struct drm_i915_gem_object *intel_fb_obj(const struct drm_framebuffer *fb)
-{
-       return fb ? to_intel_bo(fb->obj[0]) : NULL;
-}
-
 struct drm_gem_object *intel_fb_bo(const struct drm_framebuffer *fb)
 {
        return fb ? fb->obj[0] : NULL;

diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index c11cca4..8240feb 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -100,8 +100,6 @@ bool intel_fb_uses_dpt(const struct drm_framebuffer *fb);
 
 unsigned int intel_fb_modifier_to_tiling(u64 fb_modifier);
 
-struct drm_i915_gem_object *intel_fb_obj(const struct drm_framebuffer *fb);
-
 struct drm_gem_object *intel_fb_bo(const struct drm_framebuffer *fb);
 
 #endif /* __INTEL_FB_H__ */

diff --git a/drivers/gpu/drm/i915/display/intel_fb_pin.c b/drivers/gpu/drm/i915/display/intel_fb_pin.c
index 575b271..d3a86f9 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_pin.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_pin.c
@@ -26,7 +26,8 @@ intel_fb_pin_to_dpt(const struct drm_framebuffer *fb,
 {
        struct drm_device *dev = fb->dev;
        struct drm_i915_private *dev_priv = to_i915(dev);
-       struct drm_i915_gem_object *obj = intel_fb_obj(fb);
+       struct drm_gem_object *_obj = intel_fb_bo(fb);
+       struct drm_i915_gem_object *obj = to_intel_bo(_obj);
        struct i915_gem_ww_ctx ww;
        struct i915_vma *vma;
        int ret;
@@ -111,7 +112,8 @@ intel_fb_pin_to_ggtt(const struct drm_framebuffer *fb,
 {
        struct drm_device *dev = fb->dev;
        struct drm_i915_private *dev_priv = to_i915(dev);
-       struct drm_i915_gem_object *obj = intel_fb_obj(fb);
+       struct drm_gem_object *_obj = intel_fb_bo(fb);
+       struct drm_i915_gem_object *obj = to_intel_bo(_obj);
        intel_wakeref_t wakeref;
        struct i915_gem_ww_ctx ww;
        struct i915_vma *vma;
@@ -274,9 +276,11 @@ int intel_plane_pin_fb(struct intel_plane_state *plane_state)
                 * will trigger might_sleep() even if it won't actually sleep,
                 * which is the case when the fb has already been pinned.
                 */
-               if (intel_plane_needs_physical(plane))
-                       plane_state->phys_dma_addr =
-                               i915_gem_object_get_dma_address(intel_fb_obj(&fb->base), 0);
+               if (intel_plane_needs_physical(plane)) {
+                       struct drm_i915_gem_object *obj = to_intel_bo(intel_fb_bo(&fb->base));
+
+                       plane_state->phys_dma_addr = i915_gem_object_get_dma_address(obj, 0);
+               }
        } else {
                unsigned int alignment = intel_plane_fb_min_alignment(plane_state);