Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/xe: remove compat i915_drv.h and -Ddrm_i915_private=xe_device hack
The xe display build no longer needs the compat i915_drv.h or the ugly
-Ddrm_i915_private=xe_device hack. Remove them, with great pleasure.
Reviewed-by: Matt Roper <matthew.d.roper@intel.com>
Link: https://patch.msgid.link/8d2da5404439ed334d7682922b599f36eeb60e9d.1767009044.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+1
-24
+1
-2
drivers/gpu/drm/xe/Makefile
+1
-2
drivers/gpu/drm/xe/Makefile
···
196
196
# i915 Display compat #defines and #includes
197
197
subdir-ccflags-$(CONFIG_DRM_XE_DISPLAY) += \
198
198
-I$(src)/compat-i915-headers \
199
-
-I$(srctree)/drivers/gpu/drm/i915/display/ \
200
-
-Ddrm_i915_private=xe_device
199
+
-I$(srctree)/drivers/gpu/drm/i915/display/
201
200
202
201
# Rule to build display code shared with i915
203
202
$(obj)/i915-display/%.o: $(srctree)/drivers/gpu/drm/i915/display/%.c FORCE
-22
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
-22
drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h
···
1
-
/* SPDX-License-Identifier: MIT */
2
-
/*
3
-
* Copyright © 2023 Intel Corporation
4
-
*/
5
-
#ifndef _XE_I915_DRV_H_
6
-
#define _XE_I915_DRV_H_
7
-
8
-
/*
9
-
* "Adaptation header" to allow i915 display to also build for xe driver.
10
-
* TODO: refactor i915 and xe so this can cease to exist
11
-
*/
12
-
13
-
#include <drm/drm_drv.h>
14
-
15
-
#include "xe_device_types.h"
16
-
17
-
static inline struct drm_i915_private *to_i915(const struct drm_device *dev)
18
-
{
19
-
return container_of(dev, struct drm_i915_private, drm);
20
-
}
21
-
22
-
#endif