github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/intel: move i915_gtt_view_types.h to include/drm/intel

Browse Source 
The i915 and xe drivers share i915_gtt_view_types.h from i915
source. Move it to include/drm/intel/gtt_view_types.h.

Remove the i915 compat header.

v2: Keep comment for header guard #endif (Ville)

Reviewed-by: Maarten Lankhorst <dev@lankhorst.se>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/174f7e26be755b29a1286bf8b8ef0342dcc083a6.1790780340.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2026-09-30 17:59:57 +03:00
parent 4e8bc6b5bb
commit 042b855e19
5 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_display_types.h
View File

@ -41,10 +41,10 @@
#include <drm/drm_panel.h>
#include <drm/drm_rect.h>
#include <drm/drm_vblank_work.h>
#include <drm/intel/gtt_view_types.h>
#include <drm/intel/i915_hdcp_interface.h>
#include <uapi/drm/i915_drm.h>
#include "i915_gtt_view_types.h"
#include "intel_bios.h"
#include "intel_display.h"
#include "intel_display_conversion.h"

3
drivers/gpu/drm/i915/i915_vma_types.h
View File

@ -29,11 +29,10 @@
#include <linux/rbtree.h>
#include <drm/drm_mm.h>
#include <drm/intel/gtt_view_types.h>
#include "gem/i915_gem_object_types.h"
#include "i915_gtt_view_types.h"
/**
* DOC: Global GTT views
*

7
drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h
View File

@ -1,7 +0,0 @@
/* SPDX-License-Identifier: MIT */
/* Copyright © 2025 Intel Corporation */
#include "../../i915/i915_gtt_view_types.h"
/* Partial view not supported in xe, fail build if used. */
#define I915_GTT_VIEW_PARTIAL

4
drivers/gpu/drm/xe/display/xe_fb_pin.c
View File

@ -4,11 +4,9 @@
*/
#include <drm/intel/display_parent_interface.h>
#include <drm/intel/gtt_view_types.h>
#include <drm/ttm/ttm_bo.h>
/* FIXME move the types to parent interface? */
#include "i915_gtt_view_types.h"
/* FIXME move intel_remapped_info_size() & co. to parent interface? */
#include "intel_fb.h"

6
drivers/gpu/drm/i915/i915_gtt_view_types.h → include/drm/intel/gtt_view_types.h
View File

@ -1,8 +1,8 @@
/* SPDX-License-Identifier: MIT */
/* Copyright © 2025 Intel Corporation */
#ifndef __I915_GTT_VIEW_TYPES_H__
#define __I915_GTT_VIEW_TYPES_H__
#ifndef __DRM_INTEL_GTT_VIEW_TYPES_H__
#define __DRM_INTEL_GTT_VIEW_TYPES_H__
#include <linux/types.h>
@ -71,4 +71,4 @@ static inline bool i915_gtt_view_is_rotated(const struct i915_gtt_view *view)
return view->type == I915_GTT_VIEW_ROTATED;
}
#endif /* __I915_GTT_VIEW_TYPES_H__ */
#endif /* __DRM_INTEL_GTT_VIEW_TYPES_H__ */