Commit 208f5310 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: include xe_bo.h, gem_object_types etc. where needed 



Include what you use. The dependencies on the headers, and what they
include, is a bit convoluted. Add xe compat gem/gem_object_types.h. Fix
all the places needed.

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/e9ca3d6127ea22f252d9dbf30cfde99e37538c99.1717004739.git.jani.nikula@intel.com
parent 61e22c77

drivers/gpu/drm/i915/display/intel_atomic_plane.c

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
 */



#include <linux/dma-fence-chain.h>

#include <linux/dma-resv.h>



#include <drm/drm_atomic_helper.h>

#include <drm/drm_gem_atomic_helper.h>

drivers/gpu/drm/i915/display/intel_display_types.h

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ 
#include <drm/intel/i915_hdcp_interface.h>

#include <media/cec-notifier.h>



#include "gem/i915_gem_object_types.h" /* for to_intel_bo() */

#include "i915_vma.h"

#include "i915_vma_types.h"

#include "intel_bios.h"

drivers/gpu/drm/i915/display/intel_fb.c

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/dma-fence.h>

#include <linux/dma-resv.h>



#include "gem/i915_gem_object.h"

#include "i915_drv.h"

#include "intel_display.h"

#include "intel_display_types.h"

drivers/gpu/drm/i915/display/intel_fbdev.c

+1 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ 
#include <drm/drm_gem_framebuffer_helper.h>



#include "gem/i915_gem_mman.h"

#include "gem/i915_gem_object.h"



#include "i915_drv.h"

#include "intel_display_types.h"

drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_types.h

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/* Copyright © 2024 Intel Corporation */



#ifndef __I915_GEM_OBJECT_TYPES_H__

#define __I915_GEM_OBJECT_TYPES_H__



#include "xe_bo.h"



#define to_intel_bo(x) gem_to_xe_bo((x))



#endif