drm/i915/display: convert intel_atomic_plane.c 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/a60e14663f53e921bf228420af0e3d8762d92b82.1726589119.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/i915/display/intel_atomic_plane.c b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
index 928d985f9985e7bcfc538ec6be074af8fee94fb6..18c516298e79ae751845347298e2bd16ba816a11 100644 (file)
--- a/drivers/gpu/drm/i915/display/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/display/intel_atomic_plane.c
@@ -35,11 +35,11 @@
 #include <linux/dma-resv.h>
 
 #include <drm/drm_atomic_helper.h>
-#include <drm/drm_gem_atomic_helper.h>
 #include <drm/drm_blend.h>
 #include <drm/drm_fourcc.h>
+#include <drm/drm_gem.h>
+#include <drm/drm_gem_atomic_helper.h>
 
-#include "gem/i915_gem_object_types.h"
 #include "i915_config.h"
 #include "i9xx_plane_regs.h"
 #include "intel_atomic_plane.h"
@@ -1115,8 +1115,8 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
        struct drm_i915_private *dev_priv = to_i915(plane->base.dev);
        struct intel_plane_state *old_plane_state =
                intel_atomic_get_old_plane_state(state, plane);
-       struct drm_i915_gem_object *obj = intel_fb_obj(new_plane_state->hw.fb);
-       struct drm_i915_gem_object *old_obj = intel_fb_obj(old_plane_state->hw.fb);
+       struct drm_gem_object *obj = intel_fb_bo(new_plane_state->hw.fb);
+       struct drm_gem_object *old_obj = intel_fb_bo(old_plane_state->hw.fb);
        int ret;
 
        if (old_obj) {
@@ -1136,7 +1136,7 @@ intel_prepare_plane_fb(struct drm_plane *_plane,
                 * can safely continue.
                 */
                if (new_crtc_state && intel_crtc_needs_modeset(new_crtc_state)) {
-                       ret = add_dma_resv_fences(intel_bo_to_drm_bo(old_obj)->resv,
+                       ret = add_dma_resv_fences(old_obj->resv,
                                                  &new_plane_state->uapi);
                        if (ret < 0)
                                return ret;
@@ -1196,7 +1196,7 @@ intel_cleanup_plane_fb(struct drm_plane *plane,
        struct intel_atomic_state *state =
                to_intel_atomic_state(old_plane_state->uapi.state);
        struct drm_i915_private *dev_priv = to_i915(plane->dev);
-       struct drm_i915_gem_object *obj = intel_fb_obj(old_plane_state->hw.fb);
+       struct drm_gem_object *obj = intel_fb_bo(old_plane_state->hw.fb);
 
        if (!obj)
                return;