Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
drm/i915: move intel_dram.[ch] from soc/ to display/
The remaining users of intel_dram.[ch] are all in display. Move them
under display.
This allows us to remove the compat soc/intel_dram.h from xe.
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patch.msgid.link/4c0fbdab989a70d287536a7eafb002dc836ced12.1763578288.git.jani.nikula@intel.com
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+11
-22
+1
-1
drivers/gpu/drm/i915/Makefile
+1
-1
drivers/gpu/drm/i915/Makefile
···
58
58
59
59
# core peripheral code
60
60
i915-y += \
61
-
soc/intel_dram.o \
62
61
soc/intel_gmch.o \
63
62
soc/intel_rom.o
64
63
···
267
268
display/intel_dpll_mgr.o \
268
269
display/intel_dpt.o \
269
270
display/intel_dpt_common.o \
271
+
display/intel_dram.o \
270
272
display/intel_drrs.o \
271
273
display/intel_dsb.o \
272
274
display/intel_dsb_buffer.o \
+1
-2
drivers/gpu/drm/i915/display/i9xx_wm.c
+1
-2
drivers/gpu/drm/i915/display/i9xx_wm.c
···
7
7
8
8
#include <drm/drm_print.h>
9
9
10
-
#include "soc/intel_dram.h"
11
-
12
10
#include "i915_drv.h"
13
11
#include "i915_reg.h"
14
12
#include "i9xx_wm.h"
···
17
19
#include "intel_display.h"
18
20
#include "intel_display_regs.h"
19
21
#include "intel_display_trace.h"
22
+
#include "intel_dram.h"
20
23
#include "intel_fb.h"
21
24
#include "intel_mchbar_regs.h"
22
25
#include "intel_wm.h"
+1
-2
drivers/gpu/drm/i915/display/intel_bw.c
+1
-2
drivers/gpu/drm/i915/display/intel_bw.c
···
6
6
#include <drm/drm_atomic_state_helper.h>
7
7
#include <drm/drm_print.h>
8
8
9
-
#include "soc/intel_dram.h"
10
-
11
9
#include "i915_drv.h"
12
10
#include "i915_reg.h"
13
11
#include "intel_bw.h"
···
14
16
#include "intel_display_regs.h"
15
17
#include "intel_display_types.h"
16
18
#include "intel_display_utils.h"
19
+
#include "intel_dram.h"
17
20
#include "intel_mchbar_regs.h"
18
21
#include "intel_pcode.h"
19
22
#include "intel_uncore.h"
+1
-2
drivers/gpu/drm/i915/display/intel_cdclk.c
+1
-2
drivers/gpu/drm/i915/display/intel_cdclk.c
···
28
28
#include <drm/drm_fixed.h>
29
29
#include <drm/drm_print.h>
30
30
31
-
#include "soc/intel_dram.h"
32
-
33
31
#include "hsw_ips.h"
34
32
#include "i915_drv.h"
35
33
#include "i915_reg.h"
···
40
42
#include "intel_display_regs.h"
41
43
#include "intel_display_types.h"
42
44
#include "intel_display_utils.h"
45
+
#include "intel_dram.h"
43
46
#include "intel_mchbar_regs.h"
44
47
#include "intel_pci_config.h"
45
48
#include "intel_pcode.h"
+1
-2
drivers/gpu/drm/i915/display/intel_display_power.c
+1
-2
drivers/gpu/drm/i915/display/intel_display_power.c
···
8
8
9
9
#include <drm/drm_print.h>
10
10
11
-
#include "soc/intel_dram.h"
12
-
13
11
#include "i915_drv.h"
14
12
#include "i915_reg.h"
15
13
#include "intel_backlight_regs.h"
···
23
25
#include "intel_display_types.h"
24
26
#include "intel_display_utils.h"
25
27
#include "intel_dmc.h"
28
+
#include "intel_dram.h"
26
29
#include "intel_mchbar_regs.h"
27
30
#include "intel_parent.h"
28
31
#include "intel_pch_refclk.h"
+1
-1
drivers/gpu/drm/i915/display/skl_watermark.c
+1
-1
drivers/gpu/drm/i915/display/skl_watermark.c
···
8
8
#include <drm/drm_blend.h>
9
9
#include <drm/drm_print.h>
10
10
11
-
#include "soc/intel_dram.h"
12
11
#include "i915_reg.h"
13
12
#include "i9xx_wm.h"
14
13
#include "intel_atomic.h"
···
22
23
#include "intel_display_rpm.h"
23
24
#include "intel_display_types.h"
24
25
#include "intel_display_utils.h"
26
+
#include "intel_dram.h"
25
27
#include "intel_fb.h"
26
28
#include "intel_fixed.h"
27
29
#include "intel_flipq.h"
+1
-1
drivers/gpu/drm/i915/i915_driver.c
+1
-1
drivers/gpu/drm/i915/i915_driver.c
···
59
59
#include "display/intel_dmc.h"
60
60
#include "display/intel_dp.h"
61
61
#include "display/intel_dpt.h"
62
+
#include "display/intel_dram.h"
62
63
#include "display/intel_encoder.h"
63
64
#include "display/intel_fbdev.h"
64
65
#include "display/intel_gmbus.h"
···
88
87
#include "pxp/intel_pxp_debugfs.h"
89
88
#include "pxp/intel_pxp_pm.h"
90
89
91
-
#include "soc/intel_dram.h"
92
90
#include "soc/intel_gmch.h"
93
91
94
92
#include "i915_debugfs.h"
+2
-3
drivers/gpu/drm/i915/soc/intel_dram.c
drivers/gpu/drm/i915/display/intel_dram.c
+2
-3
drivers/gpu/drm/i915/soc/intel_dram.c
drivers/gpu/drm/i915/display/intel_dram.c
···
8
8
#include <drm/drm_managed.h>
9
9
#include <drm/drm_print.h>
10
10
11
-
#include "../display/intel_display_core.h" /* FIXME */
12
-
13
11
#include "i915_drv.h"
14
12
#include "i915_reg.h"
15
-
#include "i915_utils.h"
13
+
#include "intel_display_core.h"
14
+
#include "intel_display_utils.h"
16
15
#include "intel_dram.h"
17
16
#include "intel_mchbar_regs.h"
18
17
#include "intel_pcode.h"
drivers/gpu/drm/i915/soc/intel_dram.h
drivers/gpu/drm/i915/display/intel_dram.h
drivers/gpu/drm/i915/soc/intel_dram.h
drivers/gpu/drm/i915/display/intel_dram.h
+1
-1
drivers/gpu/drm/xe/Makefile
+1
-1
drivers/gpu/drm/xe/Makefile
···
220
220
221
221
# SOC code shared with i915
222
222
xe-$(CONFIG_DRM_XE_DISPLAY) += \
223
-
i915-soc/intel_dram.o \
224
223
i915-soc/intel_rom.o
225
224
226
225
# Display code shared with i915
···
271
272
i915-display/intel_dpll.o \
272
273
i915-display/intel_dpll_mgr.o \
273
274
i915-display/intel_dpt_common.o \
275
+
i915-display/intel_dram.o \
274
276
i915-display/intel_drrs.o \
275
277
i915-display/intel_dsb.o \
276
278
i915-display/intel_dsi.o \
-6
drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h
-6
drivers/gpu/drm/xe/compat-i915-headers/soc/intel_dram.h
+1
-1
drivers/gpu/drm/xe/display/xe_display.c
+1
-1
drivers/gpu/drm/xe/display/xe_display.c
···
17
17
#include <drm/intel/display_parent_interface.h>
18
18
#include <uapi/drm/xe_drm.h>
19
19
20
-
#include "soc/intel_dram.h"
21
20
#include "intel_acpi.h"
22
21
#include "intel_audio.h"
23
22
#include "intel_bw.h"
···
28
29
#include "intel_dmc.h"
29
30
#include "intel_dmc_wl.h"
30
31
#include "intel_dp.h"
32
+
#include "intel_dram.h"
31
33
#include "intel_encoder.h"
32
34
#include "intel_fbdev.h"
33
35
#include "intel_hdcp.h"