drm/xe/display: drop i915_drv.h include from xe code

Drop i915_drv.h include from xe display code as much as possible, and
switch to xe types where necessary.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@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/bb490f3e928fd8178277fde2435de80638fc5715.1717004739.git.jani.nikula@intel.com

diff --git a/drivers/gpu/drm/xe/display/ext/i915_irq.c b/drivers/gpu/drm/xe/display/ext/i915_irq.c
index bee191a4a97dfc888f065f1279eb46bf51da1aa5..eb40f1cb44f680c3230e94bae0284941ddb7401b 100644 (file)
--- a/drivers/gpu/drm/xe/display/ext/i915_irq.c
+++ b/drivers/gpu/drm/xe/display/ext/i915_irq.c
@@ -3,7 +3,6 @@
  * Copyright © 2023 Intel Corporation
  */
 
-#include "i915_drv.h"
 #include "i915_irq.h"
 #include "i915_reg.h"
 #include "intel_uncore.h"

diff --git a/drivers/gpu/drm/xe/display/intel_fb_bo.c b/drivers/gpu/drm/xe/display/intel_fb_bo.c
index b89cda053d2c6309c53983be53204b01baa730db..f835492f73fb42d8e816ba3a6b20f3b30b1dbc0a 100644 (file)
--- a/drivers/gpu/drm/xe/display/intel_fb_bo.c
+++ b/drivers/gpu/drm/xe/display/intel_fb_bo.c
@@ -6,7 +6,6 @@
 #include <drm/drm_modeset_helper.h>
 #include <drm/ttm/ttm_bo.h>
 
-#include "i915_drv.h"
 #include "intel_display_types.h"
 #include "intel_fb_bo.h"
 #include "xe_bo.h"
@@ -26,7 +25,7 @@ int intel_fb_bo_framebuffer_init(struct intel_framebuffer *intel_fb,
                                 struct xe_bo *bo,
                                 struct drm_mode_fb_cmd2 *mode_cmd)
 {
-       struct drm_i915_private *i915 = to_i915(bo->ttm.base.dev);
+       struct xe_device *xe = to_xe_device(bo->ttm.base.dev);
        int ret;
 
        xe_bo_get(bo);
@@ -42,7 +41,7 @@ int intel_fb_bo_framebuffer_init(struct intel_framebuffer *intel_fb,
                 * mode when the boect is VM_BINDed, so we can only set
                 * coherency with display when unbound.
                 */
-               if (XE_IOCTL_DBG(i915, !list_empty(&bo->ttm.base.gpuva.list))) {
+               if (XE_IOCTL_DBG(xe, !list_empty(&bo->ttm.base.gpuva.list))) {
                        ttm_bo_unreserve(&bo->ttm);
                        ret = -EINVAL;
                        goto err;

diff --git a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
index 5ecc7d4679348ddcdf8ec226f9d54141c8b14b8e..816ad13821a837f6ad8d86b1635b1de9ee536ca9 100644 (file)
--- a/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
+++ b/drivers/gpu/drm/xe/display/intel_fbdev_fb.c
@@ -5,7 +5,6 @@
 
 #include <drm/drm_fb_helper.h>
 
-#include "i915_drv.h"
 #include "intel_display_types.h"
 #include "intel_fbdev_fb.h"
 #include "xe_bo.h"
@@ -17,7 +16,7 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
 {
        struct drm_framebuffer *fb;
        struct drm_device *dev = helper->dev;
-       struct drm_i915_private *dev_priv = to_i915(dev);
+       struct xe_device *xe = to_xe_device(dev);
        struct drm_mode_fb_cmd2 mode_cmd = {};
        struct drm_i915_gem_object *obj;
        int size;
@@ -38,26 +37,26 @@ struct intel_framebuffer *intel_fbdev_fb_alloc(struct drm_fb_helper *helper,
        size = PAGE_ALIGN(size);
        obj = ERR_PTR(-ENODEV);
 
-       if (!IS_DGFX(dev_priv)) {
-               obj = xe_bo_create_pin_map(dev_priv, xe_device_get_root_tile(dev_priv),
+       if (!IS_DGFX(xe)) {
+               obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe),
                                           NULL, size,
                                           ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
                                           XE_BO_FLAG_STOLEN |
                                           XE_BO_FLAG_PINNED);
                if (!IS_ERR(obj))
-                       drm_info(&dev_priv->drm, "Allocated fbdev into stolen\n");
+                       drm_info(&xe->drm, "Allocated fbdev into stolen\n");
                else
-                       drm_info(&dev_priv->drm, "Allocated fbdev into stolen failed: %li\n", PTR_ERR(obj));
+                       drm_info(&xe->drm, "Allocated fbdev into stolen failed: %li\n", PTR_ERR(obj));
        }
        if (IS_ERR(obj)) {
-               obj = xe_bo_create_pin_map(dev_priv, xe_device_get_root_tile(dev_priv), NULL, size,
-                                         ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
-                                         XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(dev_priv)) |
-                                         XE_BO_FLAG_PINNED);
+               obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe), NULL, size,
+                                          ttm_bo_type_kernel, XE_BO_FLAG_SCANOUT |
+                                          XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |
+                                          XE_BO_FLAG_PINNED);
        }
 
        if (IS_ERR(obj)) {
-               drm_err(&dev_priv->drm, "failed to allocate framebuffer (%pe)\n", obj);
+               drm_err(&xe->drm, "failed to allocate framebuffer (%pe)\n", obj);
                fb = ERR_PTR(-ENOMEM);
                goto err;
        }

diff --git a/drivers/gpu/drm/xe/display/xe_dsb_buffer.c b/drivers/gpu/drm/xe/display/xe_dsb_buffer.c
index 44c9fd2143cc62885cde9cb0c2cde45c8222d2c3..9e860c61f4b33f7ed19a579ab47406d6ec47ffb9 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_dsb_buffer.c
+++ b/drivers/gpu/drm/xe/display/xe_dsb_buffer.c
@@ -3,7 +3,6 @@
  * Copyright 2023, Intel Corporation.
  */
 
-#include "i915_drv.h"
 #include "i915_vma.h"
 #include "intel_display_types.h"
 #include "intel_dsb_buffer.h"
@@ -34,18 +33,18 @@ void intel_dsb_buffer_memset(struct intel_dsb_buffer *dsb_buf, u32 idx, u32 val,
 
 bool intel_dsb_buffer_create(struct intel_crtc *crtc, struct intel_dsb_buffer *dsb_buf, size_t size)
 {
-       struct drm_i915_private *i915 = to_i915(crtc->base.dev);
-       struct drm_i915_gem_object *obj;
+       struct xe_device *xe = to_xe_device(crtc->base.dev);
+       struct xe_bo *obj;
        struct i915_vma *vma;
 
        vma = kzalloc(sizeof(*vma), GFP_KERNEL);
        if (!vma)
                return false;
 
-       obj = xe_bo_create_pin_map(i915, xe_device_get_root_tile(i915),
+       obj = xe_bo_create_pin_map(xe, xe_device_get_root_tile(xe),
                                   NULL, PAGE_ALIGN(size),
                                   ttm_bo_type_kernel,
-                                  XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(i915)) |
+                                  XE_BO_FLAG_VRAM_IF_DGFX(xe_device_get_root_tile(xe)) |
                                   XE_BO_FLAG_GGTT);
        if (IS_ERR(obj)) {
                kfree(vma);

diff --git a/drivers/gpu/drm/xe/display/xe_fb_pin.c b/drivers/gpu/drm/xe/display/xe_fb_pin.c
index 0449cdb892f3e21b885840d5a7f83049bf0b65a1..a2f4172091242b2db69e5a3686dd31893be9a369 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_fb_pin.c
+++ b/drivers/gpu/drm/xe/display/xe_fb_pin.c
@@ -5,7 +5,6 @@
 
 #include <drm/ttm/ttm_bo.h>
 
-#include "i915_drv.h"
 #include "intel_display_types.h"
 #include "intel_dpt.h"
 #include "intel_fb.h"

diff --git a/drivers/gpu/drm/xe/display/xe_plane_initial.c b/drivers/gpu/drm/xe/display/xe_plane_initial.c
index 7672a0cffbd8f69d3cbae7418c68d461cea6e475..e135b20962d9c90be958505a7791ccb35e5d1622 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_plane_initial.c
+++ b/drivers/gpu/drm/xe/display/xe_plane_initial.c
@@ -9,7 +9,6 @@
 #include "regs/xe_gtt_defs.h"
 #include "xe_ggtt.h"
 
-#include "i915_drv.h"
 #include "intel_atomic_plane.h"
 #include "intel_crtc.h"
 #include "intel_display.h"
@@ -25,10 +24,10 @@ intel_reuse_initial_plane_obj(struct intel_crtc *this,
                              const struct intel_initial_plane_config plane_configs[],
                              struct drm_framebuffer **fb)
 {
-       struct drm_i915_private *i915 = to_i915(this->base.dev);
+       struct xe_device *xe = to_xe_device(this->base.dev);
        struct intel_crtc *crtc;
 
-       for_each_intel_crtc(&i915->drm, crtc) {
+       for_each_intel_crtc(&xe->drm, crtc) {
                struct intel_plane *plane =
                        to_intel_plane(crtc->base.primary);
                const struct intel_plane_state *plane_state =
@@ -135,8 +134,7 @@ static bool
 intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
                              struct intel_initial_plane_config *plane_config)
 {
-       struct drm_device *dev = crtc->base.dev;
-       struct drm_i915_private *dev_priv = to_i915(dev);
+       struct xe_device *xe = to_xe_device(crtc->base.dev);
        struct drm_mode_fb_cmd2 mode_cmd = { 0 };
        struct drm_framebuffer *fb = &plane_config->fb->base;
        struct xe_bo *bo;
@@ -148,9 +146,9 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
        case I915_FORMAT_MOD_4_TILED:
                break;
        default:
-               drm_dbg(&dev_priv->drm,
-                       "Unsupported modifier for initial FB: 0x%llx\n",
-                       fb->modifier);
+               drm_dbg_kms(&xe->drm,
+                           "Unsupported modifier for initial FB: 0x%llx\n",
+                           fb->modifier);
                return false;
        }
 
@@ -161,13 +159,13 @@ intel_alloc_initial_plane_obj(struct intel_crtc *crtc,
        mode_cmd.modifier[0] = fb->modifier;
        mode_cmd.flags = DRM_MODE_FB_MODIFIERS;
 
-       bo = initial_plane_bo(dev_priv, plane_config);
+       bo = initial_plane_bo(xe, plane_config);
        if (!bo)
                return false;
 
        if (intel_framebuffer_init(to_intel_framebuffer(fb),
                                   bo, &mode_cmd)) {
-               drm_dbg_kms(&dev_priv->drm, "intel fb init failed\n");
+               drm_dbg_kms(&xe->drm, "intel fb init failed\n");
                goto err_bo;
        }
        /* Reference handed over to fb */