Commit 8e712bd7 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bb490f3e928fd8178277fde2435de80638fc5715.1717004739.git.jani.nikula@intel.com
parent 3ddb4f80

drivers/gpu/drm/xe/display/ext/i915_irq.c

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
 * Copyright © 2023 Intel Corporation

 */



#include "i915_drv.h"

#include "i915_irq.h"

#include "i915_reg.h"

#include "intel_uncore.h"

drivers/gpu/drm/xe/display/intel_fb_bo.c

+2 −3
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/xe/display/intel_fbdev_fb.c

+10 −11
Original line number Diff line number Diff line
@@ -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,

		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(dev_priv)) |

					   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;

	}

drivers/gpu/drm/xe/display/xe_dsb_buffer.c

+4 −5
Original line number Diff line number Diff line
@@ -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);

drivers/gpu/drm/xe/display/xe_fb_pin.c

+0 −1
Original line number Diff line number Diff line
@@ -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"