Skip to content

Commit fd585ee

Browse files
committed
drm/i915/display: include intel_display_reg_defs.h from display regs files
Some display register files include i915_reg_defs.h, some don't include anything. Prefer intel_display_reg_defs.h in display. Reviewed-by: Michał Grzelak <[email protected]> Link: https://lore.kernel.org/r/06c24e1f6a7a2f6b4801b0a079eec3cc924402a7.1749469962.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 5f105b2 commit fd585ee

File tree

8 files changed

+9
-7
lines changed

8 files changed

+9
-7
lines changed

drivers/gpu/drm/i915/display/intel_cmtg_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __INTEL_CMTG_REGS_H__
77
#define __INTEL_CMTG_REGS_H__
88

9-
#include "i915_reg_defs.h"
9+
#include "intel_display_reg_defs.h"
1010

1111
#define CMTG_CLK_SEL _MMIO(0x46160)
1212
#define CMTG_CLK_SEL_A_MASK REG_GENMASK(31, 29)

drivers/gpu/drm/i915/display/intel_combo_phy_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __INTEL_COMBO_PHY_REGS__
77
#define __INTEL_COMBO_PHY_REGS__
88

9-
#include "i915_reg_defs.h"
9+
#include "intel_display_reg_defs.h"
1010

1111
#define _ICL_COMBOPHY_A 0x162000
1212
#define _ICL_COMBOPHY_B 0x6C000

drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#ifndef __INTEL_CX0_PHY_REGS_H__
77
#define __INTEL_CX0_PHY_REGS_H__
88

9-
#include "i915_reg_defs.h"
109
#include "intel_display_limits.h"
10+
#include "intel_display_reg_defs.h"
1111

1212
/* DDI Buffer Control */
1313
#define _DDI_CLK_VALFREQ_A 0x64030

drivers/gpu/drm/i915/display/intel_dkl_phy_regs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
#include <linux/types.h>
1010

11+
#include "intel_display_reg_defs.h"
12+
1113
struct intel_dkl_phy_reg {
1214
u32 reg:24;
1315
u32 bank_idx:4;

drivers/gpu/drm/i915/display/intel_dmc_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __INTEL_DMC_REGS_H__
77
#define __INTEL_DMC_REGS_H__
88

9-
#include "i915_reg_defs.h"
9+
#include "intel_display_reg_defs.h"
1010

1111
enum dmc_event_id {
1212
DMC_EVENT_TRUE = 0x0,

drivers/gpu/drm/i915/display/intel_gmbus_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __INTEL_GMBUS_REGS_H__
77
#define __INTEL_GMBUS_REGS_H__
88

9-
#include "i915_reg_defs.h"
9+
#include "intel_display_reg_defs.h"
1010

1111
#define __GMBUS_MMIO_BASE(__display) ((__display)->gmbus.mmio_base)
1212

drivers/gpu/drm/i915/display/intel_hti_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#ifndef __INTEL_HTI_REGS_H__
77
#define __INTEL_HTI_REGS_H__
88

9-
#include "i915_reg_defs.h"
9+
#include "intel_display_reg_defs.h"
1010

1111
#define HDPORT_STATE _MMIO(0x45050)
1212
#define HDPORT_DPLL_USED_MASK REG_GENMASK(15, 12)

drivers/gpu/drm/i915/display/intel_sbi_regs.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#ifndef __INTEL_SBI_REGS_H__
55
#define __INTEL_SBI_REGS_H__
66

7-
#include "i915_reg_defs.h"
7+
#include "intel_display_reg_defs.h"
88

99
/*
1010
* Sideband Interface (SBI) is programmed indirectly, via SBI_ADDR, which

0 commit comments

Comments
 (0)