github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-29 10:41:49 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/xe/compat: refactor compat i915_drv.h

Browse Source 
The compat i915_drv.h contains things that aren't there in the original
i915_drv.h. Split out gem/i915_gem_object.h and i915_scheduler_types.h,
moving the corresponding pieces out, including FORCEWAKE_ALL to
intel_uncore.h.

Technically I915_PRIORITY_DISPLAY should be in i915_priolist_types.h,
but it's a bit overkill to split out another file just for
that. i915_scheduler_types.h shall do.

With this, the compat i915_drv.h becomes a strict subset of the
original.

Reviewed-by: Nemesa Garg <nemesa.garg@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/d6bd95bf52aa37f48ddec3e675b7a3cc66829eef.1741192597.git.jani.nikula@intel.com
[Jani: fix i915_gem_object.h header guard while applying]
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
This commit is contained in:
Jani Nikula 2025-03-05 18:38:22 +02:00
parent fb64f5568c
commit 2fff55d499
5 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/i915/display/intel_atomic_plane.c
View File

@ -41,8 +41,10 @@
#include <drm/drm_gem.h>
#include <drm/drm_gem_atomic_helper.h>
#include "gem/i915_gem_object.h"
#include "i915_config.h"
#include "i915_drv.h"
#include "i915_scheduler_types.h"
#include "i915_vma.h"
#include "i9xx_plane_regs.h"
#include "intel_atomic_plane.h"

15
drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object.h Normal file
View File

@ -0,0 +1,15 @@
/* SPDX-License-Identifier: MIT */
/* Copyright © 2025 Intel Corporation */
#ifndef __I915_GEM_OBJECT_H__
#define __I915_GEM_OBJECT_H__
struct dma_fence;
struct i915_sched_attr;
static inline void i915_gem_fence_wait_priority(struct dma_fence *fence,
const struct i915_sched_attr *attr)
{
}
#endif

8
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
View File

@ -95,14 +95,6 @@ static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
#define HAS_128_BYTE_Y_TILING(xe) (xe || 1)
#define I915_PRIORITY_DISPLAY 0
struct i915_sched_attr {
int priority;
};
#define i915_gem_fence_wait_priority(fence, attr) do { (void) attr; } while (0)
#define FORCEWAKE_ALL XE_FORCEWAKE_ALL
#ifdef CONFIG_ARM64
/*
* arm64 indirectly includes linux/rtc.h,

13
drivers/gpu/drm/xe/compat-i915-headers/i915_scheduler_types.h Normal file
View File

@ -0,0 +1,13 @@
/* SPDX-License-Identifier: MIT */
/* Copyright © 2025 Intel Corporation */
#ifndef __I915_SCHEDULER_TYPES_H__
#define __I915_SCHEDULER_TYPES_H__
#define I915_PRIORITY_DISPLAY 0
struct i915_sched_attr {
int priority;
};
#endif

2
drivers/gpu/drm/xe/compat-i915-headers/intel_uncore.h
View File

@ -10,6 +10,8 @@
#include "xe_device_types.h"
#include "xe_mmio.h"
#define FORCEWAKE_ALL XE_FORCEWAKE_ALL
static inline struct intel_uncore *to_intel_uncore(struct drm_device *drm)
{
return &to_xe_device(drm)->uncore;