Commit fd585ee8 authored by Jani Nikula's avatar Jani Nikula
Browse files

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: default avatarMichał Grzelak <michal.grzelak@intel.com>
Link: https://lore.kernel.org/r/06c24e1f6a7a2f6b4801b0a079eec3cc924402a7.1749469962.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 5f105b2e

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

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __INTEL_CMTG_REGS_H__

#define __INTEL_CMTG_REGS_H__



#include "i915_reg_defs.h"

#include "intel_display_reg_defs.h"



#define CMTG_CLK_SEL			_MMIO(0x46160)

#define CMTG_CLK_SEL_A_MASK		REG_GENMASK(31, 29)

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

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __INTEL_COMBO_PHY_REGS__

#define __INTEL_COMBO_PHY_REGS__



#include "i915_reg_defs.h"

#include "intel_display_reg_defs.h"



#define _ICL_COMBOPHY_A				0x162000

#define _ICL_COMBOPHY_B				0x6C000

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

+1 −1
Original line number Diff line number Diff line
@@ -6,8 +6,8 @@ 
#ifndef __INTEL_CX0_PHY_REGS_H__

#define __INTEL_CX0_PHY_REGS_H__



#include "i915_reg_defs.h"

#include "intel_display_limits.h"

#include "intel_display_reg_defs.h"



/* DDI Buffer Control */

#define _DDI_CLK_VALFREQ_A		0x64030

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

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ 


#include <linux/types.h>



#include "intel_display_reg_defs.h"



struct intel_dkl_phy_reg {

	u32 reg:24;

	u32 bank_idx:4;

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

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __INTEL_DMC_REGS_H__

#define __INTEL_DMC_REGS_H__



#include "i915_reg_defs.h"

#include "intel_display_reg_defs.h"



enum dmc_event_id {

	DMC_EVENT_TRUE = 0x0,