Skip to content

Commit 188bdfb

Browse files
committed
drm/i915: split out display register macros to a separate file
This is a scripted split of the display related register macros from i915_reg.h to display/intel_display_regs.h. As a starting point, move all the macros that are only used in display code (or GVT). If there are users in core i915 code or soc/, or no users anywhere, keep the macros in i915_reg.h. This is done in groups of macros separated by blank lines, moving the comments along with the groups. Some manually picked macro groups are kept/moved regardless of the heuristics above. This is obviously a very crude approach. It's not perfect. But there are 4.2k lines in i915_reg.h, and its refactoring has ground to a halt. This is the big hammer that splits the file to two, and enables further cleanup. Cc: Suraj Kandpal <[email protected]> Cc: Ville Syrjälä <[email protected]> Cc: Lucas De Marchi <[email protected]> Reviewed-by: Suraj Kandpal <[email protected]> # v2 Reviewed-by: Lucas De Marchi <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jani Nikula <[email protected]>
1 parent 34c5536 commit 188bdfb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+3020
-2934
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "intel_crtc.h"
1919
#include "intel_de.h"
2020
#include "intel_display_power.h"
21+
#include "intel_display_regs.h"
2122
#include "intel_display_types.h"
2223
#include "intel_dp.h"
2324
#include "intel_dp_aux.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "intel_crtc.h"
1616
#include "intel_de.h"
1717
#include "intel_display_power.h"
18+
#include "intel_display_regs.h"
1819
#include "intel_display_types.h"
1920
#include "intel_dp_aux.h"
2021
#include "intel_dpio_phy.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "i915_reg.h"
1111
#include "intel_color_regs.h"
1212
#include "intel_de.h"
13+
#include "intel_display_regs.h"
1314
#include "intel_display_rpm.h"
1415
#include "intel_display_types.h"
1516
#include "intel_pcode.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "i9xx_display_sr.h"
1010
#include "i9xx_wm_regs.h"
1111
#include "intel_de.h"
12+
#include "intel_display_regs.h"
1213
#include "intel_gmbus.h"
1314
#include "intel_pci_config.h"
1415

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
/*
33
* Copyright © 2020 Intel Corporation
44
*/
5+
56
#include <linux/kernel.h>
67

78
#include <drm/drm_atomic_helper.h>
@@ -17,6 +18,7 @@
1718
#include "intel_atomic_plane.h"
1819
#include "intel_de.h"
1920
#include "intel_display_irq.h"
21+
#include "intel_display_regs.h"
2022
#include "intel_display_types.h"
2123
#include "intel_fb.h"
2224
#include "intel_fbc.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#include "intel_bo.h"
1212
#include "intel_de.h"
1313
#include "intel_display.h"
14+
#include "intel_display_regs.h"
1415
#include "intel_display_trace.h"
1516
#include "intel_fb.h"
1617
#include "intel_mchbar_regs.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
#include "intel_crtc.h"
4646
#include "intel_ddi.h"
4747
#include "intel_de.h"
48+
#include "intel_display_regs.h"
4849
#include "intel_dsi.h"
4950
#include "intel_dsi_vbt.h"
5051
#include "intel_panel.h"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
#include <linux/kernel.h>
88
#include <linux/pwm.h>
99
#include <linux/string_helpers.h>
10-
1110
#include <acpi/video.h>
1211

1312
#include <drm/drm_file.h>
@@ -19,6 +18,7 @@
1918
#include "intel_backlight_regs.h"
2019
#include "intel_connector.h"
2120
#include "intel_de.h"
21+
#include "intel_display_regs.h"
2222
#include "intel_display_rpm.h"
2323
#include "intel_display_types.h"
2424
#include "intel_dp_aux_backlight.h"

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,15 @@
66
#include <drm/drm_atomic_state_helper.h>
77

88
#include "soc/intel_dram.h"
9+
910
#include "i915_drv.h"
1011
#include "i915_reg.h"
1112
#include "i915_utils.h"
1213
#include "intel_atomic.h"
1314
#include "intel_bw.h"
1415
#include "intel_cdclk.h"
1516
#include "intel_display_core.h"
17+
#include "intel_display_regs.h"
1618
#include "intel_display_types.h"
1719
#include "intel_mchbar_regs.h"
1820
#include "intel_pcode.h"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
#include "intel_cdclk.h"
3939
#include "intel_crtc.h"
4040
#include "intel_de.h"
41+
#include "intel_display_regs.h"
4142
#include "intel_display_types.h"
4243
#include "intel_mchbar_regs.h"
4344
#include "intel_pci_config.h"

0 commit comments

Comments
 (0)