drm/i915/fb: convert intel_fb_bo_framebuffer_fini() to struct drm_i915_gem_object

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

The xe specific intel_fb_bo.h becomes redundant. Remove it, and rely on
the common header in i915 display.

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/0efbc9ae2dbe157f92fa71d423ed37fd17346da5.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 107ee5d3665fb7fd35f52c0296027ebe7cc1048d..7bd4a519cd10837ca2f2d80dd306460b99d61700 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb.c
+++ b/drivers/gpu/drm/i915/display/intel_fb.c
@@ -1870,7 +1870,7 @@ static void intel_user_framebuffer_destroy(struct drm_framebuffer *fb)
 
        intel_frontbuffer_put(intel_fb->frontbuffer);
 
-       intel_fb_bo_framebuffer_fini(intel_fb_obj(fb));
+       intel_fb_bo_framebuffer_fini(intel_fb_bo(fb));
 
        kfree(intel_fb);
 }
@@ -2076,7 +2076,7 @@ err_free_dpt:
 err_frontbuffer_put:
        intel_frontbuffer_put(intel_fb->frontbuffer);
 err:
-       intel_fb_bo_framebuffer_fini(to_intel_bo(obj));
+       intel_fb_bo_framebuffer_fini(obj);
        return ret;
 }
 

diff --git a/drivers/gpu/drm/i915/display/intel_fb_bo.c b/drivers/gpu/drm/i915/display/intel_fb_bo.c
index 0932bd9f0100ac3509800e1a9cf6f9ed3f363a7f..810ca6ff86401b8557f5a06791c25fe5594f2ba0 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_bo.c
+++ b/drivers/gpu/drm/i915/display/intel_fb_bo.c
@@ -11,7 +11,7 @@
 #include "intel_fb.h"
 #include "intel_fb_bo.h"
 
-void intel_fb_bo_framebuffer_fini(struct drm_i915_gem_object *obj)
+void intel_fb_bo_framebuffer_fini(struct drm_gem_object *obj)
 {
        /* Nothing to do for i915 */
 }

diff --git a/drivers/gpu/drm/i915/display/intel_fb_bo.h b/drivers/gpu/drm/i915/display/intel_fb_bo.h
index 6030029042e798db5b8657234c3719e3e1cca992..e71acd1bcb24201898acde716579fea8dbfee0e7 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_fb_bo.h
+++ b/drivers/gpu/drm/i915/display/intel_fb_bo.h
@@ -8,12 +8,11 @@
 
 struct drm_file;
 struct drm_gem_object;
-struct drm_i915_gem_object;
 struct drm_i915_private;
 struct drm_mode_fb_cmd2;
 struct intel_framebuffer;
 
-void intel_fb_bo_framebuffer_fini(struct drm_i915_gem_object *obj);
+void intel_fb_bo_framebuffer_fini(struct drm_gem_object *obj);
 
 int intel_fb_bo_framebuffer_init(struct intel_framebuffer *intel_fb,
                                 struct drm_gem_object *obj,

diff --git a/drivers/gpu/drm/xe/display/intel_fb_bo.c b/drivers/gpu/drm/xe/display/intel_fb_bo.c
index a3ec82d5ac8aa0c6682ab65be8d40024ae4ea458..4d209ebc26c2a117fa6cca32342355951d9ae8c1 100644 (file)
--- a/drivers/gpu/drm/xe/display/intel_fb_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_fb_bo.c
@@ -11,8 +11,10 @@
 #include "intel_fb_bo.h"
 #include "xe_bo.h"
 
-void intel_fb_bo_framebuffer_fini(struct xe_bo *bo)
+void intel_fb_bo_framebuffer_fini(struct drm_gem_object *obj)
 {
+       struct xe_bo *bo = gem_to_xe_bo(obj);
+
        if (bo->flags & XE_BO_FLAG_PINNED) {
                /* Unpin our kernel fb first */
                xe_bo_lock(bo, false);

diff --git a/drivers/gpu/drm/xe/display/intel_fb_bo.h b/drivers/gpu/drm/xe/display/intel_fb_bo.h
deleted file mode 100644 (file)
index ad835bc..0000000
--- a/drivers/gpu/drm/xe/display/intel_fb_bo.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: MIT */
-/*
- * Copyright © 2021 Intel Corporation
- */
-
-#ifndef __INTEL_FB_BO_H__
-#define __INTEL_FB_BO_H__
-
-struct drm_file;
-struct drm_gem_object;
-struct drm_i915_private;
-struct drm_mode_fb_cmd2;
-struct intel_framebuffer;
-struct xe_bo;
-
-void intel_fb_bo_framebuffer_fini(struct xe_bo *bo);
-int intel_fb_bo_framebuffer_init(struct intel_framebuffer *intel_fb,
-                                struct drm_gem_object *obj,
-                                struct drm_mode_fb_cmd2 *mode_cmd);
-
-struct drm_gem_object *intel_fb_bo_lookup_valid_bo(struct drm_i915_private *i915,
-                                                  struct drm_file *filp,
-                                                  const struct drm_mode_fb_cmd2 *mode_cmd);
-
-#endif