drm/i915/fb: convert intel_framebuffer_init() to struct drm_gem_object

Prefer the driver agnostic struct drm_gem_object over i915 specific
struct drm_i915_gem_object.

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/1b14bb0719c172304f38dfe59ea7240b3f42ed73.1726589119.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_fb.c b/drivers/gpu/drm/i915/display/intel_fb.c
index eb8dc3dd21eed4841cd1b0380d81cbd850298cf7..d863550021a0a1001850d4d4d597c3b66494d440 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -1963,20 +1963,20 @@ static const struct drm_framebuffer_funcs intel_fb_funcs = {
 };
 
 int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
-                          struct drm_i915_gem_object *obj,
+                          struct drm_gem_object *obj,
                           struct drm_mode_fb_cmd2 *mode_cmd)
 {
-       struct drm_i915_private *dev_priv = to_i915(intel_bo_to_drm_bo(obj)->dev);
+       struct drm_i915_private *dev_priv = to_i915(obj->dev);
        struct drm_framebuffer *fb = &intel_fb->base;
        u32 max_stride;
        int ret = -EINVAL;
        int i;
 
-       ret = intel_fb_bo_framebuffer_init(intel_fb, obj, mode_cmd);
+       ret = intel_fb_bo_framebuffer_init(intel_fb, to_intel_bo(obj), mode_cmd);
        if (ret)
                return ret;
 
-       intel_fb->frontbuffer = intel_frontbuffer_get(obj);
+       intel_fb->frontbuffer = intel_frontbuffer_get(to_intel_bo(obj));
        if (!intel_fb->frontbuffer) {
                ret = -ENOMEM;
                goto err;
@@ -2042,7 +2042,7 @@ int intel_framebuffer_init(struct intel_framebuffer *intel_fb,
                        }
                }
 
-               fb->obj[i] = intel_bo_to_drm_bo(obj);
+               fb->obj[i] = obj;
        }
 
        ret = intel_fill_fb_info(dev_priv, intel_fb);
@@ -2076,7 +2076,7 @@ err_free_dpt:
 err_frontbuffer_put:
        intel_frontbuffer_put(intel_fb->frontbuffer);
 err:
-       intel_fb_bo_framebuffer_fini(obj);
+       intel_fb_bo_framebuffer_fini(to_intel_bo(obj));
        return ret;
 }
 
@@ -2111,7 +2111,7 @@ intel_framebuffer_create(struct drm_i915_gem_object *obj,
        if (!intel_fb)
                return ERR_PTR(-ENOMEM);
 
-       ret = intel_framebuffer_init(intel_fb, obj, mode_cmd);
+       ret = intel_framebuffer_init(intel_fb, intel_bo_to_drm_bo(obj), mode_cmd);
        if (ret)
                goto err;
 

diff --git a/drivers/gpu/drm/i915/display/intel_fb.h b/drivers/gpu/drm/i915/display/intel_fb.h
index 2ca919bdbd7db9951b7577e4e3c50efd5fe92730..fef1f713dab0e0d90958369bd5718dad97fdd046 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.h
+++ b/drivers/gpu/drm/i915/display/intel_fb.h
@@ -85,7 +85,7 @@ void intel_fb_fill_view(const struct intel_framebuffer *fb, unsigned int rotatio
 int intel_plane_compute_gtt(struct intel_plane_state *plane_state);
 
 int intel_framebuffer_init(struct intel_framebuffer *ifb,
-                          struct drm_i915_gem_object *obj,
+                          struct drm_gem_object *obj,
                           struct drm_mode_fb_cmd2 *mode_cmd);
 struct drm_framebuffer *
 intel_user_framebuffer_create(struct drm_device *dev,

diff --git a/drivers/gpu/drm/i915/display/intel_plane_initial.c b/drivers/gpu/drm/i915/display/intel_plane_initial.c
index ada1792df5b3e9731f2c6a7460f8b9210e5e9ff0..62401f6a04e4fff068f2e148a8e0530b4615d919 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_plane_initial.c
+++ b/drivers/gpu/drm/i915/display/intel_plane_initial.c
@@ -302,7 +302,7 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
        mode_cmd.flags = DRM_MODE_FB_MODIFIERS;
 
        if (intel_framebuffer_init(to_intel_framebuffer(fb),
-                                  vma->obj, &mode_cmd)) {
+                                  intel_bo_to_drm_bo(vma->obj), &mode_cmd)) {
                drm_dbg_kms(&dev_priv->drm, "intel fb init failed\n");
                goto err_vma;
        }

diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index a50ab9eae40ae4ffc37efd52ad8affd45962a544..1b10ea499d8c8956993ceb7f2d3e6442ab0920d9 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -170,7 +170,7 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
                return false;
 
        if (intel_framebuffer_init(to_intel_framebuffer(fb),
-                                  bo, &mode_cmd)) {
+                                  &bo->ttm.base, &mode_cmd)) {
                drm_dbg_kms(&xe->drm, "intel fb init failed\n");
                goto err_bo;
        }