Commit f0702380 authored by Uma Shankar's avatar Uma Shankar
Browse files

drm/i915: Remove i915_reg.h from intel_dram.c 



Make intel_dram.c free from including i915_reg.h.

v3: Move MEM_SS info reg to display instead of pcode header (Jani)

v2: Move mem config register to newly added pcode header (Jani)

Signed-off-by: default avatarUma Shankar <uma.shankar@intel.com>
Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patch.msgid.link/20260205094341.1882816-9-uma.shankar@intel.com
parent 8b21f753

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

+6 −0
Original line number Diff line number Diff line
@@ -3075,6 +3075,12 @@ enum skl_power_gate { 
#define MTL_PIPE_CLKGATE_DIS2(pipe)		_MMIO_PIPE(pipe, _MTL_PIPE_CLKGATE_DIS2_A, _MTL_PIPE_CLKGATE_DIS2_B)

#define   MTL_DPFC_GATING_DIS			REG_BIT(6)



#define MTL_MEM_SS_INFO_GLOBAL			_MMIO(0x45700)

#define   XE3P_ECC_IMPACTING_DE			REG_BIT(12)

#define   MTL_N_OF_ENABLED_QGV_POINTS_MASK	REG_GENMASK(11, 8)

#define   MTL_N_OF_POPULATED_CH_MASK		REG_GENMASK(7, 4)

#define   MTL_DDR_TYPE_MASK			REG_GENMASK(3, 0)



#define MTL_MEM_SS_INFO_QGV_POINT_OFFSET	0x45710

#define MTL_MEM_SS_INFO_QGV_POINT_LOW(point)	_MMIO(MTL_MEM_SS_INFO_QGV_POINT_OFFSET + (point) * 8)

#define   MTL_TRCD_MASK			REG_GENMASK(31, 24)

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

+1 −1
Original line number Diff line number Diff line
@@ -9,9 +9,9 @@ 
#include <drm/drm_print.h>

#include <drm/intel/intel_pcode_regs.h>



#include "i915_reg.h"

#include "intel_display_core.h"

#include "intel_display_utils.h"

#include "intel_display_regs.h"

#include "intel_dram.h"

#include "intel_mchbar_regs.h"

#include "intel_parent.h"

drivers/gpu/drm/i915/i915_reg.h

+0 −6
Original line number Diff line number Diff line
@@ -1005,12 +1005,6 @@ 
#define OROM_OFFSET				_MMIO(0x1020c0)

#define   OROM_OFFSET_MASK			REG_GENMASK(20, 16)



#define MTL_MEM_SS_INFO_GLOBAL			_MMIO(0x45700)

#define   XE3P_ECC_IMPACTING_DE			REG_BIT(12)

#define   MTL_N_OF_ENABLED_QGV_POINTS_MASK	REG_GENMASK(11, 8)

#define   MTL_N_OF_POPULATED_CH_MASK		REG_GENMASK(7, 4)

#define   MTL_DDR_TYPE_MASK			REG_GENMASK(3, 0)



#define MTL_MEDIA_GSI_BASE		0x380000



#endif /* _I915_REG_H_ */